Unverified Commit 4fbb23ef authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

top-level/release-attrpaths-superset: remove __attrsFailEvaluation (#428015)

parents b901df34 59233ecd

ci/eval/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ let 
        set +e

        command time -o "$outputDir/timestats/$myChunk" \

          -f "Chunk $myChunk on $system done [%MKB max resident, %Es elapsed] %C" \

          nix-env -f "${nixpkgs}/pkgs/top-level/release-attrpaths-parallel.nix" \

          nix-env -f "${nixpkgs}/pkgs/top-level/release-outpaths-parallel.nix" \

          --eval-system "$system" \

          --option restrict-eval true \

          --option allow-import-from-derivation false \

pkgs/applications/editors/jetbrains/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -430,8 +430,6 @@ rec { 
    ];

  };



  plugins = callPackage ./plugins { } // {

    __attrsFailEvaluation = true;

  };

  plugins = callPackage ./plugins { };



}

pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ lib.makeScope newScope ( 
      plugins = [ ];

    };



    # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here.

    pidginPackages = self // {

      pidginPackages = self.pidginPackages // {

        __attrsFailEvaluation = true;

      };

    };

    pidginPackages = self;



    pidgin-indicator = callPackage ./pidgin-indicator { };

pkgs/desktops/gnome/extensions/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ let 
    lib.trivial.pipe extensions [

      (map (extension: lib.nameValuePair extension.extensionUuid extension))

      builtins.listToAttrs

      (attrs: attrs // { __attrsFailEvaluation = true; })

    ];



  # Map the list of extensions to an attrset based on the pname as key, which is more human readable than the UUID
@@ -80,7 +79,6 @@ rec { 


  # Keep the last three versions in here

  gnomeExtensions = lib.trivial.pipe (gnome46Extensions // gnome47Extensions // gnome48Extensions) [

    (v: builtins.removeAttrs v [ "__attrsFailEvaluation" ])

    # Apply some custom patches for automatically packaged extensions

    (callPackage ./extensionOverrides.nix { })

    # Add all manually packaged extensions

pkgs/development/compilers/rust/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -89,12 +89,7 @@ in 
      in

      {

        # Packages suitable for build-time, e.g. `build.rs`-type stuff.

        buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable // {

          # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing more than one level here.

          buildRustPackages = self.buildRustPackages // {

            __attrsFailEvaluation = true;

          };

        };

        buildRustPackages = (selectRustPackage pkgsBuildHost).packages.stable;

        # Analogous to stdenv

        rustPlatform = makeRustPlatform self.buildRustPackages;

        rustc-unwrapped = self.callPackage ./rustc.nix ({