Commit Graph

318 Commits

Author SHA1 Message Date
Thomas Tuegel
cedd23b215
Merge pull request #191281 from r-ryantm/auto-update/cmake
cmake: 3.24.1 -> 3.24.2
2022-09-21 10:39:59 -05:00
R. Ryantm
d2749ccd12 cmake: 3.24.1 -> 3.24.2 2022-09-15 07:47:03 +00:00
Artturin
b1149dc303 cmake: add check-pc-files hook to check broken pc files
see nixpkgs pr 172150
2022-09-08 21:27:47 +03:00
Vladimír Čunát
47cfdd695f
Merge #187582: cmake: 3.24.0 -> 3.24.1 (into staging) 2022-08-25 13:35:59 +02:00
Sergei Trofimovich
da0a5e5f3b cmake: fix crash on CC without libc support
Without this change pkgsLLVM fails to build any packages
as compiler-rt fails early in cmake:

    CMake Error at ...-cmake-3.24.0/share/cmake-3.24/Modules/Platform/UnixPaths.cmake:53 (file):
      file STRINGS file
      "...-x86_64-unknown-linux-gnu-clang-wrapper-11.1.0/nix-support/orig-libc-dev"
      cannot be read.

It's a regression caused by 871cf9f7b3 "cmake: detect libc location
at runtime #181431" where we started using `orig-libc-dev` as a libc pointer.

During pkgsLLVM pootstrap first compiler has no libc support yet.

The change skips runtime detection if there are no libc signs.
2022-08-21 19:18:11 +01:00
R. Ryantm
410a9ae700 cmake: 3.24.0 -> 3.24.1 2022-08-20 10:52:56 +00:00
github-actions[bot]
28612f43c8
Merge master into staging-next 2022-08-18 12:01:28 +00:00
Nick Cao
ef640cb346
Revert "cmake_3_23: bring this version back (temporarily, I hope)"
This reverts commit 8334328f11.
2022-08-16 21:59:20 +08:00
Vladimír Čunát
4a944dfeac
Merge branch 'staging' into staging-next 2022-08-16 13:12:47 +02:00
Vladimír Čunát
8334328f11
cmake_3_23: bring this version back (temporarily, I hope) 2022-08-16 10:40:27 +02:00
Anderson Torres
a1d622bf68
Merge pull request #181431 from stephank/feat/cmake-libc
cmake: detect libc location at runtime
2022-08-12 17:07:06 -03:00
Jonathan Ringer
b34a4df857
[staging] cmake: 3.23.3 -> 3.24.0 2022-08-05 11:32:50 -07:00
Sandro
7d311bd0c9
Merge pull request #183982 from r-ryantm/auto-update/cmake 2022-08-05 19:35:10 +02:00
Jonathan Ringer
3d17b4c305
cmake/setup.sh: allow for cmakeBuildDir to be configured 2022-08-02 14:19:33 -07:00
R. Ryantm
a4cfeb7cf1 cmake: 3.23.2 -> 3.23.3 2022-07-30 15:22:57 +00:00
Stéphan Kochen
871cf9f7b3 cmake: detect libc location at runtime 2022-07-14 07:08:57 +02:00
Josef Kemetmüller
f7414e2b3a cmake/setup-hook.sh: Don't skip build-RPATH
This should simplify using `nix-shell -A` or `nix develop` to develop
CMake based projects. CMake features a mechanism to use a different
RPATH for all executables in the build directory and only rewrite these
RPATHs on installation. This makes it possible to run executables
already from the build directory without having to set LD_LIBRARY_PATH.
This should simplify the checkPhase for cmake based projects and
hopefully not break anything.

Fixes: #22060
2022-07-04 02:58:50 +03:00
Vladimír Čunát
aab2ab55a4
Merge #167671: cmake: Fix a darwin-specific patch
...into staging-next.  I assume that applying on non-Darwin was
just temporary for testing, so I cut that part to avoid rebuilds.
2022-07-02 15:30:32 +02:00
R. Ryantm
54a65b5cd5
cmake: Fix darwin-specific remove-systemconfiguration-dep patch
Unbreaks cmakeMinimal on darwin.

Co-authored-by: Ryan Burns <rtburns@protonmail.com>
2022-06-27 23:54:11 +08:00
AndersonTorres
fc881d3a4b cmake: 3.22.3 -> 3.23.2 2022-06-22 22:11:27 -03:00
AndersonTorres
cd39674dc0 cmake: add myself as maintainer 2022-06-22 22:11:27 -03:00
AndersonTorres
02155ca916 cmake: rename patches
Because it is easier to look at them as a block, not polluting the directory
listing so much.
2022-06-22 22:11:09 -03:00
AndersonTorres
d6f12ab2f6 cmake: use a list of suitable uiToolkits instead of Boolean values
Also, aborts when the list contains anything besides the acceptable options.
2022-06-22 21:52:07 -03:00
AndersonTorres
033cfacaf2 cmake: reformat expression 2022-06-21 23:04:07 -03:00
Rick van Schijndel
010f6ee30d
treewide: mark broken for darwin 2022-05-30 13:42:58 +02:00
R. Ryantm
28b3e0a8a0 cmake: 3.22.2 -> 3.22.3 2022-03-05 15:48:05 +00:00
Sandro Jäckel
29c409f824 cmake: 3.22.1 -> 3.22.2 2022-02-01 10:54:38 -08:00
ajs124
5161de0a1e cmake_2_8: drop 2022-01-21 03:45:24 +01:00
Sergei Trofimovich
653ff61cb6
cmake: 3.21.2 -> 3.22.1 (#147818)
https://cmake.org/cmake/help/latest/release/3.22.html

Co-authored-by: Winter <winter@winter.cafe>
2021-12-25 17:06:52 -05:00
Felix Buehler
7678aa30b4 pkgs/development: rename name to pname&version 2021-11-30 21:32:28 +01:00
toonn
982f7228ff cmake: Temporarily pass flags
To mimic LLVM 7 behavior we need to pass `-Wno-elaborated-enum-base` in
`CXXFLAGS`. Ideally this gets fixed upstream and won't be necessary.
2021-11-24 15:17:13 -08:00
Luke Granger-Brown
a8be3a74cc cmake: revert cmake support for 10.4 Tiger
This is a reversed patch of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6426.

_CURRENT_OSX_VERSION isn't set properly, which causes this condition to fail,
which means we don't get CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG which means
we can't compile libcxx. Ugh.
2021-09-11 15:12:21 +01:00
Luke Granger-Brown
daa1175255 cmake: 3.21.1 -> 3.21.2
3.21.1 has a bug which causes darktable to fail to compile (passes weird
  arguments to ar in the ninja-generated files), which is fixed in
  3.21.2.
2021-09-11 03:24:26 +00:00
Jan Tojnar
7a04c2ad68 Merge branch 'staging-next' into staging
- boost 171 removed on staging-next
- re-generated node-packages.nix

; Conflicts:
;	pkgs/development/java-modules/m2install.nix
;	pkgs/development/node-packages/node-packages.nix
;	pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sebastián Mancilla
8f94a33b38 treewide: ensure pre/post phase hooks are strings
Some derivations use lib.optional or lib.optionals when setting pre/post
phase hooks. Ensure the proper lib.optionalString is used.
2021-08-20 19:08:42 -04:00
Tobias Mayer
4aac491f18 cmake: Fix on darwin-arm64
Adds the SystemConfiguration framework to buildInputs unless we're
bootstrapping.

For the bootstrap version, we revert
31f631a142
instead so CMake builds without SystemConfiguration.
2021-08-12 11:26:13 +02:00
tobim
12da67f0c6 cmake: 3.21.0 -> 3.21.1 2021-08-12 11:26:13 +02:00
Tobias Mayer
3c7fbeaf4a Revert "Revert "cmake: 3.19.7 -> 3.21.0""
This reverts commit bd57a30d1b.
2021-08-11 14:31:11 +02:00
Sandro Jäckel
9e3ca9d8ee
cmake: format, cleanup 2021-07-30 14:35:01 +02:00
Frederik Rietdijk
bd57a30d1b Revert "cmake: 3.19.7 -> 3.21.0"
cmake on darwin now depends on the SystemConfiguration framework.
Support for this has not yet been added to our bootstrapping.

We need to decide how to go further. As this is blocking staging-next
it is reverted.

This reverts commit 29bbaa1489.
2021-07-30 10:21:40 +02:00
Tobias Mayer
29bbaa1489 cmake: 3.19.7 -> 3.21.0
Also removing a comment that instructs maintainers to cross-check
the hash with one that is posted upstream, because as @lilyball
reasoned:

"I'm not really sure what the benefit of comparing the hash is; if the
download is tampered with, the hash is served from the same site and
would presumably be tampered with as well, and the download is done over
https and declares its Content-Length so there's no risk of truncation
(which would cause the file to fail to unpack anyway)"
2021-07-29 10:52:18 +02:00
Sandro
f32f7553c5
cmake: don't use meta.homepage in fetchurl 2021-07-20 23:57:01 +02:00
Artturin
ac01728725 cmake: add wrapQtAppsHook 2021-06-22 06:06:27 +03:00
Michal Sojka
498b5e578a cmake: Add man and info outputs
By default, the cmake derivation contains the documentation in .rst
format. This format is not well suited for interactive use. Therefore,
we add both man and info outputs and convert the documentation to
these formats using Sphinx.

These formats are enabled by default only in cmake versions for
interactive use (ncurses, Qt), because using Sphinx in the basic
version leads to circular dependency (infinite recursion). Namely,
Sphinx has imagemagick in its checkInputs and imagemagick has several
transitive dependencies, which have cmake in nativeBuildInputs.
2021-06-06 21:49:41 +02:00
Alyssa Ross
02f013b8a4
cmakeWithQt4Gui: drop
Support for Qt 4 was removed in CMake 3.19.0:
https://cmake.org/cmake/help/latest/release/3.19.html#deprecated-and-removed-features
2021-05-12 11:31:12 +00:00
R. RyanTM
7eac452484 cmake: 3.19.6 -> 3.19.7 2021-03-22 21:07:11 +00:00
Sandro
9fe654a203
Merge pull request #112947 from SuperSandro2000/curl-brotli
curl: enable brotli by default
2021-03-08 02:30:32 +01:00
R. RyanTM
57047b485c cmake: 3.19.4 -> 3.19.6 2021-03-06 22:16:11 +01:00
Andrew Childs
d16a8753d9 stdenv: set CMAKE_OSX_ARCHITECTURES appropriately 2021-03-02 17:21:07 +09:00
Ivan Babrou
5269ed23f2
cmake: remove obsolete substituteInPlace (#113843)
This `substituteInPlace` was introduced in 2016 when cmake was at v3.4:

* https://github.com/NixOS/nixpkgs/commit/5286c0aebb

In 2018 cmake v3.12.0 changed the code to make it not match anything:

* https://github.com/Kitware/CMake/commit/50b5e9ed13

```
substituteStream(): WARNING: pattern '${PYTHON_EXECUTABLE}' doesn't match anything in file 'Modules/FindCxxTest.cmake'
```

Having it around in 2021 with cmake v3.19.3 doesn't help,
and tests are disabled anyway.
2021-02-21 22:29:45 -05:00