diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-09-08 22:08:32 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-08 22:08:32 +0000 |
commit | b7bd0561be4e95edd69a5b42d5aedc5e909db01f (patch) | |
tree | bd82469f1c93ce6d4d03c0b0e8ad0c32b0251e24 /pkgs/development/compilers | |
parent | 16650af8c34e468cee61d6826c72cbc79eb114c2 (diff) | |
parent | fb0e0dcbc65a7b54bcf98b37b16b06412f0b042f (diff) | |
download | nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar.gz nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar.bz2 nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar.lz nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar.xz nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.tar.zst nixlib-b7bd0561be4e95edd69a5b42d5aedc5e909db01f.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/gnu-smalltalk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/go/1.11.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/julia/shared.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/sbcl/default.nix | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 21c0a5ede91b..39d1652fc700 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + hardeningDisable = [ "format" ]; + installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; # For some reason the tests fail if executated with nix-build, but pass if diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 55cc654b0aa9..237f74e319f7 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { else if stdenv.targetPlatform.isAarch32 then "arm" else if stdenv.targetPlatform.isAarch64 then "arm64" else throw "Unsupported system"; - GOARM = stdenv.targetPlatform.parsed.cpu.version or ""; + GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 41c9c57bd034..e07c2c04b92d 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob ]; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isi686; }; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a860aa7dc734..34855838fe8b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm"; + sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; }; patchPhase = '' |