diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-17 10:14:29 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-17 10:14:29 +0200 |
| commit | 0d832585b7a24e6634958c72396c7dff41cdedb5 (patch) | |
| tree | b97fe62696eb8f88845b772a1b2c262c3fc3445a /pkgs/development/interpreters | |
| parent | 3f3403bfcf1ac98b1fbdb6c1f993047e7414131c (diff) | |
| parent | 69476b4d9066571c37158c113762abe8fe7ded95 (diff) | |
| download | nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar.gz nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar.bz2 nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar.lz nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar.xz nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.tar.zst nixpkgs-0d832585b7a24e6634958c72396c7dff41cdedb5.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 49715bf256b..fce94ecc846 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -12,11 +12,11 @@ (rec { name = "guile-${version}"; - version = "2.2.4"; + version = "2.2.6"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"; + sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index f071aab94c7..ceea3932063 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mujs-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; + sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df"; }; buildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 01cffe93024..5adf41a0f3b 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "18.12"; + version = "19.6"; src = fetchurl { url = "https://www.software-lab.de/${name}.tgz"; - sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk"; + sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch index ceb6047d31d..243313f7654 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -83,8 +83,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') + (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ + get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', @@ -108,7 +108,7 @@ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] +- cflags = cflags + ' ' + os.environ['CFLAGS'] + cflags = os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CXXFLAGS' in os.environ: |