diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters')
13 files changed, 49 insertions, 59 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix index 40136fd22de8..e240e1907e06 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.8.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.8.1"; - sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9"; + version = "1.8.2"; + sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; } diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix index 28166dfc0b0a..8c4e1561ec0a 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R21.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation rec { - version = "21.2.3"; - sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws"; + version = "21.3.7.1"; + sha256 = "03vbp22vwra3zz76q3sjv23lmic60gi96a7dncry8whbfp4i4j8a"; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' diff --git a/nixpkgs/pkgs/development/interpreters/gauche/default.nix b/nixpkgs/pkgs/development/interpreters/gauche/default.nix index 5481c4e7d05a..bb3294e2097b 100644 --- a/nixpkgs/pkgs/development/interpreters/gauche/default.nix +++ b/nixpkgs/pkgs/development/interpreters/gauche/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-iconv=${libiconv}" "--with-dbm=gdbm" "--with-zlib=${zlib}" - "--with-ca-bundle=$SSL_CERT_FILE" + "--with-ca-bundle=$NIX_SSL_CERT_FILE" # TODO: Enable slib # Current slib in nixpkgs is specialized to Guile # "--with-slib=${slibGuile}/lib/slib" diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix index 2fa8b50f017e..029471fe7d98 100644 --- a/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = "janet"; rev = "v${version}"; - sha256 = "00lrj21k85sqyn4hv2rc5sny9vxghafjxyvs0dq4zp68461s3l7c"; + sha256 = "1w6d5a4akd868x89bgyvw3cnadfva7gnyvhmxx5ixxd580n5ba6v"; }; JANET_BUILD=''\"release\"''; diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/zip.nix b/nixpkgs/pkgs/development/interpreters/lua-5/zip.nix deleted file mode 100644 index 295f41aaa2b8..000000000000 --- a/nixpkgs/pkgs/development/interpreters/lua-5/zip.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, stdenv, fetchurl, lua5_1, zziplib }: - -stdenv.mkDerivation rec { - version = "1.2.3"; - name = "lua-zip-${version}"; - isLibrary = true; - src = fetchurl { - url = "https://github.com/luaforge/luazip/archive/0b8f5c958e170b1b49f05bc267bc0351ad4dfc44.zip"; - sha256 = "beb9260d606fdd5304aa958d95f0d3c20be7ca0a2cff44e7b75281c138a76a50"; - }; - - buildInputs = [ pkgs.unzip lua5_1 zziplib ]; - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua5_1.luaversion}" - LUA_INC="-I${lua5_1}/include"); - ''; - - patches = [ ./zip.patch ]; - - meta = { - homepage = https://github.com/luaforge/luazip; - hydraPlatforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index c95d9b3009a7..3bcedc47c4bd 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, buildPackages, callPackage +{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -23,7 +23,7 @@ let libcLib = lib.getLib libc; crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; - common = { self, version, sha256 }: stdenv.mkDerivation (rec { + common = { perl, buildPerl, version, sha256 }: stdenv.mkDerivation (rec { inherit version; name = "perl-${version}"; @@ -106,14 +106,14 @@ let setupHook = ./setup-hook.sh; passthru = rec { - interpreter = "${self}/bin/perl"; + interpreter = "${perl}/bin/perl"; libPrefix = "lib/perl5/site_perl"; pkgs = callPackage ../../../top-level/perl-packages.nix { - perl = self; + inherit perl buildPerl; overrides = config.perlPackageOverrides or (p: {}); # TODO: (self: super: {}) like in python }; buildEnv = callPackage ./wrapper.nix { - perl = self; + inherit perl; inherit (pkgs) requiredPerlModules; }; withPackages = f: buildEnv.override { extraLibs = f pkgs; }; @@ -171,11 +171,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "9e4051cd28b7b3afb162776f5627c7abe4c7b9ea"; # Apr 21, 2019 + crossVersion = "2152db1ea241f796206ab309036be1a7d127b370"; # May 25, 2019 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "0dj99w2dicbp3c3wn0k32785pc4c68iqnlyxswnza6mhw6wvl9v7"; + sha256 = "1k08iqdkf9q00hbcq2b933w3vmds7xkfr90phhk0qf64l18wdrkf"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -190,18 +190,27 @@ let # TODO merge setup hooks setupHook = ./setup-hook-cross.sh; }); -in rec { +in { # the latest Maint version perl528 = common { - self = perl528; + perl = pkgs.perl528; + buildPerl = buildPackages.perl528; version = "5.28.2"; sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; }; + perl530 = common { + perl = pkgs.perl530; + buildPerl = buildPackages.perl530; + version = "5.30.0"; + sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; + }; + # the latest Devel version perldevel = common { - self = perldevel; - version = "5.29.9"; - sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; + perl = pkgs.perldevel; + buildPerl = buildPackages.perldevel; + version = "5.30.0"; + sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5"; }; } diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 073f3dfdc30e..9a6b2f99f4ae 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -258,24 +258,24 @@ let in { php71 = generic { - version = "7.1.29"; - sha256 = "0dc3p3xq430vawcryw3xb4d1ckkz44rdnvfr833jsrl2zrzd2a45"; + version = "7.1.30"; + sha256 = "1czcf5qwk727sdzx5n4wvsxvl50jx6d5x8ws1dqx46fa9xvm0j36"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.18"; - sha256 = "0wjb9j5slqjx1fn00ljwgy4vlxvz9a6s9677h5z20wqi5nqjf6ps"; + version = "7.2.19"; + sha256 = "16d0j0d4563bcrxlw5yysldscxpgyp917hmc4m4ys1zyfprv3l7b"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.5"; - sha256 = "0pn3c9fj24v0r57d3cz67nisg6vjyw2yn5il7j1c6rw2z47bi023"; + version = "7.3.6"; + sha256 = "0xvgdxmhk0hsx8gh3ircm2s7pf59gm8i9a73204mr0sl05qchnhy"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix index 9a30ae7d8a85..5710f1066757 100644 --- a/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix +++ b/nixpkgs/pkgs/development/interpreters/proglodyte-wasm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, clang, python, v8_static, coreutils }: +{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }: let sexpr_wasm_prototype = stdenv.mkDerivation { @@ -45,7 +45,7 @@ stdenv.mkDerivation { installPhase = '' export DESTDIR=$out export MKTEMPDIR=${coreutils}/bin - export D8DIR=${v8_static}/bin + export D8DIR=${v8}/bin export SWDIR=${sexpr_wasm_prototype}/bin make install ''; diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 894a9b084c68..bc90d93a7e3d 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -22,6 +22,7 @@ , sourceVersion , sha256 , passthruFun +, static ? false }: assert x11Support -> tcl != null @@ -164,7 +165,8 @@ let ] # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no"; + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" + ++ optional static "LDFLAGS=-static"; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ diff --git a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index d986490310bc..b3561bcbb725 100644 --- a/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -49,6 +49,9 @@ # Skip wrapping of python programs altogether , dontWrapPythonPrograms ? false +# Skip setting the PYTHONNOUSERSITE environment variable in wrapped programs +, permitUserSite ? false + # Remove bytecode from bin folder. # When a Python script has the extension `.py`, bytecode is generated # Typically, executables in bin have no extension, so no bytecode is generated. diff --git a/nixpkgs/pkgs/development/interpreters/python/wrap.sh b/nixpkgs/pkgs/development/interpreters/python/wrap.sh index b2d65422db45..c7201c7a997b 100644 --- a/nixpkgs/pkgs/development/interpreters/python/wrap.sh +++ b/nixpkgs/pkgs/development/interpreters/python/wrap.sh @@ -73,9 +73,12 @@ wrapPythonProgramsIn() { # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" --prefix PATH ':' "$program_PATH" - --set PYTHONNOUSERSITE "true" ) + if [ -z "$permitUserSite" ]; then + wrap_args+=(--set PYTHONNOUSERSITE "true") + fi + # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. local -a user_args="($makeWrapperArgs)" diff --git a/nixpkgs/pkgs/development/interpreters/python/wrapper.nix b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix index 27d01e4e1f51..5a2ec567b9eb 100644 --- a/nixpkgs/pkgs/development/interpreters/python/wrapper.nix +++ b/nixpkgs/pkgs/development/interpreters/python/wrapper.nix @@ -3,6 +3,7 @@ , extraOutputsToInstall ? [] , postBuild ? "" , ignoreCollisions ? false +, permitUserSite ? false , requiredPythonModules # Wrap executables with the given argument. , makeWrapperArgs ? [] @@ -34,7 +35,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix index cf0fad18d1ca..ac291668e2d9 100644 --- a/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasm-gc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date - cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7"; + cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; meta = with stdenv.lib; { description = "gc-sections for wasm"; |