From 71c71a991bbaaf8e6707fc74893a076f0fcced9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 24 Apr 2020 01:27:00 +0200 Subject: [PATCH] Upgrade environment packages to latest --- environments/immae-eu.nix | 2 +- overlays/bonfire/default.nix | 4 ++ overlays/default.nix | 2 +- overlays/pass/default.nix | 2 +- overlays/s6/default.nix | 73 --------------------------------- overlays/vdirsyncer/default.nix | 14 +++++++ 6 files changed, 21 insertions(+), 76 deletions(-) delete mode 100644 overlays/s6/default.nix create mode 100644 overlays/vdirsyncer/default.nix diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix index 90633491..0322b53a 100644 --- a/environments/immae-eu.nix +++ b/environments/immae-eu.nix @@ -90,7 +90,7 @@ let mailcap # password management - pass apg pwgen + (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen # pdf pdftk poppler_utils diff --git a/overlays/bonfire/default.nix b/overlays/bonfire/default.nix index 68bde20f..a01e6191 100644 --- a/overlays/bonfire/default.nix +++ b/overlays/bonfire/default.nix @@ -7,6 +7,10 @@ self: super: { inherit version; sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; + postPatch = '' + substituteInPlace click/_unicodefun.py --replace "'locale'" "'${self.locale}/bin/locale'" + ''; + doCheck = false; }); in super.bonfire.overridePythonAttrs(old: { diff --git a/overlays/default.nix b/overlays/default.nix index b3bc8caf..0cefc17c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -19,7 +19,6 @@ pelican = import ./pelican; postfix = import ./postfix; postgresql = import ./databases/postgresql; - s6 = import ./s6; sc-im = import ./sc-im; shaarli = import ./shaarli; slrn = import ./slrn; @@ -30,5 +29,6 @@ ympd = import ./ympd; doing = import ./doing; xmr-stak = import ./xmr-stak; + vdirsyncer = import ./vdirsyncer; } // import ./python-packages diff --git a/overlays/pass/default.nix b/overlays/pass/default.nix index df42cf19..262492f5 100644 --- a/overlays/pass/default.nix +++ b/overlays/pass/default.nix @@ -1,5 +1,5 @@ self: super: { - pass = (super.pass.withExtensions (exts: [ exts.pass-otp ])).overrideAttrs (old: + pass = super.pass.overrideAttrs (old: self.mylibs.fetchedGit ./pass.json // { patches = old.patches ++ [ ./pass-fix-pass-init.patch ]; } diff --git a/overlays/s6/default.nix b/overlays/s6/default.nix deleted file mode 100644 index ddf0a239..00000000 --- a/overlays/s6/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -self: super: { - skawarePackages = super.skawarePackages // (with super.skawarePackages; { - skalibs = skalibs.overrideAttrs(old: rec { - pname = "skalibs"; - name = "${pname}-${version}"; - version = "2.8.1.0"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723"; - }; - }); - - execline = execline.overrideAttrs(old: rec { - pname = "execline"; - name = "${pname}-${version}"; - version = "2.5.1.0"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi"; - }; - }); - - s6 = s6.overrideAttrs(old: rec { - pname = "s6"; - name = "${pname}-${version}"; - version = "2.8.0.1"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v"; - }; - }); - - s6-dns = s6-dns.overrideAttrs(old: rec { - pname = "s6-dns"; - name = "${pname}-${version}"; - version = "2.3.0.2"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8"; - }; - }); - - s6-linux-utils = s6-linux-utils.overrideAttrs(old: rec { - pname = "s6-linux-utils"; - name = "${pname}-${version}"; - version = "2.5.0.1"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1"; - }; - }); - - s6-networking = s6-networking.overrideAttrs(old: rec { - pname = "s6-networking"; - name = "${pname}-${version}"; - version = "2.3.0.4"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa"; - }; - }); - - s6-portable-utils = s6-portable-utils.overrideAttrs(old: rec { - pname = "s6-portable-utils"; - name = "${pname}-${version}"; - version = "2.2.1.3"; - src = self.fetchurl { - url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2"; - }; - }); - }); -} diff --git a/overlays/vdirsyncer/default.nix b/overlays/vdirsyncer/default.nix new file mode 100644 index 00000000..53248f91 --- /dev/null +++ b/overlays/vdirsyncer/default.nix @@ -0,0 +1,14 @@ +self: super: { + vdirsyncer = super.vdirsyncer.overridePythonAttrs(old: { + # https://github.com/NixOS/nixpkgs/pull/85809 + postPatch = old.postPatch + '' + sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py + ''; + }); + khal = super.khal.overridePythonAttrs(old: { + postPatch = '' + sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py + sed -i "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'[ICS]\\\'/" tests/cli_test.py + ''; + }); +} -- 2.41.0