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

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

Browse Source
This commit is contained in:
John Ericson
2018-05-03 16:24:30 -04:00
parent cbe21ac614 b45ef79b74
commit cf06e42d1c
330 changed files with 20112 additions and 16126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "apktool-${version}";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
urls = [
"https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
"https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
];
sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4";
sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f";
};
phases = [ "installPhase" ];

3
pkgs/development/tools/build-managers/buildbot/default.nix
View File

@@ -76,6 +76,9 @@ let
./skip_test_linux_distro.patch
];
# TimeoutErrors on slow machines -> aarch64
doCheck = !stdenv.isAarch64;
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
'';

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
version = "10.6.0";
version = "10.7.1";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6";
sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9";
sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz";
sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5";
};
patches = [ ./fix-shell-path.patch ];

4
pkgs/development/tools/database/liquibase/default.nix
View File

@@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "liquibase";
version = "3.6.0";
version = "3.6.1";
src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb";
sha256 = "0my5rh553yfb8lz1lv5gmgvqbc5pl4xjii4z5wwbbpniyxwy64q4";
};
buildInputs = [ jre makeWrapper ];

6
pkgs/development/tools/gllvm/default.nix
View File

@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "gllvm-${version}";
version = "2018-04-28"; # ~= 1.0.2, but no release tags yet
version = "1.2.0";
goPackagePath = "github.com/SRI-CSL/gllvm";
src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "gllvm";
rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e";
sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl";
rev = "v${version}";
sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is";
};
meta = with stdenv.lib; {

26
pkgs/development/tools/godot/default.nix
View File

@@ -34,27 +34,29 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildPhase = ''
scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \
scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \
${lib.concatStringsSep " "
(lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}
'';
outputs = [ "out" "dev" "man" ];
installPhase = ''
mkdir -p $out/bin
cp bin/godot.x11.tools.* $out/bin/godot
mkdir -p "$out/bin"
cp bin/godot.* $out/bin/godot
mkdir -p "$out/share/applications"
mkdir "$dev"
cp -r modules/gdnative/include $dev
mkdir -p "$man/share/man/man6"
cp misc/dist/linux/godot.6 "$man/share/man/man6/"
mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
cp misc/dist/linux/godot.desktop "$out/share/applications/"
substituteInPlace "$out/share/applications/godot.desktop" \
--replace "Exec=godot" \
"Exec=$out/bin/godot"
mkdir -p "$out/share/icons/hicolor/scalable/apps/"
cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
cp icon.png "$out/share/icons/godot.png"
mkdir -p "$out/share/man/man6"
cp misc/dist/linux/godot.6 "$out/share/man/man6/"
substituteInPlace "$out/share/applications/godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
'';
meta = {

1
pkgs/development/tools/iaca/2.1.nix
View File

@@ -1,5 +1,4 @@
{ stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
assert stdenv.system == "x86_64-linux";
with stdenv.lib;
# v2.1: last version with NHM/WSM arch support

1
pkgs/development/tools/iaca/3.0.nix
View File

@@ -1,5 +1,4 @@
{ stdenv, requireFile, patchelf, unzip }:
assert stdenv.system == "x86_64-linux";
with stdenv.lib;
stdenv.mkDerivation {

4
pkgs/development/tools/java/visualvm/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
stdenv.mkDerivation rec {
version = "1.4";
version = "1.4.1";
name = "visualvm-${version}";
src = fetchzip {
url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip";
sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z";
sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78";
};
desktopItem = makeDesktopItem {

8
pkgs/development/tools/misc/cquery/default.nix
View File

@@ -5,8 +5,8 @@ let
src = fetchFromGitHub {
owner = "cquery-project";
repo = "cquery";
rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e";
sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg";
rev = "34b357bc5e873d52d2aa41287c6e138244cea109";
sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c";
fetchSubmodules = true;
};
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
name = "cquery-${version}";
version = "2018-03-25";
version = "2018-05-01";
inherit src;
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
doInstallCheck = true;
installCheckPhase = ''
pushd ${src}
$out/bin/cquery --ci --clang-sanity-check && \
$out/bin/cquery --ci --test-unit
'';
@@ -56,6 +55,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.tobim ];
priority = 3;
};
}

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

@@ -10,10 +10,14 @@ stdenv.mkDerivation rec {
buildInputs = [ elfutils libunwind ];
preConfigure =
''
configureFlags="--disable-werror"
makeFlagsArray=(INSTALL="install -c")
prePatch = let
debian = fetchurl {
url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz;
sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp";
};
in ''
tar xf '${debian}'
patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
'';
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/saleae-logic/default.nix
View File

@@ -21,8 +21,6 @@ let
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec {
pname = "saleae-logic";
version = "1.2.10";
@@ -93,7 +91,7 @@ stdenv.mkDerivation rec {
description = "Software for Saleae logic analyzers";
homepage = http://www.saleae.com/;
license = licenses.unfree;
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.bjornfor ];
};
}

1
pkgs/development/tools/phantomjs/default.nix
View File

@@ -3,7 +3,6 @@
let
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
in
assert lib.elem stdenv.system platforms;
stdenv.mkDerivation rec {
name = "phantomjs-1.9.8";

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

@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="slimerjs";
version="0.10.3";
version="1.0.0";
name="${baseName}-${version}";
owner = "laurentj";
repo = "${baseName}";
sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y";
sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
rev = "${version}";
};
buildInputs = [

6
pkgs/development/tools/sqsh/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, freetds, readline }:
{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }:
let
mainVersion = "2.5";
@@ -17,11 +17,13 @@ in stdenv.mkDerivation rec {
substituteInPlace src/cmd_connect.c \
--replace CS_TDS_80 CS_TDS_73
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "libct.so" "libct.dylib"
'';
enableParallelBuilding = true;
buildInputs = [ freetds readline ];
buildInputs = [ freetds readline libiconv ];
nativeBuildInputs = [ autoreconfHook ];