Skip to content

fix references to git depencies in workspaces with inherited configuration #393

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

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
a829957
allow workspace in git dependancies
marius851000 Feb 18, 2021
da21fc1
feat(tools): deduplicate sources by URL
tilpner Nov 11, 2021
3bcba9a
feat: add resolve-manifest subcommand to fill in workspace-inherited …
tilpner Sep 19, 2023
acfc308
style(tools): create2nix_options -> crate2nix_options
tilpner Sep 19, 2023
9f8df83
chore: update nixpkgs
tilpner Sep 19, 2023
f5697b1
fix(nix/dependencies): don't shadow nix 2.3 over the users own nix ve…
tilpner Sep 19, 2023
e8d7df6
fix(nix/dependencies): add pkg-config and openssl for cargo
tilpner Sep 19, 2023
a61f891
feat: allow libgit2-sys to build libgit2
tilpner Sep 19, 2023
510373d
feat(tools): resolve workspace-inherited fields in manifests
tilpner Sep 19, 2023
a49a56a
fix(regenerate_cargo_nix.sh): port to stable nix CLI
tilpner Sep 19, 2023
09ecedb
chore: update lockfiles
tilpner Sep 19, 2023
5f51c97
Merge branch 'master' into git-workspaces
hallettj Jan 20, 2025
4b83a94
revert Cargo.lock and Cargo.nix to versions from master
hallettj Jan 20, 2025
dd7df05
delete files that don't exist in master anymore
hallettj Jan 20, 2025
d45e3bb
select cargo 0.85 instead of cargo 0.72
hallettj Jan 20, 2025
7d151a8
update nixpkgs to get rust version required by new dependencies
hallettj Jan 20, 2025
8582c6d
update Cargo.lock and Cargo.nix for new dependencies
hallettj Jan 20, 2025
edbc9d4
update added rust code for cargo 0.85
hallettj Jan 20, 2025
0e9b845
fix legacy checksum lookup after cargo metadata package id format change
hallettj Jan 21, 2025
f8af070
fix clippy lint warnings
hallettj Jan 21, 2025
06bcbcd
Cargo.nix updated by test suite
hallettj Jan 21, 2025
4aad25e
fix references to flake.lock that were getting the wrong nixpkgs
hallettj Jan 21, 2025
cad6b80
remove a leftover line
hallettj Jan 21, 2025
8af1c29
output normalized_toml to get inherited workspace value expansions
hallettj Jan 21, 2025
48e9039
fix devshell
hallettj Jan 22, 2025
924087c
test fixes
hallettj Jan 23, 2025
5ce0709
switch from cargo lib to much smaller cargo_toml
hallettj Jan 24, 2025
64de397
add test
hallettj Jan 25, 2025
e168c18
filters out any inherited workspace values that cargo_toml didn't rep…
hallettj Jan 25, 2025
7a5f283
do not prefetch git sources - use builtins.fetchGit to avoid need for…
hallettj Jan 22, 2025
2cb81ac
delete test crate hashes that are no longer used
hallettj Jan 25, 2025
62c56a3
update git fetcher in tools
hallettj Jan 25, 2025
abd30b0
we need to fetch submodules
hallettj Jan 25, 2025
aec89f2
I think we don't want allRefs
hallettj Jan 26, 2025
0aec946
parse commit hashes to verify validity
hallettj Jan 26, 2025
a0f275e
remove blank lines from Cargo.nix files
hallettj Jan 26, 2025
9939a0a
make git source parsing consistent in different places where it is done
hallettj Jan 26, 2025
dacea5d
fiddle with whitespace in tera template
hallettj Jan 27, 2025
ca3fafc
removed a function I didn't end up using
hallettj Jan 27, 2025
10de5c9
accidentally use rust interpolation syntax in a nix string
hallettj Jan 27, 2025
eb94830
rename resolve-manifest to normalize-manifest
hallettj Jan 27, 2025
9e68ee5
missed a null check
hallettj Jan 27, 2025
cb531bf
skip step of rewriting manifest if there is no workspace to inherit v…
hallettj Jan 27, 2025
f6fee14
Merge branch 'avoid-git-prefetch' into git-workspaces
hallettj Feb 9, 2025
96b8cbf
changes written by test suite
hallettj Feb 9, 2025
b98cdda
skip redundant serialization
hallettj Feb 9, 2025
0580843
skip conditional normalization skip since it didn't work
hallettj Feb 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 66 additions & 54 deletions crate2nix/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading