about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-01-24 00:43:37 +0100
committerGitHub <noreply@github.com>2019-01-24 00:43:37 +0100
commit89654abe66338a7ee2d37a24b33330a86d0abf2c (patch)
treea2b55bb452d5ed6d239553d74efdfc5a6757a62f
parentb6da1ca26c33d2ca9c4881065f785835a6819e67 (diff)
parent1506f0f8cd1e84cc671ff8428d6b5f50434a9aa2 (diff)
downloadnixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar.gz
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar.bz2
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar.lz
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar.xz
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.tar.zst
nixlib-89654abe66338a7ee2d37a24b33330a86d0abf2c.zip
Merge pull request #54360 from dtzWill/update/ispc-1.10.0
ispc: 1.9.2 -> 1.10.0
-rw-r--r--pkgs/development/compilers/ispc/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index a5d6247ffdc7..2657ee6633b7 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -3,7 +3,7 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is n
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.9.2";
+  version = "1.10.0";
   rev = "v${version}";
 
   inherit testedTargets;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "ispc";
     repo = "ispc";
     inherit rev;
-    sha256 = "0zaw7mwvly1csbdcbz9j8ry89n0r1fag1m1f579l4mgg1x6ksqry";
+    sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b";
   };
 
   # there are missing dependencies in the Makefile, causing sporadic build failures
@@ -32,14 +32,7 @@ stdenv.mkDerivation rec {
     llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped
   ];
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch;
-      sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s";
-    })
-  ];
-
-  postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile";
+  postPatch = "sed -i -e 's,/bin/,,g' -e 's/-lcurses/-lncurses/g' Makefile";
 
   # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real
   # errors