Commit Graph

194 Commits

Author SHA1 Message Date
Guillaume Racicot
fa65b293a9
cmake: 3.25.1 -> 3.25.2 2023-02-18 00:28:08 +01:00
Anderson Torres
809f21a32f cmake: 3.24.3 -> 3.25.1 2023-01-28 15:24:14 -03:00
AndersonTorres
568e01e675 cmake: incorporate darwin and libsForQt5 into its expression 2022-12-12 16:50:49 -03:00
R. Ryantm
edd361904b cmake: 3.24.2 -> 3.24.3 2022-11-03 01:04:32 +00:00
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
R. Ryantm
410a9ae700 cmake: 3.24.0 -> 3.24.1 2022-08-20 10:52:56 +00:00
Jonathan Ringer
b34a4df857
[staging] cmake: 3.23.3 -> 3.24.0 2022-08-05 11:32:50 -07:00
R. Ryantm
a4cfeb7cf1 cmake: 3.23.2 -> 3.23.3 2022-07-30 15:22:57 +00: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
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
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
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
Sandro Jäckel
e3d19670a0
curl: enable brotli by default 2021-02-13 00:04:40 +01:00
R. RyanTM
1bfa781657 cmake: 3.19.3 -> 3.19.4 2021-02-11 10:26:17 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
R. RyanTM
74c652e023 cmake: 3.19.2 -> 3.19.3 2021-01-22 21:33:15 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Linus Heckemann
dfb2a526e3 cmake: 3.19.1 -> 3.19.2 2020-12-25 18:31:09 +01:00
Jonathan Ringer
8f02cddf30 cmake: patch namelink regression
see:
 - https://github.com/NixOS/nixpkgs/issues/106329
 - https://github.com/awslabs/aws-c-common/issues/734
2020-12-11 07:23:28 -08:00
Luke Granger-Brown
31dfbca2d7 cmake: 3.19.0 -> 3.19.1
This fixes issues with building LibreSSL, which is required for the
NixOS tests: https://cmake.org/cmake/help/latest/release/3.19.html#id1

> CMake 3.19.0 compiles source files with the `LANGUAGE` property by
> passing an explicit language flag such as -x c. This is consistent
> with the property’s documented meaning that the source file is written
> in the specified language. However, it can break projects that were
> using the property only to cause the specified language’s compiler to
> be used. This has been reverted to restore behavior from CMake 3.18
> and below.
2020-11-29 13:49:07 +01:00
R. RyanTM
91c6eb509b cmake: 3.18.4 -> 3.19.0 2020-11-26 12:28:45 -08:00
R. RyanTM
fad425cfbb cmake: 3.18.2 -> 3.18.4 2020-11-11 15:58:37 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00