diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-18 10:26:55 +0000 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-30 18:35:29 -0500 |
| commit | 1ebc042878132a31f80b76938c47c0bee2932487 (patch) | |
| tree | f969d04353f77875332f4def4cc40076eebaa1bb /pkgs/development/compilers/dale | |
| parent | 6ea79d2707e099fc5e35b22b7713a95e80def99d (diff) | |
| download | nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar.gz nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar.bz2 nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar.lz nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar.xz nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.tar.zst nixpkgs-1ebc042878132a31f80b76938c47c0bee2932487.zip | |
dale: 20170519 -> 20181024
Diffstat (limited to 'pkgs/development/compilers/dale')
| -rw-r--r-- | pkgs/development/compilers/dale/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/compilers/dale/link-llvm.patch | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 128c245d277..9c70e96a9c0 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -3,12 +3,12 @@ , cmake , pkgconfig , libffi -, llvm_35 +, llvm_6 , doCheck ? false , perl }: -let version = "20170519"; +let version = "20181024"; in stdenv.mkDerivation { pname = "dale"; @@ -17,16 +17,14 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "tomhrr"; repo = "dale"; - rev = "39e16d8e89fa070de65a673d4462e783d530f95a"; - sha256 = "0dc5cjahv7lzlp92hidlh83rwgrpgb6xz2pnba2pm5xrv2pnsskl"; + rev = "f5db8b486f4e7c423fc25941a8315f1209bc0e54"; + sha256 = "0v4ajrzrqvf279kd7wsd9flrpsav57lzxlwwimk9vnfwh7xpzf9v"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libffi llvm_35 ] + buildInputs = [ cmake libffi llvm_6 ] ++ stdenv.lib.optional doCheck perl; - patches = [ ./link-llvm.patch ]; - inherit doCheck; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch deleted file mode 100644 index 3facec91874..00000000000 --- a/pkgs/development/compilers/dale/link-llvm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100 -+++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100 -@@ -78,6 +78,7 @@ - execute_process (COMMAND ${LLVM_CONFIG} --libs - OUTPUT_VARIABLE LLVM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE) -+STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}") - if (${D_LLVM_VERSION_MINOR} GREATER 4) - execute_process (COMMAND ${LLVM_CONFIG} --system-libs - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS |