Commit Graph

60 Commits

Author SHA1 Message Date
Cryolitia PukNgae
7e74b626f6
cmd-wrapped: 0.2.0 -> 0.4.1 2024-09-02 10:07:32 +08:00
github-actions[bot]
b430e34392
Merge master into staging-next 2024-08-29 06:05:05 +00:00
Sandro Jäckel
ca355f14c8
treewide: replace all pytest-cov patching outside of pythonPackages with pytest-cov-stub 2024-08-27 20:47:13 +02:00
Yueh-Shun Li
468cfccb0c cmake: setup-hook.sh: unify indentation 2024-08-19 04:59:27 +08:00
Someone
ccaaa9ca53
Merge pull request #318614 from wolfgangwalther/structured-attrs-setup-hooks
treewide: support structuredAttrs in setup hooks
2024-08-13 19:29:36 +00:00
Wolfgang Walther
34a2b7ae9f
cmake: support structuredAttrs in setup hook
Tested litehtml with and without __structuredAttrs.

Resolves #289037
Supersedes #299622 (at least parts)
2024-08-03 12:56:08 +02:00
K900
4f29b5a16b Merge remote-tracking branch 'origin/staging-next' into staging 2024-07-31 08:57:17 +03:00
Daru
f3b5635d25 cmd-polkit: fix meta.mainProgram binary 2024-07-30 20:43:00 +02:00
Emily
8ac24638b1
Merge pull request #318226 from paparodeo/cmake-cc-full-path
cmake:  fix strictDeps
2024-07-27 20:58:22 +01:00
Reno Dakota
8c9c8ade2f
cmake: fix strictDeps
patch cmake to implement a NIXPKGS_CMAKE_PREFIX_PATH env variable which
is similar to CMAKE_PREFIX_PATH except it is not searched for programs.

This is required because cmake will search CMAKE_PREFIX_PATH for
programs before PATH which is problematic as that means buildInputs gets
searched before nativeBuildInputs which can break things when the
binaries in PATH are covered or the order re-arranged.
2024-07-27 18:36:23 +00:00
Reno Dakota
00cb5c8fc4
cmake: use addToSearchPath 2024-07-27 18:36:22 +00:00
github-actions[bot]
7208220b63
Merge master into staging-next 2024-07-24 18:01:18 +00:00
Vladimír Čunát
e2f5764068
Merge #323286: cmake: fix file fixing process
...into staging
2024-07-20 09:42:16 +02:00
Vladimír Čunát
5155e0c03b
cmake: refactor setup hook's find command
It became unnecessarily repetitive and complicated.
2024-07-20 09:41:02 +02:00
Pyrox
70c7038fa6
cmake-lint: remove nose dependency 2024-07-14 19:02:14 -04:00
Daru
9499694330 cmd-polkit: init at 0.3.0 2024-07-09 18:29:49 +02:00
siddharth-narayan
4f8de0d551 cmake: Add -type f filter to find command
This commit adds the -type f filter to the find command. Previously, -type f
only applied to the first file name: *.cmake. The -o command means that -type f
has to be added back for the other file names.
2024-06-29 16:45:24 -04:00
Alexis Hildebrandt
436b46b69f cmake: 3.29.3 -> 3.29.6 2024-06-18 12:33:27 +02:00
Ben Siraphob
924b59b584
Merge pull request #286473 from raboof/cmake-cross-compilation
cmake: enable cross compilation
2024-06-16 08:21:44 +00:00
github-actions[bot]
0cc78468fa
Merge master into staging-next 2024-06-10 18:01:13 +00:00
Sandro
557f4359f3
Merge pull request #317455 from luftmensch-luftmensch/cmake-lint_1.4.3
cmake-lint: init at 1.4.3
2024-06-10 17:18:13 +02:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
luftmensch-luftmensch
d13628ee2b
cmake-lint: init at 1.4.3 2024-06-08 10:39:02 +02:00
Vladimír Čunát
f1e3df16b3
Merge #310117: cmake: 3.29.2 -> 3.29.3
...into staging
2024-05-30 10:52:17 +02:00
Audrey Dutcher
ffb781820b cmake: remove propagatedBuildInput ps and patch to use an abspath
This would be an approprate patch on all platforms, but it seems to
trigger infinite recursion.
2024-05-20 16:08:30 +02:00
Audrey Dutcher
11f90585cd cmake: propagate ps as a build input on native FreeBSD 2024-05-20 16:08:30 +02:00
AMS21
651971f2f3
cmake: 3.29.2 -> 3.29.3 2024-05-08 15:58:43 +02:00
Sergei Trofimovich
80dac46dcf cmake: 3.29.1 -> 3.29.2
Changes: https://cmake.org/cmake/help/latest/release/3.29.html#id2
2024-04-14 21:55:52 +01:00
Mario Rodas
6083fb0a15 cmake: 3.29.0 -> 3.29.1
Diff: https://gitlab.kitware.com/cmake/cmake/-/compare/v3.29.0...v3.29.1
2024-04-05 04:20:00 +00:00
Arnout Engelen
596ca95c57 cmake: enable cross compilation
When cross-compiling cmake, for example with
`nix build .#pkgsCross.mipsel-linux-gnu.cmake`, the `configure`
script will invoke the build platform cmake to build the
host platform cmake. Usually, stdenv will automatically pass
variables such as `-DCMAKE_SYSTEM_PROCESSOR` to cmake
(https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/make-derivation.nix#L416),
but since here cmake is invoked 'indirectly' we have to pass
these parameters to the `configure` script ourselves.

It appears this was (surprisingly) not necessary on versions
through 3.26.4, but the update to 3.27.7 exposed that these
flags were missing, causing link failures.

Fixes #284734
2024-04-03 23:20:11 +02:00
R. Ryantm
3eedc01a98 cmake: 3.28.3 -> 3.29.0 2024-03-25 18:25:35 +00:00
github-actions[bot]
3174119b20
Merge staging-next into staging 2024-02-28 00:02:28 +00:00
Elian Doran
31b1dd083c
cmake: add meta.mainProgram 2024-02-27 20:28:27 +02:00
Sergei Trofimovich
a9de206ed4 cmake: 3.28.2 -> 3.28.3
While at it added trivial updater.

Changes: https://gitlab.kitware.com/cmake/cmake/-/compare/v3.28.2...v3.28.3?from_project_id=541&straight=false
2024-02-19 21:46:13 +00:00
Artem Leshchev
1a16930721 cmake: fix patch for darwin
The patch was malformed and did not apply before.
2024-02-16 13:23:03 +03:00
Jacek Galowicz
1bee8a0b0a cmake: 3.28.1 -> 3.28.2 2024-02-14 07:34:03 +00:00
github-actions[bot]
1fe30fdf4b
Merge staging-next into staging 2024-02-10 18:01:16 +00:00
R. Ryantm
f5fae3ff88 cmd-wrapped: 0.1.1 -> 0.2.0 2024-02-10 08:20:26 +00:00
github-actions[bot]
370cda4ea0
Merge staging-next into staging 2024-02-09 18:01:33 +00:00
github-actions[bot]
b64b4f2d6a
Merge master into staging-next 2024-02-09 18:01:06 +00:00
Nick Cao
6ddcfabd59
Merge pull request #278998 from Cryolitia/cmd-unwrapped
cmd-wrapped: init at 0.1.1
2024-02-09 10:15:47 -05:00
Guillaume Racicot
aeb939f81f cmake: 3.27.9 -> 3.28.1 2024-02-08 10:12:15 -05:00
Alyssa Ross
4a5606d31f cmake: enable debug info 2024-01-23 16:23:44 +01:00
Sandro
f5076d066b
Merge pull request #271629 from trofi/cmake-update 2024-01-23 10:52:05 +01:00
Cryolitia
b2007d128e cmd-wrapped: init at 0.1.1 2024-01-06 13:54:36 +01:00
Nick Cao
8b2757a191
cmake: drop libatomic workaround for riscv 2023-12-16 16:27:08 -05:00
Dmitry Kalinkin
025a278148 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/tools/networking/ofono/default.nix
2023-12-08 12:27:28 -05:00
github-actions[bot]
1287e59c06
Merge master into staging-next 2023-12-08 06:00:55 +00:00
Guillaume Racicot
84ab279895 cmakerc: init at 2.0.1 2023-12-07 10:01:00 -03:00