ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #228928 from DeeUnderscore/fix/replace-workspace-values-bool

Browse Source
This commit is contained in:
figsoda 2023-05-18 14:54:12 -04:00 committed by GitHub
commit 9a7fd959fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/rust/import-cargo-lock.nix
View File

@ -108,7 +108,7 @@ let
# Replaces values inherited by workspace members.
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
(builtins.readFile ./replace-workspace-values.py);
# Fetch and unpack a crate.

6
pkgs/build-support/rust/replace-workspace-values.py
View File

@ -18,7 +18,11 @@ def load_file(path: str) -> dict[str, Any]:
def replace_key(
workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
) -> bool:
if "workspace" in table[key] and table[key]["workspace"] is True:
if (
isinstance(table[key], dict)
and "workspace" in table[key]
and table[key]["workspace"] is True
):
print("replacing " + key)
replaced = table[key]

2
pkgs/build-support/rust/test/import-cargo-lock/default.nix
View File

@ -14,7 +14,7 @@
v1 = callPackage ./v1 { };
gitDependencyWorkspaceInheritance = callPackage ./git-dependency-workspace-inheritance {
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
(builtins.readFile ../../replace-workspace-values.py);
};
}

7
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/crate.toml
View File

@ -1,5 +1,12 @@
[package]
name = "im_using_workspaces"
version = { workspace = true }
publish = false
keywords = [
"workspace",
"other_thing",
"third_thing",
]
[dependencies]
foo = { workspace = true, features = ["cat"] }

7
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml
View File

@ -1,5 +1,12 @@
[package]
name = "im_using_workspaces"
version = "1.0.0"
publish = false
keywords = [
"workspace",
"other_thing",
"third_thing",
]
[dependencies]
bar = "1.0.0"