From a31b5e4710741368f2082cae4b367699f522fca7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 22 Mar 2024 14:40:19 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 30 +++++++++++++++--------------- patches/296865.patch | 36 ------------------------------------ patches/297158.patch | 39 --------------------------------------- 3 files changed, 15 insertions(+), 90 deletions(-) delete mode 100644 patches/296865.patch delete mode 100644 patches/297158.patch diff --git a/flake.lock b/flake.lock index f63e7d9d..2c0648ab 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1711103947, - "narHash": "sha256-IlzuogfSgyemAVt+SJ0gqJstGmTIPW85U0DlD9Z+O/I=", + "lastModified": 1711111985, + "narHash": "sha256-coe8O4ZwhYciHWMndFWszRK4+PxEL5VWtLtHXFy68N4=", "owner": "accentor", "repo": "api", - "rev": "18caf3fc465e0f65c036ddab96d1b43b7719e811", + "rev": "bd6d41433f7565afbb28e5d32f244be1f9f9b87f", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1711103995, - "narHash": "sha256-NdFADzR673XJPUcAjPoxkDBb3+9T4SbsLkJiegNEpvo=", + "lastModified": 1711111866, + "narHash": "sha256-ntGC3R7IYWsQnvbMdtgVacfGGYdWDgs79lWjjGYwLuA=", "owner": "accentor", "repo": "web", - "rev": "2967ed7b1b66dcc7d29448ea8044721117acf6a8", + "rev": "adc0b3d3d2609db6a85635ceb9f974ee01fcc0ce", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1711001935, + "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "20f77aa09916374aa3141cbc605c955626762c9a", "type": "github" }, "original": { @@ -521,11 +521,11 @@ }, "nur": { "locked": { - "lastModified": 1711104278, - "narHash": "sha256-RNGTDnDQIZWN86ujldIeExVFlgU8GhHkPumoeyhYiUo=", + "lastModified": 1711114493, + "narHash": "sha256-2WAjqAs3W6vHU7X7EVviHEOex8hU8mOucXBKcYNZ08s=", "owner": "nix-community", "repo": "NUR", - "rev": "f5ee95b131630a3bb053c3e3e3c8a39595974ab4", + "rev": "00e8f787a8f4f51e0e1f13bbf340ae496ab1e52a", "type": "github" }, "original": { @@ -738,11 +738,11 @@ ] }, "locked": { - "lastModified": 1711100109, - "narHash": "sha256-PANTnxwGuaWjNCjGAQNjrxKeVuE9PkVxlpTfesFP+4I=", + "lastModified": 1711107286, + "narHash": "sha256-bsVIrPy4oN7DqraUzu1xYuTBXOvP8Wcw4QrvPSm3JLk=", "owner": "chvp", "repo": "tetris", - "rev": "5d402cbf66d2b6533a8b3e7dcd85610c40a4d5f3", + "rev": "99d911761510bc75af8c74d6600222539275c0ef", "type": "github" }, "original": { diff --git a/patches/296865.patch b/patches/296865.patch deleted file mode 100644 index 2f846e83..00000000 --- a/patches/296865.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix -index 823cf7fa75ecb8..47071c60f29424 100644 ---- a/pkgs/applications/misc/waybar/default.nix -+++ b/pkgs/applications/misc/waybar/default.nix -@@ -51,6 +51,7 @@ - , mpdSupport ? true - , mprisSupport ? stdenv.isLinux - , nlSupport ? true -+, pipewireSupport ? true - , pulseSupport ? true - , rfkillSupport ? true - , runTests ? true -@@ -122,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { - fftw - iniparser - ncurses -- pipewire - portaudio - ] - ++ lib.optional evdevSupport libevdev -@@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower - ++ lib.optional wireplumberSupport wireplumber -+ ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; - - nativeCheckInputs = [ catch2_3 ]; -@@ -154,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: { - "man-pages" = true; - "mpd" = mpdSupport; - "mpris" = mprisSupport; -+ "pipewire" = pipewireSupport; - "pulseaudio" = pulseSupport; - "rfkill" = rfkillSupport; - "sndio" = sndioSupport; diff --git a/patches/297158.patch b/patches/297158.patch deleted file mode 100644 index b2baa719..00000000 --- a/patches/297158.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix -index 47071c60f29424..fd24f6605e4e08 100644 ---- a/pkgs/applications/misc/waybar/default.nix -+++ b/pkgs/applications/misc/waybar/default.nix -@@ -2,6 +2,7 @@ - , stdenv - , bash - , fetchFromGitHub -+, fetchFromGitLab - , SDL2 - , alsa-lib - , catch2_3 -@@ -72,6 +73,17 @@ let - rev = "0.10.1"; - hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw="; - }; -+ -+ wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec { -+ version = "0.4.17"; -+ src = fetchFromGitLab { -+ domain = "gitlab.freedesktop.org"; -+ owner = "pipewire"; -+ repo = "wireplumber"; -+ rev = version; -+ hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI="; -+ }; -+ }); - in - stdenv.mkDerivation (finalAttrs: { - pname = "waybar"; -@@ -138,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { - ++ lib.optional traySupport libdbusmenu-gtk3 - ++ lib.optional udevSupport udev - ++ lib.optional upowerSupport upower -- ++ lib.optional wireplumberSupport wireplumber -+ ++ lib.optional wireplumberSupport wireplumber_0_4 - ++ lib.optional (cavaSupport || pipewireSupport) pipewire - ++ lib.optional (!stdenv.isLinux) libinotify-kqueue; -