diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-10 20:14:08 +0200 |
commit | f2352f7ecfe86249c73416263b397175e8a6f06e (patch) | |
tree | 027474c621c6407a717c315894096e5f1679abfb /pkgs/development/interpreters | |
parent | 5a98b9f5140578d8cbd4db8bddfe01e24249c2a9 (diff) | |
parent | bd7f3fbf0f1294e5b32caacbfa66b984aec85c5f (diff) | |
download | nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.gz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.bz2 nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.lz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.xz nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.tar.zst nixlib-f2352f7ecfe86249c73416263b397175e8a6f06e.zip |
Merge recent master
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/pypy/2.2/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/racket/default.nix | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6db652572a3a..fd1a2d019fea 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: -let version = "1.5.1"; in +let version = "1.6.0"; in stdenv.mkDerivation { name = "clojure-${version}"; src = fetchurl { url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy"; + sha256 = "0yv67gackrzlwn9f8cnpw14y2hwspklxhy1450rl71vdrqjahlwq"; }; buildInputs = [ unzip ant jdk makeWrapper ]; @@ -43,5 +43,6 @@ stdenv.mkDerivation { offers a software transactional memory system and reactive Agent system that ensure clean, correct, multithreaded designs. ''; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix index 427e06eca13d..d67f1c2a8215 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.2"; + majorVersion = "2.3"; version = "${majorVersion}.1"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -16,8 +16,8 @@ let inherit majorVersion version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; - sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815"; + url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; + sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] @@ -60,7 +60,8 @@ let # disable test_mhlib because it fails for unknown reason # disable test_multiprocessing due to transient errors # disable sqlite3 due to https://bugs.pypy.org/issue1740 - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python + # disable test_os because test_urandom_failure fails + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8432c848d732..469ef118310a 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cairo, file, pango, glib, gtk , which, libtool, makeWrapper, libjpeg, libpng -, fontconfig, liberation_ttf, sqlite } : +, fontconfig, liberation_ttf, sqlite, openssl } : stdenv.mkDerivation rec { pname = "racket"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; # Various racket executables do run-time searches for these. - ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib"; + ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib"; buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ]; |