diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:06:41 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:06:41 +0100 |
| commit | 0ea0dacc20c706e258f103cfc925a9a02102ce26 (patch) | |
| tree | 8c0bd111d92fd39bc41ba8ac2d8054487c3ab39a /pkgs/development/interpreters | |
| parent | 9075da145aedc85467598a61e556f4d1032bd0d1 (diff) | |
| parent | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (diff) | |
| download | nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar.gz nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar.bz2 nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar.lz nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar.xz nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.tar.zst nixlib-0ea0dacc20c706e258f103cfc925a9a02102ce26.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f12645ec2b62..06e18c96ac38 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.727"; + version = "1.10.1.763"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1mnxvy4n7g72vcwhvrgr0xqri3p9d9w76c8a78kphhmd8lq0m92q"; + sha256 = "042d5bk59wv145fvjrk72g4hvaq7j2p4a2d1pg13b433qfkchgia"; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; - maintainers = with maintainers; [ jlesquembre ]; + maintainers = with maintainers; [ jlesquembre thiagokokada ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index a26c209acc9a..bdde69b407e1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -35,7 +35,7 @@ , rebuildBytecode ? true , stripBytecode ? false , includeSiteCustomize ? true -, static ? false +, static ? stdenv.hostPlatform.isStatic # Not using optimizations on Darwin # configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found. , enableOptimizations ? (!stdenv.isDarwin) |