3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

257 commits

Author SHA1 Message Date
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
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
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
Peter Simons baa9150130 pkgs/development/tools/build-managers/scons: cosmetic build improvements
- The flag "--mandir" has no effect with setup.py. Instead, "--install-data"
   must be used.

 - Don't generate wrappers for trivial symlink aliases in bin.

 - Prefer symlinks over hard-links.

 - The dependencies of this expression don't need to be propagated.

svn path=/nixpkgs/trunk/; revision=25021
2010-12-07 11:41:25 +00:00
Peter Simons 1e1610b37e pkgs/development/tools/build-managers/scons: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25009
2010-12-06 18:01:28 +00:00
Ludovic Courtès e729128faa GNU Make 3.82: Ignore test failures on Darwin.
See <http://hydra.nixos.org/build/740597/nixlog/1/raw>.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24626
2010-11-09 13:12:26 +00:00
Ludovic Courtès 7ecc652da4 Re-add GNU Make 3.81.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24623
2010-11-09 09:14:07 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Russell O'Connor 9bcb9bcea1 Patching scons to give an absolute path to python rather than using ".../bin/env python"
When users install scons, users no longer need to also install python in their environment.


svn path=/nixpkgs/trunk/; revision=24425
2010-10-22 19:10:02 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00