From 22e09a87fb538a0eaf81837750b0948f26f79cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 30 Mar 2020 23:20:50 +0200 Subject: Use niv for ldapvi --- overlays/ldapvi/default.nix | 6 +++++- overlays/ldapvi/ldapvi.json | 14 -------------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 overlays/ldapvi/ldapvi.json (limited to 'overlays/ldapvi') diff --git a/overlays/ldapvi/default.nix b/overlays/ldapvi/default.nix index 030e6769..58cd4ede 100644 --- a/overlays/ldapvi/default.nix +++ b/overlays/ldapvi/default.nix @@ -1,3 +1,7 @@ self: super: { - ldapvi = super.ldapvi.overrideAttrs (old: self.mylibs.fetchedGit ./ldapvi.json); + 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; + }); } diff --git a/overlays/ldapvi/ldapvi.json b/overlays/ldapvi/ldapvi.json deleted file mode 100644 index ceaff712..00000000 --- a/overlays/ldapvi/ldapvi.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "tag": "f1d42ba-master", - "meta": { - "name": "ldapvi", - "url": "http://www.lichteblau.com/git/ldapvi.git", - "branch": "master" - }, - "git": { - "url": "http://www.lichteblau.com/git/ldapvi.git", - "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", - "sha256": "0c2h4b1spp9z6a16gy9azf0wyxq397yy7001x1zlvc7c60q11wry", - "fetchSubmodules": true - } -} -- cgit v1.2.3