From 3ce7f2023dd52bde298f428570bc7c170ea3062f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 6 Jul 2022 11:39:13 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 36 ++++++++++++++++++------------------ patches/179441.patch | 29 ----------------------------- patches/179780.patch | 29 ----------------------------- 3 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 patches/179441.patch delete mode 100644 patches/179780.patch diff --git a/flake.lock b/flake.lock index 39e4c7b9..ea132ee2 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1657043543, - "narHash": "sha256-fdaW8c6LqJDCE34pskoKW/qAsJuiaWnOvpXYHP/QYXU=", + "lastModified": 1657090595, + "narHash": "sha256-JRrLWTzUIMNppfixM/Lfh1kqwb4WPoSRpcr3mLOAh6s=", "owner": "accentor", "repo": "flake", - "rev": "ad8a266ce516a61c0088da22bdbc95db784b8974", + "rev": "2452b8344ebad7679d8d1b1f806ea4b19f9e229f", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1657053888, - "narHash": "sha256-RiSmzsqhN4blXJjES2nlPl3FN+PtmmYyyeFKmhP++qI=", + "lastModified": 1657097878, + "narHash": "sha256-ysg4W7bkxgbn8++qkyEUb0zmX9Cfs3UY7vzfQT0dFLo=", "owner": "accentor", "repo": "api", - "rev": "c0e8f26e4e09e1ca0318ff08ede114e0388a11d7", + "rev": "6009ef58528f2cecd65b9203f5d1d186b1f9a393", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1657076596, - "narHash": "sha256-bK4sBum4CyNpi8cCTQghHqjum7MfMsEH6WbHqYoPUMs=", + "lastModified": 1657090599, + "narHash": "sha256-44iSLclg3ILqSAKDh7b2yxym9lUPRuk+oWoxbbTp1nU=", "owner": "accentor", "repo": "web", - "rev": "76a73abc8dff0ebaaa4fa8f2827ae0ad07dd89a0", + "rev": "8db6fdf7f89c5c8133c6b8d6ca06c429215977df", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1656835607, - "narHash": "sha256-zONMAG6JSfGyW20AsVWGnlZwNWws6Q/7IT0oDNGc1xY=", + "lastModified": 1656934082, + "narHash": "sha256-Xl5uJidLtIAAt62837o3acKJtiwPwkLyWHcTf2OCmKE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18b14a254dca6b68ca0ce2ce885ce2b550065799", + "rev": "ac8fadc7f35009bf0fd81e9306c92a4238b0fe4c", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1657081900, - "narHash": "sha256-S/VhfaLACSdLJzBuruU/h1lUQjaznJBLiGR8QyIX11E=", + "lastModified": 1657092940, + "narHash": "sha256-CCadT5373eCDAKkfLVAnJrf5krX5B6Go+YlULi9MsB0=", "owner": "nix-community", "repo": "NUR", - "rev": "cb6883e9ce6b792ae5044d6967aad5c9a85f6a49", + "rev": "f21f863b74ed65b8802008aa2497e0fbd58bbe63", "type": "github" }, "original": { @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1657043092, - "narHash": "sha256-Rx1jwHt4GUZz0MFAC4WavjPgDPC5sCHwsYwLzaIEK6M=", + "lastModified": 1657090053, + "narHash": "sha256-uEVJwjpNruSdp75fG7viUMCNM6T/ml3RC7VJh5ax2lU=", "owner": "chvp", "repo": "tetris", - "rev": "47ea031c8fa64991ad2395df1b9d0e49170414f8", + "rev": "f5c4b583099d3d7208a873b0d44a3484e7c8b387", "type": "github" }, "original": { diff --git a/patches/179441.patch b/patches/179441.patch deleted file mode 100644 index 70f0ff63..00000000 --- a/patches/179441.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b6104eecad5ed414beda446b07a5fda272d17bca Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Tue, 28 Jun 2022 13:57:34 +0200 -Subject: [PATCH] eid-mw: 5.0.28 -> 5.1.4 - ---- - 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 e05f96ef4be7c..d73a93d851b74 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.28"; -+ version = "5.1.4"; - - src = fetchFromGitHub { - owner = "Fedict"; - repo = "eid-mw"; - rev = "v${version}"; -- sha256 = "rrrzw8i271ZZkwY3L6aRw2Nlz+GmDr/1ahYYlUBvtzo="; -+ sha256 = "pHzjLyQFn7UvFrPUcI/ZQHMOwVp6ndnX9YegJzlhERM="; - }; - - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/patches/179780.patch b/patches/179780.patch deleted file mode 100644 index 80631c07..00000000 --- a/patches/179780.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7e7c6744736c45ab7df708a97942a369bacc5ec2 Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Fri, 1 Jul 2022 09:52:41 +0200 -Subject: [PATCH] mu: 1.8.2 -> 1.8.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 1a1a8d3c673dd..3e68b54b9b50b 100644 ---- a/pkgs/tools/networking/mu/default.nix -+++ b/pkgs/tools/networking/mu/default.nix -@@ -14,13 +14,13 @@ - - stdenv.mkDerivation rec { - pname = "mu"; -- version = "1.8.2"; -+ version = "1.8.3"; - - src = fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = "v${version}"; -- sha256 = "wpyolNXm5JloKMJarYzSbs2yMcrkl73vOw6951Ol8Rs="; -+ sha256 = "gEqhk600pYHOcYhwr8LGvXHH8KcinX5MbMqYGyYOsnY="; - }; - - postPatch = ''