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

Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs

Browse Source
This commit is contained in:
Moritz Ulrich
2014-10-27 01:14:13 +01:00
parent 3a0a389312 aec6d83c25
commit cdd2dd70aa
605 changed files with 9168 additions and 4205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "5.7";
version = "5.8";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
sha256 = "0kzj507ylynq6p7v097bjzsckkjny5i2fxwxyrlwi5samhi2m06x";
sha256 = "0ydv99rwzib29j2vq51qvgqjk0mn8zrjg8akflr5i62m866r4lsx";
};
installPhase = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
cp -R * $out/checkstyle
'';
meta = {
meta = with stdenv.lib; {
description = "Checks Java source against a coding standard";
longDescription = ''
checkstyle is a development tool to help programmers write Java code that
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
Conventions, but is highly configurable.
'';
homepage = http://checkstyle.sourceforge.net/;
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;
maintainers = with maintainers; [ pSub ];
};
}

6
pkgs/development/tools/build-managers/gradle/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
stdenv.mkDerivation rec {
name = "gradle-1.11";
name = "gradle-2.1";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
sha256 = "14a0qdzjiar97l9a0i3ds2y48p1lrqkj7skkkvhz0r29hbgkbqh7";
sha256 = "0y7qifc61nng24zn73bdwh5d0m25dnllfiwfkyw220mblag4zviy";
};
installPhase = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
makeWrapper ${jdk}/bin/java $out/bin/gradle \
--set JAVA_HOME ${jdk} \
--add-flags "-classpath $out/lib/gradle-launcher-1.11.jar org.gradle.launcher.GradleMain"
--add-flags "-classpath $out/lib/gradle-launcher-2.1.jar org.gradle.launcher.GradleMain"
'';
phases = "unpackPhase installPhase";

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

@@ -1,12 +1,12 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
name = "gnulib-0.1-83-g8008cac";
name = "gnulib-0.1-228-gb155b06";
src = fetchgit {
url = "http://git.savannah.gnu.org/r/gnulib.git";
rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6";
sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm";
rev = "b155b0649814b20e635a2db305696710fa1037ce";
sha256 = "06r0cpm97k82hx6qqm9nbwyp5mr8g9qqdiw2ak2pndymc66v233l";
};
buildPhase = ":";

12
pkgs/development/tools/haskell/PastePipe/default.nix
View File

@@ -1,18 +1,18 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, cmdargs, HTTP, network }:
{ cabal, cmdargs, HTTP, network, networkUri }:
cabal.mkDerivation (self: {
pname = "PastePipe";
version = "1.5";
sha256 = "1jqfk6d22vi0vrwx0whjkh4pxwagr4hmi79bid6bffn72c7ygm8f";
version = "1.6";
sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4";
isLibrary = true;
isExecutable = true;
buildDepends = [ cmdargs HTTP network ];
buildDepends = [ cmdargs HTTP network networkUri ];
meta = {
homepage = "http://github.com/creswick/pastepipe";
homepage = "http://github.com/Fuuzetsu/pastepipe";
description = "CLI for pasting to lpaste.net";
license = "GPL";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
};

1
pkgs/development/tools/haskell/SourceGraph/default.nix
View File

@@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
description = "Static code analysis using graph-theoretic techniques";
license = "GPL";
platforms = self.ghc.meta.platforms;
broken = true;
};
})

6
pkgs/development/tools/haskell/cabal-db/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "cabal-db";
version = "0.1.9";
sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq";
version = "0.1.10";
sha256 = "0j9xnf23zrpyrfkcx321rqbabzsm4208idpvfy7sdnnvw9a2k5xw";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
];
meta = {
homepage = "http://github.com/vincenthz/cabal-db";
description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)";
description = "query tools for the local cabal database";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

14
pkgs/development/tools/haskell/codex/default.nix
View File

@@ -1,18 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH
, monadLoops, tar, text, transformers, yaml, zlib
{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, machines
, machinesDirectory, MissingH, monadLoops, monoTraversable, tar
, text, transformers, yaml, zlib
}:
cabal.mkDerivation (self: {
pname = "codex";
version = "0.1.0.5";
sha256 = "0hlx72dan9qvwrpp6rkyr6y9zk2lafa15va098w38r7658jymfy0";
version = "0.2.0.2";
sha256 = "0an043cmsxc296i90pv19d8xdl7fg2fvf026lx4rly7bwskzn99x";
isLibrary = true;
isExecutable = true;
buildDepends = [
Cabal downloadCurl either filepath hackageDb MissingH monadLoops
tar text transformers yaml zlib
Cabal downloadCurl either filepath hackageDb machines
machinesDirectory MissingH monadLoops monoTraversable tar text
transformers yaml zlib
];
jailbreak = true;
meta = {

4
pkgs/development/tools/haskell/graphmod/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "graphmod";
version = "1.2.5";
sha256 = "1rmrsfvajzrak7jlhwnvhrgszgyg1b6z5wp21k0d7pv2cbfdkp8s";
version = "1.2.6";
sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3";
isLibrary = false;
isExecutable = true;
buildDepends = [ dotgen filepath haskellLexer ];

4
pkgs/development/tools/haskell/hlint/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.9.4";
sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m";
version = "1.9.10";
sha256 = "08pfc0mhqkhali0hjxpa26hr5ykfdmyldh0r04v1b42a1c60k1id";
isLibrary = true;
isExecutable = true;
buildDepends = [

1
pkgs/development/tools/haskell/hscope/default.nix
View File

@@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
description = "cscope like browser for Haskell code";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
broken = true;
};
})

4
pkgs/development/tools/haskell/ihaskell/default.nix
View File

@@ -16,7 +16,7 @@ cabal.mkDerivation (self: {
sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c";
isLibrary = true;
isExecutable = true;
patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/288.patch"; sha256 = "022zdz4wnyra6cfa7mq0w2ycsb007cvppn2f1360nr3fa5s9wibg"; }) ];
patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/296.patch"; sha256 = "1h9gxq9l3j949prcwqkdkrc3q3sxai4b345hfp5hfi0mhfbysfn6"; }) ];
prePatch = ''
tar xvf profile/profile.tar -C profile
sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py
@@ -39,11 +39,13 @@ cabal.mkDerivation (self: {
postInstall = ''
patchShebangs .
'';
jailbreak = true;
meta = with self.stdenv.lib; {
homepage = "http://gibiansky.github.io/IHaskell/";
description = "A Haskell backend kernel for the IPython project";
license = licenses.mit;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
maintainers = with maintainers; [ edwtjo ];
};
})

6
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View File

@@ -20,7 +20,5 @@ stdenv.mkDerivation rec {
--set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
'';
meta = {
description = ihaskell.meta.description;
};
}
inherit (ihaskell) meta;
}

4
pkgs/development/tools/haskell/keter/default.nix
View File

@@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "keter";
version = "1.3.4";
sha256 = "127sv155kgwz64adylfn2dmpnqh833pa53lnc8ahhwa63xwf9pzk";
version = "1.3.5";
sha256 = "0jbf9x50gy9qja6gazh0lgyffz46a3wps6hbxppqmcicjhwbpvr5";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/tools/haskell/pointfree/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "pointfree";
version = "1.0.4.7";
sha256 = "0jwql0ka01cr53ayjc4dpaci11i7r1y3b9gcbh3rlamb1mnfcqvl";
version = "1.0.4.8";
sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy";
isLibrary = false;
isExecutable = true;
buildDepends = [ haskellSrcExts transformers ];

4
pkgs/development/tools/misc/autoconf/2.13.nix
View File

@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "autoconf-2.13";
src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.gz";
sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh";
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# "fixed" path in generated files!
dontPatchShebangs = true;
postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13'';
meta = {
homepage = http://www.gnu.org/software/autoconf/;
description = "Part of the GNU Build System";

28
pkgs/development/tools/misc/chruby/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "chruby";
src = fetchFromGitHub {
owner = "postmodern";
repo = "chruby";
rev = "d5ae98410311aec1358d4cfcc1e3ec02de593c3b";
sha256 = "1iq9milnnj3189yw02hkly2pnnh4g0vn2fxq6dfx90kldjwpwxq5";
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
mkdir $out
cp -r bin $out
cp -r share $out
'';
meta = with lib; {
description = "Changes the current Ruby";
homepage = https://github.com/postmodern/chruby;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
version = "1.18.5";
sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7";
version = "1.18.6";
sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc";
isLibrary = true;
isExecutable = true;
buildDepends = [ polyparse ];

14
pkgs/development/tools/misc/ddd/default.nix
View File

@@ -7,12 +7,14 @@ stdenv.mkDerivation rec {
sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis";
};
buildInputs = [lesstif ncurses libX11 libXt];
configureFlags = "--with-x";
configureFlags = "--with-x";
patches = [ ./gcc44.patch ];
meta = {
homepage = http://www.gnu.org/software/ddd;
description = "Graphical front-end for command-line debuggers";
license = stdenv.lib.licenses.gpl2;
};
meta = {
homepage = http://www.gnu.org/software/ddd;
description = "Graphical front-end for command-line debuggers";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

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

@@ -1,73 +0,0 @@
{ stdenv, fetchurl, nix, perlPackages, perl, makeWrapper, libtool
, unzip, nukeReferences, pkgconfig, boehmgc, libxslt, sqlite
, subversion, openssh, coreutils, findutils, gzip, bzip2, lzma
, gnutar, git, mercurial, gnused, graphviz, rpm, dpkg, cdrkit
}:
let
perldeps = with perlPackages;
[ CatalystDevel
CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace
CatalystPluginAuthorizationRoles
CatalystAuthenticationStoreDBIxClass
CatalystViewTT
CatalystEngineHTTPPrefork
CatalystViewDownload
XMLSimple
IPCRun
IOCompress
Readonly
DBDPg
EmailSender
TextTable
NetTwitterLite
PadWalker
DataDump
JSONXS
DateTime
DigestSHA1
CryptRandPasswd
nixPerl
];
version = "0.1pre27592";
in
stdenv.mkDerivation {
name = "hydra-${version}";
src = fetchurl {
url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz;
sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz";
};
configureFlags = "--with-nix=${nix}";
buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ;
hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
libxslt sqlite subversion openssh nix coreutils findutils
gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz
rpm dpkg cdrkit]));
postInstall = ''
for i in "$out/bin/"*; do
wrapProgram $i \
--prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
--prefix PATH ':' $out/bin:$hydraPath \
--set HYDRA_RELEASE ${version} \
--set HYDRA_HOME $out/libexec/hydra \
--set NIX_RELEASE ${nix.name}
done
'';
meta = {
description = "Hydra, the Nix-based continuous integration system";
homepage = http://nixos.org/hydra/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
};
}

19
pkgs/development/tools/misc/kibana/default.nix
View File

@@ -1,29 +1,28 @@
{ stdenv, fetchurl, unzip, conf ? null }:
{ stdenv, fetchurl, conf ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "kibana-${version}";
version = "3.1.0";
version = "3.1.1";
src = fetchurl {
url = "https://download.elasticsearch.org/kibana/kibana/${name}.zip";
sha256 = "05i97zi08rxwx951hgs92fbhk6cchpvdlikrfz07v1dpn787xz8j";
url = "https://download.elasticsearch.org/kibana/kibana/${name}.tar.gz";
sha256 = "195x6zq9x16nlh2akvn6z0kp8qnba4vq90yrysiafgv8dmw34p5b";
};
buildInputs = [ unzip ];
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out && cp -R * $out
${optionalString (conf!=null) ''cp ${conf} $out/config.js''}
mkdir -p $out
mv * $out/
${optionalString (conf != null) "cp ${conf} $out/config.js"}
'';
meta = {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = licenses.asl20;
maintainers = [ maintainers.offline ];
maintainers = with maintainers; [ offline rickynils ];
};
}

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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
homepage = http://lttng.org/;
# liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
# The rest of the LTTV package is distributed under the GNU GPL v2.
# TODO license = with licenses; [ gpl2 lgpl21 ];
license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};

1
pkgs/development/tools/quilt/default.nix
View File

@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
'';
license = "GPLv2+";
platforms = stdenv.lib.platforms.all;
};
}