Commit graph

164 commits

Author SHA1 Message Date
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
Peter Simons 05474e174b cmake: updated meta.platforms to reflect the fact that CMake is supposed to build on all Unix-like platforms
svn path=/nixpkgs/trunk/; revision=26512
2011-03-25 12:55:33 +00:00
Peter Simons 5ba10a94e1 cmake: add install_name_tool on Darwin to fix the build
svn path=/nixpkgs/trunk/; revision=26511
2011-03-25 12:55:29 +00:00
Yury G. Kudryashov 53a7f85871 cmake-2.8.4
svn path=/nixpkgs/trunk/; revision=26137
2011-03-02 18:49:56 +00:00
Yury G. Kudryashov 2e92a0cd12 cmake-2.8.3
svn path=/nixpkgs/trunk/; revision=25859
2011-02-09 21:08:53 +00:00
Rob Vermaas 5b408a85da build cmake only on linux and freebsd
svn path=/nixpkgs/trunk/; revision=25412
2011-01-05 10:04:49 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00