From bea992ff5e70e31de4380cdbf068787371006d60 Mon Sep 17 00:00:00 2001 From: Tomas Zaluckij Date: Fri, 17 Mar 2023 21:03:25 +0000 Subject: [PATCH 1/2] fix makeSetupHook deprecations --- pkgs/sops-import-keys-hook/default.nix | 3 ++- pkgs/sops-pgp-hook/default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/sops-import-keys-hook/default.nix b/pkgs/sops-import-keys-hook/default.nix index 66b94aa..98ada72 100644 --- a/pkgs/sops-import-keys-hook/default.nix +++ b/pkgs/sops-import-keys-hook/default.nix @@ -1,8 +1,9 @@ { stdenv, makeSetupHook, gnupg, sops, nix }: (makeSetupHook { + name = "sops-import-keys-hook"; substitutions = { gpg = "${gnupg}/bin/gpg"; }; - deps = [ sops gnupg ]; + propagatedBuildInputs = [ sops gnupg ]; } ./sops-import-keys-hook.bash) diff --git a/pkgs/sops-pgp-hook/default.nix b/pkgs/sops-pgp-hook/default.nix index 4f7d82e..8c08850 100644 --- a/pkgs/sops-pgp-hook/default.nix +++ b/pkgs/sops-pgp-hook/default.nix @@ -1,8 +1,9 @@ { stdenv, makeSetupHook, gnupg, sops, nix }: (makeSetupHook { + name = "sops-pgp-hook"; substitutions = { gpg = "${gnupg}/bin/gpg"; }; - deps = [ sops gnupg ]; + propagatedBuildInputs = [ sops gnupg ]; } ./sops-pgp-hook.bash) From b84b3177a1031f70e5d5c20aa8c748dade477385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 8 May 2023 06:48:56 +0200 Subject: [PATCH 2/2] fix makeSetupHook's also for older nixos release --- pkgs/sops-import-keys-hook/default.nix | 8 ++++++-- pkgs/sops-pgp-hook/default.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/sops-import-keys-hook/default.nix b/pkgs/sops-import-keys-hook/default.nix index 98ada72..1e6d10d 100644 --- a/pkgs/sops-import-keys-hook/default.nix +++ b/pkgs/sops-import-keys-hook/default.nix @@ -1,9 +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"; }; - propagatedBuildInputs = [ sops gnupg ]; + ${propagatedBuildInputs} = [ sops gnupg ]; } ./sops-import-keys-hook.bash) diff --git a/pkgs/sops-pgp-hook/default.nix b/pkgs/sops-pgp-hook/default.nix index 8c08850..b088d39 100644 --- a/pkgs/sops-pgp-hook/default.nix +++ b/pkgs/sops-pgp-hook/default.nix @@ -1,9 +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"; }; - propagatedBuildInputs = [ sops gnupg ]; + ${propagatedBuildInputs} = [ sops gnupg ]; } ./sops-pgp-hook.bash)