From def6ad9963ed6f3f81fddea854f2a7b110dd5183 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 7 Oct 2021 15:19:16 +0200 Subject: [PATCH] Bump programs --- flakes/backports/flake.nix | 20 ++++++++++++++++++++ nix/sources.json | 14 -------------- overlays/default.nix | 2 -- overlays/ldapvi/default.nix | 7 ------- overlays/pass/default.nix | 4 ---- overlays/sudo/default.nix | 10 ---------- 6 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 overlays/ldapvi/default.nix delete mode 100644 overlays/sudo/default.nix 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 @@ duply = pkgs.duply; fiche = pkgs.fiche; influxdb2 = pkgs.influxdb2; + ldapvi = pkgs.ldapvi; + lego = pkgs.lego; mpd = pkgs.mpd; mpd-small = pkgs.mpd-small; + opensmtpd = pkgs.opensmtpd; + pass = pkgs.pass; pg_activity = pkgs.pg_activity; signald = pkgs.signald; ssh-to-age = pkgs.ssh-to-age; stgit = pkgs.stgit; sops = pkgs.sops; + sudo = pkgs.sudo; telegram-cli = pkgs.telegram-cli; woob = pkgs.python3Packages.woob; zrepl = pkgs.zrepl; @@ -37,13 +42,18 @@ fiche = flake-utils.lib.mkApp { drv = packages.fiche; name = "fiche"; }; influxd = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influxd"; }; influx = flake-utils.lib.mkApp { drv = packages.influxdb2; name = "influx"; }; + ldapvi = flake-utils.lib.mkApp { drv = packages.ldapvi; name = "ldapvi"; }; + lego = flake-utils.lib.mkApp { drv = packages.lego; name = "lego"; }; mpd = flake-utils.lib.mkApp { drv = packages.mpd; name = "mpd"; }; mpd-small = flake-utils.lib.mkApp { drv = packages.mpd-small; name = "mpd"; }; + opensmtpd = flake-utils.lib.mkApp { drv = packages.opensmtpd; name = "opensmtpd"; }; + pass = flake-utils.lib.mkApp { drv = packages.pass; name = "pass"; }; pg_activity = flake-utils.lib.mkApp { drv = packages.pg_activity; name = "pg_activity"; }; signald = flake-utils.lib.mkApp { drv = packages.signald; name = "signald"; }; ssh-to-age = flake-utils.lib.mkApp { drv = packages.ssh-to-age; name = "ssh-to-age"; }; stgit = flake-utils.lib.mkApp { drv = packages.stgit; name = "stgit"; }; sops = flake-utils.lib.mkApp { drv = packages.sops; name = "sops"; }; + sudo = flake-utils.lib.mkApp { drv = packages.sudo; name = "sudo"; }; telegram-cli = flake-utils.lib.mkApp { drv = packages.telegram-cli; name = "telegram-cli"; }; woob = flake-utils.lib.mkApp { drv = packages.woob; name = "woob"; }; zrepl = flake-utils.lib.mkApp { drv = packages.zrepl; name = "zrepl"; }; @@ -68,12 +78,17 @@ duply = final: prev: { duply = self.packages."${final.system}".duply; }; fiche = final: prev: { fiche = self.packages."${final.system}".fiche; }; influxdb2 = final: prev: { influxdb2 = self.packages."${final.system}".influxdb2; }; + ldapvi = final: prev: { ldapvi = self.packages."${final.system}".ldapvi; }; + lego = final: prev: { lego = self.packages."${final.system}".lego; }; mpd = final: prev: { mpd = self.packages."${final.system}".mpd; }; + opensmtpd = final: prev: { opensmtpd = self.packages."${final.system}".opensmtpd; }; + pass = final: prev: { pass = self.packages."${final.system}".pass; }; pg_activity = final: prev: { pg_activity = self.packages."${final.system}".pg_activity; }; signald = final: prev: { signald = self.packages."${final.system}".signald; }; ssh-to-age = final: prev: { ssh-to-age = self.packages."${final.system}".ssh-to-age; }; stgit = final: prev: { stgit = self.packages."${final.system}".stgit; }; sops = final: prev: { sops = self.packages."${final.system}".sops; }; + sudo = final: prev: { sudo = self.packages."${final.system}".sudo; }; telegram-cli = final: prev: { telegram-cli = self.packages."${final.system}".telegram-cli; }; woob = final: prev: { woob = self.packages."${final.system}".woob; }; zrepl = final: prev: { zrepl = self.packages."${final.system}".zrepl; }; @@ -87,12 +102,17 @@ // overlays.duply final prev // overlays.fiche final prev // overlays.influxdb2 final prev + // overlays.ldapvi final prev + // overlays.lego final prev // overlays.mpd final prev + // overlays.opensmtpd final prev + // overlays.pass final prev // overlays.pg_activity final prev // overlays.signald final prev // overlays.ssh-to-age final prev // overlays.stgit final prev // overlays.sops final prev + // overlays.sudo final prev // overlays.telegram-cli final prev // overlays.woob final prev // 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 @@ "url": "https://github.com/NixOS/nixpkgs-channels/archive/840c782d507d60aaa49aa9e3f6d0b0e780912742.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "overlays-ldapvi": { - "ref": "master", - "repo": "http://www.lichteblau.com/git/ldapvi.git", - "rev": "f1d42bad66cc4623d1ff21fbd5dddbf5009d3e40", - "type": "git", - "version": "f1d42ba-master" - }, - "overlays-pass": { - "ref": "master", - "repo": "https://git.zx2c4.com/password-store/", - "rev": "d29a389a40524c684595f51bb937f66958bc14ea", - "type": "git", - "version": "d29a389-master" - }, "webapps-landing": { "ref": "gitolite_local/local_changes", "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 // { gitolite = import ./gitolite; goaccess = import ./goaccess; kanboard = import ./kanboard; - ldapvi = import ./ldapvi; ledger = import ./ledger; lesspipe = import ./lesspipe; mysql = import ./databases/mysql; @@ -37,7 +36,6 @@ in flakes // { sc-im = import ./sc-im; shaarli = import ./shaarli; slrn = import ./slrn; - sudo = import ./sudo; taskwarrior = import ./taskwarrior; vcsh = import ./vcsh; 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 @@ -self: super: { - ldapvi = super.ldapvi.overrideAttrs (old: rec { - name = "ldapvi-${version}"; - version = self.sources.overlays-ldapvi.version; - src = self.sources.overlays-ldapvi; - }); -} 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 @@ self: super: { 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/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 @@ -self: super: { - sudo = super.sudo.overrideAttrs (old: rec { - version = "1.9.5p2"; - pname = "sudo"; - src = self.fetchurl { - url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk"; - }; - }); -} -- 2.41.0