JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,695 Commits 2 Branches 0 Tags 13 GiB
2e56ba6fbd
Commit Graph

154 Commits

Author SHA1 Message Date
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
William A. Kennington III
6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III
793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Rok Garbas
0860826795 cygwin: cmake expression should not change for linux 2015-06-12 12:17:12 +02:00
Rok Garbas
277c263c1e cygwin: update patch for cmake 3.2.2 2015-06-12 12:17:12 +02:00
Eelco Dolstra
e7f1038798 Fix typo in last merge 2015-06-01 20:09:31 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
 2015-06-01 20:08:43 +02:00
Florian Friesdorf
90a97d32df cygwin cmake 2015-05-28 10:53:36 +02:00
Joel Taylor
78ef78719f Merge branch 'master' of https://github.com/NixOS/nixpkgs 2015-05-15 14:33:21 -07:00
Joel Taylor
1aef9fc4af cmake: disable building with ncurses if building without ncurses 2015-05-15 14:31:40 -07:00
Vladimír Čunát
b7fe141f6b Revert "remove cmake-2.8" 
Some packages fail with the only cmake version we've left.
This reverts commit 67199bda4e.
 2015-05-15 23:02:41 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency 
Also, don't install static libraries in jsoncpp.
 2015-05-13 18:17:26 +02:00
William A. Kennington III
64c68c5413 cmake: 3.2.1 -> 3.2.2 2015-05-01 22:27:14 -07:00
Vladimír Čunát
a8813a3db0 cmake: fix with multiple outputs, split help, refactor 
The removed configureFlags seemed to have no effect.
 2015-04-18 22:30:26 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Eric Seidel
c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
John Wiegley
d628247bdf Merge pull request #7095 from giogadi/cmake-full-install-name-staging 
Make cmake install shared libraries with full install names by default
 2015-03-30 21:47:27 -05:00
Luis G. Torres
ff35c4a5e2 Make cmake install libraries with full install names by default so that executables can find cmake-installed shared libraries at runtime on Darwin. Addresses #6821. 2015-03-30 21:25:44 -04:00
William A. Kennington III
22018c40d1 cmake: Remove obsolete openssl patch 2015-03-27 11:30:39 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
goodwillcoding
62d4564de4 fix the cmake 2.8.x detection of OpenSSL version broken in openssl 1.0.1m 
this is a follow up to security update for openssl: 1.0.1l -> 1.0.1m,
references:
 - http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386
 - http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1

(cherry picked from commit 30dd174520827c58f7d58408029f8845878dd021)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-26 11:42:02 +01:00
Thomas Tuegel
f47af9b2c8 remove cmake-3.0 2015-03-22 17:03:57 -05:00
Thomas Tuegel
3628370127 remove cmake-2.6.4 2015-03-22 17:02:32 -05:00
Thomas Tuegel
67199bda4e remove cmake-2.8 2015-03-22 17:01:45 -05:00
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
Thomas Tuegel
7e21c519ba add cmake-3.2.1 
Earlier versions of CMake have a bug in their OpenSSL version detection code.
 2015-03-21 12:32:38 -05:00
Eric Seidel
dbf3d31727 make llvm-3.5 the default and remove references to gccApple 
make perl be less dumb

revert change to release.nix
 2015-02-03 14:31:04 -08:00
Michael Raskin
ffbd1d011b Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist 2014-11-09 18:31:46 +03:00
Vladimír Čunát
381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát
abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
Eelco Dolstra
0acc4e6b26 cmake: Fix setup hook on bash < 4.0 
This matters in nix-shell and stdenvNative on Darwin.

Fixes #3204.
 2014-08-09 23:14:01 +02:00
Vladimír Čunát
02a1e85ab1 cmake, podofo: fix finding freetype-2.5 2014-06-26 18:24:44 +02: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
Petr Rockai
abd8059802 cmake: Update to latest upstream (2.8.12.2). 2014-02-15 10:27:38 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01: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
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
7f1e09c35d Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement" 
This reverts commit b08e12b37a.
 2013-06-27 15:14:32 +02: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
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
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
Shea Levy
45f6008817 cmake setup hook: If configurePhase is set, don't override it 2013-02-07 14:03:23 -05:00
Shea Levy
29fd8d4eaa cmake: Bump 2012-10-08 03:12:42 -04: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
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
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
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
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
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
Yury G. Kudryashov
cd73464fdf Mention UIs in cmake.name 
svn path=/nixpkgs/trunk/; revision=24026
 2010-10-02 05:24:39 +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
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
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
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
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
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
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
Peter Simons
6a051f96a2 Updated cmake to version 2.6.2. 
svn path=/nixpkgs/trunk/; revision=13286
 2008-11-13 21:05:01 +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
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