Merge branch 'test-json' into derivation-work

Author: Ericson2314

hnix-store-json/hnix-store-json.cabal

@@ -17,9 +17,26 @@ extra-doc-files:
 extra-source-files:
     README.md
 data-files:
-    upstream-libstore-data/build-result/*.json
-    upstream-libstore-data/realisation/*.json
-    upstream-libutil-data/nars/*.nar
+    upstream-libstore-data/content-address/nar.json
+    upstream-libstore-data/content-address/text.json
+    upstream-libstore-data/derived-path/multi_built_built.json
+    upstream-libstore-data/derived-path/multi_built_built_wildcard.json
+    upstream-libstore-data/derived-path/multi_opaque.json
+    upstream-libstore-data/derived-path/mutli_built.json
+    upstream-libstore-data/derived-path/single_built_built.json
+    upstream-libstore-data/derived-path/single_built.json
+    upstream-libstore-data/derived-path/single_opaque.json
+    upstream-libstore-data/outputs-spec/all.json
+    upstream-libstore-data/outputs-spec/name.json
+    upstream-libstore-data/outputs-spec/names.json
+    upstream-libstore-data/realisation/simple.json
+    upstream-libstore-data/realisation/with-dependent-realisations.json
+    upstream-libstore-data/realisation/with-signature.json
+    upstream-libstore-data/store-path/simple.json
+    upstream-libutil-data/hash/sha256-base16.json
+    upstream-libutil-data/hash/sha256-base64.json
+    upstream-libutil-data/hash/sha256-nix32.json
+    upstream-libutil-data/hash/simple.json
 
 common commons
   ghc-options:  -Wall
@@ -73,6 +90,8 @@ test-suite json
     SingleDerivedPathSpec
     StorePathSpec
     Paths_hnix_store_json
+  autogen-modules:
+    Paths_hnix_store_json
   hs-source-dirs:
     tests
   build-tool-depends:

overlay.nix

@@ -17,14 +17,16 @@ in
 {
   hnix-store-core =
     lib.pipe
-      (hself.callCabal2nix "hnix-store-core" ./hnix-store-core {})
+      (hself.callCabal2nix "hnix-store-core" ./hnix-store-core/hnix-store-core.cabal {})
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-core; }))
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-db =
     lib.pipe
-      (hself.callCabal2nix "hnix-store-db" ./hnix-store-db {})
+      (hself.callCabal2nix "hnix-store-db" ./hnix-store-db/hnix-store-db.cabal {})
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-db; }))
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-aterm =
@@ -34,21 +36,46 @@ in
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-json =
+    let
+      # Include the JSON test data files from upstream Nix that we need
+      # for testing.
+      src = lib.fileset.toSource {
+        root = ./.;
+        fileset = lib.fileset.unions [
+          ./hnix-store-json
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libstore-tests/data/content-address)
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libstore-tests/data/derived-path)
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libstore-tests/data/outputs-spec)
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libstore-tests/data/realisation)
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libstore-tests/data/store-path)
+          (lib.fileset.fileFilter (file: file.hasExt "json") ./upstream-nix/src/libutil-tests/data/hash)
+        ];
+      };
+    in
     lib.pipe
-      (hself.callCabal2nix "hnix-store-json" ./hnix-store-json {})
+      (hself.callCabal2nix "hnix-store-json" ./hnix-store-json/hnix-store-json.cabal {})
       [
+        (drv: drv.overrideAttrs (old: {
+          inherit src;
+          # Set up symlinks to upstream data files
+          postUnpack = ''
+            sourceRoot+=/hnix-store-json
+          '';
+        }))
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-nar =
     lib.pipe
-      (hself.callCabal2nix "hnix-store-nar" ./hnix-store-nar {})
+      (hself.callCabal2nix "hnix-store-nar" ./hnix-store-nar/hnix-store-nar.cabal {})
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-nar; }))
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-readonly =
     lib.pipe
-      (hself.callCabal2nix "hnix-store-readonly" ./hnix-store-readonly {})
+      (hself.callCabal2nix "hnix-store-readonly" ./hnix-store-readonly/hnix-store-readonly.cabal {})
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-readonly; }))
         haskellLib.compose.buildFromSdist
       ];
   hnix-store-remote =
@@ -60,10 +87,11 @@ in
       # after cabal2nix step
       (
       if pkgs.stdenv.isDarwin
-      then hself.callCabal2nix "hnix-store-remote" ./hnix-store-remote {}
-      else hself.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" {}
+      then hself.callCabal2nix "hnix-store-remote" ./hnix-store-remote/hnix-store-remote.cabal {}
+      else hself.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote/hnix-store-remote.cabal "-fio-testsuite" {}
       )
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-remote; }))
         haskellLib.compose.buildFromSdist
         (pkg: pkg.overrideAttrs (attrs: {
           buildInputs = attrs.buildInputs ++ [
@@ -73,8 +101,9 @@ in
       ];
   hnix-store-tests =
     lib.pipe
-      (hself.callCabal2nix "hnix-store-tests" ./hnix-store-tests {})
+      (hself.callCabal2nix "hnix-store-tests" ./hnix-store-tests/hnix-store-tests.cabal {})
       [
+        (drv: drv.overrideAttrs (old: { src = ./hnix-store-tests; }))
         haskellLib.compose.buildFromSdist
       ];
 }