Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rust: Fix for legacy fetch cargo #80153

Merged
merged 1 commit into from Feb 16, 2020
Merged

rust: Fix for legacy fetch cargo #80153

merged 1 commit into from Feb 16, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Feb 15, 2020

See inline comment and #79975 for details.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@bhipple bhipple requested a review from andir as a code owner February 15, 2020 00:55
@bhipple bhipple mentioned this pull request Feb 15, 2020
Closed
@bhipple
Copy link
Contributor Author

bhipple commented Feb 15, 2020

Building a package with a custom hook on the legacy fetcher, a "well behaved" package on the legacy fetcher, and a package on the new fetcher, respectively.

@GrahamcOfBorg build spotifyd ripgrep hexdino

@bhipple bhipple requested review from zimbatm and Ma27 February 15, 2020 00:59
@veprbl veprbl added this to WIP in Staging via automation Feb 15, 2020
@veprbl veprbl moved this from WIP to Needs review in Staging Feb 15, 2020
@veprbl
Copy link
Member

veprbl commented Feb 15, 2020

Actually, this could go to master.

@marsam marsam mentioned this pull request Feb 15, 2020
Closed
@marsam
Copy link
Contributor

marsam commented Feb 15, 2020

@GrahamcOfBorg build nushell

Staging automation moved this from Needs review to Ready Feb 15, 2020
@jonringer
Copy link
Contributor

I would also be fine with targeting master

@bhipple bhipple changed the base branch from staging to master February 15, 2020 19:37
@bhipple
rust: Fix for legacy fetch cargo
d8e4f8a 
See inline comment and NixOS#79975 for details.
@bhipple
Copy link
Contributor Author

bhipple commented Feb 15, 2020

Re-targeted the PR and rebased to master.

@bhipple
Copy link
Contributor Author

bhipple commented Feb 15, 2020

@GrahamcOfBorg build ripgrep hexdino nushell

@bhipple bhipple mentioned this pull request Feb 15, 2020
Closed
jonringer pushed a commit that referenced this pull request Feb 15, 2020
@bhipple
nushell: fix build by using newer cargo fetcher
a5df5df 
Resolves #80117 by using the newer fetcher; see #79975 for details.

Would also be fixed by #80153 eventually, but we want to upgrade Rust packages
either way, so might as well start with the broken ones!
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 15, 2020
@bhipple
sequoia: fix build by migrating off legacy fetchCargo implementation
993719b 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.
This was referenced Feb 15, 2020
Merged
Merged
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 15, 2020
@bhipple
pijul: fix build by migrating off legacy fetchCargo
a7c4515 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 16, 2020
@bhipple
xidlehook: fix build by migrating off legacy fetchCargo
9917c35 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/xidlehook.x86_64-linux
@bhipple bhipple mentioned this pull request Feb 16, 2020
Merged
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 16, 2020
@bhipple
silicon: fix build by migrating off legacy fetchCargo
9d68ef6 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/silicon.x86_64-linux
@bhipple bhipple mentioned this pull request Feb 16, 2020
Merged
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 16, 2020
@bhipple
xprite-editor: fix build by migrating off legacy fetchCargo
ddccc20 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/xprite-editor.x86_64-linux
@bhipple bhipple mentioned this pull request Feb 16, 2020
Merged
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 16, 2020
@bhipple
ncspot: fix build by migrating off legacy fetchCargo
4cacccf 
Currently broken; see NixOS#79975 for details. Would also be fixed by NixOS#80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/ncspot.x86_64-linux
@bhipple bhipple mentioned this pull request Feb 16, 2020
Merged
jonringer
jonringer approved these changes Feb 16, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

shouldn't affect most packages

jonringer pushed a commit that referenced this pull request Feb 16, 2020
@bhipple
ncspot: fix build by migrating off legacy fetchCargo
e66fb0f 
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/ncspot.x86_64-linux
jonringer pushed a commit that referenced this pull request Feb 16, 2020
@bhipple
silicon: fix build by migrating off legacy fetchCargo
c292376 
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/silicon.x86_64-linux
jonringer pushed a commit that referenced this pull request Feb 16, 2020
@bhipple
xprite-editor: fix build by migrating off legacy fetchCargo
2227115 
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/xprite-editor.x86_64-linux
@bhipple
Copy link
Contributor Author

bhipple commented Feb 16, 2020 •
edited

Yeah, I've searched through Hydra and sent pre-emptive upgrade PRs to fix the broken pkgs, so this is less urgent, but should still be merged regardless. I currently have it targeting master but LMK if I should re-rebase it back to staging.

It looks like out of the ~220 Rust applications, ~10 of them were depending on the writable cargo vendor dir.

jonringer
jonringer approved these changes Feb 16, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

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

diff LGTM

as far as i can tell, failures all fail on master

[276 built (34 failed), 521 copied (28991.8 MiB), 3074.0 MiB DL]
error: build of '/nix/store/hkksv82z4jib341jzzldjq87rypx5dra-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/80153
44 package failed to build:
icedtea_web amp b3sum bepasty bitwarden_rs-mysql btrfs-dedupe cargo-geiger ethabi firefox firefox-esr firefox-esr-68-unwrapped firefox-unwrapped firefox-wayland fluidasserts gitAndTools.git-dit gnvim heatseeker ion leftwm licensor mozplugger parinfer-rust parity python37Packages.aplpy python37Packages.arviz python37Packages.dask-jobqueue python37Packages.datashader python37Packages.intake python37Packages.optuna python37Packages.rl-coach python37Packages.streamz python37Packages.sunpy python38Packages.aplpy python38Packages.arviz python38Packages.dask-jobqueue python38Packages.datashader python38Packages.intake python38Packages.optuna python38Packages.rl-coach python38Packages.streamz sit slimerjs vector whitebox-tools

258 package built:
alacritty amber async bandwhich bat bitwarden_rs bitwarden_rs-postgresql boringtun bukubrow cargo-about cargo-asm cargo-audit cargo-bloat cargo-deb cargo-deps cargo-edit cargo-expand cargo-flamegraph cargo-fuzz cargo-generate cargo-graph cargo-inspect cargo-license cargo-make cargo-outdated cargo-raze cargo-release cargo-sweep cargo-udeps cargo-watch cargo-web cargo-xbuild chit click clog-cli cloudflare-wrangler cntr coloursum contrast crosvm diesel-cli diffr diskus du-dust dua dwm-status eidolon elan emplace eva evcxr exa fd ffsend findomain fractal fselect geckodriver gifski gir-rs git-backup git-series gitAndTools.delta gitAndTools.git-absorb gitAndTools.git-codeowners gitAndTools.git-gone gitAndTools.git-ignore gitAndTools.git-interactive-rebase-tool gleam gnirehtet gnome-podcasts gnvim-unwrapped zola hexyl httplz hydra-cli hyperfine i3status-rust intecture-agent intecture-auth intecture-cli ja2-stracciatella journaldriver just jwt-cli kak-lsp khal loc loop lorri lsd maturin mcfly mdbook mdcat miniserve mq-cli ncspot newsboat nix-index nixdoc nixpkgs-fmt nushell onefetch oxipng panopticon parallel-rust parity-beta pastel pax-rs pazi peek pijul powerline-rs procs prometheus-wireguard-exporter pueue python27Packages.bokeh python27Packages.colorcet python27Packages.holoviews python27Packages.hvplot python27Packages.nbsmoke python27Packages.panel python27Packages.robotframework-selenium2library python27Packages.robotframework-seleniumlibrary python27Packages.runway-python python27Packages.selenium python27Packages.splinter python37Packages.bokeh python37Packages.caffe python37Packages.colorcet python37Packages.dask python37Packages.dask-glm python37Packages.dask-image python37Packages.dask-ml python37Packages.dask-mpi python37Packages.dask-xgboost python37Packages.distributed python37Packages.glymur python37Packages.holoviews python37Packages.hvplot python37Packages.image-match python37Packages.imagecorruptions python37Packages.imgaug python37Packages.nbsmoke python37Packages.panel python37Packages.pims python37Packages.pyfftw python37Packages.robotframework-selenium2library python37Packages.robotframework-seleniumlibrary python37Packages.runway-python python37Packages.scikitimage python37Packages.selenium sequoia python37Packages.splinter python37Packages.stumpy python37Packages.stytra python38Packages.bokeh python38Packages.caffe python38Packages.colorcet python38Packages.dask python38Packages.dask-glm python38Packages.dask-image python38Packages.dask-ml python38Packages.dask-mpi python38Packages.dask-xgboost python38Packages.distributed python38Packages.glymur python38Packages.holoviews python38Packages.hvplot python38Packages.image-match python38Packages.imagecorruptions python38Packages.imgaug python38Packages.nbsmoke python38Packages.panel python38Packages.pims python38Packages.pyfftw python38Packages.robotframework-selenium2library python38Packages.robotframework-seleniumlibrary python38Packages.runway-python python38Packages.scikitimage python38Packages.selenium python38Packages.sequoia python38Packages.splinter python38Packages.stytra rage railcar rav1e rdedup rink ripasso-cursive ripgrep-all rnix-lsp routinator rq rsclock ruplacer rust-bindgen rust-cbindgen rustracer rustracerd rustup rx scaff sccache sd searx shadowenv shadowsocks-rust shell-hist shotgun silicon skim starship svd2rust svgbob svgcleaner synapse-bt system-syzygy taizen tdns-cli tealdeer tectonic tensorman termplay texlab thunderbird tiny todiff topgrade tox-node unpfs uq uutils-coreutils vdirsyncer vimPlugins.LanguageClient-neovim vimPlugins.YouCompleteMe vimPlugins.skim viu vivid void wasm-bindgen-cli wasm-gc wasm-pack wasmer wasmtime watchexec webmetro websocat wishbone-tool wmfocus xidlehook xprite-editor xsv xv ycmd ytop zcash

@jonringer jonringer merged commit 6d88147 into NixOS:master Feb 16, 2020
Staging automation moved this from Ready to Done Feb 16, 2020
@bhipple bhipple mentioned this pull request Feb 16, 2020
Closed
@veprbl veprbl removed this from Done in Staging Feb 16, 2020
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Feb 16, 2020
@bhipple
rust: backport fix for legacy fetch cargo
faa46f4 
Cherry-picked from PR NixOS#80153

(cherry picked from commit 4f8921bd7fa3744a8c2b9cfa475fb102e53d0230)
jonringer pushed a commit that referenced this pull request Feb 16, 2020
@bhipple
pijul: fix build by migrating off legacy fetchCargo
201d464 
Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux
@drewrisinger drewrisinger mentioned this pull request Jul 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@jonringer jonringer jonringer approved these changes

@andir andir Awaiting requested review from andir

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@bhipple @veprbl @marsam @jonringer @Ma27