Commit Graph

41 Commits

Author SHA1 Message Date
github-actions[bot]
e9c8665026
Merge master into staging-next 2024-10-05 00:14:01 +00:00
Peder Bergebakken Sundt
cd673393d2 treewide: remove unreferenced patch files
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'``

We're running more and more into patches fetched via `applyPatches`, for the next PR i'll script something to account for that.
2024-10-04 19:38:56 +02:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Alyssa Ross
47f16e4b74
meson: 1.5.1 -> 1.5.2 2024-09-20 22:13:39 +02: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
7c732de6e3
meson: remove unused crossMesonFlags from setup hook
This was used in ##35666 to add the --cross-file argument, but #86080
moved that somewhere else - leaving crossMesonFlags unused.
2024-08-03 12:56:07 +02:00
Wolfgang Walther
55933d9bf6
meson: support structuredAttrs in setup hook
Tested emilua with and without __structuredAttrs.
2024-08-03 12:56:05 +02:00
Wolfgang Walther
6bdfef9d2d
stdenv: generalize _accumFlagsArray to concatTo
Passing "flagsArray" as the first argument allows using this function
in a few more places.
2024-08-02 22:11:38 +02:00
K900
4f29b5a16b Merge remote-tracking branch 'origin/staging-next' into staging 2024-07-31 08:57:17 +03:00
Alyssa Ross
3b7f89348e
meson.meta.maintainers: add myself
I've done most of the updates recently.
2024-07-29 11:26:10 +02:00
Alyssa Ross
332946ab2f
meson: 1.5.0 -> 1.5.1 2024-07-29 11:25:02 +02:00
Tristan Ross
f822fae2be
meson: include patch for zig cc 2024-07-27 19:43:41 -07: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
f9a7cf528b
meson: add support for NIXPKGS_CMAKE_PREFIX_PATH
nixpkgs cmake uses NIXPKGS_CMAKE_PREFIX_PATH rather than
CMAKE_PREFIX_PATH env to specify module search paths. Add the env
variable to meson to allow finding modules via cmake to work.
2024-07-27 18:36:23 +00:00
Randy Eckenrode
bc32f01336
meson: fix extraframework dependencies on case-sensitive APFS 2024-07-26 18:12:25 -04:00
Alyssa Ross
cd8e02828a
meson: 1.4.1 -> 1.5.0 2024-07-20 15:08:51 +02:00
Artturin
343caa6c47 meson: add patch to find boost via pkg-config 2024-07-04 11:01:15 +02:00
Randy Eckenrode
bd52a20a83
Merge pull request #322497 from reckenrode/meson-structred-attrs
meson: use _accumFlagsArray
2024-07-01 09:27:26 -04:00
Masum Reza
3c0b7e126c
Merge pull request #316178 from alyssais/meson-1.4.1
meson: 1.4.0 -> 1.4.1
2024-06-27 21:24:52 +05:30
Randy Eckenrode
65da162fa7
meson: use _accumFlagsArray 2024-06-25 17:09:34 -04: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
github-actions[bot]
738e64a2f9
Merge master into staging-next 2024-06-01 00:02:18 +00:00
Alyssa Ross
9d76da314b
meson: 1.4.0 -> 1.4.1 2024-05-31 16:11:51 +01:00
Artemis Tosini
665daed22b meson: fix build on FreeBSD (and possibly other non-darwin clang) 2024-05-29 10:58:17 -07:00
John Ericson
b60831abee
Merge pull request #311779 from rhelmot/freebsd-minimal3/meson
meson: fix build for native FreeBSD
2024-05-26 12:12:45 -04:00
Vladimír Čunát
9d9c87e699
Merge #303416: ninja: 1.11.1 -> 1.12.1
...into staging
2024-05-25 09:11:48 +02:00
Audrey Dutcher
497d4b3836 meson: fix build for native FreeBSD 2024-05-17 18:29:27 -07:00
Alyssa Ross
4dec85d68b meson.setupHook: always set --print-errorlogs
Otherwise, the logs are discarded, unless you built with
--keep-failed.
2024-05-14 21:26:19 +02:00
John Titor
36d4305d40
meson: add patch to allow building via ninja 1.12
adapted from 1b9eb6f313
2024-05-13 11:33:08 +05:30
Jörg Thalheim
6bbb71e0cb meson: fix cross-compilation of rust proc-macro
This workaround was suggested by upstream Meson developers in https://github.com/mesonbuild/meson/issues/12973
and was also applied in archlinux.
2024-04-09 08:47:03 +02:00
Alyssa Ross
a0a4b45ba9 meson: 1.3.2 -> 1.4.0 2024-03-26 11:03:50 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
Sergei Trofimovich
88b862c256 meson: 1.3.1 -> 1.3.2
Changes: https://github.com/mesonbuild/meson/compare/1.3.1...1.3.2
2024-02-15 20:39:04 +01:00
Alyssa Ross
503f06151f meson: 1.3.0 -> 1.3.1 2024-01-06 01:02:19 +01:00
Alyssa Ross
8f001560cf
meson: 1.2.3 -> 1.3.0
Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
2023-12-03 21:57:37 +01:00
Anderson Torres
efac6d1302 meson.setupHook: shellcheck 2023-10-30 16:32:56 -03:00
Anderson Torres
1a3bec02f0 meson: rename patches 2023-10-30 16:32:56 -03:00
Anderson Torres
9cf584eb57 meson: move darwin references to the package.nix file 2023-10-30 16:32:56 -03:00
Anderson Torres
30020455fd meson: migrate to by-name 2023-10-30 16:32:56 -03:00