gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-10-27 06:04:59 +00:00
committed by GitHub
parent b67a45959d 50ef4f6586
commit a9ebf88c51
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ispc/default.nix
+2 -4
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
};
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ];
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
"-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"))
] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [
"-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
];
meta = with lib; {
pkgs/top-level/all-packages.nix
-1
View File
@@ -20310,7 +20310,6 @@ with pkgs;
isort = with python3Packages; toPythonApplication isort;
ispc = callPackage ../development/compilers/ispc {
xcode = darwin.xcode_14;
llvmPackages = llvmPackages_17;
};
pkgs/top-level/java-packages.nix
+3 -3
View File
@@ -31,9 +31,9 @@ with pkgs;
openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix;
# Legacy aliases
openjdk8-bootstrap = openjdk8.jdk-bootstrap;
openjdk11-bootstrap = openjdk11.jdk-bootstrap;
openjdk17-bootstrap = openjdk17.jdk-bootstrap;
openjdk8-bootstrap = temurin-bin.jdk-8;
openjdk11-bootstrap = temurin-bin.jdk-11;
openjdk17-bootstrap = temurin-bin.jdk-17;
temurin-bin = recurseIntoAttrs (callPackage (
if stdenv.hostPlatform.isLinux