nixos/system: backport system.rebuild.enableNg

thiagokokada · Dec 10, 2024 · e0a48f2 · e0a48f2
1 parent 4846f42
commit e0a48f2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/lib/flake-helpers.nix b/lib/flake-helpers.nix
@@ -72,7 +72,24 @@ in
       inherit (self.outputs.nixosConfigurations.${hostname}) config pkgs;
       inherit (nixpkgs.legacyPackages.${system}) applyPatches fetchpatch;
 
-      patches = [ ];
+      patches = [
+        (fetchpatch {
+          url = "https://github.com/NixOS/nixpkgs/commit/8ce6a1efacc9092f8e6bcdc649b7b14960f519dc.patch";
+          hash = "sha256-H7RXLGDwtWtLeXfrMVSd0Mab89JNoqhumKu/dE3lqVc=";
+        })
+        (fetchpatch {
+          url = "https://github.com/NixOS/nixpkgs/commit/dc737160fdcc4a25f0ae6c6aeedaa050e185084c.patch";
+          hash = "sha256-GirvMkd5T1dKDxaQrWWAOqTtSLvHzd7+GhjzYvedI5c=";
+        })
+        (fetchpatch {
+          url = "https://github.com/NixOS/nixpkgs/commit/3e1e64d0438b03c3ae171b78f8ac6977221afe92.patch";
+          hash = "sha256-iimCxs7LvJWrFTGWTeFvMzguf0s3ZKRfJfB2hBn0qFQ=";
+        })
+        (fetchpatch {
+          url = "https://github.com/NixOS/nixpkgs/commit/1642dbbc079bc3926b840bbadd5de068bb921650.patch";
+          hash = "sha256-nsiKnr8IA87nrVcUZRrHTpgqb26YcYlLvlIDNafK0+Y=";
+        })
+      ];
 
       nixosSystem =
         args:

diff --git a/nixos/system/default.nix b/nixos/system/default.nix
@@ -82,8 +82,6 @@ in
       };
     };
 
-    environment.systemPackages = with pkgs; [ nixos-rebuild-ng ];
-
     # Enable firmware-linux-nonfree
     hardware.enableRedistributableFirmware = lib.mkDefault true;
 
@@ -119,6 +117,7 @@ in
     };
 
     system.configurationRevision = flake.rev or "dirty";
+    system.rebuild.enableNg = true;
 
     # nixos/modules/misc/version.nix
     users.motd = lib.mkIf cfg.motd.enable ''Welcome to '${config.networking.hostName}' running NixOS ${config.system.nixos.version}!'';