Skip to content

treewide: directly pass cargoRoot to fetcher#373541

Merged
K900 merged 15 commits intoNixOS:masterfrom
TomaSajt:treewide-cargo-root
Jun 3, 2025
Merged

treewide: directly pass cargoRoot to fetcher#373541
K900 merged 15 commits intoNixOS:masterfrom
TomaSajt:treewide-cargo-root

Conversation

@TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented Jan 13, 2025

Followup to #350541

You can run the following to test that it actually still can re-generate the FODs.

nix build .#{ccextractor,ibus-engines.openbangla-keyboard,kdePackages.akonadi-search,kdePackages.kdepim-addons,librepcb,opengamepadui,python313Packages.bcrypt,python313Packages.biliass,python313Packages.libcst,python313Packages.temporalio,ruby,surrealist,wealthfolio}.cargoDeps.vendorStaging --rebuild

(I have left out ceph's inner derivations from this command because they are not exposed directly)

Note: I have split this PR into separate commits in case some parts need backporting.

Question: should the docs follow the formatting rules, or can it stay in a format that's more readable (single-line)?
Edit: was answered in comments

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.

@TomaSajt TomaSajt marked this pull request as draft January 13, 2025 20:09
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. labels Jan 13, 2025
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 13, 2025
@nix-owners nix-owners bot requested review from MDM23, emilazy and hqurve January 13, 2025 20:18
@TomaSajt
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review


x86_64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 1 package failed to build:
  • surrealist
✅ 72 packages built:
  • alacarte
  • ayatana-indicator-display
  • blueberry
  • btrfs-assistant
  • ccextractor
  • cinnamon-common
  • cinnamon-gsettings-overrides
  • cinnamon-screensaver
  • cinnamon-session
  • cross-seed
  • fcitx5-openbangla-keyboard
  • hypnotix
  • ibus-engines.openbangla-keyboard
  • kubecolor
  • lightdm-slick-greeter
  • lomiri.lomiri
  • lomiri.lomiri-history-service
  • lomiri.lomiri-history-service.dev
  • lomiri.lomiri-session
  • lomiri.telephony-service
  • mate.marco
  • mate.mate-applets
  • mate.mate-control-center
  • mate.mate-gsettings-overrides
  • mate.mate-indicator-applet
  • mate.mate-media
  • mate.mate-netbook
  • mate.mate-notification-daemon
  • mate.mate-panel
  • mate.mate-panel-with-applets
  • mate.mate-power-manager
  • mate.mate-screensaver
  • mate.mate-sensors-applet
  • mate.mate-session-manager
  • mate.mate-settings-daemon-wrapped
  • mate.mate-tweak
  • mate.mate-tweak.dist
  • mate.mate-utils
  • mate.mate-wayland-session
  • nemo
  • nemo-fileroller
  • nemo-python
  • nemo-with-extensions
  • nemo.dev
  • nixpkgs-manual
  • pix
  • plata-theme
  • python312Packages.mmcv
  • python312Packages.mmcv.dist
  • python312Packages.mmengine
  • python312Packages.mmengine.dist
  • python312Packages.python-xapp
  • python313Packages.python-xapp
  • snapper
  • snapper-gui
  • snapper-gui.dist
  • sticky
  • telepathy-mission-control
  • telepathy-mission-control.dev
  • telepathy-mission-control.lib
  • timeshift
  • timeshift-minimal
  • timeshift-unwrapped
  • warpinator
  • xapp
  • xapp.dev
  • xdg-desktop-portal-xapp
  • xed-editor
  • xilinx-bootgen
  • xmonad_log_applet_mate
  • xreader
  • xviewer

surrealist build failure is unrelated

Copy link
Contributor

@MDM23 MDM23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks for fixing this! The surrealist build should be fixed by #373428.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 15, 2025
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch from bdfc4cd to 8fc366b Compare March 9, 2025 19:00
@TomaSajt TomaSajt marked this pull request as ready for review March 9, 2025 19:00
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 9, 2025
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch 2 times, most recently from ad51137 to 8b17bf6 Compare March 9, 2025 19:02
@nix-owners nix-owners bot requested a review from ShadowApex March 9, 2025 19:08
@K900
Copy link
Contributor

K900 commented Mar 10, 2025

ack

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch from 8b17bf6 to 52c345d Compare April 11, 2025 10:22
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 11, 2025
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch from 52c345d to 7ae9882 Compare April 20, 2025 23:10
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch 4 times, most recently from 0cd264e to 3c65d8a Compare May 30, 2025 14:43
@github-actions github-actions bot added 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. labels May 30, 2025
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch 2 times, most recently from 18c4a6b to 62a136b Compare May 30, 2025 14:52
@github-actions github-actions bot added the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label May 30, 2025
@TomaSajt TomaSajt requested a review from alyssais May 30, 2025 14:57
@TomaSajt TomaSajt force-pushed the treewide-cargo-root branch from 62a136b to 8e87675 Compare June 3, 2025 00:20
@K900 K900 merged commit bf8cde1 into NixOS:master Jun 3, 2025
15 checks passed
@TomaSajt TomaSajt deleted the treewide-cargo-root branch June 19, 2025 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants