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:
Matthew Bauer
2018-05-08 09:36:00 -05:00
parent 4f7cdd35d5 3510b983c4
commit 6748534d83
317 changed files with 7440 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/bazel/default.nix
View File

@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "0.11.1";
version = "0.12.0";
meta = with stdenv.lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f";
sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754";
};
sourceRoot = ".";

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

@@ -14,11 +14,11 @@ let
package = pythonPackages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "buildbot";
version = "1.1.0";
version = "1.1.1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc";
sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir";
};
buildInputs = with pythonPackages; [

10
pkgs/development/tools/build-managers/buildbot/plugins.nix
View File

@@ -11,7 +11,7 @@
src = pythonPackages.fetchPypi {
inherit pname version format;
sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj";
sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb";
};
meta = with stdenv.lib; {
@@ -29,7 +29,7 @@
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll";
sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -49,7 +49,7 @@
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi";
sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -69,7 +69,7 @@
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr";
sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -89,7 +89,7 @@
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp";
sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2";
};
propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];

4
pkgs/development/tools/build-managers/buildbot/worker.nix
View File

@@ -3,11 +3,11 @@
pythonPackages.buildPythonApplication (rec {
name = "${pname}-${version}";
pname = "buildbot-worker";
version = "1.1.0";
version = "1.1.1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y";
sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm";
};
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "icestorm-${version}";
version = "2018.03.21";
version = "2018.05.03";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
rev = "4476d83f76fa0222be0b691fe27c1e0228266f82";
sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a";
rev = "237280ce44f72c7b2e1ca671d5113dba34cc4fca";
sha256 = "0r9xh024snaf1g2r5k524yl6lvf5rkfhqwjzcixh1m12012i5hrh";
};
nativeBuildInputs = [ pkgconfig ];

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cfr-${version}";
version = "0_125";
version = "0.128";
src = fetchurl {
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa";
sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix";
};
buildInputs = [ makeWrapper ];

4
pkgs/development/tools/misc/fswatch/default.nix
View File

@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
name = "fswatch-${version}";
version = "1.11.2";
version = "1.11.3";
src = fetchFromGitHub {
owner = "emcrisostomo";
repo = "fswatch";
rev = version;
sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq";
sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1";
};
nativeBuildInputs = [ autoreconfHook ];

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

@@ -2,14 +2,14 @@
buildPythonApplication rec {
pname = "mypy";
version = "0.590";
version = "0.600";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4";
sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
};
propagatedBuildInputs = [ lxml typed-ast psutil ];

6
pkgs/development/tools/ocaml/jbuilder/default.nix
View File

@@ -2,16 +2,18 @@
stdenv.mkDerivation rec {
name = "jbuilder-${version}";
version = "1.0+beta17";
version = "1.0+beta20";
src = fetchFromGitHub {
owner = "ocaml";
repo = "dune";
rev = "${version}";
sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x";
sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
};
buildInputs = [ ocaml ];
dontAddPrefix = true;
installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
preFixup = "rm -rf $out/jbuilder";

35
pkgs/development/tools/rust/cargo-fuzz/default.nix Normal file
View File

@@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
rustPlatform.buildRustPackage rec {
name = "cargo-fuzz-${version}";
version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
src =
let
source = fetchFromGitHub {
owner = "rust-fuzz";
repo = "cargo-fuzz";
rev = version;
sha256 = "1l452fnjw7i10nrd4y4rssi5d457vgjp6rhdr9cnq32bjhdkprrs";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/Ekleog/7d5b62d13b7207aafa4c37d1bbdf2de7/raw/c6027fc1c531947f4d6836a3c4cba1b3e24df24c/Cargo.lock";
sha256 = "0d7b6kxfbfvwksybzrihylamg2zv5fmsk9m6xshryhwipskzzvmd";
};
in
runCommand "cargo-fuzz-src" {} ''
cp -R ${source} $out
chmod +w $out
cp ${cargo-lock} $out/Cargo.lock
'';
cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk";
meta = with stdenv.lib; {
description = "Command line helpers for fuzzing";
homepage = https://github.com/rust-fuzz/cargo-fuzz;
license = with licenses; [ mit asl20 ];
maintainers = [ maintainers.ekleog ];
platforms = platforms.all;
};
}

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

@@ -1,13 +1,13 @@
{ stdenv, python3Packages }:
python3Packages.buildPythonApplication rec {
version = "1.1.5";
version = "1.2.0";
pname = "wllvm";
name = "${pname}-${version}";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv";
sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
};
meta = with stdenv.lib; {