From 62e56ded2fedf998749883e033f078720a69120d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 23 May 2021 10:11:29 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 18 ++-- flake.nix | 2 +- patches/.keep | 0 patches/122247.patch | 201 ------------------------------------------- 4 files changed, 10 insertions(+), 211 deletions(-) create mode 100644 patches/.keep delete mode 100644 patches/122247.patch diff --git a/flake.lock b/flake.lock index f3694560..e3351d70 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "emacs-overlay": { "locked": { - "lastModified": 1621652967, - "narHash": "sha256-AvqQEE0xNVnAO4lbROLcnFe/3OPAFTGFEtKxQkOlbr8=", + "lastModified": 1621740021, + "narHash": "sha256-uLu8Zgrkbsq8mnl6LjbcMvItFyAaLH45Iik5qMmb9T0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cbc63fe7656be94bf0ebd366740dbc0112cf7069", + "rev": "5df3462dda05d8e44669cf374776274e1bc47d0a", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1621649712, - "narHash": "sha256-SGOWonfYzV/Cdjfv3dlEgbMlg5yRZohTG/Cm0xcuiEA=", + "lastModified": 1621719066, + "narHash": "sha256-TcpYTMKkZztb8YDHIlxM87t1e+Pzxzku28qBAT4ZsYY=", "owner": "nix-community", "repo": "home-manager", - "rev": "4f70f49cec34cb22b9be9f42cd0dd68ef816a797", + "rev": "64607f58b75741470284c698f82f0199fcecdfa7", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1621625051, - "narHash": "sha256-X/DsI3uoDrd8AGVlps+CoTJZzFxTt126S8WyerFnJ10=", + "lastModified": 1621711967, + "narHash": "sha256-0OSqbuc+aLD0na9n9rZsnaAPBL4BYTVBR1kMhD02lIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea422282d68bfaa81ea0ce0bf546d6c5afc06579", + "rev": "255709420269fcd57392824ee43f2b0638f3de5d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d6de4eff..83311002 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ supportedSystems = [ "x86_64-linux" ]; channels.nixpkgs = { input = nixpkgs; - patches = map (patch: ./patches + "/${patch}") (builtins.attrNames (builtins.readDir ./patches)); + patches = map (patch: ./patches + "/${patch}") (builtins.filter (x: x != ".keep") (builtins.attrNames (builtins.readDir ./patches))); overlaysBuilder = _: [ emacs-overlay.overlay ]; }; hostDefaults = { diff --git a/patches/.keep b/patches/.keep new file mode 100644 index 00000000..e69de29b diff --git a/patches/122247.patch b/patches/122247.patch deleted file mode 100644 index edafa1d3..00000000 --- a/patches/122247.patch +++ /dev/null @@ -1,201 +0,0 @@ -From cdc5953d38868ddd51ecc2a912716e59b33e25ba Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 8 May 2021 23:55:56 +0200 -Subject: [PATCH 1/5] eid-mw: 4.4.27 -> 5.0.14 - ---- - pkgs/tools/security/eid-mw/default.nix | 65 +++++++++++++++----------- - 1 file changed, 38 insertions(+), 27 deletions(-) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index cbe56694da1421..d943274a98e9b3 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -1,24 +1,36 @@ --{ lib, stdenv, fetchFromGitHub --, autoreconfHook, pkg-config --, gtk3, nssTools, pcsclite --, libxml2, libproxy --, openssl, curl -+{ lib -+, stdenv -+, fetchFromGitHub -+, autoreconfHook -+, autoconf-archive -+, pkg-config - , makeWrapper --, substituteAll }: -+, curl -+, gtk3 -+, libassuan -+, libbsd -+, libproxy -+, libxml2 -+, openssl -+, p11-kit -+, pcsclite -+, nssTools -+, substituteAll -+}: - - stdenv.mkDerivation rec { - pname = "eid-mw"; -- version = "4.4.27"; -+ version = "5.0.14"; - - src = fetchFromGitHub { - rev = "v${version}"; -- sha256 = "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1"; -+ sha256 = "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4"; - repo = "eid-mw"; - owner = "Fedict"; - }; - -- nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; -- buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; -+ nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; -+ buildInputs = [ curl gtk3 libassuan libbsd libproxy libxml2 openssl p11-kit pcsclite ]; - preConfigure = '' - mkdir openssl - ln -s ${openssl.out}/lib openssl -@@ -27,30 +39,29 @@ stdenv.mkDerivation rec { - export SSL_PREFIX=$(realpath openssl) - substituteInPlace plugins_tools/eid-viewer/Makefile.in \ - --replace "c_rehash" "openssl rehash" -- ''; -+ ''; -+ configureFlags = [ "--disable-pinentry" ]; - - postPatch = '' - sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac - ''; - -- configureFlags = [ "--enable-dialogs=yes" ]; -- - postInstall = -- let -- eid-nssdb-in = substituteAll { -- inherit (stdenv) shell; -- isExecutable = true; -- src = ./eid-nssdb.in; -- }; -- in -- '' -- install -D ${eid-nssdb-in} $out/bin/eid-nssdb -- substituteInPlace $out/bin/eid-nssdb \ -- --replace "modutil" "${nssTools}/bin/modutil" -+ let -+ eid-nssdb-in = substituteAll { -+ inherit (stdenv) shell; -+ isExecutable = true; -+ src = ./eid-nssdb.in; -+ }; -+ in -+ '' -+ install -D ${eid-nssdb-in} $out/bin/eid-nssdb -+ substituteInPlace $out/bin/eid-nssdb \ -+ --replace "modutil" "${nssTools}/bin/modutil" - -- rm $out/bin/about-eid-mw -- wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" -- ''; -+ rm $out/bin/about-eid-mw -+ wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" -+ ''; - - enableParallelBuilding = true; - - -From 5bdad0ac18f150ac710b2829e3c53781c5a94a89 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 8 May 2021 23:56:10 +0200 -Subject: [PATCH 2/5] eid-mw: add chvp as maintainer - ---- - pkgs/tools/security/eid-mw/default.nix | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index d943274a98e9b3..a104112265730f 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -94,6 +94,6 @@ stdenv.mkDerivation rec { - firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; } - ''; - platforms = platforms.linux; -- maintainers = with maintainers; [ bfortz ]; -+ maintainers = with maintainers; [ bfortz chvp ]; - }; - } - -From b9d63bfdec294a3de66ec87e7b9e8e860b9275c5 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 22 May 2021 10:03:10 +0200 -Subject: [PATCH 3/5] eid-mw: 5.0.14 -> 5.0.21 - ---- - pkgs/tools/security/eid-mw/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index a104112265730f..45774ea8a5077c 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -20,11 +20,11 @@ - - stdenv.mkDerivation rec { - pname = "eid-mw"; -- version = "5.0.14"; -+ version = "5.0.21"; - - src = fetchFromGitHub { - rev = "v${version}"; -- sha256 = "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4"; -+ sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh"; - repo = "eid-mw"; - owner = "Fedict"; - }; - -From 49acdd355f918efe7b3358cc71a7beb0f2a2a4d5 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 22 May 2021 10:08:13 +0200 -Subject: [PATCH 4/5] eid-mw: add note about upstream version management - ---- - pkgs/tools/security/eid-mw/default.nix | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index 45774ea8a5077c..b84a7a2f22ef39 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -20,6 +20,7 @@ - - stdenv.mkDerivation rec { - pname = "eid-mw"; -+ # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.21"; - - src = fetchFromGitHub { - -From cabfc153d5a8e22da2de1d9ac7da0b2227a8535d Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Sat, 22 May 2021 10:09:34 +0200 -Subject: [PATCH 5/5] eid-mw: add note about why --disable-pinentry is used - ---- - pkgs/tools/security/eid-mw/default.nix | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index b84a7a2f22ef39..e07ea1a3337998 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -41,6 +41,7 @@ stdenv.mkDerivation rec { - substituteInPlace plugins_tools/eid-viewer/Makefile.in \ - --replace "c_rehash" "openssl rehash" - ''; -+ # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry. - configureFlags = [ "--disable-pinentry" ]; - - postPatch = ''