Commit Graph
535113 Commits
Author SHA1 Message Date
Alyssa RossandJan Tojnar 10f35ff05d meson.setupHook: prefer meson commands over ninja
Meson now comes with its own set of commands for building, testing,
installing etc., that by default wrap around Ninja.  The reason to
prefer using the Meson commands is that they take additional
options (e.g. setting custom timeouts for tests — my motivation for
this change).

Here, I've modified the Meson setup hook so that Meson's test and
install commands will be used instead of Ninja's when Meson's
configurePhase is used.  This restriction is to avoid starting to run
Meson directly when dealing with custom build systems that wrap around
Meson, like QEMU's.  We don't use meson's compile command, as it just
runs ninja, and that's handled fine by the existing Ninja setup hook.

Naturally the Meson commands don't support entirely the same set of
options that the Ninja ones did, but I checked through Nixpkgs to find
any packages using Meson that used any options that wouldn't be picked
up by this new system.  I only found one, and it was just setting
checkTarget = "test", which is the default value for Ninja and has no
Meson equivalent (because we directly tell Meson to run the tests
rather than going through a generic job system like Ninja).

Link: https://github.com/NixOS/nixpkgs/issues/113829
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2023-10-09 10:21:36 +00:00
Vladimír Čunát f93bb58142 Merge #254965: libopenmpt: 0.7.2 -> 0.7.3
...into staging
2023-10-09 10:24:19 +02:00
github-actions[bot]andGitHub 986a054797 Merge staging-next into staging 2023-10-09 06:02:00 +00:00
github-actions[bot]andGitHub 8443de20df Merge master into staging-next 2023-10-09 06:01:20 +00:00
Samuel Dionne-RielandGitHub 85f158659a Merge pull request #258711 from allusive-dev/picom-allusive
picom-allusive: init for 0.3.1
2023-10-09 01:51:20 -04:00
allusive-dev 0b55e764ad picom-allusive: init for 0.3.1 2023-10-09 16:43:27 +11:00
allusive-dev acf6f9c869 maintainers: add allusive 2023-10-09 16:43:12 +11:00
Sam GraysonandBjørn Forsman 840b0698a4 fsatrace: 0.0.1 -> 0.0.5 2023-10-09 07:05:49 +02:00
Samuel Dionne-RielandGitHub 5a9c737c58 Merge pull request #259769 from cafkafk/cafk-cargo-leptos-0.2.0
cargo-leptos: 0.1.11 -> 0.2.0
2023-10-09 00:43:50 -04:00
Anderson Torres 2df9f0182e eudev: refactor
- finalAttrs
- no nested with
- meta.longDescription
- meta.changelog
2023-10-09 00:46:25 -03:00
Anderson Torres 8c90bddab1 eudev: migrate to by-name 2023-10-09 00:46:25 -03:00
Ryan MulliganandGitHub 43a87a1ca5 Merge pull request #259705 from spacefault/update-osu-lazer
osu-lazer-bin: 2023.924.1 -> 2023.1008.0
2023-10-08 20:11:11 -07:00
Weijia WangandGitHub de711334a3 Merge pull request #259878 from yayayayaka/update-maintainer-info
maintainers: update yayayayaka's email
2023-10-09 03:51:33 +02:00
Weijia WangandGitHub e94813133f Merge pull request #259873 from emilytrau/minimal-remove-gcc2
minimal-bootstrap: remove glibc and gcc2
2023-10-09 03:51:06 +02:00
Weijia WangandGitHub 67cb29ddff Merge pull request #259871 from wegank/vendor-hash-cleanup-2
prometheus-pgbouncer-exporter: vendorSha256 -> vendorHash
2023-10-09 03:45:54 +02:00
Lin JianandGitHub 98edbf83ae Merge pull request #259009 from bobvanderlinden/pr-locate-package
nixos/locate: rename option `locate` -> `package`
2023-10-09 09:34:16 +08:00
Yaya c93291dbe5 maintainers: update yayayayaka's email 2023-10-09 03:10:52 +02:00
maxineandGitHub 35c640b19a Merge pull request #259376 from R-VdP/fwupd_1_9_6
fwupd: 1.9.5 -> 1.9.6
2023-10-09 02:17:58 +02:00
maxineandGitHub 2b87093f03 Merge pull request #259700 from r-ryantm/auto-update/docker-distribution
docker-distribution: 2.8.2 -> 2.8.3
2023-10-09 02:13:33 +02:00
github-actions[bot]andGitHub f1a87e41ca Merge staging-next into staging 2023-10-09 00:03:06 +00:00
github-actions[bot]andGitHub 2df946c4bd Merge master into staging-next 2023-10-09 00:02:27 +00:00
Emily Trau 6eb660c22f minimal-bootstrap: remove glibc and gcc2
These components aren't needed in the dependency chain anymore but take significant time to build in `minimal-bootstrap.test`
2023-10-08 16:50:10 -07:00
Mario RodasandGitHub 65cd946c31 Merge pull request #259857 from r-ryantm/auto-update/flyctl
flyctl: 0.1.102 -> 0.1.104
2023-10-08 18:48:10 -05:00
Martin WeineltandGitHub 51595486f4 Merge pull request #249740 from deviant/update-ircrobots
python3Packages.irctokens: 2.0.1 -> 2.0.2, python3Packages.ircstates: 0.11.8 -> 0.12.1, python3Packages.ircrobots: 0.4.6 -> 0.6.6
2023-10-09 01:44:54 +02:00
Weijia Wang 1c0c8f4832 prometheus-pgbouncer-exporter: vendorSha256 -> vendorHash 2023-10-09 01:41:04 +02:00
Mario RodasandGitHub 9c7e292aa3 Merge pull request #259854 from r-ryantm/auto-update/flow
flow: 0.217.2 -> 0.218.0
2023-10-08 18:36:53 -05:00
Weijia WangandGitHub a7e91f0509 Merge pull request #257557 from ocfox/gbar
gbar: init at unstable-2023-09-21
2023-10-09 01:31:42 +02:00
Weijia WangandGitHub 3579497541 Merge pull request #207730 from akkesm/passky-desktop
passky-desktop: 7.1.0 -> 8.1.1
2023-10-09 01:31:00 +02:00
Silvan MosbergerandGitHub cc51aa2b0f Merge pull request #259743 from GaetanLepage/invidious-update
invidious: unstable-2023-09-18 -> unstable-2023-10-07
2023-10-09 01:15:30 +02:00
Weijia WangandGitHub 613dfce23f Merge pull request #258008 from 999eagle/update/searxng
searxng: move to pkgs/by-name, unstable-2023-07-19 -> unstable-2023-10-01
2023-10-09 01:07:07 +02:00
Mario RodasandGitHub b64a9159ac Merge pull request #259852 from Intuinewin/tfupdate-0.8
tfupdate: 0.7.2 -> 0.8.0
2023-10-08 18:06:51 -05:00
Weijia WangandGitHub 253b7c6675 Merge pull request #259836 from reckenrode/dxvk-by-name
dxvk: migrate to by-name
2023-10-09 01:06:07 +02:00
Weijia WangandGitHub badea05e21 Merge pull request #259850 from wegank/photoqt-bump
photoqt: 3.3 -> 3.4
2023-10-09 00:54:34 +02:00
Mario RodasandGitHub 7ae736453e Merge pull request #259687 from kashw2/terragrunt
terragrunt: 0.51.7 -> 0.52.0
2023-10-08 17:44:54 -05:00
Mario RodasandGitHub b34964e069 Merge pull request #259834 from lunik1/iosevka-27.2.0
iosevka: 27.1.0 -> 27.2.0
2023-10-08 17:44:24 -05:00
Mario RodasandGitHub 77fe025f38 Merge pull request #259837 from marsam/update-pglast
python310Packages.pglast: 5.4 -> 5.5
2023-10-08 17:43:44 -05:00
Weijia WangandGitHub 1ebdfa7db3 Merge pull request #259771 from lorenz/liblinphone-qr
liblinphone: add back QR support
2023-10-09 00:36:59 +02:00
Randy EckenrodeandGitHub aae6b0bd44 Merge pull request #259726 from K900/wine-staging-8.17.1
wine-staging: 8.17 -> 8.17.1
2023-10-08 18:32:21 -04:00
Weijia WangandGitHub d88d7ed846 Merge pull request #259825 from wegank/zulu-lts-init
zulu17, zulu21: init
2023-10-09 00:15:29 +02:00
Mario RodasandGitHub 350f9a67bb Merge pull request #259794 from r-ryantm/auto-update/cargo-binstall
cargo-binstall: 1.4.2 -> 1.4.3
2023-10-08 17:13:12 -05:00
Mario RodasandGitHub ce2c8eea0e Merge pull request #259802 from figsoda/tjournal
tui-journal: 0.3.2 -> 0.3.3
2023-10-08 17:12:26 -05:00
Mario RodasandGitHub 77c04821f6 Merge pull request #259801 from figsoda/leptos
leptosfmt: 0.1.14 -> 0.1.15
2023-10-08 17:12:06 -05:00
Mario RodasandGitHub ca9bd3e721 Merge pull request #259808 from figsoda/poe
poethepoet: 0.24.0 -> 0.24.1
2023-10-08 17:11:39 -05:00
Mario RodasandGitHub 396b42c932 Merge pull request #259810 from figsoda/fzf-make
fzf-make: 0.7.0 -> 0.8.0
2023-10-08 17:11:25 -05:00
Mario RodasandGitHub 750db99aae Merge pull request #259838 from r-ryantm/auto-update/apktool
apktool: 2.8.1 -> 2.9.0
2023-10-08 17:10:15 -05:00
Mario RodasandGitHub 8eeec57310 Merge pull request #259841 from r-ryantm/auto-update/containerlab
containerlab: 0.45.1 -> 0.46.0
2023-10-08 17:09:59 -05:00
Mario RodasandGitHub f39d760682 Merge pull request #259842 from marsam/update-luau
luau: 0.596 -> 0.598
2023-10-08 17:09:27 -05:00
R. Ryantm b8d7c9d5f1 flyctl: 0.1.102 -> 0.1.104 2023-10-08 21:57:45 +00:00
Anselm SchülerandYaya bf1bd46d9b rio: set meta.mainProgram 2023-10-08 23:57:30 +02:00
stuebinmandYaya 0fc6faf92b hugs: fix meta.mainProgram
this allos lib.getExe to work as expected, e.g. in uses of `nix run ...`
(currently it fails since the binary is `hugs`, but the package `hugs98`)
2023-10-08 23:55:19 +02:00