From 3767312778dfdcc0edf473ef27e71a3efc93d9a5 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 7 May 2024 13:42:34 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 54 +++++++++++++++++++------------------- patches/eid-mw-build.patch | 13 +++++++++ 2 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 patches/eid-mw-build.patch diff --git a/flake.lock b/flake.lock index 59ad1ff8..e49efaba 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1714689517, - "narHash": "sha256-8j+bg3Fmoc/kDrCJraF8UEEpzdSJ9PdHuvT5zl7nnhU=", + "lastModified": 1714948711, + "narHash": "sha256-Tyl0W00st1jlQKKPDJpgjfKcW7QiqHQYFua37zQNNWQ=", "owner": "accentor", "repo": "api", - "rev": "dc3ed92e3b9de7e9ba5c1c88310750cb2d42c0d3", + "rev": "e43cf703d49ba8a5631396d7533900ef84c3154f", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714810219, - "narHash": "sha256-3hHd+DpLwDe/omVExCIGyv6m2sHEd0au2xmAl51RfVI=", + "lastModified": 1714948806, + "narHash": "sha256-bjQScClXDSRwsKrYoHgQtpMTUCTXrjxQnSkytewScEw=", "owner": "accentor", "repo": "web", - "rev": "28ac4f4ad129c9dd0aea0233d61edb9642805410", + "rev": "896fb069d024dba48b26634e0febbbffd6bfd540", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714873811, - "narHash": "sha256-bTLuVi1Kt3P70mIPxquqyI+wB7+GjZ2Z1xhvaj6vqnw=", + "lastModified": 1715046400, + "narHash": "sha256-gryLgWTbv1C4/j/6YleqQ5UmJQwa+UdkXEaemwhkGlM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "53d749b467ee0727d8417756137f4dcf657917dc", + "rev": "f2804916dbc4655722f743b5299b6f706335b25b", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1714865296, - "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1714273701, - "narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=", + "lastModified": 1714878592, + "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "941c4973c824509e0356be455d89613611f76c8a", + "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "type": "github" }, "original": { @@ -489,11 +489,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714685007, - "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { @@ -521,11 +521,11 @@ }, "nur": { "locked": { - "lastModified": 1714873496, - "narHash": "sha256-w8r/wecqioCoH4vILHsnZ1SB1D5VdUJn+cZJQy5OMpI=", + "lastModified": 1715078704, + "narHash": "sha256-7tdLdqmov1ISpjqJo5fs+XThb7+UY5eu+GRWMsEJ4Q8=", "owner": "nix-community", "repo": "NUR", - "rev": "9c990bb1fbf969875018c136b8332fd773f527c1", + "rev": "60f67c69a8af718ba07a88114c3d3b420eb9fdcd", "type": "github" }, "original": { @@ -738,11 +738,11 @@ ] }, "locked": { - "lastModified": 1714685687, - "narHash": "sha256-yCtSjE5UuyKGaKJkVdp/uf2qSvERVxgsWAmEH2GYyFs=", + "lastModified": 1714948656, + "narHash": "sha256-/jnKyUozOpOoxGiNTi/SqJyxjz3MLKItW7RJknNWe2g=", "owner": "chvp", "repo": "tetris", - "rev": "d09402d1a0a6500a4028062df56593cfcb98686f", + "rev": "ea3f44a5a5bf1fb37e2b6bd335c206b3503cd56c", "type": "github" }, "original": { diff --git a/patches/eid-mw-build.patch b/patches/eid-mw-build.patch new file mode 100644 index 00000000..99f435e5 --- /dev/null +++ b/patches/eid-mw-build.patch @@ -0,0 +1,13 @@ +diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix +index 5a330c7126fa..070e1bae0b00 100644 +--- a/pkgs/tools/security/eid-mw/default.nix ++++ b/pkgs/tools/security/eid-mw/default.nix +@@ -71,6 +71,8 @@ stdenv.mkDerivation rec { + + enableParallelBuilding = true; + ++ env.LD_LIBRARY_PATH = lib.makeLibraryPath [ pcsclite ]; ++ + doCheck = true; + + meta = with lib; {