diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-02-14 21:59:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 21:59:03 -0500 |
| commit | b393356aeb284449ac49c94e645fe538e603589c (patch) | |
| tree | 7f280c99b86e36557f0d755934657d6dbb87a020 | |
| parent | 5eabb050bee11c0d589f17b747aaa9846e707a6f (diff) | |
| parent | 661c43188e3e92e91ddef4310fa7e4b8554c76f9 (diff) | |
| download | nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar.gz nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar.bz2 nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar.lz nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar.xz nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.tar.zst nixpkgs-b393356aeb284449ac49c94e645fe538e603589c.zip | |
Merge pull request #113128 from iblech/patch-racket
racket: 7.9 -> 8.0
| -rw-r--r-- | pkgs/development/interpreters/racket/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/interpreters/racket/minimal.nix | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8d33962f914..48be64aa0b8 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -8,6 +8,7 @@ , libGL , libGLU , libjpeg +, ncurses , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? false @@ -46,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.9"; # always change at once with ./minimal.nix + version = "8.0"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; + sha256 = "0lqqpa88v0br93qw7450a4blyi3pwn7sq2k04h0ikbsqrdnfj7lj"; }; FONTCONFIG_FILE = fontsConf; @@ -68,12 +69,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cacert wrapGAppsHook ]; buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ]; preConfigure = '' unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname + for f in src/lt/configure src/cs/c/configure src/bc/src/string.c src/ChezScheme/workarea; do + substituteInPlace "$f" \ + --replace /usr/bin/uname ${coreutils}/bin/uname \ + --replace /bin/cp ${coreutils}/bin/cp \ + --replace /bin/ln ${coreutils}/bin/ln \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/true ${coreutils}/bin/true done mkdir src/build cd src/build diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9fd220e5b98..c954b4f05ea 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia"; + sha256 = "0qvfi6rg9cwzh716q5j7m30rqq9xysi6zsalqlpdqrzhnx8y54k0"; }; meta = oldAttrs.meta // { |