mirrors/sops-nix
1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2024-12-14 11:57:52 +00:00
Code Activity

Merge pull request #326 from Mic92/deprecation-stuff

Browse source 
fix makeSetupHook deprecations
This commit is contained in:
Jörg Thalheim 2023-05-08 05:58:13 +01:00 committed by GitHub
commit 2e77ca66d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/sops-import-keys-hook/default.nix
View file

@ -1,8 +1,13 @@
{ stdenv, makeSetupHook, gnupg, sops, nix }:
{ makeSetupHook, gnupg, sops, lib }:
let
# FIXME: drop after 23.05
propagatedBuildInputs = if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.05") then "deps" else "propagatedBuildInputs";
in
(makeSetupHook {
name = "sops-import-keys-hook";
substitutions = {
gpg = "${gnupg}/bin/gpg";
};
deps = [ sops gnupg ];
${propagatedBuildInputs} = [ sops gnupg ];
} ./sops-import-keys-hook.bash)

9
pkgs/sops-pgp-hook/default.nix
View file

@ -1,8 +1,13 @@
{ stdenv, makeSetupHook, gnupg, sops, nix }:
{ makeSetupHook, gnupg, sops, lib }:
let
# FIXME: drop after 23.05
propagatedBuildInputs = if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.05") then "deps" else "propagatedBuildInputs";
in
(makeSetupHook {
name = "sops-pgp-hook";
substitutions = {
gpg = "${gnupg}/bin/gpg";
};
deps = [ sops gnupg ];
${propagatedBuildInputs} = [ sops gnupg ];
} ./sops-pgp-hook.bash)