Merge pull request #14707 from obsidiansystems/store-dir-in-info

Make `storeDir` a part of `UnkeyedValidPathInfo`
2025-12-20 16:01:07 +01:00 · 2025-12-08 18:00:42 +00:00 · 2025-12-08 18:00:42 +00:00 · 907a5761fa
commit 907a5761fa
parent a95580e468 f9089deb20
36 changed files with 111 additions and 29 deletions
--- a/src/libstore-tests/data/dummy-store/one-flat-file.json
+++ b/src/libstore-tests/data/dummy-store/one-flat-file.json
@ -29,6 +29,7 @@
        "references": [],
        "registrationTime": null,
        "signatures": [],
+        "storeDir": "/nix/store",
        "ultimate": false,
        "version": 2
      }
--- a/src/libstore-tests/data/nar-info/json-1/impure.json
+++ b/src/libstore-tests/data/nar-info/json-1/impure.json
@ -15,6 +15,7 @@
    "asdf",
    "qwer"
  ],
+  "storeDir": "/nix/store",
  "ultimate": true,
  "url": "nar/1w1fff338fvdw53sqgamddn1b2xgds473pv6y13gizdbqjv4i5p3.nar.xz",
  "version": 1
--- a/src/libstore-tests/data/nar-info/json-1/pure.json
+++ b/src/libstore-tests/data/nar-info/json-1/pure.json
@ -6,5 +6,6 @@
    "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
    "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
  ],
+  "storeDir": "/nix/store",
  "version": 1
 }
--- a/src/libstore-tests/data/nar-info/json-2/impure.json
+++ b/src/libstore-tests/data/nar-info/json-2/impure.json
@ -30,6 +30,7 @@
    "asdf",
    "qwer"
  ],
+  "storeDir": "/nix/store",
  "ultimate": true,
  "url": "nar/1w1fff338fvdw53sqgamddn1b2xgds473pv6y13gizdbqjv4i5p3.nar.xz",
  "version": 2
--- a/src/libstore-tests/data/nar-info/json-2/pure.json
+++ b/src/libstore-tests/data/nar-info/json-2/pure.json
@ -17,5 +17,6 @@
    "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
    "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
  ],
+  "storeDir": "/nix/store",
  "version": 2
 }
--- a/src/libstore-tests/data/path-info/json-1/empty_impure.json
+++ b/src/libstore-tests/data/path-info/json-1/empty_impure.json
@ -6,6 +6,7 @@
  "references": [],
  "registrationTime": null,
  "signatures": [],
+  "storeDir": "/nix/store",
  "ultimate": false,
  "version": 1
 }
--- a/src/libstore-tests/data/path-info/json-1/empty_pure.json
+++ b/src/libstore-tests/data/path-info/json-1/empty_pure.json
@ -3,5 +3,6 @@
  "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=",
  "narSize": 0,
  "references": [],
+  "storeDir": "/nix/store",
  "version": 1
 }
--- a/src/libstore-tests/data/path-info/json-1/impure.json
+++ b/src/libstore-tests/data/path-info/json-1/impure.json
@ -12,6 +12,7 @@
    "asdf",
    "qwer"
  ],
+  "storeDir": "/nix/store",
  "ultimate": true,
  "version": 1
 }
--- a/src/libstore-tests/data/path-info/json-1/pure.json
+++ b/src/libstore-tests/data/path-info/json-1/pure.json
@ -6,5 +6,6 @@
    "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
    "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
  ],
+  "storeDir": "/nix/store",
  "version": 1
 }
--- a/src/libstore-tests/data/path-info/json-2/empty_impure.json
+++ b/src/libstore-tests/data/path-info/json-2/empty_impure.json
@ -10,6 +10,7 @@
  "references": [],
  "registrationTime": null,
  "signatures": [],
+  "storeDir": "/nix/store",
  "ultimate": false,
  "version": 2
 }
--- a/src/libstore-tests/data/path-info/json-2/empty_pure.json
+++ b/src/libstore-tests/data/path-info/json-2/empty_pure.json
@ -7,5 +7,6 @@
  },
  "narSize": 0,
  "references": [],
+  "storeDir": "/nix/store",
  "version": 2
 }
--- a/src/libstore-tests/data/path-info/json-2/impure.json
+++ b/src/libstore-tests/data/path-info/json-2/impure.json
@ -23,6 +23,7 @@
    "asdf",
    "qwer"
  ],
+  "storeDir": "/nix/store",
  "ultimate": true,
  "version": 2
 }
--- a/src/libstore-tests/data/path-info/json-2/pure.json
+++ b/src/libstore-tests/data/path-info/json-2/pure.json
@ -17,5 +17,6 @@
    "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
    "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"
  ],
+  "storeDir": "/nix/store",
  "version": 2
 }
--- a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json
+++ b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json
@ -11,6 +11,7 @@
    "references": [],
    "registrationTime": null,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  },
@ -28,6 +29,7 @@
    ],
    "registrationTime": null,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  }
--- a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json
+++ b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json
@ -13,6 +13,7 @@
    ],
    "registrationTime": null,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  },
@ -41,6 +42,7 @@
      "fake-sig-1",
      "fake-sig-2"
    ],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  }
--- a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json
+++ b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json
@ -11,6 +11,7 @@
    "references": [],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  },
@ -28,6 +29,7 @@
    ],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  }
--- a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json
+++ b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json
@ -12,6 +12,7 @@
    "references": [],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  },
@ -31,6 +32,7 @@
    ],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  }
--- a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json
+++ b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json
@ -12,6 +12,7 @@
    "references": [],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": true,
    "version": 2
  },
@ -34,6 +35,7 @@
      "fake-sig-1",
      "fake-sig-2"
    ],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  },
@ -60,6 +62,7 @@
    ],
    "registrationTime": 23423,
    "signatures": [],
+    "storeDir": "/nix/store",
    "ultimate": false,
    "version": 2
  }