diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-11-11 17:21:39 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-11-11 17:21:39 -0500 |
| commit | 8d0a3bfcdae4bc9dd15e7fb0488dce8f16e8f867 (patch) | |
| tree | 77f19aa2370df0e0d9bfc7effd5fd5f982642cef /etc | |
| parent | aee3c5a894fddf88810f18fa8880b423b078b3fa (diff) | |
| parent | af6105afc67a15a491a0a4fd18a28c9f801a0b94 (diff) | |
| download | guix-8d0a3bfcdae4bc9dd15e7fb0488dce8f16e8f867.tar.gz guix-8d0a3bfcdae4bc9dd15e7fb0488dce8f16e8f867.zip | |
Merge branch 'master' into mesa-updates
Change-Id: I6848392e8c1ffca1473bd25511d8d90ae0f98ce7
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/completion/fish/guix.fish | 4 | ||||
| -rw-r--r-- | etc/git/gitconfig | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/etc/completion/fish/guix.fish b/etc/completion/fish/guix.fish index 8d1a1eb1e9..e6c290256f 100644 --- a/etc/completion/fish/guix.fish +++ b/etc/completion/fish/guix.fish @@ -298,7 +298,7 @@ complete -f -c guix -n '__fish_guix_using_command publish' -l repl -d '[=PORT] s #### lint set -l remotecommands checkers list-checkers -complete -f -c guix -n '__fish_guix_needs_command' -a lint -d 'Run a set of checkers on the specificied package.' +complete -f -c guix -n '__fish_guix_needs_command' -a lint -d 'Run a set of checkers on the specified package.' complete -f -c guix -n '__fish_guix_using_command lint' -l list-checkers -d 'Display the list of available lint checkers.' complete -f -c guix -n '__fish_guix_using_command lint' -l checkers -d 'Only run the specified checkers.' complete -f -c guix -n '__fish_guix_using_command lint' -l description -d 'Validate package descriptions.' @@ -327,7 +327,7 @@ complete -f -c guix -n '__fish_guix_using_command import; and not __fish_seen_su ##### import cpan complete -f -c guix -n '__fish_guix_using_command import; and not __fish_seen_subcommand_from $remotecommands' -a cpan -d 'Import and convert the CPAN package for PACKAGE-NAME.' ##### import hackage -complete -f -c guix -n '__fish_guix_using_command import; and not __fish_seen_subcommand_from $remotecommands' -a hackage -d 'Import and convert the Hackage package for PACKAGE-NAME. If PACKAGE-NAME includes a suffix constituted by a at-sign followed by a numerical version (as used with Guix packages), then a definition for the specified version of the package will be generated. If no version suffix is pecified, then the generated package definition will correspond to the latest available version.' +complete -f -c guix -n '__fish_guix_using_command import; and not __fish_seen_subcommand_from $remotecommands' -a hackage -d 'Import and convert the Hackage package for PACKAGE-NAME. If PACKAGE-NAME includes a suffix constituted by a at-sign followed by a numerical version (as used with Guix packages), then a definition for the specified version of the package will be generated. If no version suffix is specified, then the generated package definition will correspond to the latest available version.' complete -f -c guix -n '__fish_guix_using_command import; and __fish_seen_subcommand_from hackage' -s e -d 'ALIST specify environment for Cabal evaluation.' complete -f -c guix -n '__fish_guix_using_command import; and __fish_seen_subcommand_from hackage' -a "--cabal-environment=" -d 'ALIST specify environment for Cabal evaluation.' complete -f -c guix -n '__fish_guix_using_command import; and __fish_seen_subcommand_from hackage' -s s -l stdin -d 'Read from standard input.' diff --git a/etc/git/gitconfig b/etc/git/gitconfig index 907ad01804..654a630b18 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -16,3 +16,10 @@ to = guix-patches@gnu.org headerCmd = etc/teams.scm cc-members-header-cmd thread = no + +[b4] + attestation-check-dkim = off + attestation-policy = off + linkmask = https://yhetil.org/guix/%s + linktrailermask = https://yhetil.org/guix/%s + midmask = https://yhetil.org/guix/%s |