cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23 from nixops4/newer-nix

Browse source 
Update to latest Nix master
This commit is contained in:
Robert Hensing 2025-12-06 11:47:31 +01:00 • committed by GitHub
commit d83eb579f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -170,11 +170,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1761069056, "lastModified": 1764949869,
"narHash": "sha256-R6uBB3fef75wVM1OjiM0uYLLf2P5eTCWHPCQAbCaGzA=", "narHash": "sha256-esRP6gaYG8d3gLkfr306HBgWYe2jEfHIJq6A1W/pdYw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "7e8db2eb59d8798047e8cc025a3eb18613a8918c", "rev": "5f42e5ebb797433e3db3cfbc81f9cc3139903636",
"type": "github" "type": "github"
}, },
"original": { "original": {

40
nix-bindings-store/src/store.rs
View file

@ -581,8 +581,10 @@ mod tests {
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9", "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
"system": "{}" "system": "{}"
}}, }},
"inputDrvs": {{}}, "inputs": {{
"inputSrcs": [], "drvs": {{}},
"srcs": []
}},
"name": "myname", "name": "myname",
"outputs": {{ "outputs": {{
"out": {{ "out": {{
@ -591,7 +593,7 @@ mod tests {
}} }}
}}, }},
"system": "{}", "system": "{}",
"version": 3 "version": 4
}}"#, }}"#,
system, system system, system
) )
@ -664,7 +666,7 @@ mod tests {
format!( format!(
r#"{{ r#"{{
"version": 3, "version": 4,
"name": "multi-output-test", "name": "multi-output-test",
"system": "{}", "system": "{}",
"builder": "/bin/sh", "builder": "/bin/sh",
@ -684,8 +686,10 @@ mod tests {
"outj": "/0gkw1366qklqfqb2lw1pikgdqh3cmi3nw6f1z04an44ia863nxaz", "outj": "/0gkw1366qklqfqb2lw1pikgdqh3cmi3nw6f1z04an44ia863nxaz",
"outa": "/039akv9zfpihrkrv4pl54f3x231x362bll9afblsgfqgvx96h198" "outa": "/039akv9zfpihrkrv4pl54f3x231x362bll9afblsgfqgvx96h198"
}}, }},
"inputDrvs": {{}}, "inputs": {{
"inputSrcs": [], "drvs": {{}},
"srcs": []
}},
"outputs": {{ "outputs": {{
"outd": {{ "hashAlgo": "sha256", "method": "nar" }}, "outd": {{ "hashAlgo": "sha256", "method": "nar" }},
"outf": {{ "hashAlgo": "sha256", "method": "nar" }}, "outf": {{ "hashAlgo": "sha256", "method": "nar" }},
@ -740,8 +744,10 @@ mod tests {
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9", "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
"system": "{}" "system": "{}"
}}, }},
"inputDrvs": {{}}, "inputs": {{
"inputSrcs": [], "drvs": {{}},
"srcs": []
}},
"name": "myname", "name": "myname",
"outputs": {{ "outputs": {{
"out": {{ "out": {{
@ -750,7 +756,7 @@ mod tests {
}} }}
}}, }},
"system": "{}", "system": "{}",
"version": 3 "version": 4
}}"#, }}"#,
system, system system, system
); );
@ -794,8 +800,10 @@ mod tests {
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9", "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
"system": "{}" "system": "{}"
}}, }},
"inputDrvs": {{}}, "inputs": {{
"inputSrcs": [], "drvs": {{}},
"srcs": []
}},
"name": "failing", "name": "failing",
"outputs": {{ "outputs": {{
"out": {{ "out": {{
@ -804,7 +812,7 @@ mod tests {
}} }}
}}, }},
"system": "{}", "system": "{}",
"version": 3 "version": 4
}}"#, }}"#,
system, system system, system
); );
@ -848,8 +856,10 @@ mod tests {
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9", "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
"system": "{}" "system": "{}"
}}, }},
"inputDrvs": {{}}, "inputs": {{
"inputSrcs": [], "drvs": {{}},
"srcs": []
}},
"name": "no-output", "name": "no-output",
"outputs": {{ "outputs": {{
"out": {{ "out": {{
@ -858,7 +868,7 @@ mod tests {
}} }}
}}, }},
"system": "{}", "system": "{}",
"version": 3 "version": 4
}}"#, }}"#,
system, system system, system
); );