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.

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

dvc: add overrides for scmrepo and grandalf #175945

Merged
merged 1 commit into from
Jun 11, 2022
Merged

Conversation

fabaff
Copy link
Member

@fabaff fabaff commented Jun 2, 2022

Description of changes

Fixes #175885

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@fabaff

This comment was marked as outdated.

@ofborg ofborg bot requested a review from CMCDragonkai June 2, 2022 14:09
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jun 2, 2022
@fabaff fabaff force-pushed the dvc-deps branch 2 times, most recently from 13722fb to 9a4b56c Compare June 3, 2022 10:02
@fabaff
Copy link
Member Author

fabaff commented Jun 11, 2022

Result of nixpkgs-review pr 175945 run on x86_64-linux 1

2 packages built:
  • dvc
  • dvc-with-remotes

@fabaff fabaff merged commit 9e6c6ad into NixOS:master Jun 11, 2022
@fabaff fabaff deleted the dvc-deps branch June 11, 2022 23:12
@github-actions
Copy link
Contributor

Backport failed for release-22.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-22.05
git worktree add -d .worktree/backport-175945-to-release-22.05 origin/release-22.05
cd .worktree/backport-175945-to-release-22.05
git checkout -b backport-175945-to-release-22.05
ancref=$(git merge-base 37b7e36ed12d76d560aad23869ff0b9b5a578ed9 050ca6ef8faeb3f3519478efafad94b847bd8177)
git cherry-pick -x $ancref..050ca6ef8faeb3f3519478efafad94b847bd8177

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DVC 2.10.2 unpinned dependencies causes issues with file imports
1 participant