JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
334,784 Commits 2 Branches 0 Tags 12 GiB
195a583d27
Commit Graph

2448 Commits

Author SHA1 Message Date
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
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
Yury G. Kudryashov
cd73464fdf Mention UIs in cmake.name 
svn path=/nixpkgs/trunk/; revision=24026
 2010-10-02 05:24:39 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Yury G. Kudryashov
139de1ea2f Don't try to build Qt guis if qt is unsupported on the platform 
svn path=/nixpkgs/trunk/; revision=23812
 2010-09-15 18:52:07 +00:00
Yury G. Kudryashov
48c13f4096 Update cmake 
Use system libraries, make curses optional, add optional qt4 gui etc.

svn path=/nixpkgs/trunk/; revision=23810
 2010-09-15 18:37:21 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
 2010-08-29 11:09:23 +00:00
Eelco Dolstra
a9da4153c4 * Fix an infinite recursion in scons. 
svn path=/nixpkgs/trunk/; revision=23464
 2010-08-26 13:30:25 +00:00
Peter Simons
25308dd098 pkgs/development/tools/build-managers/scons: updated to version 2.0.1 
svn path=/nixpkgs/trunk/; revision=23457
 2010-08-26 12:24:16 +00:00
Lluís Batlle i Rossell
75a9a710fd Fixing the gnumake log.patch so it applies to the new gnumake 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23308
 2010-08-21 15:54:48 +00:00
Ludovic Courtès
58b1dfe0fe GNU Make 3.82. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23281
 2010-08-20 15:26:41 +00:00
Eelco Dolstra
6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Ludovic Courtès
c1cd5e04af Ant: Fix typo. 
svn path=/nixpkgs/trunk/; revision=21991
 2010-05-26 15:10:24 +00:00
Ludovic Courtès
c228b1a957 Ant/GCJ: Clean up. 
svn path=/nixpkgs/trunk/; revision=21990
 2010-05-26 14:53:13 +00:00
Peter Simons
fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression. 
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
 2010-05-09 16:01:44 +00:00
Marc Weber
8d9af6d596 patch provided by David Brown adding simple-build-tool which builds Scala packages 
svn path=/nixpkgs/trunk/; revision=21671
 2010-05-08 21:51:47 +00:00
Peter Simons
69857a11c7 pkgs/development/tools/build-managers/scons: bumped to version 1.3.0 
svn path=/nixpkgs/trunk/; revision=21025
 2010-04-12 11:21:22 +00:00
Lluís Batlle i Rossell
bc54fc96da Updating cmake. Big kde rebuild to come. 
svn path=/nixpkgs/trunk/; revision=20996
 2010-04-09 16:04:11 +00:00
Lluís Batlle i Rossell
4a6cfd435e Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module. 
That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

svn path=/nixpkgs/trunk/; revision=20921
 2010-04-01 18:19:44 +00:00
Marc Weber
1d5910bb94 add Gradle 0.8 
patch provided by Francois Perrad

svn path=/nixpkgs/trunk/; revision=20863
 2010-03-29 23:36:35 +00:00
Rob Vermaas
e260b68122 added NIX_ANT_ARGS to ant wrapper 
svn path=/nixpkgs/trunk/; revision=20334
 2010-03-02 15:54:54 +00:00
Lluís Batlle i Rossell
e0ff817c40 Big kde-related update. 
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965
 2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Ludovic Courtès
54322bbd02 BuildBot: Fix erroneous absolute paths. 
svn path=/nixpkgs/trunk/; revision=19415
 2010-01-13 21:34:50 +00:00
Rob Vermaas
5a787b0ab7 ant version 1.8.0RC1 
svn path=/nixpkgs/trunk/; revision=19400
 2010-01-13 15:20:24 +00:00
Ludovic Courtès
8670c51227 Merge the two BuildBot expressions. 
svn path=/nixpkgs/trunk/; revision=19358
 2010-01-11 17:00:46 +00:00
Lluís Batlle i Rossell
dae3eb2383 Merging from trunk. 
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
 2009-12-12 18:39:09 +00:00
Lluís Batlle i Rossell
2dd9764a9e Major update to cmake, from 2.6.4 to 2.8.0. 
I tried some kde4 builds, and the worked.

svn path=/nixpkgs/trunk/; revision=18890
 2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell
f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild 
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
 2009-12-10 22:19:52 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build: 
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
 2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
57a544d59c Adding 'remake': a patched and modernized version of GNU make utility that adds 
improved error reporting, the ability to trace execution in a comprehensible
way, and a debugger.

svn path=/nixpkgs/trunk/; revision=17744
 2009-10-11 15:03:13 +00:00
Ludovic Courtès
a5945916f0 More Apache mirrors; use them for Ant. 
svn path=/nixpkgs/trunk/; revision=17563
 2009-10-01 09:07:09 +00:00
Ludovic Courtès
c1f7e5ff90 ant-gcj: Add missing file. 
svn path=/nixpkgs/trunk/; revision=17402
 2009-09-24 14:50:42 +00:00
Ludovic Courtès
18e946cb9d Add Apache Ant, built from source with GCJ. 
svn path=/nixpkgs/trunk/; revision=17401
 2009-09-24 14:49:15 +00:00
Peter Simons
2ec77fdc7e scons: don't overwrite a pre-existing PYTHONPATH in the wrapper 
svn path=/nixpkgs/trunk/; revision=16342
 2009-07-13 20:08:44 +00:00
Peter Simons
afa04f4576 Updated scons to version 1.2.0. 
svn path=/nixpkgs/trunk/; revision=16111
 2009-06-30 18:51:01 +00:00
Rob Vermaas
e89d4a39c6 * added checkstyle, pmd, jdepends. 
* changed version of ant to 1.7

svn path=/nixpkgs/trunk/; revision=15995
 2009-06-18 12:52:10 +00:00
Lluís Batlle i Rossell
94d2e57c62 Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while 
before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
 2009-06-03 09:19:19 +00:00
Lluís Batlle i Rossell
07caf9a9bd Updated cmake 
svn path=/nixpkgs/trunk/; revision=15807
 2009-05-31 08:34:57 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally. 
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
 2009-04-18 22:22:51 +00:00
Peter Simons
047f6d20d5 Updated CMake to version 2.6.3. 
svn path=/nixpkgs/trunk/; revision=15114
 2009-04-17 13:48:22 +00:00
Peter Simons
2796d3a185 Updated fixCmakeFiles to handle file paths that contain whitespace. 
svn path=/nixpkgs/trunk/; revision=15113
 2009-04-17 13:48:11 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Peter Simons
c8e6fa7dd6 cmake: added (low priority) expression for 2.6.3-rc-15. 
svn path=/nixpkgs/trunk/; revision=14124
 2009-02-19 14:41:51 +00:00
Eelco Dolstra
62fa1a418f * cmake setup hook: override the whole configurePhase rather than 
setting a postUnpack hook.

svn path=/nixpkgs/trunk/; revision=14074
 2009-02-13 14:43:01 +00:00
Eelco Dolstra
808bf6d34a * Make the nested output patch in GNU Make runtime configurable (by 
setting the NIX_INDENT_MAKE variable; disabled by default) so we
  don't need a separate gnumakeNix package.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13807
 2009-01-19 18:49:58 +00:00
Peter Simons
6fb297513a Committing Lluís Batlle's submissions from mailing list posting 
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
 2009-01-12 21:12:07 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=13299
 2008-11-14 16:57:19 +00:00
Peter Simons
6a051f96a2 Updated cmake to version 2.6.2. 
svn path=/nixpkgs/trunk/; revision=13286
 2008-11-13 21:05:01 +00:00
Peter Simons
85546a8e31 Updated scons and twisted; added buildbot. 
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to
   ensure that the python binary finds its library files.

 * Updated Twisted from 2.5 to 8.1.

 * Added an expression for buildbot.

svn path=/nixpkgs/trunk/; revision=12782
 2008-09-01 15:11:09 +00:00
Eelco Dolstra
8f309bc83e * Add a meta attribute. 
svn path=/nixpkgs/trunk/; revision=12415
 2008-07-24 13:02:22 +00:00
Peter Simons
a16eebd0a6 Cosmetic, no functional change intended. 
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
 2008-07-18 20:11:25 +00:00
Ludovic Courtès
4793092374 GNU Make: Make `nix-log2xml' support optional. 
One question remains: how to make the option available to the user.
`getConfig' is nice but useless as long as `useFromStdenv' prevails.

svn path=/nixpkgs/trunk/; revision=12311
 2008-07-07 22:02:36 +00:00
Peter Simons
4842708ca1 scons: install library files in python's site-package directory 
svn path=/nixpkgs/trunk/; revision=12179
 2008-06-23 22:24:12 +00:00
Michael Raskin
8b90ef4690 Python must be propagatedBuildInputs now that they are using env 
svn path=/nixpkgs/trunk/; revision=12158
 2008-06-19 07:24:43 +00:00
Peter Simons
bc4f5932ad scons: updated to version 0.95.5 and added selectVersion dispatcher 
Scons is not only a tool, it's also a python library. However, the
modules are installed in ~/.nix-profile/lib/scons-${version} -- not in
python's "site-packages" directory -- so python won't find the library
without further help. Maybe there should be a symlink in nix-profile? I
guess there should, but I didn't know how to write that into the
expression.

svn path=/nixpkgs/trunk/; revision=12157
 2008-06-18 22:48:54 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Marc Weber
1f15a6abfd updated cmake to 2.6.0 (Pierre on #cmake told me it's almost compatible with 2.4) so I don't expect any trouble 
svn path=/nixpkgs/trunk/; revision=11814
 2008-05-11 14:52:09 +00:00
Eelco Dolstra
09ab596e0f * Remove calls to fail(). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11690
 2008-04-23 07:34:20 +00:00
Tobias Hammerschmidt
7b9624cda6 doh! 
svn path=/nixpkgs/trunk/; revision=11594
 2008-04-11 22:10:44 +00:00
Tobias Hammerschmidt
085dc5bc74 added ant-contrib, expression works but is really really ugly - maybe someone else can have a look at it? 
svn path=/nixpkgs/trunk/; revision=11588
 2008-04-11 21:32:00 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
 2008-02-20 23:02:41 +00:00
Yury G. Kudryashov
e2751942c7 cmake: 2.4.8 added 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10611
 2008-02-10 17:41:51 +00:00
Yury G. Kudryashov
62676e09eb setup-hooks using addToSearchPath 
I've accidentially reverted setup-hooks while merging with trunk. Correcting it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9821
 2007-12-01 20:05:26 +00:00
Yury G. Kudryashov
8792fb81c7 Merged with trunk. 
The following is autogenerated by git:

commit 9aaede75e73be646f35069d0717c8c70004ba3f0
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 18:37:23 2007 +0000

    This was needed for me to get a working gnome-doc-utils package

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:30:34 2007 +0000

    gdb upgraded

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit bb908853924046681d1cd6a85b05273aed14fd9f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:29:11 2007 +0000

    gphoto2 upgraded to 2.4.0: all-packages.nix

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 619c7004d7140d6016927cd1114fd778aca3ecce
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:53 2007 +0000

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit f09310ed8403428021d2d751e273fc0add438032
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:17 2007 +0000

    gphoto2 upgraded to 2.4.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 26d5cc1628e51853fdb9a7d162361b3a13581461
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:27:27 2007 +0000

    missing catalog added. Now you can open files

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:09:32 2007 +0000

    nix expression creating startup wrapper for jedit

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 69701148e45d29b1712c9f14628459def54be076
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:06:53 2007 +0000

    The nice programmers editor jedit is now built on nix as well.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 15ecdd411e78b952d8004323ec871ce6c4969c2e
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:41:15 2007 +0000

    Missing gecko now.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6975eb6f2a972cca2adb2943190a41880e3bedf7
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:36:15 2007 +0000

    Fix path of libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:34:02 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7fb35510feb89fecc9d92810a723baead232dff4
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:33:36 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7a9eb1e172ef5b111556d78a30003a87aee7f775
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:24:24 2007 +0000

    libnotify is missing

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 433cc0578ce00860ddfac7d7934818ec0584f6e1
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:08:04 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 194a84b18965e9a3c8f9fa1305fac57690e683cb
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:07:30 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1d832560cf94bfa6793d90ff43f2235415bc3958
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:49:02 2007 +0000

    Added openftd. Doesnt work (yet)

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:08:20 2007 +0000

    * GCC 3.4: pass --disable-multilib to make it build on x86_64.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 03:45:42 2007 +0000

    bzip2 dependency added in a couple of places

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 128ac8a7ee8668fc933f4933a66f491c44234379
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 23:47:03 2007 +0000

    Added python to libgsf dependencies

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1847defee6331b03ba8a54ae9e3e68033310f7a2
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 17:05:45 2007 +0000

    * Use latest Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit cb1992780c20cb5885cf4d3932e7352f8b912533
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 04:23:46 2007 +0000

    Added a currently more functional URL for libgcrypt

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 9d099dbef1a5721065bff5f2edd73844c829f538
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:16:03 2007 +0000

    facile: fixed a typo

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 031c5b7d0797f5eee7be0a06856530c29adee710
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:11:56 2007 +0000

    Added kde-4

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:08:58 2007 +0000

    Added new kde-4 staff

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 18edb608ee7822438d4b2dc2a76af7567efd646a
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:48:40 2007 +0000

    kde-4: removed old staff from kde-4 dir

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:46:48 2007 +0000

    lame: upgrade to 3.97

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52f8f699f29b6def41eee392f489c7e8ecd9399d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:44:21 2007 +0000

    libgsf: meta written

    0.14.7 in my previous commit was a typo: 1.14.7 of course

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:40:39 2007 +0000

    libgsf: upgraded to 0.14.7

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7787b342945cb13856168a353fdc9b0062e5f32b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:37:51 2007 +0000

    clucene: upgrade, kde4: remove

    clucene-core upgraded to 0.9.20
    clucene-contrib removed (can't find any version later than 0.9.16a and don't
    know whether it's compatible with new clucene-core)
    kde4: old staff removed, will add new tonight

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b4900dece179788dfb8879518b8ec639ba089980
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:25:32 2007 +0000

    Strigi removed

    I'll add a version from kdesupport trunk today

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ffad224993440be069d4f15cf5e73ed018979311
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:23:36 2007 +0000

    dbus-glib upgraded to 0.74, meta written

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:13:29 2007 +0000

    xine-lib: upgraded to 1.1.8

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:11:37 2007 +0000

    chmlib: upgraded to 0.39

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:05:11 2007 +0000

    Added facile library

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:03:29 2007 +0000

    libgcrypt-1.3.1

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ca314a236b855b73024677f6dc5bc021070c4e72
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:49:24 2007 +0000

    Fixed a typo in ocaml-3.10.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b3fa79d09289ab61a30f63692e7c475d0aec142e
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:39:58 2007 +0000

    ocaml: Added 3.10.0, using getVersion staff

    I've added the latest (3.10.0) version of ocaml and let the user choose default
    version.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 853d65d8a9fd65f7bf918c42342baf6690008f54
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:22:06 2007 +0000

    Let user to choose python2.4 or python2.5

    Currently, there is some code duplication. I'll try to rewrite it without
    modifying resulting derivations.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:57:26 2007 +0000

    useVersion function added

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:41:01 2007 +0000

    git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit dd564f36bd54d4900aefa759bc94cfac7496d1a2
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 19:07:38 2007 +0000

    added small script fixing the shebang (#!/bin/...) path.
    It searches the PATH env variable for the same executable.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2f9213e49fbaa40634ccb9699e44aec239212aea
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 01:20:17 2007 +0000

    Now SVN Nix builds as a purely alternative Nix choice

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 016b6bfcc67244964251d68d86e1fa6de2062e54
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 15:52:16 2007 +0000

    Added possibility to use non-default Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 89f53d7b8dae8d4ec537322340be212602524102
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 01:26:54 2007 +0000

    implemented proposal by niksnut.
    Now you have to use either date= or tag= when specifying cvs revision

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:45:47 2007 +0000

    * Symlink $out/bin to $out/libexec.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d454ab8861882e18ed3b79287727890ec6668455
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:42:13 2007 +0000

    Beta-version of builderDefs fixes.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 959e395c49753d902201d457cee102b40608d3f9
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:12:50 2007 +0000

    djview location corrected

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52530f607a15017e94225ee50e2698963325ed80
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:51:46 2007 +0000

    * Revert the setup hook changes on the trunk (but they remain on the
      stdenv-updates branch).

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 977bdfec49557f48bc1e121e3375c21d4991434f
Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:48:33 2007 +0000

    * added Haskell package gtk2hs

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
 2007-11-16 21:05:15 +00:00
Eelco Dolstra
7a424b47f6 * Revert the setup hook changes on the trunk (but they remain on the 
stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652
 2007-11-12 13:51:46 +00:00
Yury G. Kudryashov
16b44ea14d Some setup-hooks with new syntax; pkgconfig upgraded to 0.22 
svn path=/nixpkgs/trunk/; revision=9645
 2007-11-11 20:32:43 +00:00
Michael Raskin
3dc3021d01 Renamed replace executable to replace-literal (Yurii Kudryashov noticed conflict with MySQL) 
svn path=/nixpkgs/trunk/; revision=9376
 2007-09-27 14:48:09 +00:00
Yury G. Kudryashov
b6b6888765 cmake hooks changed 
svn path=/nixpkgs/trunk/; revision=9349
 2007-09-20 19:27:55 +00:00
Eelco Dolstra
ea9667ab18 * Fixed some more URLs. 
svn path=/nixpkgs/trunk/; revision=9294
 2007-09-11 11:15:37 +00:00
Eelco Dolstra
e68cfbe1b4 * Symlink to the lib/ and etc/ directories of the real Ant, 
OpenOffice needs that.

svn path=/nixpkgs/trunk/; revision=9261
 2007-09-06 15:30:38 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/. 
svn path=/nixpkgs/trunk/; revision=9201
 2007-08-27 13:42:00 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
 2007-08-24 12:32:36 +00:00
Yury G. Kudryashov
33f6eb6b03 Some upgrades needed for kde4: 
* alsa-lib: 1.0.12 -> 1.0.14
* alsa-utils: 1.0.13 -> 1.0.14
* strigi: 0.5.1 -> 0.5.3dev
* libgpg-error: 1.0 -> 1.4
* gpgme: 1.0.3 -> 1.1.4
* cmake: 2.4.6 -> 2.4.7

* Some kde4 components added (not compilable yet).
* icu4c-3.6 added
* boost: added unicode support to RegEx, switched to "system" layout

svn path=/nixpkgs/trunk/; revision=9068
 2007-08-08 13:20:18 +00:00
Yury G. Kudryashov
67d41efde1 Added some parts of kde-4. It doesn't work yet, but I need version control 
svn path=/nixpkgs/trunk/; revision=9049
 2007-08-05 13:54:42 +00:00
Michael Raskin
26ad059fb5 Added cdrkit to burn DVDs. 
svn path=/nixpkgs/trunk/; revision=8958
 2007-07-07 22:31:37 +00:00
Eelco Dolstra
030b604a1b * Doh. 
svn path=/nixpkgs/trunk/; revision=8756
 2007-05-24 15:23:44 +00:00
Eelco Dolstra
45c7aa04d7 * Don't look in /usr/lib and /usr/include for certain kinds of 
dependencies.  (NIXPKGS-45)

svn path=/nixpkgs/trunk/; revision=8755
 2007-05-24 15:20:40 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Martin Bravenboer
530657fb19 The real gnumake 3.80 
svn path=/nixpkgs/trunk/; revision=5491
 2006-06-22 10:27:35 +00:00
Eelco Dolstra
169315dc1d * Revive GNU make 3.80 for programs that need it. 
svn path=/nixpkgs/trunk/; revision=5488
 2006-06-22 09:38:32 +00:00
Eelco Dolstra
2c1e5d0cfa * Latest GNU Make. 
svn path=/nixpkgs/trunk/; revision=5480
 2006-06-21 15:53:46 +00:00
Christof Douma
1fa4c66b73 added version to uuagc 
added: noweb, lua-5.x, lua-4.x, mk, qc-- (as qcmm)

svn path=/nixpkgs/trunk/; revision=4681
 2006-02-02 17:07:07 +00:00
Eelco Dolstra
3c614ad92f * Added the build manager SCons. 
svn path=/nixpkgs/trunk/; revision=4673
 2006-02-02 12:59:41 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Martin Bravenboer
8e2ba28fe1 Accept NIX_ANT_OPTS 
svn path=/nixpkgs/trunk/; revision=4132
 2005-10-25 17:57:36 +00:00
Martin Bravenboer
4c70ef7e5d Cleaning up the java naming conventions 
svn path=/nixpkgs/trunk/; revision=3871
 2005-09-17 23:58:51 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Eelco Dolstra
aa05801439 * Ant updated to 1.6.5. 
svn path=/nixpkgs/trunk/; revision=3191
 2005-06-17 11:41:52 +00:00
Martin Bravenboer
e3a47a07ed Upgrades of postgresql, jetty, and ant to the latest versions. 
svn path=/nixpkgs/trunk/; revision=3122
 2005-05-24 14:57:41 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra
1ab4a9324c * The `patch' command is now part of stdenv, so it no longer needs to 
be passed to derivations that need to apply patches.
* GCC 3.4 is now the default compiler (old GCC renamed to `gcc-3.3').
* The temporary GCCs built during the stdenvLinux bootstrap are now
  built without C++ support and without profiling.
* Remove fixincl in GCC 3.4 to prevent a retained dependency on the
  previous GCC.
* Always set $prefix in setup.sh, even when there is no configure
  script.

svn path=/nixpkgs/trunk/; revision=1444
 2004-09-18 17:23:18 +00:00
Martin Bravenboer
007765937b These Ants just keep getting better\!. Also added prelim. version of PostgreSQL. 
svn path=/nixpkgs/trunk/; revision=1326
 2004-08-24 11:38:40 +00:00
Martin Bravenboer
c70943c332 Improved Ants in Nix. The names of the various Ants now reflects the j2sdk configuration: ant-j2sdk-1.4.2, ant-j2sdk-1.5.0, ant-blackdown 
svn path=/nixpkgs/trunk/; revision=1325
 2004-08-24 11:26:26 +00:00
Eelco Visser
7f3a3764ee - upgrade ant to 1.6.2 
- comment out ant15 since nix-env cannot make the distinction
- installation of tomcat 5

svn path=/nixpkgs/trunk/; revision=1299
 2004-08-20 10:14:55 +00:00
Martin Bravenboer
3f371bfacf Improved Ant 
svn path=/nixpkgs/trunk/; revision=1254
 2004-08-09 21:28:26 +00:00
Martin Bravenboer
ad8c419f15 Minor fix' 
svn path=/nixpkgs/trunk/; revision=1166
 2004-07-12 13:41:37 +00:00
Martin Bravenboer
e86a4a1112 Added the Ant wrapper. The ant script in this wrapper sets the config in environment variables and invokes core-ant. 
svn path=/nixpkgs/trunk/; revision=1149
 2004-07-10 16:17:48 +00:00
Martin Bravenboer
feeff4dfb1 Working on improved Ant package in Nix: do configuration in wrapper scripts. This is the 'core' Ant. 
svn path=/nixpkgs/trunk/; revision=1148
 2004-07-10 13:59:21 +00:00
Eelco Dolstra
beaff0a892 * Ensure that when building gcc, libstdc++ is linked against the 
libgcc of the gcc being built, not the gcc building it.
* Only include a directory in the rpath of an executable/library if it
  is actually used.  Before, the `/lib' directory of every build input
  was added to the rpath, causing many unnecessary retained
  dependencies.  For instance, Perl has a `/lib' directory, but most
  applications whose build process uses Perl don't actually link
  against Perl.  (Also added a test for this.)
* After building glibc, remove glibcbug, to prevent a retained
  dependency on gcc.
* Add a newline after `building X' in GNU Make.

svn path=/nixpkgs/trunk/; revision=911
 2004-04-04 22:02:41 +00:00
Eelco Dolstra
798a009f1d * Print `building FOO' messages on standard error, not standard 
output.  Some build processes actually parse the output of Make
  (like Firefox).

svn path=/nixpkgs/trunk/; revision=908
 2004-04-02 17:45:20 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows 
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
 2004-03-19 16:53:04 +00:00
Martin Bravenboer
d9cebb072f Added Apache Ant, including configuration of JAVA_HOME and ANT_HOME. Currently only the shell script is patched, but this one is used most in practice. 
svn path=/nixpkgs/trunk/; revision=718
 2004-01-25 00:50:00 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs. 
svn path=/nixpkgs/trunk/; revision=502
 2003-11-14 09:59:13 +00:00