1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 10:00:56 +00:00
Commit graph

261 commits

Author SHA1 Message Date
Peter Simons 5b28aebc08 sbt: drop unconditionally set $SBT_OPTS variable from script
... and rename simple-build-tool to just "sbt", which is the name
everybody uses these days.
2014-09-12 17:11:38 +02:00
Moritz Ulrich af8a91b0b2 ant: update from 1.9.3 to 1.9.4 2014-09-04 19:31:32 +02:00
William Roe 9a30ea90f0 Elixir and rebar aren't Linux-specific tools
Widen platform support to all unix
2014-09-03 20:14:57 +01:00
Michael Raskin 1bfcc7b477 Update SCons 2014-08-31 18:20:07 +04:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Austin Seipp 528a1c0f56 ninja: 1.4.0 -> 1.5.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:13:33 -05:00
Moritz Ulrich e3bf7253b0 rebar: Bump to 2.5.1. 2014-08-12 13:47:59 +02:00
Eelco Dolstra 0acc4e6b26 cmake: Fix setup hook on bash < 4.0
This matters in nix-shell and stdenvNative on Darwin.

Fixes #3204.
2014-08-09 23:14:01 +02:00
Michael Raskin 4c176fd76e Update Scons build manager 2014-08-03 22:29:41 +04:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát 02a1e85ab1 cmake, podofo: fix finding freetype-2.5 2014-06-26 18:24:44 +02:00
Moritz Ulrich f85d3ad6d3 leiningen: Update to 2.4.2. 2014-06-19 12:04:33 +02:00
Moritz Ulrich 717d9c39f9 leiningen: Update to 2.4.0. 2014-06-10 11:49:47 +02:00
Peter Simons 7553a476f5 simple-build-tool: update to version 0.13.5 2014-06-05 12:36:39 +02:00
Moritz Ulrich 0e44d8e3e8 rebar: update from 2.2.0 to 2.3.0 2014-05-19 15:36:59 +02:00
Eelco Dolstra dbd332d147 Fix meta.maintainer -> meta.maintainers 2014-04-23 14:26:32 +02:00
aszlig 625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Bjørn Forsman 9878bb47a4 buildbot{,slave}: bump 0.8.7p1 -> 0.8.8
Build and run tested.
2014-04-13 21:11:49 +02:00
John Wiegley 010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig 5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds.
This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
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