Unverified Commit c98d1bde authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #276112 from tweag/some-eval-fixes 

Various eval fixes with `allowAliases = false`
parents f4525eef 14b11885

pkgs/applications/networking/instant-messengers/teams/default.nix

+28 −32
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ let 
  };



  appName = "Teams.app";



  darwin = stdenv.mkDerivation {

in

stdenv.mkDerivation {

  inherit pname meta;

  version = versions.darwin;
@@ -55,8 +55,4 @@ let 
    makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams

    runHook postInstall

  '';

  };

in

if stdenv.isDarwin

then darwin

else throw "Teams app for Linux has been removed as it is unmaintained by upstream. (2023-09-29)"
 
}

pkgs/by-name/gr/gruvbox-plus-icons/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, stdenvNoCC

, fetchFromGitHub

, gtk3

, breeze-icons

, plasma5Packages

, gnome-icon-theme

, hicolor-icon-theme

}:
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation { 


  nativeBuildInputs = [ gtk3 ];



  propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ];

  propagatedBuildInputs = [ plasma5Packages.breeze-icons gnome-icon-theme hicolor-icon-theme ];



  installPhase = ''

    runHook preInstall

pkgs/development/compilers/dotnet/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7 
Hashes and urls are retrieved from:

https://dotnet.microsoft.com/download/dotnet

*/

{ callPackage }:

{ lib, config, callPackage }:

let

  buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};

  buildAttrs = {
@@ -35,7 +35,7 @@ in 
  inherit systemToDotnetRid;



  combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {};



} // lib.optionalAttrs config.allowAliases {

  # EOL

  sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

  sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)";

pkgs/development/libraries/wtk/default.nix

+1 −2
Original line number Diff line number Diff line 
{ lib, stdenv, requireFile, unzip, xorg }:



assert stdenv.hostPlatform.system == "i686-linux";



stdenv.mkDerivation rec {

  pname = "sun-java-wtk";

  version = "2.5.2_01";
@@ -23,5 +21,6 @@ stdenv.mkDerivation rec { 
    description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";

    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

    license = lib.licenses.unfree;

    platforms = [ "i686-linux" ];

  };

}

pkgs/development/tools/gofumpt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, buildGoModule

, fetchFromGitHub

, nix-update-script

, testVersion

, testers

, gofumpt

}:
@@ -30,7 +30,7 @@ buildGoModule rec { 


  passthru = {

    updateScript = nix-update-script { };

    tests.version = testVersion {

    tests.version = testers.testVersion {

      package = gofumpt;

      version = "v${version}";

    };