From bfd948c6e2465c035a2a3195623ca80d08e23574 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 21 Mar 2025 15:29:36 +0100 Subject: [PATCH] fix(treewide): remove trailing whitespace Change-Id: I3116d3f397ba309be2418e188327143c7187b789 Reviewed-on: https://cl.snix.dev/c/snix/+/30235 Reviewed-by: Florian Klink Tested-by: besadii Reviewed-by: Paul Meyer Autosubmit: Paul Meyer --- contrib/refscan/LICENSES/MPL-2.0.txt | 2 +- ops/keycloak/permissions.tf | 12 ++++++------ ops/modules/forgejo.nix | 4 ++-- snix/docs/src/introduction.md | 2 +- snix/docs/src/nix-daemon/operations.md | 4 ++-- snix/nix-compat/testdata/nix.conf | 2 +- snix/nix-compat/testdata/other_nix.conf | 4 ++-- snix/nix-daemon/tests/default.nix | 2 +- third_party/lix_forgejo/default.nix | 2 +- web/content/docs/guides/building.md | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/contrib/refscan/LICENSES/MPL-2.0.txt b/contrib/refscan/LICENSES/MPL-2.0.txt index ee6256cdb..d0a1fa148 100644 --- a/contrib/refscan/LICENSES/MPL-2.0.txt +++ b/contrib/refscan/LICENSES/MPL-2.0.txt @@ -35,7 +35,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" diff --git a/ops/keycloak/permissions.tf b/ops/keycloak/permissions.tf index 4549d1f30..98a90d862 100644 --- a/ops/keycloak/permissions.tf +++ b/ops/keycloak/permissions.tf @@ -6,10 +6,10 @@ # keycloak_role.blablabla.id # ] # } -# +# # resource "keycloak_role" "can_manage_trusted_contributors" { # } -# +# # # WARNING: This give PII access to the user. # resource "keycloak_role" "can_manage_snix" { # } @@ -87,14 +87,14 @@ resource "keycloak_role" "grafana_admin" { # resource "keycloak_role" "forgejo_admin" { # } -# +# # resource "keycloak_role" "forgejo_trusted_contributor" { # } -# +# # # Gerrit -# +# # resource "keycloak_role" "gerrit_admin" { # } -# +# # resource "keycloak_role" "gerrit_trusted_contributor" { # } diff --git a/ops/modules/forgejo.nix b/ops/modules/forgejo.nix index 695c68272..1a64863b9 100644 --- a/ops/modules/forgejo.nix +++ b/ops/modules/forgejo.nix @@ -230,8 +230,8 @@ in }; }; - # Inspired from Gerrit's way of doing things (from Lix). - # Before starting Forgejo, we will re-converge any required information. + # Inspired from Gerrit's way of doing things (from Lix). + # Before starting Forgejo, we will re-converge any required information. # TODO: learn how to use update-oauth as well? systemd.services.forgejo-keys = { enable = true; diff --git a/snix/docs/src/introduction.md b/snix/docs/src/introduction.md index e4ed45f88..e21e4bd6a 100644 --- a/snix/docs/src/introduction.md +++ b/snix/docs/src/introduction.md @@ -11,7 +11,7 @@ with respects to evaluation and building Nix expressions & systems. Tvix still is in its early stages of development, **you cannot yet use it as a Nix replacement**. However, if you willing to roll up your sleeves and pipe together some existing functionality, it may already provide most of what is -needed for your usecase! [Get in touch](./community.md) if you want to +needed for your usecase! [Get in touch](./community.md) if you want to collaborate or contribute. Tvix is developed as a GPLv3-licensed free software project with diff --git a/snix/docs/src/nix-daemon/operations.md b/snix/docs/src/nix-daemon/operations.md index 80cd325b9..f80aa36b0 100644 --- a/snix/docs/src/nix-daemon/operations.md +++ b/snix/docs/src/nix-daemon/operations.md @@ -567,7 +567,7 @@ it is never sent and is therefore obsolete after that. ### Inputs #### If protocol version is 1.22 or newer -paths :: [Map][se-Map] of [StorePath][se-StorePath] to [OptContentAddress][se-OptContentAddress] +paths :: [Map][se-Map] of [StorePath][se-StorePath] to [OptContentAddress][se-OptContentAddress] #### If protocol version older than 1.22 paths :: [Set][se-Set] of [StorePath][se-StorePath] @@ -642,7 +642,7 @@ Optimise store by hardlinking files with the same content. **Introduced:** Protocol 1.14, Nix 1.9
Verify store either only db and existence of path or entire contents of store -paths against the NAR hash. +paths against the NAR hash. ### Inputs - checkContents :: [Bool64][se-Bool64] diff --git a/snix/nix-compat/testdata/nix.conf b/snix/nix-compat/testdata/nix.conf index 1fa089053..cb88b6d6e 100644 --- a/snix/nix-compat/testdata/nix.conf +++ b/snix/nix-compat/testdata/nix.conf @@ -11,7 +11,7 @@ sandbox-fallback = false substituters = https://nix-community.cachix.org https://cache.nixos.org/ system-features = nixos-test benchmark big-parallel kvm trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= -trusted-substituters = +trusted-substituters = trusted-users = flokli extra-platforms = aarch64-linux i686-linux extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl diff --git a/snix/nix-compat/testdata/other_nix.conf b/snix/nix-compat/testdata/other_nix.conf index 63c4ea2ec..17bb2cf92 100644 --- a/snix/nix-compat/testdata/other_nix.conf +++ b/snix/nix-compat/testdata/other_nix.conf @@ -5,11 +5,11 @@ cores = 0 max-jobs = 8 require-sigs = true sandbox=true -sandbox-fallback = false +sandbox-fallback = false substituters = https://nix-community.cachix.org https://cache.nixos.org/ #comment # stillcomment system-features = nixos-test benchmark big-parallel kvm trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= -trusted-substituters = +trusted-substituters = trusted-users = flokli extra-platforms = aarch64-linux i686-linux extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl diff --git a/snix/nix-daemon/tests/default.nix b/snix/nix-daemon/tests/default.nix index 186cdab79..af9f9b187 100644 --- a/snix/nix-daemon/tests/default.nix +++ b/snix/nix-daemon/tests/default.nix @@ -101,7 +101,7 @@ in ); /* This currently cannot work as our store is not mounted at /nix/store but at another location, and since nix-shell - needs bash it fails with `unable to exec /nix/store/xxx-bash/bin/bash`, to run shell we need to chroot to have the + needs bash it fails with `unable to exec /nix/store/xxx-bash/bin/bash`, to run shell we need to chroot to have the overlay store at /nix/store. */ shell = ( diff --git a/third_party/lix_forgejo/default.nix b/third_party/lix_forgejo/default.nix index c864592ac..c1f4197e1 100644 --- a/third_party/lix_forgejo/default.nix +++ b/third_party/lix_forgejo/default.nix @@ -9,7 +9,7 @@ api_dont_notify = ./api-dont-notify.patch; # Sign in redirection to the OAuth 2 handler. signin_redirect = ./signin-redirect.patch; - # Series to make Forgejo more Gerrit compatible. + # Series to make Forgejo more Gerrit compatible. forgejo_is_now_gerrit_native = ./0001-lix-Make-a-Code-Review-Gerrit-tab.patch; # Modified for our Gerrit instance. forgejo_knows_about_gerrit = ./0002-lix-link-gerrit-cl-and-change-ids.patch; diff --git a/web/content/docs/guides/building.md b/web/content/docs/guides/building.md index 6e3161273..a96f946c0 100644 --- a/web/content/docs/guides/building.md +++ b/web/content/docs/guides/building.md @@ -24,7 +24,7 @@ contribute after following this guide. - Ensure you have [Nix][] installed. ### Getting the sources -Snix is hosted in its own Forgejo instance, hosted on [git.snix.dev](https://git.snix.dev/snix/snix), and a +Snix is hosted in its own Forgejo instance, hosted on [git.snix.dev](https://git.snix.dev/snix/snix), and a (read-only) mirror on [GitHub](https://github.com/snix-project/snix). Check out the source code as follows: