Unverified Commit 47db24fe authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

release.nix: don't use special treatment for more package sets (#405039)

parents 943334bf a282257e

pkgs/os-specific/darwin/xcode/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ let 
        description = "Apple's XCode SDK";

        license = licenses.unfree;

        platforms = platforms.darwin ++ platforms.linux;

        hydraPlatforms = [ ];

        sourceProvenance = [ sourceTypes.binaryNativeCode ];

      };

pkgs/top-level/all-packages.nix

+7 −5
Original line number Diff line number Diff line
@@ -5498,7 +5498,7 @@ with pkgs; 


  gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };



  idrisPackages = dontRecurseIntoAttrs (

  idrisPackages = recurseIntoAttrs (

    callPackage ../development/idris-modules {

      idris-no-deps = haskellPackages.idris;

      pkgs = pkgs.__splicedPackages;
@@ -9615,9 +9615,11 @@ with pkgs; 


  ### DEVELOPMENT / LIBRARIES / AGDA



  agdaPackages = callPackage ./agda-packages.nix {

  agdaPackages = recurseIntoAttrs (

    callPackage ./agda-packages.nix {

      inherit (haskellPackages) Agda;

  };

    }

  );

  agda = agdaPackages.agda;



  ### DEVELOPMENT / LIBRARIES / BASH
@@ -10755,7 +10757,7 @@ with pkgs; 
  # Even though this is a set of packages not single package, use `callPackage`

  # not `callPackages` so the per-package callPackages don't have their

  # `.override` clobbered. C.F. `llvmPackages` which does the same.

  darwin = recurseIntoAttrs (callPackage ./darwin-packages.nix { });

  darwin = callPackage ./darwin-packages.nix { };



  displaylink = callPackage ../os-specific/linux/displaylink {

    inherit (linuxPackages) evdi;

pkgs/top-level/darwin-packages.nix

+168 −166
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ makeScopeWithSplicing' { 
      impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };

    in



    lib.recurseIntoAttrs (

      impure-cmds

      // apple-source-packages

      // {
@@ -214,5 +215,6 @@ makeScopeWithSplicing' { 
        };



      }

    )

  );

}

pkgs/top-level/release.nix

+1 −11
Original line number Diff line number Diff line
@@ -395,8 +395,6 @@ let 
                haskell-language-server

                ;

            });

        idrisPackages = packagePlatforms pkgs.idrisPackages;

        agdaPackages = packagePlatforms pkgs.agdaPackages;



        pkgsLLVM.stdenv = [

          "x86_64-linux"
@@ -419,16 +417,8 @@ let 
          "aarch64-linux"

        ];



        # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66



        #emacsPackages = packagePlatforms pkgs.emacsPackages;

        #rPackages = packagePlatforms pkgs.rPackages;

        # Fails CI in its current state

        ocamlPackages = { };

        perlPackages = { };



        darwin = packagePlatforms pkgs.darwin // {

          xcode = { };

        };

      };

      mapTestOn-packages = if attrNamesOnly then packageJobs else mapTestOn packageJobs;

    in