public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge recent master

Browse Source
This commit is contained in:
Vladimír Čunát
2014-06-10 20:14:08 +02:00
parent 5a98b9f514 bd7f3fbf0f
commit f2352f7ecf
199 changed files with 5598 additions and 2940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/clojure/default.nix
View File

@@ -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 ];
};
}

9
pkgs/development/interpreters/pypy/2.2/default.nix
View File

@@ -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 = ''

4
pkgs/development/interpreters/racket/default.nix
View File

@@ -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 ];