Commit Graph

111 Commits

Author SHA1 Message Date
Michael Daniels
39632953ba cmake: 4.4.2 -> 4.4.3
Changelog: https://cmake.org/cmake/help/v4.4/release/4.4.html
Diff: https://github.com/Kitware/CMake/compare/v4.4.2...v4.4.3
2026-09-05 16:05:36 -04:00
Michael Daniels
d39f4779a3 cmake: fix Darwin build 2026-09-05 10:31:42 -04:00
Michael Daniels
2635190ffd cmake: 4.3.4 -> 4.4.2 (#540343) 2026-09-05 12:53:46 +00:00
Stefan Frijters
aacc8aa4a9 cmake: enable structuredAttrs 2026-08-25 00:37:14 +02:00
Stefan Frijters
095afe0094 cmake: enable strictDeps 2026-08-25 00:37:14 +02:00
Hythera
8479b32a9f cmake: 4.3.4 -> 4.4.2
changelog: https://cmake.org/cmake/help/v4.4/release/4.4.html

diff: https://github.com/Kitware/CMake/compare/v4.3.4...v4.4.2
2026-08-01 18:12:26 +02:00
FliegendeWurst
5d0c21d222 cmake: fix parenthesis in patch 2026-07-10 00:15:24 +02:00
nixpkgs-ci[bot]
2460cec5c9 Merge staging-next into staging 2026-07-07 18:42:08 +00:00
Hythera
c1c4e61c32 cmake: remove unused fix-curl-8.16 patch 2026-07-07 14:34:51 +02:00
Hythera
09614c7c7d cmake: 4.1.2 -> 4.3.4
changelog: https://cmake.org/cmake/help/v4.3/release/4.3.html

diff: https://github.com/Kitware/CMake/compare/v4.1.2...v4.3.4
2026-06-27 15:50:04 +02:00
Marcin Serwin
bee50c11a5 pkgsStatic.cmake: fix build (#515179) 2026-06-01 16:15:00 +00:00
Marcin Serwin
85ac6ca088 maintainers: drop ttuegel
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2026-05-31 20:27:39 +02:00
Marcin Serwin
3e74c52276 maintainers: drop lnl7
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
2026-05-16 13:11:23 +02:00
edef
8d411f0a2d cmake: fix static build
bootstrap is not autoconf and rejects the --enable-static/
  --disable-shared flags injected by the static stdenv adapter;
  set dontAddStaticConfigureFlags to avoid them

FindLibArchive doesn't handle static libarchive correctly,
use pkg-config to find correct entry manually and pass via
NIX_LDFLAGS.

kwsys's DynamicLoader test is inimical to -static so
disable BUILD_TESTING in that case.

Co-authored-by: Luna Nova <git@lunnova.dev>
2026-04-30 13:58:02 -07:00
Sam
f1193203e1 cmake.setupHook: drop outdated CMake policy
This policy was introduced in CMake 3.0 (June 2014), and removed
entirely in CMake 4.0. As this causes a world-rebuild we'd probably
leave it alone except that I'm already changing the setup hook.
2025-10-25 10:41:12 -07:00
Sam
d0e837dde8 cmake.setupHook: drop no-longer-helpful FIND_FRAMEWORK flag
This was introduced in https://github.com/NixOS/nixpkgs/pull/37015,
before the migration of Apple SDK frameworks to be included by default.

More specifically, it breaks anything looking for `Network.framework`
(such as qtbase 6.10) because it will prefer `libnetwork.tbd` over the
framework.

Fixes #455059.
Supersedes #455458.
2025-10-25 10:41:12 -07:00
Cobalt
59011787de cmake: 4.1.1 -> 4.1.2 2025-10-06 18:39:18 +02:00
Emily
c9f171a0bb cmake: drop fixCmakeFiles hook
This regularly broke things – as can be seen from the number
of packages that were opting out of it – while providing only a
dubious and partial benefit to purity that other build systems did
not “enjoy”.

It has become associated with Darwin, but was actually introduced
in 2007 as part of 67d41efde1,
a work‐in‐progress commit for KDE 4 that introduced the CMake
setup hook. It has haunted us ever since, and will presumably become
even better at doing so now that it is a dead ghost.

Of course, it is possible and even likely that more impure paths will
leak into Darwin builds from third‐party CMake modules included
in packages. However, considering it already disregarded many of the
most common macOS system paths, it will be better overall to address
these in a targeted manner than dealing with the effects of this
brute‐force hook. In the long run, a good sandbox is going to be
the solution for reliable build reproducibility on the platform.
2025-09-19 18:34:06 +01:00
Emily
fd9093e66f cmake: drop code referencing /var/empty from the search path patch
These are almost all dead code – some references to `/bin` and
`/sbin` and some Windows paths notwithstanding – and dropping them
entirely makes the patch shorter and more effective.

It is likely that a lot of this patch is still superfluous; we
don’t really care about the purity of unsandboxed builds on Linux,
for instance, so any code path that is never taken on Darwin could
probably be dropped. But this provides a conservative base to drop the
problematic hook without compromise for CMake‐distributed modules. Of
course, the long‐term solution should be proper sandboxing on macOS.
2025-09-19 18:34:06 +01:00
Emily
ec7612c6c3 cmake: adjust patched FindDCMTK.cmake logic
No idea what this thing even is, frankly.
2025-09-19 18:34:06 +01:00
Emily
36b870e053 cmake: patch out search for system curl CA bundle files 2025-09-19 18:34:06 +01:00
Emily
f1cb9b0489 cmake: patch out guesses based on distribution release files 2025-09-19 18:34:06 +01:00
Emily
7edb48bad8 cmake: patch out more impure Darwin paths
`fixCmakeFiles` didn’t catch these.
2025-09-19 18:34:06 +01:00
Emily
c0b6a6aa8c cmake: undo more fixCmakeFiles Darwin changes
These are as incorrect as the earlier ones, but were not previously
being reverted.
2025-09-19 18:34:06 +01:00
Emily
7c29b3558d cmake: undo fixCmakeFiles system library determination changes
This won’t apply to Nixpkgs use anyway, and the patched logic made
no sense.
2025-09-19 18:34:06 +01:00
Emily
e4144dbd43 cmake: undo fixCmakeFiles installation path changes
We set these paths ourselves anyway, and the patched logic makes
no sense.
2025-09-19 18:34:06 +01:00
Emily
ac7b846762 cmake: undo fixCmakeFiles obscure platform changes
These are just not worth the diff noise, and we have no way to verify
them for correctness.
2025-09-19 18:34:06 +01:00
Emily
126b5567cf cmake: undo fixCmakeFiles SunPro changes
I think this will make the behaviour more correct? For people using
the SunPro compiler with Nixpkgs? A thing that will definitely happen?
2025-09-19 18:34:06 +01:00
Emily
aa23900db8 cmake: undo fixCmakeFiles Android NDK changes
I believe that these changes are incorrect because the NDK operates
with paths relative to a sysroot.
2025-09-19 18:34:06 +01:00
Emily
4746a374e7 cmake: undo fixCmakeFiles Git for Windows changes
Again, it makes more sense to address this systematically as part
of Windows support, especially as some of the paths weren’t even
being mangled.
2025-09-19 18:34:06 +01:00
Emily
2177580363 cmake: undo fixCmakeFiles MSYS changes
If we end up supporting MSYS in Nixpkgs, it would make more sense to
address this at the root in `FindMSYS.cmake` instead of adding this
diff noise.
2025-09-19 18:34:06 +01:00
Emily
65b61d82e8 cmake: undo fixCmakeFiles changes in CPack
I don’t think these were correct.
2025-09-19 18:34:06 +01:00
Emily
dfde4bba26 cmake: undo fixCmakeFiles changes in documentation and comments
In some cases these may make the statements more accurate to our
patched version, but in practice they just add lines to the diff and
often make it more confusing or outright wrong instead. I don’t
think we even install the documentation, anyway.
2025-09-19 18:34:06 +01:00
Emily
0940b4cfda cmake: undo fixCmakeFiles changes in release engineering files
We don’t run CMake’s CI or its release scripts.
2025-09-19 18:34:06 +01:00
Emily
1ac852f22e cmake: undo fixCmakeFiles changes in tests
This is a huge amount of diff noise for things that aren’t installed
and that we don’t even run. If anyone wants to try getting the tests
running, they can fix reproducibility problems that may be addressed
by these changes in a more targeted manner.
2025-09-19 18:34:06 +01:00
Emily
8d564f1ae4 cmake: undo fixCmakeFiles Darwin changes from postFixup 2025-09-19 18:34:06 +01:00
Emily
3d6b7fdc59 cmake: fold fixCmakeFiles into the search path patch
A verbatim patch representing its changes to CMake 4.1.1 provides a
useful base for further modifications as we drop the hook.
2025-09-19 18:34:06 +01:00
Emily
e60e11a6b0 cmake: split search path patch
To be honest, I’m not sure exactly how useful the libc one is or
why it doesn’t need to include the C++ library and the like, but
splitting this up helps with the following work.
2025-09-19 18:34:06 +01:00
Emily
b59cc4ca3e cmake: add sysctl(8) to the Darwin/BSD paths patch
Used for determining core count and Apple Silicon stuff.

Also drop unnecessary `@ps@` replacements in `#elif` branches that
aren’t taken, and correct a comment about `ps(1)` being in the Linux
`stdenv`, since… it does not appear to be.
2025-09-19 18:34:06 +01:00
Emily
3a2fd9a3e2 cmake: drop sequence numbers from patches
These aren’t that helpful, since most of the patches don’t have
a strict ordering and a lot of them have been dropped anyway.
2025-09-19 16:41:51 +01:00
Emily
f8cbf5c164 cmake: remove obsolete -Wno-elaborated-enum-base
This was introduced for LLVM 11 in
982f7228ff, but the package builds fine
with LLVM 21 without i.
2025-09-19 16:39:15 +01:00
Emily
cbca4728ca cmake: remove obsolete Large File Support flags
This was addressed upstream and the linked issue was closed.
2025-09-19 16:39:15 +01:00
Emily
6230af7de6 cmake: remove obsolete LLVM feature check workaround
This was fixed upstream in CMake 3.30.0 by
<https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9427>.
2025-09-19 16:39:15 +01:00
Alexander Borsuk
77b73f8071 cmake: 3.31.7 -> 4.1.1
- Update cmake to the latest 4.1.1 release:
  https://cmake.org/cmake/help/latest/release/4.1.html
- FindCurl patch has already been merged:
  https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900
- Darwin `-rpath` patch is replaced by the binary paths patch
- Fix previous patches for a newer source code
2025-09-19 16:39:15 +01:00
Alexander Borsuk
65e94121d8 cmake: Remove obsolete patch
Cygwin patch does not apply anymore, it was done for a very old cmake 3.2.2
2025-09-19 16:28:54 +01:00
Sefa Eyeoglu
329d3a931f cmake: backport curl 8.16 compatibility fix
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-09-18 17:37:00 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Sefa Eyeoglu
90432ace86 cmake: 3.31.6 -> 3.31.7
This release includes the curl fix we backported from
1b0c92a3a1.

https://gitlab.kitware.com/cmake/cmake/-/commits/v3.31.7

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-05-13 15:56:07 +02:00
Sefa Eyeoglu
262d9972ef curl: 8.12.1 -> 8.13.0 (#396200) 2025-04-27 20:32:39 +02:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00