Skip to content

Commit d83eb57

Browse files
authored
Merge pull request #23 from nixops4/newer-nix
Update to latest Nix master
2 parents 7a187fd + 369e679 commit d83eb57

File tree

2 files changed

+28
-18
lines changed

2 files changed

+28
-18
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix-bindings-store/src/store.rs

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,10 @@ mod tests {
581581
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
582582
"system": "{}"
583583
}},
584-
"inputDrvs": {{}},
585-
"inputSrcs": [],
584+
"inputs": {{
585+
"drvs": {{}},
586+
"srcs": []
587+
}},
586588
"name": "myname",
587589
"outputs": {{
588590
"out": {{
@@ -591,7 +593,7 @@ mod tests {
591593
}}
592594
}},
593595
"system": "{}",
594-
"version": 3
596+
"version": 4
595597
}}"#,
596598
system, system
597599
)
@@ -664,7 +666,7 @@ mod tests {
664666

665667
format!(
666668
r#"{{
667-
"version": 3,
669+
"version": 4,
668670
"name": "multi-output-test",
669671
"system": "{}",
670672
"builder": "/bin/sh",
@@ -684,8 +686,10 @@ mod tests {
684686
"outj": "/0gkw1366qklqfqb2lw1pikgdqh3cmi3nw6f1z04an44ia863nxaz",
685687
"outa": "/039akv9zfpihrkrv4pl54f3x231x362bll9afblsgfqgvx96h198"
686688
}},
687-
"inputDrvs": {{}},
688-
"inputSrcs": [],
689+
"inputs": {{
690+
"drvs": {{}},
691+
"srcs": []
692+
}},
689693
"outputs": {{
690694
"outd": {{ "hashAlgo": "sha256", "method": "nar" }},
691695
"outf": {{ "hashAlgo": "sha256", "method": "nar" }},
@@ -740,8 +744,10 @@ mod tests {
740744
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
741745
"system": "{}"
742746
}},
743-
"inputDrvs": {{}},
744-
"inputSrcs": [],
747+
"inputs": {{
748+
"drvs": {{}},
749+
"srcs": []
750+
}},
745751
"name": "myname",
746752
"outputs": {{
747753
"out": {{
@@ -750,7 +756,7 @@ mod tests {
750756
}}
751757
}},
752758
"system": "{}",
753-
"version": 3
759+
"version": 4
754760
}}"#,
755761
system, system
756762
);
@@ -794,8 +800,10 @@ mod tests {
794800
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
795801
"system": "{}"
796802
}},
797-
"inputDrvs": {{}},
798-
"inputSrcs": [],
803+
"inputs": {{
804+
"drvs": {{}},
805+
"srcs": []
806+
}},
799807
"name": "failing",
800808
"outputs": {{
801809
"out": {{
@@ -804,7 +812,7 @@ mod tests {
804812
}}
805813
}},
806814
"system": "{}",
807-
"version": 3
815+
"version": 4
808816
}}"#,
809817
system, system
810818
);
@@ -848,8 +856,10 @@ mod tests {
848856
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9",
849857
"system": "{}"
850858
}},
851-
"inputDrvs": {{}},
852-
"inputSrcs": [],
859+
"inputs": {{
860+
"drvs": {{}},
861+
"srcs": []
862+
}},
853863
"name": "no-output",
854864
"outputs": {{
855865
"out": {{
@@ -858,7 +868,7 @@ mod tests {
858868
}}
859869
}},
860870
"system": "{}",
861-
"version": 3
871+
"version": 4
862872
}}"#,
863873
system, system
864874
);

0 commit comments

Comments
 (0)