summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.nix2
-rw-r--r--nix/sources.json12
-rw-r--r--overlays/ldapvi/default.nix6
-rw-r--r--overlays/ldapvi/ldapvi.json14
4 files changed, 15 insertions, 19 deletions
diff --git a/default.nix b/default.nix
index ec3b9d4a..0720a568 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
1{ sources ? import ./nix/sources.nix }: 1{ sources ? import ./nix/sources.nix }:
2let 2let
3 pkgs = import sources.nixpkgs-env {}; 3 pkgs = import sources.nixpkgs {};
4 pkgs_ = pkgs; 4 pkgs_ = pkgs;
5 mypkgs = import ./pkgs { pkgs = pkgs_; }; 5 mypkgs = import ./pkgs { pkgs = pkgs_; };
6in 6in
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 @@
1{ 1{
2 "ldapvi": {
3 "ref": "master",
4 "repo": "http://www.lichteblau.com/git/ldapvi.git",
5 "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40",
6 "type": "git"
7 },
2 "niv": { 8 "niv": {
3 "branch": "master", 9 "branch": "master",
4 "description": "Easy dependency management for Nix projects", 10 "description": "Easy dependency management for Nix projects",
@@ -11,7 +17,7 @@
11 "url": "https://github.com/nmattia/niv/archive/372f96bff217a7a019de27667d04118cffa9841b.tar.gz", 17 "url": "https://github.com/nmattia/niv/archive/372f96bff217a7a019de27667d04118cffa9841b.tar.gz",
12 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 18 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13 }, 19 },
14 "nixpkgs-env": { 20 "nixpkgs": {
15 "branch": "nixos-19.03", 21 "branch": "nixos-19.03",
16 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", 22 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
17 "homepage": "https://github.com/NixOS/nixpkgs", 23 "homepage": "https://github.com/NixOS/nixpkgs",
@@ -32,7 +38,7 @@
32 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz", 38 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
33 "version": "19.03" 39 "version": "19.03"
34 }, 40 },
35 "nixpkgs-nixops-previous": { 41 "nixpkgs-nixops-next": {
36 "channel_link": "https://nixos.org/channels/nixos-19.03", 42 "channel_link": "https://nixos.org/channels/nixos-19.03",
37 "revision": "173677.daf861a810d", 43 "revision": "173677.daf861a810d",
38 "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z", 44 "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z",
@@ -41,7 +47,7 @@
41 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz", 47 "url_template": "https://releases.nixos.org/nixos/<version>/nixos-<version>.<revision>/nixexprs.tar.xz",
42 "version": "19.03" 48 "version": "19.03"
43 }, 49 },
44 "nixpkgs-nixops-next": { 50 "nixpkgs-nixops-previous": {
45 "channel_link": "https://nixos.org/channels/nixos-19.03", 51 "channel_link": "https://nixos.org/channels/nixos-19.03",
46 "revision": "173677.daf861a810d", 52 "revision": "173677.daf861a810d",
47 "sha256": "0v5bhdiyg1xv1dzsy7jbm301ighsvmi87wibw96iiky8sqs6qd4z", 53 "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 @@
1self: super: { 1self: super: {
2 ldapvi = super.ldapvi.overrideAttrs (old: self.mylibs.fetchedGit ./ldapvi.json); 2 ldapvi = super.ldapvi.overrideAttrs (old: rec {
3 name = "ldapvi-${version}";
4 version = "${builtins.substring 0 7 self.sources.ldapvi.rev}-${self.sources.ldapvi.ref}";
5 src = self.sources.ldapvi;
6 });
3} 7}
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 @@
1{
2 "tag": "f1d42ba-master",
3 "meta": {
4 "name": "ldapvi",
5 "url": "http://www.lichteblau.com/git/ldapvi.git",
6 "branch": "master"
7 },
8 "git": {
9 "url": "http://www.lichteblau.com/git/ldapvi.git",
10 "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40",
11 "sha256": "0c2h4b1spp9z6a16gy9azf0wyxq397yy7001x1zlvc7c60q11wry",
12 "fetchSubmodules": true
13 }
14}