Commit e9494dd2 authored by Robert Hensing's avatar Robert Hensing
Browse files

nixVersions.nix_2_26: Fix cross and static

parent c0df86f0

pkgs/tools/package-management/nix/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -186,7 +186,12 @@ in lib.makeExtensible (self: ({ 
    self_attribute_name = "nix_2_25";

  };



  nix_2_26 = addTests "nix_2_26" (callPackage ./vendor/2_26/componentized.nix { inherit (self.nix_2_24.meta) maintainers; });

  components.nix_2_26 =

    (callPackage ./vendor/2_26/componentized.nix {

      inherit (self.nix_2_24.meta) maintainers;

      selfAttributeName = "nix_2_26";

    });

  nix_2_26 = addTests "nix_2_26" self.components.nix_2_26.nix-everything;



  git = common rec {

    version = "2.25.0";

pkgs/tools/package-management/nix/vendor/2_26/componentized.nix

+6 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
  pkgs,

  stdenv,

  maintainers,

  selfAttributeName,

  ...

}:

let
@@ -24,7 +25,7 @@ let 
        inherit (nixDependencies) newScope;

      }

      {

        otherSplices = generateSplicesForMkScope "nixComponents";

        otherSplices = generateSplicesForMkScope [ "nixVersions" "components" selfAttributeName ];

        f = import ./packaging/components.nix {

          inherit

            lib
@@ -45,11 +46,13 @@ let 
        inherit newScope; # layered directly on pkgs, unlike nixComponents above

      }

      {

        otherSplices = generateSplicesForMkScope "nixDependencies";

        # Technically this should point to the nixDependencies set only, but

        # this is ok as long as the scopes don't intersect.

        otherSplices = generateSplicesForMkScope ["nixVersions" "components" selfAttributeName ];

        f = import ./dependencies.nix {

          inherit pkgs;

          inherit stdenv;

        };

      };

in

(nixComponents.overrideSource src).nix-everything
 
nixComponents.overrideSource src