alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
101886 commits 217 branches 121 tags 4.5 GiB
Commit graph

138 commits

Author SHA1 Message Date
Vladimír Čunát 5cf7b7c109
cmake: 3.7.1 -> 3.7.2 2017-02-20 21:29:52 +01:00
Daiderd Jordan 538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Aristid Breitkreuz 76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Vladimír Čunát 31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Will Dietz 48d7c7751a cmake: bootstrap in parallel 
Builds on previous commit so this happens without needing stdenv.glibc.
 2016-10-13 08:07:58 -05:00
Will Dietz 07849e749a cmake: When there is no stdenv.glibc, still fix search paths. 
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
 2016-10-13 08:05:37 -05:00
Eelco Dolstra e03d1ababa cmake-2.8: Fix build 
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
 2016-09-20 11:56:11 +02:00
Michael Raskin dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Tuomas Tynkkynen 3364230d56 Disable bunch of non-compiling packages on Darwin 
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
 2016-09-01 20:39:33 +03:00
Tuomas Tynkkynen 8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
Alexey Shmalko 176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos 5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02:00
Thomas Tuegel d5d4606190 Revert "cmake: use supplied RPATH instead of guessing" 
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
 2016-05-31 16:30:15 -05:00
Thomas Tuegel 8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Thomas Tuegel b70d728ed7 cmake: use single output 
Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
 2016-05-06 16:26:40 -05:00
Nikolay Amiantov 96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov 5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Thomas Tuegel 491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Nikolay Amiantov 52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát 80270e2019 cmake: maintenance updates 3.4.0 -> 3.4.3 2016-02-03 16:59:38 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Thomas Tuegel a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 1087020a46 cmake: invoke configure hooks correctly 
Otherwise, the multiple-outputs hooks will not fire correctly.
 2016-01-31 21:15:03 -06:00
Tobias Geerinckx-Rice 32d40f0f98 Remove no longer (or never) referenced patches 
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
 2016-01-24 02:02:21 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát f2ad4a47e8 cmake: remove conditional patch that no longer applies 
Close #11290. The patch will no longer apply on *any* platform.
 2015-11-29 08:58:39 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
William A. Kennington III 050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Vladimír Čunát 1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
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