BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
138418 commits 1 branch 0 tags 3.8 GiB
Commit graph

99 commits

Author SHA1 Message Date
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -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
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
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
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
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
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
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
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
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
Peter Simons
047f6d20d5 Updated CMake to version 2.6.3. 
svn path=/nixpkgs/trunk/; revision=15114
 2009-04-17 13:48:22 +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
Yury G. Kudryashov
b6b6888765 cmake hooks changed 
svn path=/nixpkgs/trunk/; revision=9349
 2007-09-20 19:27:55 +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