From 6de65850fe216699c280a53c7a558ae2798edbf2 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 23 Mar 2025 13:30:34 +0100 Subject: [PATCH] nixos/nix: use nixos-rebuild from nixpkgs/389487 --- nix-os/nix.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nix-os/nix.nix b/nix-os/nix.nix index de9687f..d536156 100644 --- a/nix-os/nix.nix +++ b/nix-os/nix.nix @@ -28,9 +28,18 @@ let }; }; + # nixpkgs PR389487 + # https://github.com/NixOS/nixpkgs/pull/389487 + futureNixosExecutables = let + nixpkgs = builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/e8f4dba5135ce202c7ef77118f145ef8b3803088.tar.gz"; + sha256 = "1ssqca6x9g6ys754zj2sdvsi85hwfhqd04pa445gavr4wiadgv0b"; + }; + in pkgs.callPackage "${nixpkgs}/pkgs/os-specific/linux/nixos-rebuild/default.nix" {}; + wrappedNixosExecutables = pkgs.symlinkJoin { name = "${pkgs.nixos-rebuild.name}-wrap"; - paths = [ pkgs.nixos-rebuild ]; + paths = [ futureNixosExecutables ]; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -47,5 +56,6 @@ in { (wrappedNixExecutables true) wrappedNixosExecutables ]; + system.tools.nixos-rebuild.enable = false; }; }