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
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
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
5ff40ddedf
add get* helper functions and mass-replace manual outputs search with them
2016-04-25 13:24:39 +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
80270e2019
cmake: maintenance updates 3.4.0 -> 3.4.3
2016-02-03 16:59:38 +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
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
1aef9fc4af
cmake: disable building with ncurses if building without ncurses
2015-05-15 14:31:40 -07: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
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 30dd174520
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
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
