From 1c5206087ad302e4d97aa3717a9e551187dea5bd Mon Sep 17 00:00:00 2001
From: Ali Rizvi <perm-iterate-0b@icloud.com>
Date: Tue, 7 Jan 2025 22:02:06 -0500
Subject: [PATCH] flake.lock: bump revisions

Some `patool` related fixes landed, including build failures for 2 of the derivations I use, so we have reverted those. Furthermore, pulseaudio related module options got moved from `hardware.pulseaudio` to `services.pulseaudio`.
---
 flake.lock                                    | 24 +++++++++----------
 .../home-manager/programs/patool/package.nix  | 10 ++------
 .../nixos/system/audio/pipewire/module.nix    |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index f2c65a4..76d930c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1735774679,
-        "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735774425,
-        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
+        "lastModified": 1736277415,
+        "narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
+        "rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1735388221,
-        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
+        "lastModified": 1736283893,
+        "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
+        "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1736012469,
+        "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
         "type": "github"
       },
       "original": {
diff --git a/modules/home-manager/programs/patool/package.nix b/modules/home-manager/programs/patool/package.nix
index bfd83bb..1f48c48 100644
--- a/modules/home-manager/programs/patool/package.nix
+++ b/modules/home-manager/programs/patool/package.nix
@@ -38,12 +38,6 @@
 let
   stdenv = gcc13Stdenv;
 
-  patool' = (builtins.getFlake "github:NixOS/nixpkgs/7fa1a3c6b3d22f5e53bb765518a749847a25bb65").legacyPackages.${stdenv.system}.patool;
-
-  arj' = arj.override {
-    inherit stdenv;
-  };
-
   lha' = lha.override {
     inherit stdenv;
   };
@@ -53,7 +47,7 @@ let
   };
 in symlinkJoin {
   name = "patool";
-  paths = [ patool' ];
+  paths = [ patool ];
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -61,7 +55,7 @@ in symlinkJoin {
     wrapProgram $out/bin/patool \
       --prefix PATH : ${lib.makeBinPath [
         archiver
-        arj'
+        arj
         bintools
         bzip2
         bzip3
diff --git a/modules/nixos/system/audio/pipewire/module.nix b/modules/nixos/system/audio/pipewire/module.nix
index b84c8bb..0ca17af 100644
--- a/modules/nixos/system/audio/pipewire/module.nix
+++ b/modules/nixos/system/audio/pipewire/module.nix
@@ -13,7 +13,7 @@ in {
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
       # Kill PulseAudio and ALSA stuff
-      hardware.pulseaudio.enable = lib.mkForce false;
+      services.pulseaudio.enable = lib.mkForce false;
       hardware.alsa.enablePersistence = false; # https://github.com/NixOS/nixpkgs/issues/330606
     }
     {