diff options
Diffstat (limited to 'nixpkgs/pkgs/development/interpreters')
5 files changed, 17 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json index 358595ef1eb8..cfffdc890d1e 100644 --- a/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/nixpkgs/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -36,7 +36,7 @@ "rollup-plugin-node-resolve": "3.4.0", "rollup-plugin-replace": "2.1.0", "webpack": "^4.25.1", - "webpack-cli": "^3.1.2", + "webpack-cli": "^3.2.3", "which-promise": "^1.0.0" } } diff --git a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix index b65dfb1d4a1e..433271d9c85e 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix @@ -115,6 +115,6 @@ (stdenv.lib.optionalAttrs (!stdenv.isLinux) { # Work around <https://bugs.gnu.org/14201>. - SHELL = "/bin/sh"; - CONFIG_SHELL = "/bin/sh"; + SHELL = "${stdenv.shell}"; + CONFIG_SHELL = "${stdenv.shell}"; }) diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index 5e8f5e2d59b6..f6990fd29d01 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, buildPackages +{ lib, stdenv, fetchurl, buildPackages , enableThreading ? stdenv ? glibc, makeWrapper }: @@ -27,7 +27,7 @@ let name = "perl-${version}"; - src = fetchurlBoot { + src = fetchurl { url = "mirror://cpan/src/5.0/${name}.tar.gz"; inherit sha256; }; @@ -46,7 +46,7 @@ let ] ++ optional (versionOlder version "5.29.6") # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360 - (fetchurlBoot { + (fetchurl { url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch"; sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0"; }) @@ -88,7 +88,10 @@ let enableParallelBuilding = !crossCompiling; - preConfigure = optionalString (!crossCompiling) '' + preConfigure = '' + substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970' + substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system' + '' + optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") @@ -156,7 +159,7 @@ let } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 2018 - perl-cross-src = fetchurlBoot { + perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; sha256 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; diff --git a/nixpkgs/pkgs/development/interpreters/php/default.nix b/nixpkgs/pkgs/development/interpreters/php/default.nix index 39f8d2514108..d26ad077c14d 100644 --- a/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/nixpkgs/pkgs/development/interpreters/php/default.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchurl, flex, bison, autoconf , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: @@ -28,6 +28,7 @@ let , curlSupport ? config.php.curl or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true + , pdo_odbcSupport ? config.php.pdo_odbc or true , postgresqlSupport ? config.php.postgresql or true , pdo_pgsqlSupport ? config.php.pdo_pgsql or true , readlineSupport ? config.php.readline or true @@ -88,6 +89,7 @@ let ++ optional readlineSupport readline ++ optional sqliteSupport sqlite ++ optional postgresqlSupport postgresql + ++ optional pdo_odbcSupport unixODBC ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs @@ -141,6 +143,7 @@ let ++ optional readlineSupport "--with-readline=${readline.dev}" ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" ++ optional postgresqlSupport "--with-pgsql=${postgresql}" + ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" ++ optionals mysqliSupport [ diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 1b4a5e751377..ed6c8c9893b4 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -209,8 +209,8 @@ in with passthru; stdenv.mkDerivation { done # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 - find $out/lib/python*/config-* -type f -print -exec nuke-refs '{}' + - find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs '{}' + + find $out/lib/python*/config-* -type f -print -exec nuke-refs -e $out '{}' + + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs -e $out '{}' + # Determinism: rebuild all bytecode # We exclude lib2to3 because that's Python 2 code which fails |