aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flakes/backports/flake.nix20
-rw-r--r--nix/sources.json14
-rw-r--r--overlays/default.nix2
-rw-r--r--overlays/ldapvi/default.nix7
-rw-r--r--overlays/pass/default.nix4
-rw-r--r--overlays/sudo/default.nix10
6 files changed, 20 insertions, 37 deletions
diff --git a/flakes/backports/flake.nix b/flakes/backports/flake.nix
index fe65d2a..8be885f 100644
--- a/flakes/backports/flake.nix
+++ b/flakes/backports/flake.nix
@@ -17,13 +17,18 @@
17 duply = pkgs.duply; 17 duply = pkgs.duply;
18 fiche = pkgs.fiche; 18 fiche = pkgs.fiche;
19 influxdb2 = pkgs.influxdb2; 19 influxdb2 = pkgs.influxdb2;
20 ldapvi = pkgs.ldapvi;
21 lego = pkgs.lego;
20 mpd = pkgs.mpd; 22 mpd = pkgs.mpd;
21 mpd-small = pkgs.mpd-small; 23 mpd-small = pkgs.mpd-small;
24 opensmtpd = pkgs.opensmtpd;
25 pass = pkgs.pass;
22 pg_activity = pkgs.pg_activity; 26 pg_activity = pkgs.pg_activity;
23 signald = pkgs.signald; 27 signald = pkgs.signald;
24 ssh-to-age = pkgs.ssh-to-age; 28 ssh-to-age = pkgs.ssh-to-age;
25 stgit = pkgs.stgit; 29 stgit = pkgs.stgit;
26 sops = pkgs.sops; 30 sops = pkgs.sops;
31 sudo = pkgs.sudo;
27 telegram-cli = pkgs.telegram-cli; 32 telegram-cli = pkgs.telegram-cli;
28 woob = pkgs.python3Packages.woob; 33 woob = pkgs.python3Packages.woob;
29 zrepl = pkgs.zrepl; 34 zrepl = pkgs.zrepl;
@@ -37,13 +42,18 @@
37 fiche = flake-utils.lib.mkApp { drv = packages.fiche; name = "fiche"; }; 42 fiche = flake-utils.lib.mkApp { drv = packages.fiche; name = "fiche"; };
38 influxd = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influxd"; }; 43 influxd = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influxd"; };
39 influx = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influx"; }; 44 influx = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influx"; };
45 ldapvi = flake-utils.lib.mkApp { drv = packages.ldapvi; name = "ldapvi"; };
46 lego = flake-utils.lib.mkApp { drv = packages.lego; name = "lego"; };
40 mpd = flake-utils.lib.mkApp { drv = packages.mpd; name = "mpd"; }; 47 mpd = flake-utils.lib.mkApp { drv = packages.mpd; name = "mpd"; };
41 mpd-small = flake-utils.lib.mkApp { drv = packages.mpd-small; name = "mpd"; }; 48 mpd-small = flake-utils.lib.mkApp { drv = packages.mpd-small; name = "mpd"; };
49 opensmtpd = flake-utils.lib.mkApp { drv = packages.opensmtpd; name = "opensmtpd"; };
50 pass = flake-utils.lib.mkApp { drv = packages.pass; name = "pass"; };
42 pg_activity = flake-utils.lib.mkApp { drv = packages.pg_activity; name = "pg_activity"; }; 51 pg_activity = flake-utils.lib.mkApp { drv = packages.pg_activity; name = "pg_activity"; };
43 signald = flake-utils.lib.mkApp { drv = packages.signald; name = "signald"; }; 52 signald = flake-utils.lib.mkApp { drv = packages.signald; name = "signald"; };
44 ssh-to-age = flake-utils.lib.mkApp { drv = packages.ssh-to-age; name = "ssh-to-age"; }; 53 ssh-to-age = flake-utils.lib.mkApp { drv = packages.ssh-to-age; name = "ssh-to-age"; };
45 stgit = flake-utils.lib.mkApp { drv = packages.stgit; name = "stgit"; }; 54 stgit = flake-utils.lib.mkApp { drv = packages.stgit; name = "stgit"; };
46 sops = flake-utils.lib.mkApp { drv = packages.sops; name = "sops"; }; 55 sops = flake-utils.lib.mkApp { drv = packages.sops; name = "sops"; };
56 sudo = flake-utils.lib.mkApp { drv = packages.sudo; name = "sudo"; };
47 telegram-cli = flake-utils.lib.mkApp { drv = packages.telegram-cli; name = "telegram-cli"; }; 57 telegram-cli = flake-utils.lib.mkApp { drv = packages.telegram-cli; name = "telegram-cli"; };
48 woob = flake-utils.lib.mkApp { drv = packages.woob; name = "woob"; }; 58 woob = flake-utils.lib.mkApp { drv = packages.woob; name = "woob"; };
49 zrepl = flake-utils.lib.mkApp { drv = packages.zrepl; name = "zrepl"; }; 59 zrepl = flake-utils.lib.mkApp { drv = packages.zrepl; name = "zrepl"; };
@@ -68,12 +78,17 @@
68 duply = final: prev: { duply = self.packages."${final.system}".duply; }; 78 duply = final: prev: { duply = self.packages."${final.system}".duply; };
69 fiche = final: prev: { fiche = self.packages."${final.system}".fiche; }; 79 fiche = final: prev: { fiche = self.packages."${final.system}".fiche; };
70 influxdb2 = final: prev: { influxdb2 = self.packages."${final.system}".influxdb2; }; 80 influxdb2 = final: prev: { influxdb2 = self.packages."${final.system}".influxdb2; };
81 ldapvi = final: prev: { ldapvi = self.packages."${final.system}".ldapvi; };
82 lego = final: prev: { lego = self.packages."${final.system}".lego; };
71 mpd = final: prev: { mpd = self.packages."${final.system}".mpd; }; 83 mpd = final: prev: { mpd = self.packages."${final.system}".mpd; };
84 opensmtpd = final: prev: { opensmtpd = self.packages."${final.system}".opensmtpd; };
85 pass = final: prev: { pass = self.packages."${final.system}".pass; };
72 pg_activity = final: prev: { pg_activity = self.packages."${final.system}".pg_activity; }; 86 pg_activity = final: prev: { pg_activity = self.packages."${final.system}".pg_activity; };
73 signald = final: prev: { signald = self.packages."${final.system}".signald; }; 87 signald = final: prev: { signald = self.packages."${final.system}".signald; };
74 ssh-to-age = final: prev: { ssh-to-age = self.packages."${final.system}".ssh-to-age; }; 88 ssh-to-age = final: prev: { ssh-to-age = self.packages."${final.system}".ssh-to-age; };
75 stgit = final: prev: { stgit = self.packages."${final.system}".stgit; }; 89 stgit = final: prev: { stgit = self.packages."${final.system}".stgit; };
76 sops = final: prev: { sops = self.packages."${final.system}".sops; }; 90 sops = final: prev: { sops = self.packages."${final.system}".sops; };
91 sudo = final: prev: { sudo = self.packages."${final.system}".sudo; };
77 telegram-cli = final: prev: { telegram-cli = self.packages."${final.system}".telegram-cli; }; 92 telegram-cli = final: prev: { telegram-cli = self.packages."${final.system}".telegram-cli; };
78 woob = final: prev: { woob = self.packages."${final.system}".woob; }; 93 woob = final: prev: { woob = self.packages."${final.system}".woob; };
79 zrepl = final: prev: { zrepl = self.packages."${final.system}".zrepl; }; 94 zrepl = final: prev: { zrepl = self.packages."${final.system}".zrepl; };
@@ -87,12 +102,17 @@
87 // overlays.duply final prev 102 // overlays.duply final prev
88 // overlays.fiche final prev 103 // overlays.fiche final prev
89 // overlays.influxdb2 final prev 104 // overlays.influxdb2 final prev
105 // overlays.ldapvi final prev
106 // overlays.lego final prev
90 // overlays.mpd final prev 107 // overlays.mpd final prev
108 // overlays.opensmtpd final prev
109 // overlays.pass final prev
91 // overlays.pg_activity final prev 110 // overlays.pg_activity final prev
92 // overlays.signald final prev 111 // overlays.signald final prev
93 // overlays.ssh-to-age final prev 112 // overlays.ssh-to-age final prev
94 // overlays.stgit final prev 113 // overlays.stgit final prev
95 // overlays.sops final prev 114 // overlays.sops final prev
115 // overlays.sudo final prev
96 // overlays.telegram-cli final prev 116 // overlays.telegram-cli final prev
97 // overlays.woob final prev 117 // overlays.woob final prev
98 // overlays.zrepl final prev 118 // overlays.zrepl final prev
diff --git a/nix/sources.json b/nix/sources.json
index bc49278..961d378 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -129,20 +129,6 @@
129 "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz", 129 "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz",
130 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 130 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
131 }, 131 },
132 "overlays-ldapvi": {
133 "ref": "master",
134 "repo": "http://www.lichteblau.com/git/ldapvi.git",
135 "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40",
136 "type": "git",
137 "version": "f1d42ba-master"
138 },
139 "overlays-pass": {
140 "ref": "master",
141 "repo": "https://git.zx2c4.com/password-store/",
142 "rev": "d29a389a40524c684595f51bb937f66958bc14ea",
143 "type": "git",
144 "version": "d29a389-master"
145 },
146 "webapps-landing": { 132 "webapps-landing": {
147 "ref": "gitolite_local/local_changes", 133 "ref": "gitolite_local/local_changes",
148 "repo": "https://git.immae.eu/github/bastienwirtz/homer.git", 134 "repo": "https://git.immae.eu/github/bastienwirtz/homer.git",
diff --git a/overlays/default.nix b/overlays/default.nix
index a64097c..bdc99d2 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -22,7 +22,6 @@ in flakes // {
22 gitolite = import ./gitolite; 22 gitolite = import ./gitolite;
23 goaccess = import ./goaccess; 23 goaccess = import ./goaccess;
24 kanboard = import ./kanboard; 24 kanboard = import ./kanboard;
25 ldapvi = import ./ldapvi;
26 ledger = import ./ledger; 25 ledger = import ./ledger;
27 lesspipe = import ./lesspipe; 26 lesspipe = import ./lesspipe;
28 mysql = import ./databases/mysql; 27 mysql = import ./databases/mysql;
@@ -37,7 +36,6 @@ in flakes // {
37 sc-im = import ./sc-im; 36 sc-im = import ./sc-im;
38 shaarli = import ./shaarli; 37 shaarli = import ./shaarli;
39 slrn = import ./slrn; 38 slrn = import ./slrn;
40 sudo = import ./sudo;
41 taskwarrior = import ./taskwarrior; 39 taskwarrior = import ./taskwarrior;
42 vcsh = import ./vcsh; 40 vcsh = import ./vcsh;
43 weechat = import ./weechat; 41 weechat = import ./weechat;
diff --git a/overlays/ldapvi/default.nix b/overlays/ldapvi/default.nix
deleted file mode 100644
index 6a08ac4..0000000
--- a/overlays/ldapvi/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
1self: super: {
2 ldapvi = super.ldapvi.overrideAttrs (old: rec {
3 name = "ldapvi-${version}";
4 version = self.sources.overlays-ldapvi.version;
5 src = self.sources.overlays-ldapvi;
6 });
7}
diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix
index 9deda77..ad8facd 100644
--- a/overlays/pass/default.nix
+++ b/overlays/pass/default.nix
@@ -1,9 +1,5 @@
1self: super: { 1self: super: {
2 pass = super.pass.overrideAttrs (old: rec { 2 pass = super.pass.overrideAttrs (old: rec {
3 pname = "password-store";
4 name = "${pname}-${version}";
5 version = self.sources.overlays-pass.version;
6 src = self.sources.overlays-pass;
7 patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; 3 patches = old.patches ++ [ ./pass-fix-pass-init.patch ];
8 }); 4 });
9} 5}
diff --git a/overlays/sudo/default.nix b/overlays/sudo/default.nix
deleted file mode 100644
index 27fb678..0000000
--- a/overlays/sudo/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
1self: super: {
2 sudo = super.sudo.overrideAttrs (old: rec {
3 version = "1.9.5p2";
4 pname = "sudo";
5 src = self.fetchurl {
6 url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
7 sha256 = "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk";
8 };
9 });
10}