diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
commit | b4af993c3f2a2e9808b582eb6dd4500a2847fb2b (patch) | |
tree | 6a4d51255f30e0da26fb94d4725b6c19145bb89d /pkgs/development/interpreters | |
parent | 5ad9db047327b74a4002341f074369ee736e4f9e (diff) | |
parent | 961ed7c8b41bb80cdf5f4f0f5e49093ad171393b (diff) | |
download | nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.gz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.bz2 nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.lz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.xz nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.tar.zst nixlib-b4af993c3f2a2e9808b582eb6dd4500a2847fb2b.zip |
Merge branch 'master' into staging
Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
Diffstat (limited to 'pkgs/development/interpreters')
8 files changed, 41 insertions, 26 deletions
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 66cd199373e1..f2fcfc1ad77c 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "2.0.1"; + version = "2.0.2"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1iyz19c15yw0p5lgfbfh8arja2cy3apx5697cm671j4qzjkws32p"; + sha256 = "0vgvvj0qywx9a1ihc8nddc3fcw69dinf136spw4i7qz4bszbs9j5"; }; buildInputs = [ pkgconfig nix git ]; diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 786622fe4cce..4c9bf13937cd 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -95,11 +95,12 @@ let --set LIBRARY_PATH "${LIBRARY_PATH}" ''; - passthru = { + passthru = rec { inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; buildEnv = callPackage ../../python/wrapper.nix { python = self; }; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index bb6dea2a4a3e..3894f401d4ae 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -93,6 +93,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 85970641daaf..3201d7520d13 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -101,6 +101,7 @@ let libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 9222f9fc4e11..d3f5c6e1f138 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation { isPy32 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f96167018297..1f91d1bbaf43 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation { isPy33 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index e585c6c148dd..3cadfc2d22f6 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation { isPy34 = true; is_py3k = true; # deprecated sitePackages = "lib/${libPrefix}/site-packages"; + interpreter = "${self}/bin/${executable}"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 310b0d935420..8c26d1f89ef2 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,38 +1,47 @@ -{ stdenv, fetchurl, cairo, file, pango, glib, gtk -, which, libtool, makeWrapper, libjpeg, libpng -, fontconfig, liberation_ttf, sqlite, openssl } : +{ stdenv, fetchurl, cairo, file, fontconfig, glib, gtk, freefont_ttf +, libjpeg, libpng, libtool, makeWrapper, openssl, pango, sqlite, which } : stdenv.mkDerivation rec { pname = "racket"; - version = "6.1"; + version = "6.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "fde283bf5899bb9266ce721db44631c9bac4a4864a7c3211de413fd9503178c6"; + sha256 = "090269522d20e7a5ce85d2251a126745746ebf5e87554c05efe03f3b7173da75"; }; - # Various racket executables do run-time searches for these. - ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib"; + # Various Racket executables do runtime searches for these. + ffiSharedLibs = "${cairo}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${libjpeg}/lib:" + + "${libpng}/lib:${openssl}/lib:${pango}/lib:${sqlite}/lib"; - buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ]; + buildInputs = [ file fontconfig freefont_ttf libtool makeWrapper sqlite which ]; preConfigure = '' export LD_LIBRARY_PATH=${ffiSharedLibs}:$LD_LIBRARY_PATH - # Chroot builds do not have access to /etc/fonts/fonts.conf, but the Racket bootstrap - # needs a working fontconfig, so here a simple standin is used. + # Chroot builds do not have access to /etc/fonts/fonts.conf, + # but the Racket bootstrap needs a working fontconfig, + # so here a simple temporary stand-in is used. mkdir chroot-fontconfig cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf - echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf + echo "<dir>${freefont_ttf}</dir>" >> chroot-fontconfig/fonts.conf echo "</fontconfig>" >> chroot-fontconfig/fonts.conf + # remove extraneous directories from temporary fonts.conf + sed -e 's@<dir></dir>@@g' \ + -e 's@<dir prefix="xdg">fonts</dir>@@g' \ + -e 's@<dir>~/.fonts</dir>@@g' \ + -e 's@<cachedir prefix="xdg">fontconfig</cachedir>@@g' \ + -e 's@<cachedir>~/.fontconfig</cachedir>@@g' \ + -i chroot-fontconfig/fonts.conf + export FONTCONFIG_FILE=$(pwd)/chroot-fontconfig/fonts.conf cd src sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure - sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure + sed -e 's@/usr/bin/file@'"$(which file)"'@g' -i foreign/libffi/configure ''; configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; @@ -41,25 +50,25 @@ stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}" ; + wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${ffiSharedLibs}"; done ''; meta = { - description = "Programming language derived from Scheme (formerly called PLT Scheme)"; + description = "A programmable programming language"; longDescription = '' - Racket (formerly called PLT Scheme) is a programming language derived - from Scheme. The Racket project has four primary components: the - implementation of Racket, a JIT compiler; DrRacket, the Racket program - development environment; the TeachScheme! outreach, an attempt to turn - Computing and Programming into "an indispensable part of the liberal - arts curriculum"; and PLaneT, Racket's web-based package - distribution system for user-contributed packages. + Racket is a full-spectrum programming language. It goes beyond + Lisp and Scheme with dialects that support objects, types, + laziness, and more. Racket enables programmers to link + components written in different dialects, and it empowers + programmers to create new, project-specific dialects. Racket's + libraries support applications from web servers and databases to + GUIs and charts. ''; homepage = http://racket-lang.org/; - license = stdenv.lib.licenses.lgpl2Plus; # and licenses of contained libraries - maintainers = [ stdenv.lib.maintainers.kkallio ]; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ kkallio henrytill ]; platforms = stdenv.lib.platforms.linux; }; } |