Commit Graph

254 Commits

Author SHA1 Message Date
github-actions[bot]
ae6040d6a6
Merge master into staging-next 2024-08-14 00:02:32 +00:00
Robert Schütz
87d6cc69a4 nodePackages.yarn: drop 2024-08-13 06:55:04 -07:00
github-actions[bot]
dc79586bdf
Merge master into staging-next 2024-08-12 00:02:44 +00:00
Peder Bergebakken Sundt
fe902212ab
Merge pull request #329820 from Guanran928/metacubexd/1.143.0
metacubexd: 1.141.1 -> 1.143.0
2024-08-11 22:54:47 +02:00
github-actions[bot]
a473a12c7d
Merge master into staging-next 2024-08-11 18:01:11 +00:00
Benjamin Staffin
6c2a4b2622
Merge pull request #333827 from nadiaholmquist/melonDS-enet
melonDS: Update for recent upstream changes
2024-08-11 11:53:56 -04:00
Nadia Holmquist Pedersen
665e0551c8 Fix accidental whitespace 2024-08-11 17:01:20 +02:00
Nadia Holmquist Pedersen
d0afa7dac6
Fix ordering
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
2024-08-11 16:09:13 +02:00
Martin Weinelt
182792a514 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/laundrify-aio/default.nix
2024-08-11 13:56:09 +02:00
Nadia Holmquist Pedersen
05de07ee2e melonDS: Update for recent upstream changes
* Added enet dependency
* Remove Darwin-specific installPhase
2024-08-11 05:08:25 +02:00
Robert Schütz
c7caf3faca mealie: run tests 2024-08-10 13:22:44 -07:00
Robert Schütz
9318bf784c mealie: modernize 2024-08-10 13:01:28 -07:00
github-actions[bot]
45080a9559
Merge master into staging-next 2024-08-10 18:01:08 +00:00
Litchi Pi
0ec7dd5011 fix: replace relative paths in sources with nix store paths
Signed-off-by: Litchi Pi <litchi.pi@proton.me>
2024-08-10 16:23:27 +02:00
Litchi Pi
d8fb82bc23 mealie: 1.9.0 -> 1.11.0
Signed-off-by: Litchi Pi <litchi.pi@proton.me>
2024-08-10 16:23:03 +02:00
github-actions[bot]
6c87856002
Merge staging-next into staging 2024-08-06 12:01:45 +00:00
R. Ryantm
1e59c37674 melonDS: 0.9.5-unstable-2024-07-21 -> 0.9.5-unstable-2024-08-05 2024-08-05 21:32:16 +00:00
Vladimír Čunát
d4720e9c1e
Merge branch 'staging-next' into staging
There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools*
(reorganizing code vs. modifying it)  I hope I really got it right.
2024-08-05 11:05:55 +02:00
Pavel Sobolev
fefc54e71e
mesonlsp: 4.3.1 -> 4.3.2 2024-08-04 11:33:50 +03:00
R. Ryantm
f2fb5aa2e7 media-downloader: 4.8.0 -> 4.9.0 2024-08-01 15:09:39 +00: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
github-actions[bot]
f8a6105aee
Merge staging-next into staging 2024-07-28 00:03:18 +00:00
K900
24076029d2 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-28 01:04:35 +03: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
Gliczy
6ea8bb2ed7 melonDS: format with nixfmt-rfc-style 2024-07-27 15:36:50 +02:00
Gliczy
e08c01e39b melonDS: fix segfault on wayland 2024-07-27 15:36:10 +02:00
Randy Eckenrode
bc32f01336
meson: fix extraframework dependencies on case-sensitive APFS 2024-07-26 18:12:25 -04:00
github-actions[bot]
8c2e73a4ed
Merge staging-next into staging 2024-07-26 18:01:39 +00:00
Martin Weinelt
93f4195fe0
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/applications/graphics/seamly2d/default.nix
2024-07-26 18:05:04 +02:00
Sigmanificient
61fe0c0416 pkgs/by-name: remove unused arguments 2024-07-26 10:11:07 +02:00
Guanran Wang
9de25880f6
metacubexd: 1.141.1 -> 1.143.0
Diff: https://github.com/MetaCubeX/metacubexd/compare/v1.141.1...v1.143.0
2024-07-25 12:48:33 +08:00
github-actions[bot]
a4b184a41e
Merge staging-next into staging 2024-07-24 18:01:51 +00:00
github-actions[bot]
7208220b63
Merge master into staging-next 2024-07-24 18:01:18 +00:00
R. Ryantm
11542157c4 melonDS: 0.9.5-unstable-2024-07-14 -> 0.9.5-unstable-2024-07-21 2024-07-24 10:24:42 +00:00
github-actions[bot]
391f0616a8
Merge staging-next into staging 2024-07-24 06:01:28 +00:00
Vladimír Čunát
cd346565bb
Merge branch 'master' into staging-next 2024-07-24 07:19:19 +02:00
Aleksana
885ae53a58
Merge pull request #324137 from malob/fix-mealie-darwin
mealie: fix Darwin builds
2024-07-24 12:57:07 +08:00
Masum Reza
382bb7c090
Merge pull request #326187 from alyssais/meson-1.5.0
meson: 1.4.1 -> 1.5.0
2024-07-22 15:17:18 +05:30
Alyssa Ross
cd8e02828a
meson: 1.4.1 -> 1.5.0 2024-07-20 15:08:51 +02:00
github-actions[bot]
637b531dcf
Merge staging-next into staging 2024-07-19 18:01:40 +00:00
OPNA2608
2ab27f2619 melonDS: Add qtwayland for Qt wayland plugin
Otherwise it fails to start on Wayland:

qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
2024-07-18 15:06:23 +02:00
Weijia Wang
078fdedf26 Merge branch 'staging-next' into staging 2024-07-17 13:10:23 +02:00
Aleksana
7936809dd4
Merge pull request #327029 from r-ryantm/auto-update/media-downloader
media-downloader: 4.7.0 -> 4.8.0
2024-07-17 12:41:07 +08:00
Artturin
a516ea8c99 Merge branch 'staging-next' into staging 2024-07-16 19:07:48 +03:00
R. Ryantm
9b8aaf12dc melonDS: 0.9.5-unstable-2024-07-04 -> 0.9.5-unstable-2024-07-14 2024-07-15 04:52:09 +00:00
github-actions[bot]
0d7af056e2
Merge staging-next into staging 2024-07-14 12:02:04 +00:00