diff options
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/ldapvi/default.nix | 4 | ||||
| -rw-r--r-- | overlays/pass/default.nix | 13 | ||||
| -rw-r--r-- | overlays/pass/pass.json | 14 |
3 files changed, 9 insertions, 22 deletions
diff --git a/overlays/ldapvi/default.nix b/overlays/ldapvi/default.nix index 58cd4ed..6a08ac4 100644 --- a/overlays/ldapvi/default.nix +++ b/overlays/ldapvi/default.nix | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | self: super: { | 1 | self: super: { |
| 2 | ldapvi = super.ldapvi.overrideAttrs (old: rec { | 2 | ldapvi = super.ldapvi.overrideAttrs (old: rec { |
| 3 | name = "ldapvi-${version}"; | 3 | name = "ldapvi-${version}"; |
| 4 | version = "${builtins.substring 0 7 self.sources.ldapvi.rev}-${self.sources.ldapvi.ref}"; | 4 | version = self.sources.overlays-ldapvi.version; |
| 5 | src = self.sources.ldapvi; | 5 | src = self.sources.overlays-ldapvi; |
| 6 | }); | 6 | }); |
| 7 | } | 7 | } |
diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix index 262492f..9deda77 100644 --- a/overlays/pass/default.nix +++ b/overlays/pass/default.nix | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | self: super: { | 1 | self: super: { |
| 2 | pass = super.pass.overrideAttrs (old: | 2 | pass = super.pass.overrideAttrs (old: rec { |
| 3 | self.mylibs.fetchedGit ./pass.json // { | 3 | pname = "password-store"; |
| 4 | patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; | 4 | name = "${pname}-${version}"; |
| 5 | } | 5 | version = self.sources.overlays-pass.version; |
| 6 | ); | 6 | src = self.sources.overlays-pass; |
| 7 | 7 | patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; | |
| 8 | }); | ||
| 8 | } | 9 | } |
diff --git a/overlays/pass/pass.json b/overlays/pass/pass.json deleted file mode 100644 index a4638c1..0000000 --- a/overlays/pass/pass.json +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | { | ||
| 2 | "tag": "d29a389-master", | ||
| 3 | "meta": { | ||
| 4 | "name": "password-store", | ||
| 5 | "url": "https://git.zx2c4.com/password-store/", | ||
| 6 | "branch": "master" | ||
| 7 | }, | ||
| 8 | "git": { | ||
| 9 | "url": "https://git.zx2c4.com/password-store/", | ||
| 10 | "rev": "d29a389a40524c684595f51bb937f66958bc14ea", | ||
| 11 | "sha256": "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn", | ||
| 12 | "fetchSubmodules": true | ||
| 13 | } | ||
| 14 | } | ||