Skip to content

[staging] staging-next merge#360831

Closed
FliegendeWurst wants to merge 267 commits intoNixOS:stagingfrom
FliegendeWurst:staging-next-merge
Closed

[staging] staging-next merge#360831
FliegendeWurst wants to merge 267 commits intoNixOS:stagingfrom
FliegendeWurst:staging-next-merge

Conversation

@FliegendeWurst
Copy link
Member

@FliegendeWurst FliegendeWurst commented Dec 1, 2024

Automatic merge failed

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

khaneliman and others added 30 commits November 23, 2024 20:46
@khaneliman
gdal: add libavif optional dependency
1677c4a
@trofi
vte: 0.78.1 -> 0.78.2
a18fac9 
Changes: https://gitlab.gnome.org/GNOME/vte/-/compare/0.78.1...0.78.2?from_project_id=1893&straight=false
@yuyuyureka
tipp10: support running under wayland
b470ee2 
In qt6, the wayland support is provided by the application rather than the system environment

Change-Id: I401e6baf2ddac4cd7535dd1cf40407aa15aeed4e
@Bot-wxt1221
abctl: 0.13.1 -> 0.22.0
1bd9d10
@Aleksanaa
anvil-editor: init at 0.4
1282bf0
@giorgiga
gotemplate: 3.10.1 -> 3.11.0
e94df9b
@mweinelt
esphome: 2024.11.1 -> 2024.11.2
3465266 
https://github.com/esphome/esphome/releases/tag/2024.11.2
@ehamberg
meli: 0.8.8 -> 0.8.9
edf127d 
https://git.meli-email.org/meli/meli/releases/tag/v0.8.9
@emilazy
pdal: add upstream patch for GDAL 3.10
411c560
@emilazy
python3Packages.rasterio: 1.4.0 -> 1.4.2
07a1577 
Diff: rasterio/rasterio@refs/tags/1.4.0...1.4.2

Changelog: https://github.com/rasterio/rasterio/blob/1.4.2/CHANGES.txt
@emilazy
python3Packages.rio-tiler: 7.0.1 -> 7.2.2
e79d2ff 
Diff: cogeotiff/rio-tiler@refs/tags/7.0.1...7.2.2
@wegank
python312Packages.boltztrap2: fix build
3ed3828
@trofi
fheroes2: 1.1.3 -> 1.1.4
34892a2 
Changes: https://github.com/ihhub/fheroes2/releases/tag/1.1.4
@wegank
ios-deploy: rename from darwin.ios-deploy
af1286f
@wegank
ios-deploy: reformat
6c59ecc
@wegank
ios-deploy: migrate to new apple-sdk pattern
5c29883
@r-ryantm
stackit-cli: 0.16.0 -> 0.17.0
2b79771
@r-ryantm
protonmail-bridge: 3.14.0 -> 3.15.0
31b8963
zrythm: 1.0.0-rc.2 -> 1.0.0
0d83445
@Stunkymonkey
steam-rom-manager: fix appimageTools version
085b17a
@Stunkymonkey
ssb-patchwork: fix appimageTools version
4171105
@fabaff
python312Packages.meilisearch: 0.31.6 -> 0.32.0
61fdb8e 
Diff: meilisearch/meilisearch-python@refs/tags/v0.31.6...v0.32.0

Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.32.0
@afh
got: 0.105 -> 0.106
c1d9c70
@guitargeek
root: 6.32.08 -> 6.34.00
de24042 
Also, remove many patches and workarounds that are not necessary
anymore.
@techknowlogick
scaleway-cli: 2.34.0 -> 2.35.0
fed6fcb 
Diff: scaleway/scaleway-cli@v2.34.0...v2.35.0
zrythm: format
1591aa5
@crschnick
xpipe: 12.0 -> 13.2
14ce5a5
@tejing1
switch-to-configuration-ng: prevent error during NIXOS_LUSTRATE install
4dd2fd7
@r-ryantm
bats: 1.11.0 -> 1.11.1
a156cee
@tejing1
doc: fix/improve NIXOS_LUSTRATE installation instructions
f2ad84d
NetaliDev and others added 14 commits December 1, 2024 18:31
@NetaliDev
plausible: 2.0.0 -> 2.1.4 (NixOS#356221)
d3ba34c
@mksafavi
libphidget22: 0-unstable-2024-04-11 -> 1.20.20240909
4c6a1b0
@mksafavi
libphidget22extra: 0-unstable-2024-04-11 -> 1.20.20240909
889493e
@khaneliman
vimPlugins: add modules to skip
398bc4a
@khaneliman
vimPlugins.cmp-*: add nativeCheckInputs
1442b26 
We dont want to bundle nvim-cmp with these because of alternative
completion plugins existing that can utilize these sources. Adding
nvim-cmp to run checkphase, though.
@khaneliman
vimPlugins: replace nvim-web-devicons deps with nativeCheckInputs
6af0ef2 
We dont want to bundle nvim-web-devicons with these because of
alternative plugins existing that can mock their require. Adding
nvim-web-devicons to run checkphase, though.
@drupol
libphidget22: 0-unstable-2024-04-11 -> 1.20.20240909 (NixOS#348834)
dad3f6c
@khaneliman
vimPlugins: nvimRequireChecks and nvimSkipModules for new nvimRequire…
d2301bd 
…CheckHook (NixOS#360800)
@wegank
ios-deploy: rename from darwin.ios-deploy (NixOS#359888)
ca98816
@wegank
python312Packages.boltztrap2: fix build (NixOS#359697)
1b9db3a
@fpletz
wget: modernize and use PCRE2 instead of PCRE1 (NixOS#360567)
0b3416b
@mweinelt
esphome: 2024.11.1 -> 2024.11.2 (NixOS#359642)
4a936cc
@github-actions
Merge master into staging-next
dc4fceb
@FliegendeWurst
Merge staging-next into staging
eb22e79 
Conflicts:
  pkgs/build-support/appimage/default.nix
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: vim Advanced text editor 6.topic: cinnamon Desktop environment 6.topic: php PHP is a general-purpose scripting language geared towards web development. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions labels Dec 1, 2024
@nix-owners
Copy link

nix-owners bot commented Dec 1, 2024

The PR's base branch is set to staging, but 265 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto fc5a956d757d0dd697410491c22fa8c3890dfda3 4a936cc90477d1605640772dae1b17f3706dcabe
git push --force-with-lease

@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 1, 2024
@khaneliman khaneliman mentioned this pull request Dec 1, 2024
Merged
15 tasks
@K900 K900 closed this Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

6.topic: cinnamon Desktop environment 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: php PHP is a general-purpose scripting language geared towards web development. 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.