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

Merge branch 'origin/master' into stdenv-updates.

Browse Source 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
This commit is contained in:
Peter Simons
2013-10-18 18:57:24 +02:00
parent ea6f711e8e 06d6c3ed5d
commit 6be8ad3392
1177 changed files with 57151 additions and 6093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/apache-ant/default.nix
+4
View File
@@ -23,4 +23,8 @@ stdenv.mkDerivation {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha1 = "d9e3e83dd9664cfe1dcd4841c082db3f559af922";
};
meta = {
description = "Java-based build tool";
};
}
pkgs/development/tools/build-managers/apache-ant/from-source.nix
+1 -1
View File
@@ -57,7 +57,7 @@ EOF
'';
meta = {
description = "Apache Ant, a Java-based build tool";
description = "Java-based build tool";
longDescription = ''
Apache Ant is a Java-based build tool. In theory, it is kind of like
pkgs/development/tools/build-managers/colormake/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "A simple wrapper around make to colorize the output.";
description = "Simple wrapper around make to colorize the output";
license = "GPLv2";
};
}
pkgs/development/tools/build-managers/leiningen/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://leiningen.org/;
description = "Project automation for Clojure";
license = "EPL";
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.linux;
maintainer = with stdenv.lib.maintainers; [ the-kenny ];
};
}