From 22e09a87fb538a0eaf81837750b0948f26f79cf1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 30 Mar 2020 23:20:50 +0200
Subject: [PATCH] Use niv for ldapvi

---
 default.nix                 |  2 +-
 nix/sources.json            | 12 +++++++++---
 overlays/ldapvi/default.nix |  6 +++++-
 overlays/ldapvi/ldapvi.json | 14 --------------
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 overlays/ldapvi/ldapvi.json

diff --git a/default.nix b/default.nix
index ec3b9d4a..0720a568 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { sources ? import ./nix/sources.nix }:
 let
-  pkgs = import sources.nixpkgs-env {};
+  pkgs = import sources.nixpkgs {};
   pkgs_ = pkgs;
   mypkgs = import ./pkgs { pkgs = pkgs_; };
 in
diff --git a/nix/sources.json b/nix/sources.json
index fb0e7d63..6af75bd5 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,4 +1,10 @@
 {
+    "ldapvi": {
+        "ref": "master",
+        "repo": "http://www.lichteblau.com/git/ldapvi.git",
+        "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40",
+        "type": "git"
+    },
     "niv": {
         "branch": "master",
         "description": "Easy dependency management for Nix projects",
@@ -11,7 +17,7 @@
         "url": "https://github.com/nmattia/niv/archive/372f96bff217a7a019de27667d04118cffa9841b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "nixpkgs-env": {
+    "nixpkgs": {
         "branch": "nixos-19.03",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
@@ -32,7 +38,7 @@
         "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
         "version": "19.03"
     },
-    "nixpkgs-nixops-previous": {
+    "nixpkgs-nixops-next": {
         "channel_link": "https://nixos.org/channels/nixos-19.03",
         "revision": "173677.daf861a810d",
         "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
@@ -41,7 +47,7 @@
         "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
         "version": "19.03"
     },
-    "nixpkgs-nixops-next": {
+    "nixpkgs-nixops-previous": {
         "channel_link": "https://nixos.org/channels/nixos-19.03",
         "revision": "173677.daf861a810d",
         "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
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
-  }
-}
-- 
2.41.0