From 2b690877a30ad77d7fb15f0ec0dbba3e39ddd554 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 16 Aug 2021 09:25:00 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 24 ++++++++++++------------ patches/133661.patch | 29 ----------------------------- patches/133776.patch | 31 ------------------------------- 3 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 patches/133661.patch delete mode 100644 patches/133776.patch diff --git a/flake.lock b/flake.lock index 9ef5e22e..abda259f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1627215454, - "narHash": "sha256-uAlu5U12E23Cr47YgZHtwdH65+Z/uvli9RMeDbxHHoU=", + "lastModified": 1628958266, + "narHash": "sha256-nyf5EroX+q6KfzbJRDVOpy8i+6i7ZcOTOTa4kffjaIg=", "owner": "accentor", "repo": "flake", - "rev": "eaaf18db4a7d0732d1bbcbc07ccf2f64e329827e", + "rev": "81ddcd3da43531ae246e2c9e9c4879b24ef6c114", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1628932644, - "narHash": "sha256-R1xgH/vADxJ8P3MhPDF6LF6q3+LhfAaaagZhciY2aHo=", + "lastModified": 1629078857, + "narHash": "sha256-41dgUwB2FdFbR9M8gwCES+MWsbcDzGG6YdHlMsXMvGs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8931da7b6c36bd2f6bce1190302e48d9dec26a80", + "rev": "c252073b4e9b5f62a9ba6e7bec3551bea2e26a32", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1628837533, - "narHash": "sha256-SQ+3ma51/vkJrk2ISiW1zVqcsQq+dqgUDkus6V5SxrU=", + "lastModified": 1628946811, + "narHash": "sha256-u/A1RzWyP88zbMwVFJ41BAkh9BTLbSLfCigrGAgyZKQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a965b097b1e0c3bcf22f39413afd1ec6cc1f5335", + "rev": "72f3bc6fa461a2899a06c87c137c7135e410e387", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1628779307, - "narHash": "sha256-ErivbgE5SGvNdFpq+Q50lw1JGGmvxBR/d71aW41S+1A=", + "lastModified": 1628869426, + "narHash": "sha256-7OetQdzAnml3+0b3pmr+reBKs9jn54IvVxbsncWzBn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4138cbd913fad85073e59007710e3f083d0eb7c6", + "rev": "6fc5211eddddc02c50ca7f98d6cc377726417fa9", "type": "github" }, "original": { diff --git a/patches/133661.patch b/patches/133661.patch deleted file mode 100644 index 2569f7d6..00000000 --- a/patches/133661.patch +++ /dev/null @@ -1,29 +0,0 @@ -From baca6e6b695df1c517210df363ad6df1f25706e6 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Thu, 12 Aug 2021 21:48:36 +0200 -Subject: [PATCH] mu: 1.6.2 -> 1.6.3 - ---- - pkgs/tools/networking/mu/default.nix | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix -index e224cc33a03c6b..468bc127228a76 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -7,13 +7,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.6.2"; -+ version = "1.6.3"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = version; -- sha256 = "EYERtDYIf0aw9nMLFZPGZ5s1i+erSq9H3tP29KwCAgQ="; -+ sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g="; - }; - - postPatch = lib.optionalString (batchSize != null) '' diff --git a/patches/133776.patch b/patches/133776.patch deleted file mode 100644 index 2a0d0f1c..00000000 --- a/patches/133776.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 18993ff63c1554a8e337b7ec208301d99a7adc90 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 13 Aug 2021 16:23:05 +0200 -Subject: [PATCH] eid-mw: 5.0.23 -> 5.0.28 - ---- - pkgs/tools/security/eid-mw/default.nix | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index a2a6caf2b1174..2b373360965ba 100644 ---- a/pkgs/tools/security/eid-mw/default.nix -+++ b/pkgs/tools/security/eid-mw/default.nix -@@ -21,13 +21,13 @@ - 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.23"; -+ version = "5.0.28"; - - src = fetchFromGitHub { -- rev = "v${version}"; -- sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; -- repo = "eid-mw"; - owner = "Fedict"; -+ repo = "eid-mw"; -+ rev = "v${version}"; -+ sha256 = "rrrzw8i271ZZkwY3L6aRw2Nlz+GmDr/1ahYYlUBvtzo="; - }; - - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ];