Merge branch 'master' into lists

This commit is contained in:
Jörg Thalheim 2021-01-27 06:23:50 +00:00 committed by GitHub
commit 47a99b6957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 8 deletions

View file

@ -20,6 +20,7 @@
'';
} {
inherit pkgs;
inherit (pkgs) system;
};
pgp-keys = makeTest {
@ -73,5 +74,6 @@
'';
} {
inherit pkgs;
inherit (pkgs) system;
};
}

View file

@ -27,4 +27,6 @@ sopsPGPHook() {
if [ -z "${shellHook-}" ]; then
shellHook=sopsPGPHook
else
shellHook="sopsPGPHook;${shellHook}"
fi