Unverified Commit d0c0b875 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

treewide: remove __recurseIntoDerivationForReleaseJobs 

This attribute was supposed to be set on derivations, to make the
release tools recurse into them. The remaining uses were all on regular
attrsets, though, so this is safe to remove.
parent b627d181

ci/eval/attrpaths.nix

+1 −20
Original line number Diff line number Diff line
@@ -21,20 +21,6 @@ 
}:

let



  # The intended semantics are that an attrpath rooted at pkgs is

  # part of the (unfiltered) release jobset iff both of the following

  # are true:

  #

  # 1. The attrpath leads to a value for which lib.isDerivation is true

  #

  # 2. Any proper prefix of the attrpath at which lib.isDerivation

  #    is true also has __recurseIntoDerivationForReleaseJobs=true.

  #

  # The second condition is unfortunately necessary because there are

  # Hydra release jobnames which have proper prefixes which are

  # attrnames of derivations (!).  We should probably restructure

  # the job tree so that this is not the case.

  #

  # TODO: Use mapAttrsToListRecursiveCond when this PR lands:

  # https://github.com/NixOS/nixpkgs/pull/395160

  justAttrNames =
@@ -43,12 +29,7 @@ let 
      result =

        if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then

          [ ]

        else if

          lib.isDerivation value

          &&

            # in some places we have *derivations* with jobsets as subattributes, ugh

            !(value.__recurseIntoDerivationForReleaseJobs or false)

        then

        else if lib.isDerivation value then

          [ path ]

        else

          lib.pipe value [

pkgs/test/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -152,9 +152,7 @@ with pkgs; 


  php = recurseIntoAttrs (callPackages ./php { });



  pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }) // {

    __recurseIntoDerivationForReleaseJobs = true;

  };

  pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { });



  buildRustCrate = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });

  importCargoLock = recurseIntoAttrs (callPackage ../build-support/rust/test/import-cargo-lock { });

pkgs/top-level/all-packages.nix

+13 −20
Original line number Diff line number Diff line
@@ -5177,10 +5177,7 @@ with pkgs; 
          haskell.packages.ghc96

        else

          haskell.packages.ghc98

      )

    // {

      __recurseIntoDerivationForReleaseJobs = true;

    };

      );



  # haskellPackages.ghc is build->host (it exposes the compiler used to build the

  # set, similarly to stdenv.cc), but pkgs.ghc should be host->target to be more
@@ -8868,8 +8865,7 @@ with pkgs; 
    }

  );



  libsForQt5 =

    (recurseIntoAttrs (

  libsForQt5 = recurseIntoAttrs (

    import ./qt5-packages.nix {

      inherit

        lib
@@ -8880,10 +8876,7 @@ with pkgs; 
        pkgsHostTarget

        ;

    }

    ))

    // {

      __recurseIntoDerivationForReleaseJobs = true;

    };

  );



  # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop

  plasma5Packages = libsForQt5;

pkgs/top-level/linux-kernels.nix

+0 −1
Original line number Diff line number Diff line
@@ -789,7 +789,6 @@ in 
      linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre);



      linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);

      __recurseIntoDerivationForReleaseJobs = true;

    }

    // lib.optionalAttrs config.allowAliases {

pkgs/top-level/pkg-config/tests.nix

+1 −3
Original line number Diff line number Diff line
@@ -22,7 +22,5 @@ let 
  };

in

lib.recurseIntoAttrs {

  defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { } // {

    __recurseIntoDerivationForReleaseJobs = true;

  };

  defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { };

}