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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-05-07 19:30:14 +02:00
parent 9ab5d01975 3c1a202a16
commit 87a5d8fede
256 changed files with 4578 additions and 2874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/flow/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.98.0";
version = "0.98.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "13ry3bmgm3xy24kasx843dwd1nsv7nyd174696iaz2c64z46bbfm";
sha256 = "1ik758ca6mfybnzb987fa8blqaskqbfk5hkzl4yg1j08p7kli5ll";
};
installPhase = ''

6
pkgs/development/tools/analysis/valgrind/default.nix
View File

@@ -82,5 +82,11 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.unix;
badPlatforms = [
"armv5tel-linux" "armv6l-linux" "armv6m-linux"
"sparc-linux" "sparc64-linux"
"riscv32-linux" "riscv64-linux"
"alpha-linux"
];
};
}

20
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, fetchurl,
{ stdenv, fetchFromGitHub,
fetchHex, erlang,
tree, hexRegistrySnapshot }:
let
version = "3.9.1";
version = "3.10.0";
bootstrapper = ./rebar3-nix-bootstrap;
@@ -65,17 +65,19 @@ let
parse_trans = fetchHex {
pkg = "parse_trans";
version = "3.3.0";
sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960";
sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp";
};
in
stdenv.mkDerivation {
name = "rebar3-${version}";
stdenv.mkDerivation rec {
pname = "rebar3";
inherit version erlang;
src = fetchurl {
url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
sha256 = "1n6287av29ws3bvjxxmw8s2j8avwich4ccisnnrnypfbm1khlcxp";
src = fetchFromGitHub {
owner = "rebar";
repo = pname;
rev = version;
sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2";
};
inherit bootstrapper;
@@ -121,7 +123,7 @@ stdenv.mkDerivation {
meta = {
homepage = https://github.com/rebar/rebar3;
description = "rebar 3 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
longDescription = ''
rebar is a self-contained Erlang script, so it's easy to distribute or

2
pkgs/development/tools/database/squirrel-sql/default.nix
View File

@@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
makeWrapper $out/share/squirrel-sql/squirrel-sql.sh $out/bin/squirrel-sql \
--set CLASSPATH "$cp" \
--set JAVA_HOME "${jre}"
# Make sure above `CLASSPATH` gets picked up
substituteInPlace $out/share/squirrel-sql/squirrel-sql.sh --replace "-cp \"\$CP\"" "-cp \"\$CLASSPATH:\$CP\""
mkdir -p $out/share/icons/hicolor/32x32/apps
ln -s $out/share/squirrel-sql/icons/acorn.png \

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

@@ -4,8 +4,8 @@ buildGoPackage rec {
name = "doctl-${version}";
version = "${major}.${minor}.${patch}";
major = "1";
minor = "12";
patch = "2";
minor = "16";
patch = "0";
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -21,7 +21,7 @@ buildGoPackage rec {
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "01li9ywzvmzmhqgk9a5li2wkqmdn7jl8pqz2rn7dnay4fr2259fv";
sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv";
};
meta = {

10
pkgs/development/tools/misc/binutils/default.nix
View File

@@ -4,6 +4,7 @@
, withAllTargets ? false, libbfd, libopcodes
, enableShared ? true
, noSysDirs, gold ? true, bison ? null
, fetchpatch
}:
let
@@ -60,7 +61,14 @@ stdenv.mkDerivation rec {
./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch
./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch
./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch;
] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch
++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.targetPlatform != stdenv.hostPlatform) [
(fetchpatch {
url = "https://sourceware.org/bugzilla/attachment.cgi?id=11141";
name = "gold-threads.patch";
sha256 = "0p26dxpba8n7z3pwjg7qf94f0gzbvwkjq0j9ng1w3sljj0gyaf1j";
})
];
outputs = [ "out" "info" "man" ];

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

@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
name = "creduce-${version}";
version = "2.8.0";
pname = "creduce";
version = "2.9.0";
src = fetchurl {
url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp";
url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w";
};
nativeBuildInputs = [ cmake makeWrapper ];

2
pkgs/development/tools/misc/stlink/default.nix
View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "In-circuit debug and programming for ST-Link devices";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor maintainers.rongcuid ];
};
}

4
pkgs/development/tools/ocaml/dune/default.nix
View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "dune-${version}";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "0z4jnj0a5vxjqlwksplhag9b3s3iqdcpcpjjzfazv5jdl5cf58f9";
sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2";
};
buildInputs = [ ocaml findlib ];

17
pkgs/development/tools/pipenv/default.nix
View File

@@ -1,5 +1,15 @@
{ stdenv, python3Packages, pew }:
with python3Packages;
{ lib
, buildPythonApplication
, flake8
, invoke
, parver
, pip
, requests
, virtualenv
, fetchPypi
, virtualenv-clone
}:
buildPythonApplication rec {
pname = "pipenv";
version = "2018.11.26";
@@ -18,6 +28,7 @@ buildPythonApplication rec {
pip
requests
virtualenv
virtualenv-clone
];
doCheck = false;
@@ -27,7 +38,7 @@ buildPythonApplication rec {
"--set PIP_IGNORE_INSTALLED 1"
];
meta = with stdenv.lib; {
meta = with lib; {
description = "Python Development Workflow for Humans";
license = licenses.mit;
platforms = platforms.all;

8
pkgs/development/tools/rust/cargo-asm/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "cargo-asm-${version}";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "gnzlbg";
repo = "cargo-asm";
rev = "7d0ece74657edb002bd8530227b829b31fd19dcd";
sha256 = "0mzbh5zw5imlaagm5zjbjk9kqdnglm398rxkqisd22h6569ppqpc";
rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145";
sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
};
cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b";
cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

19
pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch Normal file
View File

@@ -0,0 +1,19 @@
diff --git a/Cargo.lock b/Cargo.lock
index 01d38a8..e74e735 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
[[package]]
name = "adler32"
version = "1.0.3"
@@ -41,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "cargo-bloat"
-version = "0.6.2"
+version = "0.6.3"
dependencies = [
"goblin 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
"memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",

7
pkgs/development/tools/rust/cargo-bloat/default.nix
View File

@@ -2,16 +2,17 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "0wf86r1s9skv0m4gp66g388847309nw9z1h8gadfg2c5w5idh3fb";
sha256 = "0jpwaw8ryfvfw5ypjvli18wwv6l1r6dyz1msipdpy7nvw1qdw54h";
};
cargoSha256 = "1mmfcvpwwi6fjb47fz1azrpdkg1x5p3qn5bx4p6dyjcs1fmpdbbq";
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1275jfzkpkzbwv927hdkv4zplmynwrm7sbirq18dwfss55cm7r7z";
meta = with stdenv.lib; {
description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";