From db343436f0e678ef3a97e6f8ac559ffa0507e422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 10 May 2020 19:10:05 +0200 Subject: Migrate mylibs to niv (work in progress) --- overlays/pass/default.nix | 13 +++++++------ overlays/pass/pass.json | 14 -------------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 overlays/pass/pass.json (limited to 'overlays/pass') 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 @@ self: super: { - pass = super.pass.overrideAttrs (old: - self.mylibs.fetchedGit ./pass.json // { - patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; - } - ); - + pass = super.pass.overrideAttrs (old: rec { + pname = "password-store"; + name = "${pname}-${version}"; + version = self.sources.overlays-pass.version; + src = self.sources.overlays-pass; + patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; + }); } 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 @@ -{ - "tag": "d29a389-master", - "meta": { - "name": "password-store", - "url": "https://git.zx2c4.com/password-store/", - "branch": "master" - }, - "git": { - "url": "https://git.zx2c4.com/password-store/", - "rev": "d29a389a40524c684595f51bb937f66958bc14ea", - "sha256": "17g43i0if9nggcq6005iyxxy9my8s15ihc2nzwjgqzhy3svh5xvn", - "fetchSubmodules": true - } -} -- cgit v1.2.3