Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Thomas Tuegel
f47af9b2c8
remove cmake-3.0
2015-03-22 17:03:57 -05:00
Thomas Tuegel
3628370127
remove cmake-2.6.4
2015-03-22 17:02:32 -05:00
Thomas Tuegel
67199bda4e
remove cmake-2.8
2015-03-22 17:01:45 -05:00
Thomas Tuegel
a910301e18
make cmake-3.2 the default version
2015-03-22 17:00:46 -05:00
j-keck
de9e7bc5f1
sbt: bump to 0.13.8
2015-03-22 19:58:01 +01:00
Thomas Tuegel
7e21c519ba
add cmake-3.2.1
...
Earlier versions of CMake have a bug in their OpenSSL version detection code.
2015-03-21 12:32:38 -05:00
Austin Seipp
70528e9f8e
nixpkgs: ninja 1.5.1 -> 1.5.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-03-17 20:29:46 -05:00
Ricardo M. Correia
e6561c5fb1
cargo: Install man page
...
... as well as other artifacts.
2015-03-04 18:08:52 +01:00
Jordan Woehr
5821e91bd1
Restructure rustc derivations for ease of updating.
...
Update racerRust to use new rustcMaster and upgrade cargoSnapshot so racer builds.
2015-03-02 12:40:55 -07:00
Bjørn Forsman
fc966aead0
gradle: don't hardcode gradle-launcher-VERSION.jar
...
Instead, figure out VERSION at build-time. This simplifies using
overrideDerivation (no need to copy and modify installPhase).
Also add a check that the file exists (catch potential failure early).
2015-02-27 12:08:03 +01:00
Moritz Ulrich
1bbf15eca1
Leiningen: Fix GnuPG Support.
2015-02-07 18:45:35 +01:00
Eric Seidel
dbf3d31727
make llvm-3.5 the default and remove references to gccApple
...
make perl be less dumb
revert change to release.nix
2015-02-03 14:31:04 -08:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Ragnar Dahlén
aaa6d79300
Clojure: boot: Add new derivation for boot build tooling
2015-01-30 09:33:55 +00:00
Pascal Wittmann
3c7e1ef698
Merge pull request #5866 from nckx/maven
...
maven 3.2.3 -> 3.2.5
2015-01-30 10:17:35 +01:00
Ricardo M. Correia
2ee7809ac9
cargoSnapshot: Update from 2014-12-30 -> 2015-01-24
2015-01-27 04:36:37 +01:00
Tobias Geerinckx-Rice
fe6944e5bc
maven: 3.2.3 -> 3.2.5
2015-01-21 22:01:15 +01:00
Pascal Wittmann
c6845151f1
icmake: update from 7.21.01 to 7.22.00
2015-01-21 13:21:59 +01:00
Johannes Bornhold
51b4ce18f4
dub: Add dub to interact with the D package registry
2015-01-18 18:32:46 +01:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Benjamin Saunders
0351b7a710
Add tup
...
Closes #5720
2015-01-14 01:37:44 -05:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
Moritz Ulrich
85dc90565f
leiningen: Update to 2.5.1.
2015-01-10 14:38:45 +01:00
John Ericson
8d96df76b9
cargo: common.nix now only contains version-agnostic bits
2015-01-08 08:38:20 +00:00
Ricardo M. Correia
9ad3f0ed7e
cargoSnapshot: Update from 2014-12-21 -> 2014-12-30
2015-01-07 05:50:17 +01:00
Peter Simons
ac55bb22be
gnumake: add version 4.1
2015-01-01 20:36:58 +01:00
Michael Raskin
fdb785f4d1
Merge pull request #5453 from pmahoney/skarnet-2.0
...
Update skarnet.org software for 2.0 release.
2015-01-01 16:14:17 +03:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Patrick Mahoney
26e74d8a3e
Update skarnet.org software for 2.0 release.
...
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:
execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2014-12-23 15:24:30 -06:00
Ricardo M. Correia
66ca0b6163
cargoSnapshot: Update from 2014-11-22 -> 2014-12-21
2014-12-22 23:40:30 +01:00
bbarker
2682c01f29
keeping gradle updated
2014-12-11 04:19:14 +01:00
Bjørn Forsman
99eab9f1e2
buildbot{,-slave}: update 0.8.8 -> 0.8.10
...
Build tested. Source distribution is now on pypi instead of googlecode.
2014-12-09 19:14:03 +01:00
Patrick Mahoney
a61293e659
skarnet: Invoke compile as 'cc' for wider support.
...
Darwin stdenv uses clang, which can be invoked as 'cc' but not 'gcc'.
2014-11-28 13:11:36 -06:00
Patrick Mahoney
cf5f282940
Consolidate conf-compile steps for skarnet.org pkgs.
2014-11-28 13:10:37 -06:00
Ricardo M. Correia
ca6d86b7fb
cargoSnapshot: Update from 2014-09-19 -> 2014-11-22
2014-11-25 01:07:10 +01:00
j-keck
fc0b1e4bae
sbt: update to version 0.13.7
2014-11-19 18:50:59 +01:00
Pascal Wittmann
38022c9938
add icmake, a program maintenance utility
2014-11-13 17:48:06 +01:00
Alexander Flatter
064f10ba3c
Allow leiningen to build on darwin
2014-11-11 15:44:45 +01:00
Michael Raskin
ffbd1d011b
Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist
2014-11-09 18:31:46 +03:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Arseniy Seroka
c8ab037257
Merge pull request #4774 from henrytill/leiningen
...
leiningen: remove clojure dependency
2014-11-03 16:04:50 +03:00
j-keck
129cde946b
sbt: update to version 0.13.6
2014-11-02 20:03:57 +01:00
Henry Till
4feafd7953
leiningen: remove clojure dependency
2014-11-01 19:47:52 -04:00
宋文武
f1935d8eb8
gradle: update to 2.1
2014-10-26 22:10:20 +08:00
Michael Raskin
d04db3bf41
Update SCons
2014-10-06 02:43:58 +04:00
Ricardo M. Correia
a1f76142b4
cargoSnapshot: Fix evaluation error when building tarball
2014-09-26 02:22:04 +02:00
Ricardo M. Correia
a7a67e99b6
cargoSnapshot: Fix meta attributes
2014-09-25 23:30:27 +02:00
Ricardo M. Correia
614a99bd8e
cargoSnapshot: Add package
...
Cargo downloads your Rust project's dependencies and builds your
project.
The cargoSnapshot derivation simply uses a binary build, because
it's not easy to build cargo from source yet.
In the future, it's expected that we'll also add a derivation for
building cargo from source.
2014-09-24 18:18:15 +02:00
Daniel Peebles
72e76a18c1
Update maven to 3.2.3 and put it in a more sensible location
...
Closes #4187 .
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 22:33:18 +01:00
Moritz Ulrich
05c02b06f7
Leiningen: Bump to 2.5.0.
2014-09-19 00:29:16 +02:00
Daniel Peebles
44ca1a7f57
Add coreutils dependency to ant launcher script
...
Closes #4106 .
2014-09-17 03:54:25 +01:00
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
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
381dcb1d98
various packages fixed
2014-08-30 23:30:31 +02:00
Vladimír Čunát
abbc93f783
WIP: getting better
2014-08-30 19:11:52 +02: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
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +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
Mathijs Kwik
db83d9a35b
Merge branch 'master' into multiple-outputs
2013-11-01 08:29:09 +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
Eelco Dolstra
7c8518c194
Cleanup
2013-08-23 10:02:07 +02: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
Rob Vermaas
9afc8bb1e0
Add colormake
2013-07-25 11:36:07 +02:00
Shea Levy
0de17d6111
Revert "cmake: Update to 2.8.11.2"
...
This breaks some packages (notably liblapack) due to a broken macro
(CTEST_CUSTOM_POST_TEST). See NixOS/nixpkgs#762
This reverts commit ebc424c3ab
.
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-16 09:31:19 -04:00
bbenoist
ebc424c3ab
cmake: Update to 2.8.11.2
...
The changelog is available at:
http://www.cmake.org/files/v2.8/CMakeChangeLog-2.8.11
I had to create a new patch from scratch, that's why it contains a lot
of differences. CMake developers has rewritten the files
(Modules/Platform/Linux.cmake and Modules/Platform/UnixPaths.cmake) to
comply to their coding style requirements and a lot of elements has
switched from upper to lower case.
Also, the previous patch partially consisted of commenting some
instructions mixed with line removals whereas mine is directlty
removing them in order to avoid useless evaluations and parsing in
resulting files.
2013-07-16 10:07:09 +02:00
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Vladimír Čunát
3314be6b73
cmake: consistent names, to satisfy comments on #567
2013-06-27 16:33:24 +02:00
Vladimír Čunát
4251b70c7e
Merge master into stdenv-updates (contains new X stuff)
2013-06-27 16:24:57 +02:00
Vladimír Čunát
7f1e09c35d
Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
...
This reverts commit b08e12b37a
.
2013-06-27 15:14:32 +02:00
Eelco Dolstra
acba9240cd
nixos.org/tarballs -> tarballs.nixos.org
...
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Rickard Nilsson
0dbb2fdcfe
sbt: Remove duplicate package
2013-06-25 12:32:28 +02:00
Rickard Nilsson
8496b31e34
sbt: Use recommended java options
2013-06-25 12:31:44 +02:00
Bjørn Forsman
860161dcb7
remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6
...
This version needs readline. And the license is GPLv3. Also, add
meta.platforms and meta.maintainers attributes.
2013-06-22 21:09:43 +02:00
aszlig
1709571b3f
ninja: Update to v1.3.4 and drop unzip dependency.
...
Version 1.2.0 is way too old in order to build the latest chromium (29) version,
so let's get it up to date (especially because no other package is referencing
ninja, so it should be non-critical).
The dependency on unzip is not needed here, because GitHub also provides
archives in tar.gz format.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:55 +02:00
Marc Weber
ccb2e9a832
Adding multiple versions of sbt. Probably you want to use the latest(default).
2013-06-19 02:45:40 +03:00
Peter Simons
b08e12b37a
Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"
...
This reverts commit abc7591aaf
, reversing changes
made to 6b1ebeccf2
, because they broke half the
packages in stdenv-updates: http://hydra.nixos.org/eval/927013 has further
details.
2013-06-17 10:19:15 +02:00
Michael Raskin
abc7591aaf
Merge pull request #567 from MarcWeber/submit/cmake-improvement
...
experimental/cmake-improvement
2013-06-13 05:47:20 -07:00
Rickard Nilsson
a7dbbd2e25
New package: sbt 0.12.3, a Scala build tool
2013-05-30 12:12:19 +02:00
Marc Weber
f7ef08e5cd
experimental/cmake-improvement
...
set CMAKE_LIBRARY_PATH, CMAKE_INCLUDE_PATH based on NIX_CFLAGS_COMPILE and
NIX_LDFLAGS so that cmake's find_library like functions find all the libraries
gcc knows about thanks to the gcc wrapper
This is particular useful with myEnvFun which then also sets those CMAKE_* env
variables.`
Because setup.sh has to change this causes many rebuilds - thus it should be
included in a stdenv-update like branch
Also cmake builds in parallel perfectly fine
update cmake to latest minor number, I didn't change the patches,
just reapplied them manually recordin a new patch
2013-05-28 16:22:45 +02:00
Rob Vermaas
d5f7976aef
Fix maintainers attribute
2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20
Add myself as maintainer for several packages
...
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Bjørn Forsman
40d35e4bd5
ninja: include package name in source archive path
...
So that the nix store path becomes this:
/nix/store/HASH-ninja-1.2.0.zip.drv
instead of this anonymous path:
/nix/store/HASH-v1.2.0.zip.drv
2013-05-19 14:39:48 +02:00
Bjørn Forsman
7f1509aba6
ninja: use version attribute
...
...to avoid the risk of downloading a different version than the package
name suggests (i.e. on the next version bump).
2013-05-11 12:01:33 +02:00
Bjørn Forsman
beb2a7a579
ninja: add description and license
2013-05-11 12:01:31 +02:00
Bjørn Forsman
5ab346a327
ninja: move out of pythonPackages
...
ninja is a build system written in C++ that just happens to use python
to build/install *itself*. It is not a "python package".
After this commit, ninja will be at pkgs.ninja instead of
pkgs.pythonPackages.ninja.
2013-05-11 12:01:00 +02:00
Bjørn Forsman
9fa9afe71e
buildbot-slave: new package
...
Tested with buildbot (master).
2013-05-08 22:26:43 +02:00
Bjørn Forsman
a36577367e
buildbot: bump to version 0.8.7p1 (latest stable)
...
* 0.8.7p1 doesn't contain *.info documentation; use manpage
instead
* Update meta.description to not contain the package name (redundant)
* 0.8.7p1 only builds with python dateutil==1.5, so that has to be added
as well
Runtime tested with the buildbot slave that is added in the next commit.
2013-05-08 22:09:05 +02:00
Moritz Ulrich
05f2ea2d12
Add myself (the-kenny) to the maintainer list.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 21:05:15 +01:00
Moritz Ulrich
d2cb352ad9
leiningen: Update to 2.1.2
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 20:09:39 +01:00
Peter Simons
ac86eed59c
gnumake: disable test suite on FreeBSD
...
One test fails, unfortunately, but I'm not sure what to do about it.
2013-03-25 12:44:23 +01:00
Lluís Batlle i Rossell
183b37645b
cmake setup-hook: fixing cmakeFlagsArray
...
The array wasn'te expanded properly, the spaces weren't preserved.
2013-03-12 11:31:58 +01:00
Vladimír Čunát
9bc36c9729
gnumake381: fix the patching because of gnumake
2013-02-27 15:26:56 +01:00
Vladimír Čunát
d3821edb9e
gnumake: patch the patches so it looks nice
2013-02-27 15:26:56 +01:00
Vladimír Čunát
8ad7893bfc
make: PATCHES from gentoo
...
also needed for updated firebird to build
2013-02-27 15:26:55 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Shea Levy
45f6008817
cmake setup hook: If configurePhase is set, don't override it
2013-02-07 14:03:23 -05:00
Shea Levy
6ce14a6729
leiningen: Update to 2.0.0.
...
Patch thanks to Patrick Lee.
2013-01-27 20:38:32 -05:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Shea Levy
29fd8d4eaa
cmake: Bump
2012-10-08 03:12:42 -04:00
Eelco Dolstra
9f350c653a
* Ant updated to 1.8.4.
...
svn path=/nixpkgs/trunk/; revision=34551
2012-06-18 16:58:57 +00:00
Eelco Dolstra
4f19239875
* Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
...
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes. Instead
the openjdk attribute refers to the Darwin package on Darwin.
svn path=/nixpkgs/trunk/; revision=34505
2012-06-13 14:11:52 +00:00
Michel Alexandre Salim
2c64c7fe9d
- update leiningen to 1.7.1
...
- apply patch (applied upstream) to assume rlwrap is present
- update expression to depend on rlwrap
- rebase the nix-specific patch to apply cleanly
svn path=/nixpkgs/trunk/; revision=34056
2012-05-11 03:36:13 +00:00
Ludovic Courtès
04600bbec1
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
...
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.
svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Peter Simons
e49110e221
scons: updated to version 2.1.0
...
svn path=/nixpkgs/trunk/; revision=33030
2012-03-13 08:29:18 +00:00
Yury G. Kudryashov
2a074000be
patch and fixCmakeFiles do not commute
...
svn path=/nixpkgs/trunk/; revision=32876
2012-03-08 07:59:56 +00:00
Yury G. Kudryashov
614d81046c
Remove cmake_2_8_7: default is already 2.8.7
...
svn path=/nixpkgs/trunk/; revision=32827
2012-03-06 14:35:30 +00:00
Yury G. Kudryashov
0210e20b5a
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Eelco Dolstra
55ce36faee
* Updated Leiningen to 1.7.0 (contributed by Phil Hagelberg; added a
...
call to patchShebangs to fix the reference to /bin/bash).
svn path=/nixpkgs/trunk/; revision=32698
2012-02-29 14:35:34 +00:00
Michael Raskin
4ff245c5de
Add fresh cmake
...
svn path=/nixpkgs/trunk/; revision=32611
2012-02-27 06:22:47 +00:00
Lluís Batlle i Rossell
183d05a0d7
Setting the cmake build type Release in its setup-hook, for all cmake
...
projects to be built in Release by default.
Some packages were not getting optimisation flags, like rigsofrods.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32574
2012-02-26 11:27:45 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
675e16f805
Fixing jam for i686-linux. That should allow building trigger rally.
...
svn path=/nixpkgs/trunk/; revision=32557
2012-02-25 16:47:21 +00:00
Yury G. Kudryashov
38e3d7bc86
svn merge ^/nixpkgs/trunk
...
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?
svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Yury G. Kudryashov
166e87319c
Fix cmake-2.6.4 build (add xmlrpc-c)
...
svn path=/nixpkgs/trunk/; revision=32505
2012-02-23 11:27:47 +00:00
Yury G. Kudryashov
417124626b
Add cmake-2.6.4
...
This is the minimum version required for KDE-4, so I need it to ensure that my
cmake code works with cmake-2.6.4.
svn path=/nixpkgs/trunk/; revision=32504
2012-02-23 11:27:43 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov
71c28d0e33
Use meta.platforms
...
svn path=/nixpkgs/trunk/; revision=31909
2012-01-28 14:39:56 +00:00
Eelco Dolstra
1e886749b5
* Don't replace /opt if it's followed by something other than
...
whitespace or a /, otherwise strings such as /foo/opticaldrive.c
will be broken.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31793
2012-01-23 13:16:51 +00:00
Eelco Dolstra
28780d27d1
* cmake: don't use replace-literal.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31736
2012-01-20 15:10:28 +00:00
Yury G. Kudryashov
84c0185038
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
d0c8b530e9
leiningen: added package version 1.6.2
...
svn path=/nixpkgs/trunk/; revision=31716
2012-01-19 20:34:59 +00:00
Eelco Dolstra
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
29d613ba0e
Add a warning to cmake/default.nix
...
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Eelco Dolstra
5386b47ead
* Revert. Cmake is still broken on i686-linux.
...
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov
71c6de7338
cmake-2.8.7
...
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Eelco Dolstra
bb889c3605
* Revert both r30278 (cmake upgrade) and r30307 (zlib fix to get cmake
...
to build). These are more appropriate to the stdenv branch. I'll
apply them there.
svn path=/nixpkgs/trunk/; revision=30308
2011-11-07 22:05:46 +00:00
David Guibert
29bdb369ab
update cmake
...
svn path=/nixpkgs/trunk/; revision=30278
2011-11-06 20:03:00 +00:00
Eelco Dolstra
35781b1bf3
* Cmake 2.8.5 doesn't build on i686-linux
...
(http://hydra.nixos.org/build/1181148 ), so revert to 2.8.4 for now.
svn path=/nixpkgs/branches/kde-4.7/; revision=27990
2011-07-28 14:09:16 +00:00
Eelco Dolstra
489d1be918
* Cmake updated to 2.8.5. Also added a patch that prevents Cmake from
...
looking in /usr and similar locations. However, it *will* now look
in the Nixpkgs Glibc lib and include directories. This ensures that
find_library can find libraries in Glibc.
svn path=/nixpkgs/branches/kde-4.7/; revision=27884
2011-07-21 18:21:38 +00:00
Michael Raskin
8a00dfcc18
Update teeworlds
...
svn path=/nixpkgs/trunk/; revision=26814
2011-04-13 05:47:51 +00:00
Lluís Batlle i Rossell
48748dedcb
Adding the rally game Trigger. As a side effect, I add jam.
...
svn path=/nixpkgs/trunk/; revision=26615
2011-03-30 18:45:11 +00:00