From 9848c378ed3df76a2ccb4c8be9f131c1635371e6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 20 Dec 2021 15:01:12 +0100 Subject: [PATCH] nix: Remove redundant derivation attrs These cause unnecessary rebuilds when a new series is added and exposing them as package attributes looks convenient but is not sustainable. --- pkgs/tools/package-management/nix/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac47bc9df68b..0fdcbd384b91 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -31,11 +31,12 @@ common = }: let sh = busybox-sandbox-shell; - nix = stdenv.mkDerivation rec { - inherit pname version src patches; - is24 = lib.versionAtLeast version "2.4pre"; - is25 = lib.versionAtLeast version "2.5pre"; + is24 = lib.versionAtLeast version "2.4pre"; + is25 = lib.versionAtLeast version "2.5pre"; + + nix = stdenv.mkDerivation { + inherit pname version src patches; VERSION_SUFFIX = suffix; @@ -173,6 +174,9 @@ common = }; passthru = { + is24 = lib.warn ''nix package: attribute .is24 is deprecated. Please use lib.versionAtLeast X.version "2.4pre".'' is24; + is25 = lib.warn ''nix package: attribute .is25 is deprecated. Please use lib.versionAtLeast X.version "2.5pre".'' is25; + perl-bindings = perl.pkgs.toPerlModule (stdenv.mkDerivation { pname = "nix-perl"; inherit version;