From c904f6cdcb02c85181cf478496b0b9a78308133a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 3 Nov 2024 21:43:36 +1100 Subject: [PATCH] release: rename `release` to `release-lib` to match NixOS https://github.com/NixOS/nixpkgs/blob/2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53/pkgs/top-level/release.nix#L56-L58 --- release.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release.nix b/release.nix index b432a29..c4d4c58 100644 --- a/release.nix +++ b/release.nix @@ -5,7 +5,12 @@ }: let - inherit (release) pkgs; + release-lib = import (nixpkgs + "/pkgs/top-level/release-lib.nix") { + inherit supportedSystems scrubJobs system; + packageSet = import nixpkgs; + }; + + inherit (release-lib) pkgs; buildFromConfig = configuration: sel: sel (import ./. { inherit nixpkgs configuration system; }).config; @@ -58,11 +63,6 @@ let in buildFromConfig configuration (config: config.system.build.run-test); - release = import (nixpkgs + "/pkgs/top-level/release-lib.nix") { - inherit supportedSystems scrubJobs; - packageSet = import nixpkgs; - }; - manual = buildFromConfig ({ lib, config, ... }: { system.stateVersion = lib.mkDefault config.system.maxStateVersion; }) (config: config.system.build.manual);