From 5b9dfc774ba8af75002bdefd2cb5915e089e89ef Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 24 Nov 2023 10:02:13 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 54 ++++++++++++++++++++++---------------------- patches/268137.patch | 46 ------------------------------------- 2 files changed, 27 insertions(+), 73 deletions(-) delete mode 100644 patches/268137.patch diff --git a/flake.lock b/flake.lock index e0a0d5e3..3f29dacc 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1700469695, - "narHash": "sha256-cFT8oaIW1Z5TLN1sdaXZy9g6eXJLTf7uRbnBmiyOfKU=", + "lastModified": 1700772039, + "narHash": "sha256-/8kVzFL7qro3t2C/kF9c/+GhOKlrWCdhKuAr29NuGuY=", "owner": "accentor", "repo": "api", - "rev": "a0e4015015e21cc1cf5d882ee0e6a49af83e68d0", + "rev": "c2e346e969656abbd65a21cf96408db916041285", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1700469808, - "narHash": "sha256-AsVFTBQ7+ekKjnEdXoSYerDyuBG5aUOMutwAeI+psrg=", + "lastModified": 1700772069, + "narHash": "sha256-PL9W/mpwjif8dM/oG7brrGjZG2zbae+sz/C0JVlXhsY=", "owner": "accentor", "repo": "web", - "rev": "9491db415386e48c1869590f6a91a14376832de4", + "rev": "6c495a11ce88bdc9c3032932fc33c36da3ef41f8", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1698410321, - "narHash": "sha256-MphuSlgpmKwtJncGMohryHiK55J1n6WzVQ/OAfmfoMc=", + "lastModified": 1700815693, + "narHash": "sha256-JtKZEQUzosrCwDsLgm+g6aqbP1aseUl1334OShEAS3s=", "owner": "numtide", "repo": "devshell", - "rev": "1aed986e3c81a4f6698e85a7452cbfcc4b31a36e", + "rev": "7ad1c417c87e98e56dcef7ecd0e0a2f2e5669d51", "type": "github" }, "original": { @@ -212,11 +212,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700761131, - "narHash": "sha256-y6NfJB8j+YFAdNwZybBpaxbrJW4TsxBMozFD6PlncZ4=", + "lastModified": 1700793713, + "narHash": "sha256-Y1TUGNWmp8Pm83OnpVI+QAerdltEV1gupl2fVPcSJ0E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "95e53f0f4b8227d57cb121c2bdf81c6aa9165ad6", + "rev": "cc8840b8c004b94164b38d003581cba25bb44c99", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1700695018, - "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=", + "lastModified": 1700814342, + "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "134deb46abd5d0889d913b8509413f6f38b0811e", + "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700501263, - "narHash": "sha256-M0U063Ba2DKL4lMYI7XW13Rsk5tfUXnIYiAVa39AV/0=", + "lastModified": 1700678569, + "narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f741f8a839912e272d7e87ccf4b9dbc6012cdaf9", + "rev": "8f1180704ac35baded1a74164365ac7cdfba6f38", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1700763946, - "narHash": "sha256-XKCp8Krcgpy/TbugfnCB83fq41s99qqg0IwNZ9I7KHg=", + "lastModified": 1700815464, + "narHash": "sha256-8n9E+Xa2s1zSfDfx6HQQrGkehof0X122DGG9AfDfodE=", "owner": "nix-community", "repo": "NUR", - "rev": "e2af1e4fff08f6e9356a60a47e4207efaa2ef839", + "rev": "05bbd118ce31b9b37445526bb553dbfa48402845", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1700553734, - "narHash": "sha256-KS3QRjprl8FoKXqIlLGfgTqIhKwrUjCqqvK9zgE0XXo=", + "lastModified": 1700771749, + "narHash": "sha256-3871jh5N85d0xeDv3I23yN0HpFJVsSDR1IHGeWrB8NI=", "owner": "chvp", "repo": "tetris", - "rev": "51af5ad295f732f5b2844d5a7780acf2ad988f5c", + "rev": "ab2f4e2e27992b04c52249794a0df86dd1f6bdd7", "type": "github" }, "original": { diff --git a/patches/268137.patch b/patches/268137.patch deleted file mode 100644 index 5be6d8fb..00000000 --- a/patches/268137.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix -index f4914d8432728f..c77c01df85086b 100644 ---- a/pkgs/os-specific/linux/firmware/fwupd/default.nix -+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix -@@ -19,7 +19,6 @@ - , curl - , libjcat - , elfutils --, efivar - , valgrind - , meson - , libuuid -@@ -123,7 +122,7 @@ let - in - stdenv.mkDerivation (finalAttrs: { - pname = "fwupd"; -- version = "1.9.7"; -+ version = "1.9.9"; - - # libfwupd goes to lib - # daemon, plug-ins and libfwupdplugin go to out -@@ -134,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { - owner = "fwupd"; - repo = "fwupd"; - rev = finalAttrs.version; -- hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM="; -+ hash = "sha256-UUrG3CMCAC5hyy2U5I4zqvJoSP/+zuiq1P+2Pdb3QD0="; - }; - - patches = [ -@@ -193,7 +192,6 @@ stdenv.mkDerivation (finalAttrs: { - bash-completion - pango - tpm2-tss -- efivar - fwupd-efi - protobufc - modemmanager -@@ -207,7 +205,6 @@ stdenv.mkDerivation (finalAttrs: { - - mesonFlags = [ - "-Ddocs=enabled" -- "-Dplugin_dummy=true" - # We are building the official releases. - "-Dsupported_build=enabled" - "-Dlaunchd=disabled"