diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-14 12:58:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-14 12:58:46 -0400 |
| commit | eec35cb6bd82cb0eba69c55e83990f3b9f0107dc (patch) | |
| tree | 2ae8d142b28f5e9e64970315335266bb3afa4558 /pkgs | |
| parent | 9a10e5ae462bcbaeae7e556695b9329eba4cb72a (diff) | |
| parent | 6f69681dad1c937614dbbb767f95480ea630d781 (diff) | |
| download | nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar.gz nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar.bz2 nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar.lz nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar.xz nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.tar.zst nixlib-eec35cb6bd82cb0eba69c55e83990f3b9f0107dc.zip | |
Merge pull request #24889 from formaltech/halvm-bump
Remove hardening at HaLVM 2.4.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/halvm/2.4.0.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix index c167f4bdd75a..08e74bdb78e9 100644 --- a/pkgs/development/compilers/halvm/2.4.0.nix +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { isHaLVM = true; isGhcjs = false; src = fetchgit { - rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925"; + rev = "65fad65966eb7e60f234453a35aeb564a09d2595"; url = "https://github.com/GaloisInc/HaLVM"; - sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167"; + sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k"; }; prePatch = '' - sed -i '312 d' Makefile - sed -i '316,446 d' Makefile # Removes RPM packaging + sed -i '305 d' Makefile + sed -i '309,439 d' Makefile # Removes RPM packaging sed -i '20 d' src/scripts/halvm-cabal.in sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in ''; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d39e1bacd71d..0c51f208f462 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs, nodejs +, jailbreak-cabal, hscolour, cpphs, nodejs, lib }: let isCross = (ghc.cross or null) != null; in { pname @@ -53,7 +53,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? [] +, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" } @ args: assert editedCabalFile != null -> revision != null; |