From 62d323d741fa7f5736220a52649019844b57fbb4 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 28 Jun 2023 09:22:11 +0200 Subject: [PATCH] Update dependencies --- flake.lock | 48 ++++++++++++++++++------------------ modules/base/nix/default.nix | 1 - patches/239332.patch | 20 --------------- patches/239835.patch | 30 ---------------------- shells/nixos-config.nix | 2 +- 5 files changed, 25 insertions(+), 76 deletions(-) delete mode 100644 patches/239332.patch delete mode 100644 patches/239835.patch diff --git a/flake.lock b/flake.lock index 0718f57d..29bbbf99 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1687761964, - "narHash": "sha256-9dNgvrrfMo7ZZiTCjJ6dGQg/7+kNoKezNMtIt/sXqVo=", + "lastModified": 1687871138, + "narHash": "sha256-m/2P8/Q8EGV5CBkDnL3MOJpSMJBmDJ+un4G0wd3XaKU=", "owner": "accentor", "repo": "api", - "rev": "dc8ee161be5668c898b3f42b7cac77e1fe0f08ef", + "rev": "b8f926e501265e97c5feaf93728f63bc95305f15", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1687762112, - "narHash": "sha256-FdgvH0NrohBaj/jxus40VPuVenW6SPdT2NvypJWLDKU=", + "lastModified": 1687870991, + "narHash": "sha256-83nwev0lgqa/skpV0uB/tFRhkRl6IyEnk+eOiXZfgoc=", "owner": "accentor", "repo": "web", - "rev": "0e8cc9f9cf0701836fdbf539a1a46b12b46f0888", + "rev": "4a099ee78d06db4a6f9bb63605a5726ae55af697", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1687856987, - "narHash": "sha256-V+dmP0wdLXetS0pS5gI8ftg5mkXkHecmgHNhUpiLGLg=", + "lastModified": 1687924247, + "narHash": "sha256-cKViU7u/ubgN5kYdfHHEpRms/W6pFAu1C9VGhgq3WCc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "edf4b5c9b016c4223ad2fddf523ef33c15c2fecb", + "rev": "81ec662160951c188b14318b56ff5a4683234a0e", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1687856573, - "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=", + "lastModified": 1687901550, + "narHash": "sha256-p0AWnbv6+6dxBgvTZuvMHu9FW/spaISiT9k+r4bWm2g=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13", + "rev": "9dd107a1d5395fae9b969597e02f3ef3a43ddd47", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", + "lastModified": 1687807295, + "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", + "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", "type": "github" }, "original": { @@ -443,11 +443,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1687729501, - "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=", + "lastModified": 1687829761, + "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0", + "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nur": { "locked": { - "lastModified": 1687866297, - "narHash": "sha256-E31NvkGGDuUWmvm8a/OjFdNbKG8WlmjH8dQW0lggWiQ=", + "lastModified": 1687934069, + "narHash": "sha256-gtADFDH88qMhG4RcA/DIKJcjiiaSS9TaDom/8BLB/Dc=", "owner": "nix-community", "repo": "NUR", - "rev": "ae65761a01233b1c929dcae66e6c6a70b81c2cb4", + "rev": "24d948d12d1cbcee77c83248a79b3df6b4962cd4", "type": "github" }, "original": { @@ -581,11 +581,11 @@ ] }, "locked": { - "lastModified": 1687803852, - "narHash": "sha256-B/X1vZdP1PTMxG5MXVIOYThVSdKMHjWXJkP/y/yMedo=", + "lastModified": 1687873184, + "narHash": "sha256-KcIEkBrcXHNCRp8alhKYisbBA+7GoOZYNQnAgP0svAk=", "owner": "chvp", "repo": "tetris", - "rev": "a9dc2df3d6f6450cd538a02fabf9d6352ef4e0fa", + "rev": "6918442d83b0b0dc6b63fc1a8fc35cfe18c277af", "type": "github" }, "original": { diff --git a/modules/base/nix/default.nix b/modules/base/nix/default.nix index e6d4bdd3..773fd764 100644 --- a/modules/base/nix/default.nix +++ b/modules/base/nix/default.nix @@ -57,7 +57,6 @@ in dates = "hourly"; options = "--delete-older-than 7d"; }; - package = pkgs.nixVersions.nix_2_14; settings = { auto-optimise-store = true; substituters = [ diff --git a/patches/239332.patch b/patches/239332.patch deleted file mode 100644 index 498c1373..00000000 --- a/patches/239332.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix -index a4b6f6c164f32..102313ddbdfcb 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.1.10"; -+ version = "5.1.11"; - - src = fetchFromGitHub { - owner = "Fedict"; - repo = "eid-mw"; - rev = "v${version}"; -- hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI="; -+ hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY="; - }; - - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/patches/239835.patch b/patches/239835.patch deleted file mode 100644 index 516cd842..00000000 --- a/patches/239835.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix -index 8841de12f9a4b..b41b086bf1c39 100644 ---- a/pkgs/development/libraries/libnatpmp/default.nix -+++ b/pkgs/development/libraries/libnatpmp/default.nix -@@ -9,6 +9,7 @@ stdenv.mkDerivation rec { - hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA="; - }; - -+ patches = [ ./headers.patch ]; - makeFlags = [ - "INSTALLPREFIX=$(out)" - "CC:=$(CC)" -diff --git a/pkgs/development/libraries/libnatpmp/headers.patch b/pkgs/development/libraries/libnatpmp/headers.patch -new file mode 100644 -index 0000000000000..1a47bd5146707 ---- /dev/null -+++ b/pkgs/development/libraries/libnatpmp/headers.patch -@@ -0,0 +1,12 @@ -+diff a/Makefile b/Makefile -+--- a/Makefile -++++ b/Makefile -+@@ -56,7 +56,7 @@ else -+ endif -+ endif -+ -+-HEADERS = natpmp.h -++HEADERS = natpmp.h natpmp_declspec.h -+ -+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static -+ diff --git a/shells/nixos-config.nix b/shells/nixos-config.nix index f5a71656..0b0e176c 100644 --- a/shells/nixos-config.nix +++ b/shells/nixos-config.nix @@ -17,7 +17,7 @@ packages = [ pkgs.agenix # Use nixos-rebuild from flake, since it might be patched - (pkgs.nixos-rebuild.override { nix = pkgs.nixVersions.nix_2_14; }) + pkgs.nixos-rebuild pkgs.nixpkgs-fmt ]; }