Skip to content

Commit 1d1b475

Browse files
committed
WIP JSON impls without store dir
If we depend on the store dir, our JSON serializers/deserializers take extra arguements, and that interfaces with the likes of various frameworks for associating these with types (e.g. nlohmann in C++, Serde in Rust, and Aeson in Haskell).
1 parent 095ac66 commit 1d1b475

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+432
-224
lines changed

src/libfetchers/tarball.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,15 @@ DownloadFileResult downloadFile(
7474
StringSink sink;
7575
dumpString(res.data, sink);
7676
auto hash = hashString(HashAlgorithm::SHA256, res.data);
77-
ValidPathInfo info{
77+
auto info = ValidPathInfo::makeFromCA(
7878
*store,
7979
name,
8080
FixedOutputInfo{
8181
.method = FileIngestionMethod::Flat,
8282
.hash = hash,
8383
.references = {},
8484
},
85-
hashString(HashAlgorithm::SHA256, sink.s),
86-
};
85+
hashString(HashAlgorithm::SHA256, sink.s));
8786
info.narSize = sink.s.size();
8887
auto source = StringSource{sink.s};
8988
store->addToStore(info, source, NoRepair, NoCheckSigs);

src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"
1111
},
1212
"inputDrvs": {
13-
"/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": {
13+
"j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": {
1414
"dynamicOutputs": {},
1515
"outputs": [
1616
"dev",
1717
"out"
1818
]
1919
},
20-
"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": {
20+
"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": {
2121
"dynamicOutputs": {},
2222
"outputs": [
2323
"dev",
@@ -26,7 +26,7 @@
2626
}
2727
},
2828
"inputSrcs": [
29-
"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"
29+
"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"
3030
],
3131
"name": "advanced-attributes-structured-attrs",
3232
"outputs": {

src/libstore-tests/data/derivation/ca/advanced-attributes.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
"system": "my-system"
2727
},
2828
"inputDrvs": {
29-
"/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": {
29+
"j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": {
3030
"dynamicOutputs": {},
3131
"outputs": [
3232
"dev",
3333
"out"
3434
]
3535
},
36-
"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": {
36+
"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": {
3737
"dynamicOutputs": {},
3838
"outputs": [
3939
"dev",
@@ -42,7 +42,7 @@
4242
}
4343
},
4444
"inputSrcs": [
45-
"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"
45+
"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"
4646
],
4747
"name": "advanced-attributes",
4848
"outputs": {

src/libstore-tests/data/derivation/dynDerivationDeps.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"BIG_BAD": "WOLF"
99
},
1010
"inputDrvs": {
11-
"/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv": {
11+
"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv": {
1212
"dynamicOutputs": {
1313
"cat": {
1414
"dynamicOutputs": {},
@@ -30,7 +30,7 @@
3030
}
3131
},
3232
"inputSrcs": [
33-
"/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"
33+
"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"
3434
],
3535
"name": "dyn-dep-derivation",
3636
"outputs": {},

src/libstore-tests/data/derivation/ia/advanced-attributes-defaults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"name": "advanced-attributes-defaults",
1616
"outputs": {
1717
"out": {
18-
"path": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"
18+
"path": "1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"
1919
}
2020
},
2121
"system": "my-system"

src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"name": "advanced-attributes-structured-attrs-defaults",
1414
"outputs": {
1515
"dev": {
16-
"path": "/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev"
16+
"path": "8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev"
1717
},
1818
"out": {
19-
"path": "/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults"
19+
"path": "f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults"
2020
}
2121
},
2222
"structuredAttrs": {

src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"out": "/nix/store/7cxy4zx1vqc885r4jl2l64pymqbdmhii-advanced-attributes-structured-attrs"
1111
},
1212
"inputDrvs": {
13-
"/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": {
13+
"afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": {
1414
"dynamicOutputs": {},
1515
"outputs": [
1616
"dev",
1717
"out"
1818
]
1919
},
20-
"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": {
20+
"vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": {
2121
"dynamicOutputs": {},
2222
"outputs": [
2323
"dev",
@@ -26,18 +26,18 @@
2626
}
2727
},
2828
"inputSrcs": [
29-
"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"
29+
"vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"
3030
],
3131
"name": "advanced-attributes-structured-attrs",
3232
"outputs": {
3333
"bin": {
34-
"path": "/nix/store/33qms3h55wlaspzba3brlzlrm8m2239g-advanced-attributes-structured-attrs-bin"
34+
"path": "33qms3h55wlaspzba3brlzlrm8m2239g-advanced-attributes-structured-attrs-bin"
3535
},
3636
"dev": {
37-
"path": "/nix/store/wyfgwsdi8rs851wmy1xfzdxy7y5vrg5l-advanced-attributes-structured-attrs-dev"
37+
"path": "wyfgwsdi8rs851wmy1xfzdxy7y5vrg5l-advanced-attributes-structured-attrs-dev"
3838
},
3939
"out": {
40-
"path": "/nix/store/7cxy4zx1vqc885r4jl2l64pymqbdmhii-advanced-attributes-structured-attrs"
40+
"path": "7cxy4zx1vqc885r4jl2l64pymqbdmhii-advanced-attributes-structured-attrs"
4141
}
4242
},
4343
"structuredAttrs": {

src/libstore-tests/data/derivation/ia/advanced-attributes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"system": "my-system"
2525
},
2626
"inputDrvs": {
27-
"/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": {
27+
"afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": {
2828
"dynamicOutputs": {},
2929
"outputs": [
3030
"dev",
3131
"out"
3232
]
3333
},
34-
"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": {
34+
"vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": {
3535
"dynamicOutputs": {},
3636
"outputs": [
3737
"dev",
@@ -40,12 +40,12 @@
4040
}
4141
},
4242
"inputSrcs": [
43-
"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"
43+
"vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"
4444
],
4545
"name": "advanced-attributes",
4646
"outputs": {
4747
"out": {
48-
"path": "/nix/store/wyhpwd748pns4k7svh48wdrc8kvjk0ra-advanced-attributes"
48+
"path": "wyhpwd748pns4k7svh48wdrc8kvjk0ra-advanced-attributes"
4949
}
5050
},
5151
"system": "my-system"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"hash": "894517c9163c896ec31a2adbd33c0681fd5f45b2c0ef08a64c92a03fb97f390f",
33
"hashAlgo": "sha256",
4-
"method": "flat",
5-
"path": "/nix/store/rhcg9h16sqvlbpsa6dqm57sbr2al6nzg-drv-name-output-name"
4+
"method": "flat"
65
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"hash": "894517c9163c896ec31a2adbd33c0681fd5f45b2c0ef08a64c92a03fb97f390f",
33
"hashAlgo": "sha256",
4-
"method": "nar",
5-
"path": "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-drv-name-output-name"
4+
"method": "nar"
65
}

0 commit comments

Comments
 (0)