Commit graph

222 commits

Author SHA1 Message Date
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
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
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