Commit Graph

7903 Commits

Author SHA1 Message Date
Atemu
b4047a0455
Merge pull request #279260 from SuperSamus/multiPkgs-false-remove
treewide: remove `multiArch=false` and wrong usage of `extraPkgs`
2024-05-14 09:59:43 +02:00
Martino Fontana
1ee25e4d13 wrapAppImage: default extraPkgs to pkgs: [ ]
Sane default in preparation for the next commit.
2024-05-13 20:32:47 +02:00
Pol Dellaiera
7325d7ec2d
Merge pull request #310325 from patka-123/php-default-updatescript2
buildsupport/php: add passthru.updateScript
2024-05-13 14:08:52 +02:00
github-actions[bot]
42828a757c
Merge master into staging-next 2024-05-11 18:01:23 +00:00
Ryan Lahfa
f16f9410d0
Merge pull request #310453 from RaitoBezarius/lix-preps
build-support/meson: explicitly use ambiant CMake during cross compilation
2024-05-11 15:24:44 +02:00
github-actions[bot]
12da532fe3
Merge master into staging-next 2024-05-11 12:01:09 +00:00
Raito Bezarius
d4c673a92b build-support/meson: explicitly use ambiant CMake during cross compilation
Thanks to Qyriad, it was found out that Nixpkgs was unable to cross
compile when CMake was needed at cross compilation time with Meson
because Meson refuse to use the ambiant CMake.

A simple fix is to always provide the ambiant CMake and trust the
packager to pass the right CMake, otherwise the rest of the build would
probably fail in mysterious ways.

An example of package that required this fix is the Lix, a Nix
implementation, that uses `toml11` discovered via CMake during the Meson
configure phase.

Co-authored-by: Qyriad <qyriad@qyriad.me>
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-05-11 13:32:14 +02:00
Jan Tojnar
4be4408157 Merge branch 'master' into staging-next
; Conflicts:
;	maintainers/scripts/luarocks-packages.csv
;	pkgs/development/lua-modules/generated-packages.nix
2024-05-11 12:47:40 +02:00
K900
f80228a805 build-support/rust: rewrite workspace dependency inheritance
This fixes at least one bug with default-features, and also
just aligns us more with what Cargo actually does.

Also some Python style fixes and a bit less mutating state.
2024-05-10 20:55:39 +03:00
Pol Dellaiera
c7578123cf
Merge pull request #310528 from alyssais/buildRustPackage-platforms
buildRustPackage: add new supported platforms
2024-05-10 10:50:42 +02:00
Alyssa Ross
6d4a14504e
buildRustPackage: add new supported platforms
The new NetBSD platforms have appeared since last time I updated this
list, but it looks like I just missed the MIPS linux ones last time.
2024-05-10 10:18:20 +02:00
Patka
8cd73735dc
buildsupport/php: add passthru.updateScript
PHP packages where upstream provides a lock file can be automatically updated with the standard updateScript
2024-05-09 14:42:27 +02:00
github-actions[bot]
8d97a60dd1
Merge master into staging-next 2024-05-08 18:01:26 +00:00
Atemu
6d5fc9c5d9
Merge pull request #305582 from TomaSajt/dub-to-nix-git-deps
dub-to-nix,buildDubPackage: allow git-type dependencies
2024-05-08 16:34:21 +02:00
Linus Heckemann
a10842c7f0
Merge pull request #302300 from Ma27/kernel-zstd
linux kernel: prefer zstd where possible
2024-05-08 15:17:45 +02:00
TomaSajt
eaab342480
dub-to-nix,buildDubPackage: allow git-type dependencies 2024-05-08 14:01:35 +02:00
github-actions[bot]
9b1eee6539
Merge master into staging-next 2024-05-07 18:01:11 +00:00
Pol Dellaiera
3d155494e4
build-support/php: reorganize files
Pave the way for having multiple versions in the future
2024-05-07 11:18:34 +02:00
github-actions[bot]
b05583e319
Merge master into staging-next 2024-05-06 12:01:18 +00:00
Randy Eckenrode
318a6a6b52
Merge pull request #290684 from corngood/dotnet-darwin
dotnet: fix dotnet executables in darwin sandbox
2024-05-06 07:57:02 -04:00
github-actions[bot]
041bd1cdf7
Merge master into staging-next 2024-05-05 18:00:54 +00:00
Pol Dellaiera
4d2dad358d
build-support/php: remove obsolete parameters 2024-05-05 19:51:01 +02:00
Pol Dellaiera
31bdcac6a0
build-support/php: add missing binding 2024-05-05 18:51:03 +02:00
Pol Dellaiera
d8f509a470
build-support/php: composer, add meta.mainProgram 2024-05-05 18:51:03 +02:00
Pol Dellaiera
409e640cef
build-support/php: use lib.getExe 2024-05-05 18:51:03 +02:00
Pol Dellaiera
b5855e4e66
build-support/php: move environment variables under env attribute 2024-05-05 18:51:03 +02:00
Pol Dellaiera
6ca2dfeaec
build-support/php: remove obsolete parameters 2024-05-05 18:45:27 +02:00
Jan Tojnar
100509c030 Merge branch 'staging-next' into staging
Conflicts in luaPackages.luarocks-nix:

- 8b563cd9f9 switched to the new version format (prefixed by 0 since there was no relevant last tag in the branch).
  bc4f6fa543 bumped version and switched to the new version format. But the tag used is not part of the branch the commit comes from (master).

  Used the new version but replaced the tag prefix with 0.

- b73ec84b9e removed meta (it is already set in the overridden luarocks). But that would cause the update script to try to update the overridden luarocks (as did the previously used old.meta).
  bf311d950e modified meta to fix the update script properly.

  Kept the meta from the latter since it allows update script to work.
2024-05-05 14:50:32 +02:00
David McFarland
26c3d6878a dotnet: fix dotnet executables in darwin sandbox
This fixes:

    Could not load ICU data. UErrorCode: 2

We're using a hook instead of a wrapper because various things like to
reference the unwrapped dotnet executable.
2024-05-04 19:14:39 -03:00
Pol Dellaiera
75ae762133
workflows/check-nix-format: enforce for build-support/php 2024-05-04 23:06:24 +02:00
github-actions[bot]
63659f437f
Merge staging-next into staging 2024-05-04 00:02:40 +00:00
nicoo
a817fdac5f
Merge #307770: add optional version check in testers.hasPkgConfigModules 2024-05-03 20:18:56 +00:00
Weijia Wang
b4617eb071 Merge branch 'staging-next' into staging 2024-05-03 19:03:51 +02:00
Wael Nasreddine
7c4cc6476b
Merge pull request #298847 from ShamrockLee/build-go-module-buildflag
buildGoModule: warn about buildFlags only when using buildPhase provided by buildGoModule
2024-05-03 10:57:22 -06:00
github-actions[bot]
4e3bc63c95
Merge staging-next into staging 2024-05-02 12:02:05 +00:00
github-actions[bot]
c4dfa193ac
Merge master into staging-next 2024-05-02 12:01:36 +00:00
Weijia Wang
a6742256e2
Merge pull request #279391 from katexochen/buildGoModule/deprecate-buildflags
buildGoModule: announce removal of `buildFlags` and `buildFlagsArray`
2024-05-02 12:58:35 +02:00
Pol Dellaiera
e7ad484731
build-support/php: replace --no-ansi with --no-progress 2024-05-01 11:15:39 +02:00
Pol Dellaiera
382220e679
build-support/php: remove makeBinaryWrapper 2024-05-01 11:15:16 +02:00
nicoo
c150eb5e44 tests.testers.hasPkgConfigModules: Fix typo in comment 2024-04-30 22:24:47 +00:00
nicoo
039bd24f54 tests.testers.hasPkgConfigModules: add testcases for versionCheck 2024-04-30 22:24:05 +00:00
nicoo
1e9d263dd7 testers.hasPkgConfigModules: Optionally check each module's version 2024-04-30 20:34:07 +00:00
nicoo
5fce6cb334 testers.hasPkgConfigModules: Report all errors rather than fail early 2024-04-30 20:34:07 +00:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
Jan Tojnar
70cf3ecaae wrapGAppsHook: Flip inheritance relationship with wrapGAppsNoGuiHook 2024-04-27 00:05:46 +02:00
github-actions[bot]
05273cc291
Merge master into staging-next 2024-04-25 00:02:07 +00:00
Atemu
2432c6b829
Merge pull request #271071 from pbsds/wrapAppImage-pname-redux
appimageTools.wrapAppImage: remove version from `pname`
2024-04-24 21:48:19 +02:00
Peder Bergebakken Sundt
340d601e84 appimage: avoid setting name 2024-04-24 15:26:52 +02:00
Peder Bergebakken Sundt
90622c10bd appimageTools.wrapAppImage: passthru pname and version 2024-04-24 15:26:52 +02:00
Peder Bergebakken Sundt
eb02e003b0 buildFHSEnvBubblewrap/buildFHSEnv: permit pname+version instead of name 2024-04-24 15:26:52 +02:00