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

Merge branch 'master' into add-missing-licenses

Browse Source 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
This commit is contained in:
Pascal Wittmann
2018-08-09 13:10:27 +02:00
parent 8915ed06b3 1d4de0d552
commit af8cd3c74e
279 changed files with 12381 additions and 9643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
{ stdenv, cmake, zlib, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2018-06-15";
version = "1.0";
name = "bloaty-${version}";
src = fetchFromGitHub {
owner = "google";
repo = "bloaty";
rev = "bdbb3ce196c86d2154f5fba99b5ff73ca43446a9";
sha256 = "1r7di2p8bi12jpgl6cm4ygi1s0chv767mdcavc7pb45874vl02fx";
rev = "v${version}";
sha256 = "0fck83zyh9bwlwdk3fkhv3337g9nii6rzf96gyghmnrsp9rzxs3l";
fetchSubmodules = true;
};

1
pkgs/development/tools/build-managers/bazel/0.4.nix
View File

@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ cstrahan philandstuff ];
platforms = platforms.linux;
broken = true; # 2018-08-07
};
name = "bazel-${version}";

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "bear-${version}";
version = "2.3.11";
version = "2.3.12";
src = fetchFromGitHub {
owner = "rizsotto";
repo = "Bear";
rev = version;
sha256 = "0r6ykvclq9ws055ssd8w33dicmk5l9pisv0fpzkks700n8d3z9f3";
sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw";
};
nativeBuildInputs = [ cmake ];

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.2.0";
version = "1.3.0";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0lcaga16zf75aa6ckl9ahjbrs3n3bw7nj6m8g03n77873cgh94x4";
sha256 = "1l9iqyqn9yln6ln6dhfkngzx92a61v1cf5ahqj4ax663i02yq7fh";
};
buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

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

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
sha256 = "1rrn0v4bhgar3mrgs931ifggb8kfg23fv5cgvskrdd7iyvg0z9wc";
sha256 = "1pyp98svh5x8b6yp5vfl0jhz8aysjm0dqvqf7znyb3l7knfqk726";
};
patchPhase = ''

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

@@ -5,8 +5,8 @@ let
src = fetchFromGitHub {
owner = "cquery-project";
repo = "cquery";
rev = "34b357bc5e873d52d2aa41287c6e138244cea109";
sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c";
rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea";
sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1";
fetchSubmodules = true;
};
@@ -15,7 +15,7 @@ let
in
stdenv.mkDerivation rec {
name = "cquery-${version}";
version = "2018-05-01";
version = "2018-08-08";
inherit src;
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DSYSTEM_CLANG=ON"
"-DCLANG_CXX=ON"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
];
shell = stdenv.shell;
@@ -47,6 +48,10 @@ stdenv.mkDerivation rec {
installCheckPhase = ''
pushd ${src}
$out/bin/cquery --ci --test-unit
# The integration tests have to be disabled because cquery ignores `--init`
# if they are invoked, which means it won't find the system includes.
#$out/bin/cquery --ci --test-index
'';
meta = with stdenv.lib; {

2
pkgs/development/tools/misc/cquery/wrapper
View File

@@ -1,6 +1,6 @@
#! @shell@ -e
initString="--init={\"extraClangArguments\": [@standard_library_includes@"
initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@"
if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then
read -a cflags_array <<< ${NIX_CFLAGS_COMPILE}

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

@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "cscope-15.8b";
name = "cscope-15.9";
src = fetchurl {
url = "mirror://sourceforge/cscope/${name}.tar.gz";
sha256 = "1byk29rcpyygrnr03h5j3y8j0aqxldd9dr5ihi9q982sy28x12a8";
sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65";
};
configureFlags = "--with-ncurses=${ncurses.dev}";

1
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -40,6 +40,7 @@ let
FileSlurp
IOCompress
IPCRun
JSON
JSONAny
JSONXS
LWP

4
pkgs/development/tools/profiling/oprofile/default.nix
View File

@@ -8,11 +8,11 @@
assert withGUI -> qt4 != null;
stdenv.mkDerivation rec {
name = "oprofile-1.2.0";
name = "oprofile-1.3.0";
src = fetchurl {
url = "mirror://sourceforge/oprofile/${name}.tar.gz";
sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb";
sha256 = "1rj76vvkhpfn9k04s7jhb813ximfcwd9h5gh18pr4fgcw6yxiplm";
};
postPatch = ''