Merge pull request #228 from sorki/srk/release/core07

Release core `0.7`

Author: sorki

hnix-store-core/ChangeLog.md

@@ -1,6 +1,6 @@
 # ChangeLog
 
-## Unreleased 202y-mm-dd
+## [0.7.0.0](https://github.com/haskell-nix/hnix-store/compare/core-0.6.1.0...core-0.7.0.0) 2023-11-15
 
 * Breaking:
     * [(link)](https://github.com/haskell-nix/hnix-store/pull/216) `StorePath` no longer carries `storePathRoot` field and we

hnix-store-core/hnix-store-core.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                hnix-store-core
-version:             0.6.1.0
+version:             0.7.0.0
 synopsis:            Core effects for interacting with the Nix store.
 description:
   This package contains types and functions needed to describe
@@ -19,6 +19,7 @@ extra-source-files:
   , README.md
   , tests/samples/example0.drv
   , tests/samples/example1.drv
+  , tests/fixtures/case-conflict.nar
 
 Common commons
   if impl(ghc >= 8.10)

hnix-store-remote/hnix-store-remote.cabal

@@ -58,7 +58,7 @@ library
     , nix-derivation >= 1.1.1 && <2
     , mtl
     , unordered-containers
-    , hnix-store-core >= 0.6 && <0.7
+    , hnix-store-core >= 0.7 && <0.8
     , transformers
   mixins:
       base hiding (Prelude)

overlay.nix

@@ -1,14 +1,32 @@
-pkgs: hlib: helf: huper: {
+pkgs: hlib: helf: huper:
+let
+  lib = pkgs.lib;
+in
+{
   hnix-store-core =
-    helf.callCabal2nix "hnix-store-core" ./hnix-store-core {};
+    lib.pipe
+      (helf.callCabal2nix "hnix-store-core" ./hnix-store-core {})
+      [
+        hlib.compose.buildFromSdist
+      ];
   hnix-store-remote =
-    if pkgs.stdenv.isDarwin
-    then helf.callCabal2nix "hnix-store-remote" ./hnix-store-remote { }
-    else
-      ( helf.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" { }
-      ).overrideAttrs (attrs: {
+    lib.pipe
+      # enable -fio-testsuite for Linux systems as
+      # it requires linux-namespaces
+      # NOTE: we cannot use hlib.compose.enableCabalFlag
+      # as the testsuite deps won't get picked up
+      # after cabal2nix step
+      (
+      if pkgs.stdenv.isDarwin
+      then helf.callCabal2nix "hnix-store-remote" ./hnix-store-remote {}
+      else helf.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" {}
+      )
+      [
+        hlib.compose.buildFromSdist
+        (pkg: pkg.overrideAttrs (attrs: {
           buildInputs = attrs.buildInputs ++ [
             pkgs.nix
           ];
-      });
+        }))
+      ];
 }