fix(treewide): remove trailing whitespace
Change-Id: I3116d3f397ba309be2418e188327143c7187b789 Reviewed-on: https://cl.snix.dev/c/snix/+/30235 Reviewed-by: Florian Klink <flokli@flokli.de> Tested-by: besadii Reviewed-by: Paul Meyer <katexochen0@gmail.com> Autosubmit: Paul Meyer <katexochen0@gmail.com>
This commit is contained in:
parent
f5c23c5935
commit
bfd948c6e2
10 changed files with 18 additions and 18 deletions
|
|
@ -35,7 +35,7 @@ Mozilla Public License Version 2.0
|
||||||
means any form of the work other than Source Code Form.
|
means any form of the work other than Source Code Form.
|
||||||
|
|
||||||
1.7. "Larger Work"
|
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.
|
a separate file or files, that is not Covered Software.
|
||||||
|
|
||||||
1.8. "License"
|
1.8. "License"
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@
|
||||||
# keycloak_role.blablabla.id
|
# keycloak_role.blablabla.id
|
||||||
# ]
|
# ]
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
# resource "keycloak_role" "can_manage_trusted_contributors" {
|
# resource "keycloak_role" "can_manage_trusted_contributors" {
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
# # WARNING: This give PII access to the user.
|
# # WARNING: This give PII access to the user.
|
||||||
# resource "keycloak_role" "can_manage_snix" {
|
# resource "keycloak_role" "can_manage_snix" {
|
||||||
# }
|
# }
|
||||||
|
|
@ -87,14 +87,14 @@ resource "keycloak_role" "grafana_admin" {
|
||||||
|
|
||||||
# resource "keycloak_role" "forgejo_admin" {
|
# resource "keycloak_role" "forgejo_admin" {
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
# resource "keycloak_role" "forgejo_trusted_contributor" {
|
# resource "keycloak_role" "forgejo_trusted_contributor" {
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
# # Gerrit
|
# # Gerrit
|
||||||
#
|
#
|
||||||
# resource "keycloak_role" "gerrit_admin" {
|
# resource "keycloak_role" "gerrit_admin" {
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
# resource "keycloak_role" "gerrit_trusted_contributor" {
|
# resource "keycloak_role" "gerrit_trusted_contributor" {
|
||||||
# }
|
# }
|
||||||
|
|
|
||||||
|
|
@ -230,8 +230,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Inspired from Gerrit's way of doing things (from Lix).
|
# Inspired from Gerrit's way of doing things (from Lix).
|
||||||
# Before starting Forgejo, we will re-converge any required information.
|
# Before starting Forgejo, we will re-converge any required information.
|
||||||
# TODO: learn how to use update-oauth as well?
|
# TODO: learn how to use update-oauth as well?
|
||||||
systemd.services.forgejo-keys = {
|
systemd.services.forgejo-keys = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
||||||
|
|
@ -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
|
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
|
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
|
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.
|
collaborate or contribute.
|
||||||
|
|
||||||
Tvix is developed as a GPLv3-licensed free software project with
|
Tvix is developed as a GPLv3-licensed free software project with
|
||||||
|
|
|
||||||
|
|
@ -567,7 +567,7 @@ it is never sent and is therefore obsolete after that.
|
||||||
|
|
||||||
### Inputs
|
### Inputs
|
||||||
#### If protocol version is 1.22 or newer
|
#### 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
|
#### If protocol version older than 1.22
|
||||||
paths :: [Set][se-Set] of [StorePath][se-StorePath]
|
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<br>
|
**Introduced:** Protocol 1.14, Nix 1.9<br>
|
||||||
|
|
||||||
Verify store either only db and existence of path or entire contents of store
|
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
|
### Inputs
|
||||||
- checkContents :: [Bool64][se-Bool64]
|
- checkContents :: [Bool64][se-Bool64]
|
||||||
|
|
|
||||||
2
snix/nix-compat/testdata/nix.conf
vendored
2
snix/nix-compat/testdata/nix.conf
vendored
|
|
@ -11,7 +11,7 @@ sandbox-fallback = false
|
||||||
substituters = https://nix-community.cachix.org https://cache.nixos.org/
|
substituters = https://nix-community.cachix.org https://cache.nixos.org/
|
||||||
system-features = nixos-test benchmark big-parallel kvm
|
system-features = nixos-test benchmark big-parallel kvm
|
||||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
||||||
trusted-substituters =
|
trusted-substituters =
|
||||||
trusted-users = flokli
|
trusted-users = flokli
|
||||||
extra-platforms = aarch64-linux i686-linux
|
extra-platforms = aarch64-linux i686-linux
|
||||||
extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl
|
extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl
|
||||||
|
|
|
||||||
4
snix/nix-compat/testdata/other_nix.conf
vendored
4
snix/nix-compat/testdata/other_nix.conf
vendored
|
|
@ -5,11 +5,11 @@ cores = 0
|
||||||
max-jobs = 8
|
max-jobs = 8
|
||||||
require-sigs = true
|
require-sigs = true
|
||||||
sandbox=true
|
sandbox=true
|
||||||
sandbox-fallback =
false
|
sandbox-fallback = false
|
||||||
substituters = https://nix-community.cachix.org https://cache.nixos.org/ #comment # stillcomment
|
substituters = https://nix-community.cachix.org https://cache.nixos.org/ #comment # stillcomment
|
||||||
system-features = nixos-test benchmark big-parallel kvm
|
system-features = nixos-test benchmark big-parallel kvm
|
||||||
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
|
||||||
trusted-substituters =
|
trusted-substituters =
|
||||||
trusted-users = flokli
|
trusted-users = flokli
|
||||||
extra-platforms = aarch64-linux i686-linux
|
extra-platforms = aarch64-linux i686-linux
|
||||||
extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl
|
extra-sandbox-paths = /run/binfmt /nix/store/swwyxyqpazzvbwx8bv40z7ih144q841f-qemu-aarch64-binfmt-P-x86_64-unknown-linux-musl
|
||||||
|
|
|
||||||
|
|
@ -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
|
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.
|
overlay store at /nix/store.
|
||||||
*/
|
*/
|
||||||
shell = (
|
shell = (
|
||||||
|
|
|
||||||
2
third_party/lix_forgejo/default.nix
vendored
2
third_party/lix_forgejo/default.nix
vendored
|
|
@ -9,7 +9,7 @@
|
||||||
api_dont_notify = ./api-dont-notify.patch;
|
api_dont_notify = ./api-dont-notify.patch;
|
||||||
# Sign in redirection to the OAuth 2 handler.
|
# Sign in redirection to the OAuth 2 handler.
|
||||||
signin_redirect = ./signin-redirect.patch;
|
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;
|
forgejo_is_now_gerrit_native = ./0001-lix-Make-a-Code-Review-Gerrit-tab.patch;
|
||||||
# Modified for our Gerrit instance.
|
# Modified for our Gerrit instance.
|
||||||
forgejo_knows_about_gerrit = ./0002-lix-link-gerrit-cl-and-change-ids.patch;
|
forgejo_knows_about_gerrit = ./0002-lix-link-gerrit-cl-and-change-ids.patch;
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ contribute after following this guide.
|
||||||
- Ensure you have [Nix][] installed.
|
- Ensure you have [Nix][] installed.
|
||||||
|
|
||||||
### Getting the sources
|
### 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).
|
(read-only) mirror on [GitHub](https://github.com/snix-project/snix).
|
||||||
|
|
||||||
Check out the source code as follows:
|
Check out the source code as follows:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue