Merge branch 'test-json' into derivation-work

Author: Ericson2314

hnix-store-core/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Unreleased
 
 * Additions:
-   * `System.Nix.Placeholder` module with `createPlaceholder`, `renderPlaceholder`, `DownstreamPlaceholder` support
-   * `System.Nix.StorePath.ContentAddressed` module
+   * `System.Nix.Placeholder` module with `DownstreamPlaceholder`, `createPlaceholder`, and `renderPlaceholder`
+   * `System.Nix.StorePath.ContentAddressed` module, for creating content-addressed store paths
    * `textToMethod`, `methodToText` in `System.Nix.ContentAddress`
    * `parseBasePath`, `parseBasePathFromText` in `System.Nix.StorePath`
    * `textToBaseEncoding`, `baseEncodingToText` in `System.Nix.Base`

hnix-store-json/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 The test suite is now much more comprenesive, uses test data from upstream Nix to make sure the JSON formats match.
 
-   * Comprehensive test suite with upstream Nix test data
-* Additions:
-   * JSON instances for `StorePath`, `Hash`, `ContentAddress`
-   * JSON instances for `OutputsSpec`, `SingleDerivedPath`, `DerivedPath`
-   * JSON instances for `BuildTraceKey`, `Derivation`, `FreeformDerivationOutput`
-   * Roundtrip property tests for all JSON-serializable types
+* JSON instance for `StorePath` now doesn't include the store dir, matching upstream.
+  (This keeps it canonical.)
+
+* New JSON instances for:
+  * `Hash`,
+  * `ContentAddress`
+  * `OutputsSpec`
+  * `SingleDerivedPath`
+  * `DerivedPath`
+  * `Derivation`
+  * `FreeformDerivationOutput`
 
 # 0.1.0.0 2024-07-31
 

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

@@ -85,11 +85,6 @@ test-suite json
 
     , aeson
     , bytestring
-    , constraints-extras
     , containers
-    , crypton
-    , data-default-class
-    , dependent-sum
     , hspec
-    , some
     , time