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:
Tuomas Tynkkynen
2016-03-06 11:48:57 +02:00
parent a6d19c28f1 54c7ef17a9
commit ad47355786
624 changed files with 28150 additions and 13343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/analysis/checkstyle/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.15";
version = "6.16";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
sha256 = "1bazjgfr1mq6qfg4nmack467zg7s4z8v7zfzw46d2dk04mv8y9b8";
sha256 = "0kmddfzn7p6fads6crw4gnahvi36xwqyw35i7a2lplrdp8dn9xdd";
};
installPhase = ''
pkgs/development/tools/analysis/coan/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "coan-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/coan2/v${version}/${name}.tar.gz";
url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
};
pkgs/development/tools/analysis/cppcheck/default.nix
+10 -10
View File
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
let
name = "cppcheck";
version = "1.69";
pname = "cppcheck";
version = "1.72";
in
stdenv.mkDerivation {
name = "${name}-${version}";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab";
url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l";
};
buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -22,15 +22,15 @@ stdenv.mkDerivation {
cp cppcheck.1 $out/share/man/man1/cppcheck.1
'';
meta = {
meta = with stdenv.lib; {
description = "A static analysis tool for C/C++ code";
longDescription = ''
Check C/C++ code for memory leaks, mismatching
allocation-deallocation, buffer overruns and more.
'';
homepage = http://cppcheck.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ simons joachifm ];
};
}
pkgs/development/tools/analysis/spin/default.nix
+8 -5
View File
@@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
name = "spin-${version}";
version = "6.4.3";
version = "6.4.5";
url-version = stdenv.lib.replaceChars ["."] [""] version;
src = fetchurl {
url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
curlOpts = "--user-agent 'Mozilla/5.0'";
sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1";
# The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
# Dropbox mirror from developers:
# https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAANRpxsSyWC7iHZB-XgBwJFa/spin645.tar.gz?raw=1";
sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224";
};
buildInputs = [ yacc ];
@@ -20,7 +22,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Formal verification tool for distributed software systems";
homepage = http://spinroot.com/;
license = stdenv.lib.licenses.free;
license = licenses.free;
platforms = platforms.linux;
maintainers = with maintainers; [ mornfall pSub ];
};
}
pkgs/development/tools/build-managers/buildbot/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
, sqlalchemy , sqlalchemy_migrate_0_7
, sqlalchemy_migrate_0_7
, enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
}:
pkgs/development/tools/build-managers/gup/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchgit, lib, python, which }:
let
version = "0.5.3";
version = "0.5.4";
src = fetchgit {
url = "https://github.com/gfxmonk/gup.git";
rev = "55ffd8828ddc28a2a786b75422d672d6569f961f";
sha256 = "7c2abbf5d3814c6b84da0de1c91f9f7d299c2362cf091da96f6a68d8fffcb5ce";
rev = "b3980e529c860167b48e31634d2b479fc4d10274";
sha256 = "bb02ba0a7f1680ed5b9a8e8c9cc42aa07016329840f397d914b94744f9ed7c85";
};
in
import ./build.nix
pkgs/development/tools/build-managers/sbt/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "0.13.9";
version = "0.13.11";
src = fetchurl {
url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
sha256 = "19mg2xbc2vbqg33b986zvn7pj05cx106rccdzf9zs2npdnznysm3";
};
patchPhase = ''
pkgs/development/tools/continuous-integration/cide/Gemfile.lock
+1 -1
View File
@@ -11,7 +11,7 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
cide (0.8.1)
cide (0.9.0)
thor (~> 0.19)
virtus (~> 1.0)
coercible (1.0.0)
pkgs/development/tools/continuous-integration/cide/default.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ stdenv, lib, bundlerEnv, makeWrapper, docker, git }:
{ stdenv, lib, bundlerEnv, makeWrapper, docker, git, gnutar, gzip }:
stdenv.mkDerivation rec {
name = "cide-${version}";
version = "0.8.1";
version = "0.9.0";
env = bundlerEnv {
name = "${name}-gems";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/cide $out/bin/cide \
--set PATH ${docker}/bin:${git}/bin
--set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
'';
meta = with lib; {
pkgs/development/tools/continuous-integration/cide/gemset.nix
+12 -12
View File
@@ -22,20 +22,20 @@
version = "0.19.1";
};
jmespath = {
version = "1.1.3";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
type = "gem";
};
version = "1.1.3";
};
ice_nine = {
version = "0.11.2";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
type = "gem";
};
version = "0.11.2";
};
equalizer = {
source = {
@@ -61,11 +61,11 @@
version = "1.0.0";
};
cide = {
version = "0.8.1";
version = "0.9.0";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "1vsa7smab5dj6mcf0csl9wm18x95h6yphm7x18is53bv5hrzgill";
sha256 = "1wykwv0jnrh49jm9zsy1cb5wddv65iw4ixh072hr242wb83dcyl0";
};
};
axiom-types = {
@@ -77,27 +77,27 @@
version = "0.1.1";
};
aws-sdk-resources = {
version = "2.2.17";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
type = "gem";
};
version = "2.2.17";
};
aws-sdk-core = {
version = "2.2.17";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
type = "gem";
};
version = "2.2.17";
};
aws-sdk = {
version = "2.2.17";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
type = "gem";
};
version = "2.2.17";
};
}
pkgs/development/tools/literate-programming/eweb/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec{
name = "eweb-${meta.version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/eweb/${name}.tar.bz2";
url = "mirror://sourceforge/project/eweb/${name}.tar.bz2";
sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5";
};
pkgs/development/tools/literate-programming/nuweb/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec{
version = "1.58";
src = fetchurl {
url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
};
pkgs/development/tools/misc/premake/3.nix
+1 -1
View File
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
name = "${baseName}-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip";
sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
};
pkgs/development/tools/parsing/flex/default.nix
+6
View File
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
'';
crossAttrs = {
# disable tests which can't run on build machine
postPatch = ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
pkgs/development/tools/repository-managers/nexus/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "nexus-${version}";
version = "2.12.0-01";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/oss/nexus-${version}-bundle.tar.gz";
sha256 = "1k3z7kwcmr1pxaxfnak99fq5s8br9zbqbfpyw1afi86ykkph4g5z";
};
sourceRoot = name;
buildInputs = [ makeWrapper ];
installPhase =
''
mkdir -p $out
cp -rfv * $out
rm -fv $out/bin/nexus.bat
'';
meta = with stdenv.lib; {
description = "Repository manager for binary software components";
homepage = http://www.sonatype.org/nexus;
license = licenses.epl10;
platforms = platforms.all;
maintainers = [ maintainers.aespinosa ];
};
}
pkgs/development/tools/sauce-connect/default.nix
+4 -4
View File
@@ -9,18 +9,18 @@ stdenv.mkDerivation rec {
src = fetchurl (
if stdenv.system == "x86_64-linux" then {
url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
sha1 = "0d7d2dc12766ac137e62a3e4dad3025b590f9782";
sha256 = "1flhsssb7wvfbwyvhc9k2di3nd7dlq832xp6dg658xbqk7mr9rvw";
} else if stdenv.system == "i686-linux" then {
url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
sha1 = "ee2c3002eae3b29df801a2ac1db77bb5f1c97bcc";
sha256 = "1hy0riljgjf4sf4cg7kn0hd18w393bdwhp0ajyimzvscg05nx8fq";
} else {
url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
sha1 = "ihr4ynnyi464pafgqyl5xkhfi13yi76j";
sha256 = "1fhclbc79rk6pmf5qzc2pkz1z3nsawr9pfi5bzqs8r1514ki4m4p";
}
);
buildInputs = [ unzip ];
phases = "unpackPhase installPhase" + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
phases = "unpackPhase installPhase " + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
patchPhase = ''
patchelf \