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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-08-13 09:50:47 +02:00
parent 60730cb043 ef026e02fc
commit 2a8cd14d5f
338 changed files with 6621 additions and 7254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/build-managers/sbt/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "0.13.16";
version = "1.0.0";
src = fetchurl {
urls = [
"https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"
"https://cocl.us/sbt01316tgz"
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
];
sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
sha256 = "0njwch97g69vzxfqhlaibjwbif2vka68dssddk2jlpqlf94lzq4s";
};
patchPhase = ''

4
pkgs/development/tools/continuous-integration/jenkins/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.71";
version = "2.73";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl";
sha256 = "1q9q2vjza3slmbh6sbxak1y3ryvisphlh92nidsp88rv60zn3nv8";
};
buildCommand = ''

54
pkgs/development/tools/misc/automake/automake-1.12.x.nix
View File

@@ -1,54 +0,0 @@
{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec {
name = "automake-1.12.6";
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
# available upstream; see
# <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
builder = ./builder.sh;
setupHook = ./setup-hook.sh;
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q";
};
buildInputs = [perl autoconf makeWrapper];
# This test succeeds on my machine, but fails on Hydra (for reasons
# not yet understood).
patchPhase = ''
sed -i -e 's|t/aclocal7.sh||' Makefile.in
'';
inherit doCheck;
# The test suite can run in parallel.
enableParallelBuilding = true;
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
branch = "1.12";
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
longDescription = ''
GNU Automake is a tool for automatically generating
`Makefile.in' files compliant with the GNU Coding
Standards. Automake requires the use of Autoconf.
'';
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};
}

41
pkgs/development/tools/misc/automake/automake-1.13.x.nix
View File

@@ -1,41 +0,0 @@
{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec {
name = "automake-1.13.4";
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "0rhx1mr2gv483s4bc9yy9skwr5d5a3jcyfaw24h0r3wvylrlkkl9";
};
buildInputs = [ perl autoconf ];
setupHook = ./setup-hook.sh;
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
inherit doCheck;
# The test suite can run in parallel.
enableParallelBuilding = true;
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
branch = "1.13";
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''
GNU Automake is a tool for automatically generating
`Makefile.in' files compliant with the GNU Coding
Standards. Automake requires the use of Autoconf.
'';
platforms = stdenv.lib.platforms.all;
};
}

41
pkgs/development/tools/misc/automake/automake-1.14.x.nix
View File

@@ -1,41 +0,0 @@
{ stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }:
stdenv.mkDerivation rec {
name = "automake-1.14.1";
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "0s86rzdayj1licgj35q0mnynv5xa8f4p32m36blc5jk9id5z1d59";
};
buildInputs = [ perl autoconf ];
setupHook = ./setup-hook.sh;
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
inherit doCheck;
# The test suite can run in parallel.
enableParallelBuilding = true;
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
branch = "1.14";
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''
GNU Automake is a tool for automatically generating
`Makefile.in' files compliant with the GNU Coding
Standards. Automake requires the use of Autoconf.
'';
platforms = stdenv.lib.platforms.all;
};
}

12
pkgs/development/tools/misc/ccache/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, runCommand, zlib }:
{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }:
let ccache = stdenv.mkDerivation rec {
name = "ccache-${version}";
@@ -32,18 +32,16 @@ let ccache = stdenv.mkDerivation rec {
isGNU = unwrappedCC.isGNU or false;
};
inherit (unwrappedCC) lib;
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/bin
wrap() {
local cname="$1"
if [ -x "${unwrappedCC}/bin/$cname" ]; then
cat > $out/bin/$cname << EOF
#!/bin/sh
${extraConfig}
exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@"
EOF
chmod +x $out/bin/$cname
makeWrapper ${ccache}/bin/ccache $out/bin/$cname \
--run ${stdenv.lib.escapeShellArg extraConfig} \
--add-flags ${unwrappedCC}/bin/$cname
fi
}

4
pkgs/development/tools/rtags/default.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "rtags-${version}";
version = "2.11";
version = "2.12";
buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
rev = "refs/tags/v${version}";
fetchSubmodules = true;
url = "https://github.com/andersbakken/rtags.git";
sha256 = "0965jn8zk3mh07yzw6jmwwp56xly1sihkn0vhv07izkh41mdkrvv";
sha256 = "0bgjcvyvkpqcgw4571iz39sqydmcaz6ymx7kxcmq6j7rffs6qs7l";
# unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation
postFetch = ''