diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
| commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
| tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/development/interpreters | |
| parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
| parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
| download | nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.gz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.bz2 nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.lz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.xz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.zst nixlib-2858c41823db1654f123c455cca2b145b8d8737b.zip | |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/racket/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 245ff7b006fb..07f622931faa 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.9"; + version = "6.10"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714"; + sha256 = "1mqnyj3bawad12dygsb11f2dbnkjp7q6d7ra714rqyw8mxix5ws0"; }; FONTCONFIG_FILE = fontsConf; @@ -47,13 +47,14 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; preConfigure = '' + unset AR substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname mkdir src/build cd src/build ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; |