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

Merge pull request #252065 from alexfmpe/ispc-1.20

Browse Source 
ispc: 1.19.0 -> 1.20.0
This commit is contained in:
Matthias Beyer 2023-08-29 11:49:57 +02:00 committed by GitHub
commit 524fb0db55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/ispc/default.nix
View File

@ -1,22 +1,22 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
}:
stdenv.mkDerivation rec {
pname = "ispc";
version = "1.19.0";
version = "1.20.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256:0yhcgyzjlrgs920lm0l6kygj2skanfb6qkxbdgm69r8c2xkzkaa3";
sha256 = "sha256:06wgvfbc6nh5c7yili47h2gzl0ykcwnvyizy499kb6gsplflf9gh";
};
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
];
@ -52,7 +52,10 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
"-DFILE_CHECK_EXECUTABLE=${llvmPackages.llvm}/bin/FileCheck"
"-DLLVM_AS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-as"
"-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config"
"-DLLVM_DIS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-dis"
"-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang"
"-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++"
"-DISPC_INCLUDE_EXAMPLES=OFF"

2
pkgs/top-level/all-packages.nix
View File

@ -22297,7 +22297,7 @@ with pkgs;
ispc = callPackage ../development/compilers/ispc {
xcode = darwin.xcode_14;
llvmPackages = llvmPackages_14;
llvmPackages = llvmPackages_15;
};
isso = callPackage ../servers/isso {