JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,986 Commits 2 Branches 0 Tags 13 GiB
d1fc054b02
Commit Graph

239 Commits

Author SHA1 Message Date
Moritz Ulrich
be64949688 leiningen: Hardcode path to java. 
...by setting JAVA_CMD in the wrapper.
 2014-03-07 13:32:10 +01:00
Domen Kožar
2f77de37d3 Merge pull request #1825 from iyzsong/gradle 
gradle: update to 1.11
 2014-03-07 13:20:00 +01:00
Peter Simons
bc3008846d scons: update from 2.3.0 to 2.3.1 2014-03-03 11:10:26 +01:00
Song Wenwu
3db6fc36f6 gradle: update to 1.11 2014-02-24 17:30:40 +08:00
Petr Rockai
abd8059802 cmake: Update to latest upstream (2.8.12.2). 2014-02-15 10:27:38 +01:00
Moritz Ulrich
18a03d7285 Leiningen: Update to 2.3.4 2014-02-08 21:48:50 +01:00
Moritz Ulrich
93f45ad2e5 Rebar: update to 2.2.0 2014-02-08 18:54:34 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Eelco Dolstra
1b598da460 Drop unnecessary setting of java.home 2014-01-25 03:04:46 +01:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates 
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
 2014-01-20 19:39:28 +01:00
Peter Simons
c6be3dbf1d scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library 2014-01-20 13:29:36 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Eelco Dolstra
113265b6d3 apacheAntGcj: Remove 
No need to keep two different versions of Ant around.  The default Ant
works fine with GCJ (and doesn't pull in OpenJDK).
 2014-01-09 13:06:51 +01:00
Eelco Dolstra
16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Eelco Dolstra
4e29062fbc ant: Support the OpenJRE (without OpenJDK) and the GNU JVM 
For instance, a package can now say:

  buildInputs = [ ant jre ecj ];

which would cause the Eclipse compiler to be used with the OpenJRE.
Similarly:

  buildInputs = [ ant gcj ];

uses the GNU JVM with the GNU Java compiler.
 2014-01-09 11:14:36 +01:00
Eelco Dolstra
e36427fd4e ant: Add to the channel 2014-01-06 14:36:14 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates 
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
 2014-01-04 18:34:53 +01:00
Eelco Dolstra
54d1721414 ant: Update to 1.9.3 
Also, Ant no longer has a build-time dependency on a particular JDK.
It finds the JDK via $JAVA_HOME or $PATH (by looking up javac).  This
way, we don't need to have separate packages like apacheAntOpenJDK and
apacheAntOracleJDK.  It also seems reasonable: after all, installing
GNU Make doesn't give you a C compiler either.  It does mean that
instead of

  buildInputs = [ ant ];

you now need to write something like

  buildInputs = [ ant jdk ];
 2014-01-03 13:29:06 +01:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Michael Raskin
a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
 2013-12-10 00:25:54 +01:00
Peter Simons
6dfc18dc00 gnumake: add version 4.0 2013-12-09 16:14:41 +01:00
Peter Simons
aa58b5f571 gnumake: clean up directory structure; no functional change 2013-12-09 16:09:33 +01:00
Pascal Wittmann
799062bcb6 Fixed sbt options 2013-12-08 20:03:17 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Moritz Ulrich
698065715a Leiningen: Update to 2.3.3 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-11-08 21:30:34 +01:00
Rickard Nilsson
2d44f3e8af sbt: Update to 0.13.0 
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
 2013-11-05 14:51:14 +01:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates. 
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.
 2013-10-18 18:57:24 +02:00
Eelco Dolstra
df0d362f31 Fix some more Hydra evaluation errors 2013-10-08 11:07:14 +02:00
Bjørn Forsman
083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583 Some description fixes 
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
 2013-10-05 19:36:23 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Moritz Ulrich
f09dca7d60
Leiningen: Update to 2.3.2 (& add GnuPG to closure) 2013-09-30 19:11:19 +00:00
Song Wenwu
d4c222dd34 gradle: update to 1.8 2013-09-29 21:40:17 +02:00
aszlig
9170351e69
ninja: Update to new upstream version 1.4.0. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-09-27 15:23:30 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-09-26 20:03:57 +00:00
bbenoist
e13720c3c4 cmake: Fix CTest custom commands 
This commit is related to:
 - https://github.com/NixOS/nixpkgs/issues/762
 - http://public.kitware.com/Bug/view.php?id=13887
And fixes a bug present in recent CMake versions.

The fix should be integrated in the next CMake release.
 2013-08-21 10:24:53 +02:00
bbenoist
bef090400e cmake: Update to 2.8.11.2 2013-08-21 10:24:53 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
Evgeny Egorochkin
2d056f9307 Merge pull request #811 from the-kenny/erlang-elixir 
Update erlang to R16B1, add elixir and rebar
 2013-08-13 21:56:04 -07:00
Moritz Ulrich
c5d81ea3b5 Update leiningen to 2.3.1. 2013-08-13 21:48:26 +00:00
Evgeny Egorochkin
d068505b2f leiningen: fix hash 2013-08-11 07:59:30 +03:00
Moritz Ulrich
02707296e8 Update leiningen to 2.3.0. 
Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 17:30:10 +02:00
Moritz Ulrich
31083cd226 Add myself as a maintainer to erlang R16B1 and elixir. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:33:51 +02:00
Moritz Ulrich
dbfcdc9066 Add meta for elixir & rebar. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Moritz Ulrich
ceb96b7312 Package elixir and rebar. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Peter Simons
522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Rob Vermaas
d568ff324a Add meta attribute to colormake. 2013-07-25 11:38:13 +02:00