public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-12-13 11:43:39 +01:00
parent d5d8b3514d 418ad571c3
commit dfdf1597a7
154 changed files with 2448 additions and 2272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/interpreters/clojure/default.nix
View File

@@ -2,30 +2,30 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.1.489";
version = "1.10.1.492";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "12ks7adh5cx99l5vydppkqknk5nvv9vsj2k0afcwwxd897m794kz";
sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
};
buildInputs = [ makeWrapper ];
outputs = [ "out" "prefix" ];
installPhase = let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
in ''
mkdir -p $prefix/libexec
cp clojure-tools-${version}.jar $prefix/libexec
cp example-deps.edn $prefix
in
''
mkdir -p $out/libexec
cp clojure-tools-${version}.jar $out/libexec
cp example-deps.edn $out
cp deps.edn $out
substituteInPlace clojure --replace PREFIX $prefix
substituteInPlace clojure --replace PREFIX $out
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
'';
install -Dt $out/bin clj clojure
wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
'';
meta = with stdenv.lib; {
description = "A Lisp dialect for the JVM";

1
pkgs/development/interpreters/php/default.nix
View File

@@ -182,6 +182,7 @@ let
++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
++ optional bz2Support "--with-bz2=${bzip2.dev}"
++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"
++ optional ftpSupport "--enable-ftp"
++ optional fpmSupport "--enable-fpm"
++ optional ztsSupport "--enable-maintainer-zts"

11
pkgs/development/interpreters/python/manylinux/default.nix
View File

@@ -33,8 +33,10 @@ let
fi
'';
getLibOutputs = lib.mapAttrs (k: v: lib.getLib v);
# https://www.python.org/dev/peps/pep-0599/
manylinux2014Libs = with pkgs; {
manylinux2014Libs = getLibOutputs(with pkgs; {
"libgcc_s.so.1" = glibc;
"libstdc++.so.6" = stdenv.cc.cc;
"libm.so.6" = glibc;
@@ -54,17 +56,18 @@ let
"libgobject-2.0.so.0" = glib;
"libgthread-2.0.so.0" = glib;
"libglib-2.0.so.0" = glib;
};
});
# https://www.python.org/dev/peps/pep-0571/
manylinux2010Libs = manylinux2014Libs;
# https://www.python.org/dev/peps/pep-0513/
manylinux1Libs = manylinux2010Libs // (with pkgs; {
manylinux1Libs = getLibOutputs(manylinux2010Libs // (with pkgs; {
"libpanelw.so.5" = ncurses5;
"libncursesw.so.5" = ncurses5;
"libcrypt.so.1" = glibc;
});
}));
in {
# List of libraries that are needed for manylinux compatibility.
# When using a wheel that is manylinux1 compatible, just extend