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-07-09 15:44:08 +02:00
parent 46d91410af 5c8472a2a1
commit 7cf5909fad
339 changed files with 11134 additions and 8903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/cmake/application-services.patch
View File

@@ -47,3 +47,14 @@ index d7af6e2..d4808fc 100644
add_subdirectory(libarchive)
install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmlibarchive)
index e505bdd..f45557d 100644
--- a/Utilities/cmlibuv/src/unix/darwin-proctitle.c
+++ b/Utilities/cmlibuv/src/unix/darwin-proctitle.c
@@ -30,7 +30,6 @@
#if !TARGET_OS_IPHONE
# include <CoreFoundation/CoreFoundation.h>
-# include <ApplicationServices/ApplicationServices.h>
#endif
#define S(s) pCFStringCreateWithCString(NULL, (s), kCFStringEncodingUTF8)

10
pkgs/development/tools/build-managers/wafHook/default.nix Normal file
View File

@@ -0,0 +1,10 @@
{ lib, stdenv, pkgs, python, makeSetupHook, waf }:
makeSetupHook {
deps = [ python ];
substitutions = {
inherit waf;
crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
};
} ./setup-hook.sh

0
pkgs/development/tools/build-managers/waf/setup-hook.sh → pkgs/development/tools/build-managers/wafHook/setup-hook.sh
View File

27
pkgs/development/tools/cue/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ buildGoModule, fetchgit, stdenv }:
buildGoModule rec {
pname = "cue";
version = "0.0.3";
src = fetchgit {
url = "https://cue.googlesource.com/cue";
rev = "v${version}";
sha256 = "1abvvgicr64ssiprkircih2nrbcr1yqxf1qkl21kh0ww1xfp0rw7";
};
modSha256 = "0r5vbplcfq1rsp2jnixq6lfbpcv7grf0q38na76qy7pjb57zikb6";
subPackages = [ "cmd/cue" ];
buildFlagsArray = [
"-ldflags=-X cuelang.org/go/cmd/cue/cmd.version=${version}"
];
meta = {
description = "A data constraint language which aims to simplify tasks involving defining and using data.";
homepage = https://cue.googlesource.com/cue;
maintainers = with stdenv.lib.maintainers; [ solson ];
license = stdenv.lib.licenses.asl20;
};
}

46
pkgs/development/tools/devpi-server/default.nix
View File

@@ -1,28 +1,40 @@
{ stdenv, pythonPackages, nginx }:
{ stdenv, python3Packages, nginx }:
pythonPackages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
pname = "devpi-server";
version = "4.4.0";
version = "4.9.0";
src = pythonPackages.fetchPypi {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0y77kcnk26pfid8vsw07v2k61x9sdl6wbmxg5qxnz3vd7703xpkl";
sha256 = "0cx0nv1qqv8lg6p1v8dv5val0dxnc3229c15imibl9wrhrffjbg9";
};
propagatedBuildInputs = with pythonPackages;
[ devpi-common execnet itsdangerous pluggy waitress pyramid passlib ];
checkInputs = with pythonPackages; [ nginx webtest pytest beautifulsoup4 pytest-timeout mock pyyaml ];
preCheck = ''
# These tests pass with pytest 3.3.2 but not with pytest 3.4.0.
sed -i 's/test_basic/noop/' test_devpi_server/test_log.py
sed -i 's/test_new/noop/' test_devpi_server/test_log.py
sed -i 's/test_thread_run_try_again/noop/' test_devpi_server/test_replica.py
'';
propagatedBuildInputs = with python3Packages; [
appdirs
devpi-common
execnet
itsdangerous
passlib
pluggy
pyramid
strictyaml
waitress
];
checkInputs = with python3Packages; [
beautifulsoup4
mock
nginx
pytest
pytest-flakes
pytestpep8
webtest
];
# test_genconfig.py needs devpi-server on PATH
checkPhase = ''
runHook preCheck
cd test_devpi_server/
PATH=$PATH:$out/bin pytest --slow -rfsxX
PATH=$PATH:$out/bin pytest ./test_devpi_server --slow -rfsxX
'';
meta = with stdenv.lib;{

2
pkgs/development/tools/ghp-import/default.nix
View File

@@ -23,6 +23,6 @@ buildPythonApplication rec {
description = "Copy your docs directly to the gh-pages branch";
homepage = "https://github.com/davisp/ghp-import";
license = "Tumbolia Public License";
maintainers = with lib.maintainers; [ garbas ];
maintainers = with lib.maintainers; [ ];
};
}

15
pkgs/development/tools/kustomize/default.nix
View File

@@ -1,12 +1,13 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
name = "kustomize-${version}";
version = "2.0.3";
# rev is the 2.0.3 commit, mainly for kustomize version command output
rev = "a6f65144121d1955266b0cd836ce954c04122dc8";
version = "3.0.0";
# rev is the 3.0.0 commit, mainly for kustomize version command output
rev = "e0bac6ad192f33d993f11206e24f6cda1d04c4ec";
goPackagePath = "sigs.k8s.io/kustomize";
subPackages = [ "cmd/kustomize" ];
buildFlagsArray = let t = "${goPackagePath}/pkg/commands/misc"; in ''
-ldflags=
@@ -16,12 +17,14 @@ buildGoPackage rec {
'';
src = fetchFromGitHub {
sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb";
sha256 = "1ywppn97gfgrwlq1nrj4kdvrdanq5ahqaa636ynyp9yiv9ibziq6";
rev = "v${version}";
repo = "kustomize";
owner = "kubernetes-sigs";
};
modSha256 = "0w8sp73pmj2wqrg7x7z8diglyfq6c6gn9mmck0k1gk90nv7s8rf1";
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
longDescription = ''

4
pkgs/development/tools/minizinc/ide.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
let
version = "2.2.3";
version = "2.3.0";
in
stdenv.mkDerivation {
name = "minizinc-ide-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "MiniZinc";
repo = "MiniZincIDE";
rev = version;
sha256 = "1hanq7c6li59awlwghgvpd8w93a7zb6iw7p4062nphnbd1dmg92f";
sha256 = "0458k7m97qxxylcl60qvp026kicfc4ilxwlb1p3jvjhi9384r00a";
};
sourceRoot = "source/MiniZincIDE";

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

@@ -1,17 +1,21 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
version = "0.2.8";
version = "0.2.9";
name = "sccache-${version}";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
sha256 = "08v8s24q6246mdjzl5lirqg0csxcmd17szmw4lw373hvq4xvf0yk";
sha256 = "0glaaan6fh19a2d8grgsgnbgw5w53vjl0qmvvnq0ldp3hax90v46";
};
cargoSha256 = "1lafzin92h1hb1hqmbrsxja44nj8mpbsxhwcjr6rf5yrclgwmcxj";
cargoSha256 = "0chfdyhj9lyxydbnmldc8rh2v9dda46sxhv35g34a5137sjrizfh";
cargoBuildFlags = [ "--features=all" ];
# see https://github.com/mozilla/sccache/issues/467
postPatch = ''
sed -i 's/\(version = "0.2.9\)-alpha.0"/\1"/g' Cargo.lock
'';
nativeBuildInputs = [
pkgconfig cargo rustc
];

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, opaline }:
stdenv.mkDerivation rec {
name = "dune-${version}";
version = "1.9.2";
pname = "dune";
version = "1.10.0";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "0l27d13wh3i1450kgxnhr6r977sgby1dqwsfc8cqd9mqic1mr9f2";
sha256 = "15fx9rg16g7ig43rg4sdq0wp0br5h1mjxxgv8b15s317vqlfc5pd";
};
buildInputs = [ ocaml findlib ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = https://github.com/ocaml/dune;
homepage = "https://dune.build/";
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit;

2
pkgs/development/tools/pypi2nix/default.nix
View File

@@ -101,6 +101,6 @@ in stdenv.mkDerivation rec {
meta = {
homepage = https://github.com/garbas/pypi2nix;
description = "A tool that generates nix expressions for your python packages, so you don't have to.";
maintainers = with stdenv.lib.maintainers; [ garbas ];
maintainers = with stdenv.lib.maintainers; [ ];
};
}

4
pkgs/development/tools/react-native-debugger/default.nix
View File

@@ -38,11 +38,11 @@ let
];
in stdenv.mkDerivation rec {
name = "react-native-debugger-${version}";
version = "0.9.8";
version = "0.9.10";
src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
sha256 = "07mcliy5f3kcqr76izqirqzwb2rwbnl3k1al9dln1izim0lhx06r";
sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6";
};
buildInputs = [ unzip ];

4
pkgs/development/tools/rust/bindgen/default.nix
View File

@@ -3,13 +3,13 @@
rustPlatform.buildRustPackage rec {
pname = "rust-bindgen";
version = "0.49.3";
version = "0.50.0";
src = fetchFromGitHub {
owner = "rust-lang";
repo = pname;
rev = "v${version}";
sha256 = "032sgg27pdxlmas67clqldvamd2ncdiw1hmk1hiprcxng7073f4y";
sha256 = "1vm7g7z15kmk7jkhhkb3477snwcww5dgdy349b52fgjjzp75h7z7";
};
cargoSha256 = "1311d0wjjj99m59zd2n6r4aq6lwbbpyj54ha2z9g4yd1hn344r91";

12
pkgs/development/tools/rust/cargo-make/default.nix
View File

@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.20.0";
version = "0.21.0";
src =
let
@@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "0hf8g91iv4c856whaaqrv5s8z56gi3086pva6vdwmn75gwxkw7zk";
sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/8b4ca42376199d4e4781473b4112ef8f18bbd1cc/cargo-make-Cargo.lock";
sha256 = "1zffq7r1cnzdqw4d3vdvlwj56pfak9gj14ibn1g0j7lncwxw2dgs";
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock";
sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9";
};
in
runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "1r2fiwcjf739rkprrwidgsd9i5pjgk723ipazmlccz2jpwbrk7zr";
cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp";
# Some tests fail because they need network access.
# However, Travis ensures a proper build.
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "A Rust task runner and build tool";
homepage = https://github.com/sagiegurari/cargo-make;
homepage = "https://github.com/sagiegurari/cargo-make";
license = licenses.asl20;
maintainers = with maintainers; [ xrelkd ];
platforms = platforms.all;