Migrate mylibs to niv (work in progress)

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 @@
 self: super: {
   ldapvi = super.ldapvi.overrideAttrs (old: rec {
     name = "ldapvi-${version}";
-    version = "${builtins.substring 0 7 self.sources.ldapvi.rev}-${self.sources.ldapvi.ref}";
-    src = self.sources.ldapvi;
+    version = self.sources.overlays-ldapvi.version;
+    src = self.sources.overlays-ldapvi;
   });
 }
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
-  }
-}