Merge pull request #236 from sorki/srk/deinternalize

Removal of Internal namespace

Author: sorki

.github/workflows/ci.dhall

@@ -11,8 +11,7 @@ in    haskellCi.generalCi
                     defSteps.extraSteps.pre
                   # [ haskellCi.installCachixStep "hnix-store"
                     , haskellCi.BuildStep.NameIf
-                        { name =
-                            "Install libsodium"
+                        { name = "Install libsodium"
                         , run = "sudo apt install libsodium-dev"
                         , `if` = "matrix.os == 'ubuntu-latest'"
                         }
@@ -21,7 +20,12 @@ in    haskellCi.generalCi
         )
         haskellCi.DhallMatrix::{
         , ghc =
-          [ haskellCi.GHC.GHC963, haskellCi.GHC.GHC947, haskellCi.GHC.GHC902 ]
+          [ haskellCi.GHC.GHC963
+          , haskellCi.GHC.GHC947
+          , haskellCi.GHC.GHC928
+          , haskellCi.GHC.GHC902
+          , haskellCi.GHC.GHC8107
+          ]
         , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
         }
     : haskellCi.CI.Type

.github/workflows/ci.dhall.frozen

@@ -0,0 +1,32 @@
+let haskellCi =
+      https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
+        sha256:9e49c0d57a38ab766825b3d2de6656d998b15eec873982db97d590ef58298601
+
+let defSteps = haskellCi.defaultCabalSteps
+
+in    haskellCi.generalCi
+        ( haskellCi.withNix
+            ( defSteps
+              with extraSteps.pre
+                   =
+                    defSteps.extraSteps.pre
+                  # [ haskellCi.installCachixStep "hnix-store"
+                    , haskellCi.BuildStep.NameIf
+                        { name = "Install libsodium"
+                        , run = "sudo apt install libsodium-dev"
+                        , `if` = "matrix.os == 'ubuntu-latest'"
+                        }
+                    ]
+            )
+        )
+        haskellCi.DhallMatrix::{
+        , ghc =
+          [ haskellCi.GHC.GHC963
+          , haskellCi.GHC.GHC947
+          , haskellCi.GHC.GHC928
+          , haskellCi.GHC.GHC902
+          , haskellCi.GHC.GHC8107
+          ]
+        , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
+        }
+    : haskellCi.CI.Type

.github/workflows/ci.sh

@@ -4,6 +4,12 @@
 set -eo pipefail
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
+which dhall || cabal install dhall
 which dhall-to-yaml || cabal install dhall-yaml
+
+echo "cp haskellCi.dhall -> ci.dhall.frozen"
+cp ci.dhall ci.dhall.frozen
+echo "dhall freez-ing ci.dhall.frozen"
+dhall freeze ci.dhall.frozen
 echo "regenerating ci.yaml"
 dhall-to-yaml-ng --generated-comment --file ci.dhall > ci.yaml

.github/workflows/ci.yaml

@@ -46,15 +46,17 @@ jobs:
     - name: haddock all
       run: cabal haddock all
     - name: Build with Nix
-      run: "nix-build"
+      run: "nix-build --argstr compiler $(echo ghc${{ matrix.ghc }} | tr -d '.')"
     strategy:
       matrix:
         cabal:
         - '3.10'
         ghc:
         - '9.6.3'
         - '9.4.7'
+        - '9.2.8'
         - '9.0.2'
+        - '8.10.7'
         os:
         - "ubuntu-latest"
         - "macos-latest"

.gitignore

@@ -1,3 +1,11 @@
 dist
 dist-newstyle
 .ghc.environment*
+.direnv
+cabal.project.local~
+cabal.project.local
+attic
+TAGS
+tags
+result
+result-*

cabal.project

@@ -2,6 +2,9 @@ packages:
   ./hnix-store-core/hnix-store-core.cabal
   ./hnix-store-remote/hnix-store-remote.cabal
 
+-- till https://github.com/obsidiansystems/dependent-sum/pull/80
+allow-newer:
+  dependent-sum:some
+
 package hnix-store-remote
   flags: +build-readme +io-testsuite
-

cabal.project.local.ci

@@ -1,7 +1,7 @@
 tests: True
 
 package hnix-store-core
-  ghc-options: -Wunused-packages -Wall
+  ghc-options: -Wunused-packages -Wall -Werror
 
 package hnix-store-remote
-  ghc-options: -Wunused-packages -Wall
+  ghc-options: -Wunused-packages -Wall -Werror

default.nix

@@ -1,18 +1,27 @@
 { pkgs ? import <nixpkgs> {}
+, compiler ? null
 }:
 let
-  overlay = import ./overlay.nix pkgs pkgs.haskell.lib;
+  lib = pkgs.lib;
+  overlay = import ./overlay.nix pkgs compiler;
   overrideHaskellPackages = orig: {
     buildHaskellPackages =
       orig.buildHaskellPackages.override overrideHaskellPackages;
     overrides = if orig ? overrides
       then pkgs.lib.composeExtensions orig.overrides overlay
       else overlay;
   };
-  haskellPackages =
-    pkgs.haskellPackages.override overrideHaskellPackages;
+
+  packageSet =
+    if compiler == null
+    then pkgs.haskellPackages
+    else pkgs.haskell.packages.${compiler};
+
+  haskellPackages = packageSet.override overrideHaskellPackages;
 in {
-  inherit (haskellPackages) hnix-store-core hnix-store-remote;
-  inherit haskellPackages;
-  inherit pkgs;
+  inherit (haskellPackages)
+    hnix-store-core
+    hnix-store-remote;
+  haskellPackages = lib.dontRecurseIntoAttrs haskellPackages;
+  pkgs = lib.dontRecurseIntoAttrs pkgs;
 }

hnix-store-core/CHANGELOG.md

@@ -1,14 +1,17 @@
 # Next
 
 * Changes:
+   * `System.Nix.Internal` namespaces was removed [#236](https://github.com/haskell-nix/hnix-store/pull/236)
    * `StorePathMetadata` converted to `Metadata a` [#231](https://github.com/haskell-nix/hnix-store/pull/231)
+     * Moved to `System.Nix.StorePath.Metadata` [#236](https://github.com/haskell-nix/hnix-store/pull/236)
    * Constructors of `StorePathName` and `StorePathHashPart` are no longer
      exported. Use respective `mkStorePath..` functions. [#230](https://github.com/haskell-nix/hnix-store/pull/230)
    * `StorePathSet` type alias is no more, use `HashSet StorePath` [#230](https://github.com/haskell-nix/hnix-store/pull/230)
    * `makeStorePath` and `parsePath` now returns `Either InvalidPathError StorePath` [#231](https://github.com/haskell-nix/hnix-store/pull/231)
    * `BuildResult`s `timesBuild` field changes type from `Integer` to `Int` [#231](https://github.com/haskell-nix/hnix-store/pull/231)
 
 * Additions:
+   * `System.Nix.StorePath.parsePathFromText` [#236](https://github.com/haskell-nix/hnix-store/pull/236)
    * `Default StoreDir` instance [#231](https://github.com/haskell-nix/hnix-store/pull/231)
    * `System.Nix.StorePath.storePathHashPartToText` [#231](https://github.com/haskell-nix/hnix-store/pull/231)
    * Added `Generic` and `Show` instances for

hnix-store-core/README.md

@@ -2,10 +2,10 @@
 
 Core effects for interacting with the Nix store.
 
-See `NarEffects` in [System.Nix.Internal.Nar.Effects] and the [System.Nix.StorePath] for the available operations
+See `NarEffects` in [System.Nix.Nar.Effects] and the [System.Nix.StorePath] for the available operations
 on the store.
 
-[System.Nix.Internal.Nar.Effects]: ./src/System/Nix/Internal/Nar/Effects.hs
+[System.Nix.Nar.Effects]: ./src/System/Nix/Nar/Effects.hs
 [System.Nix.StorePath]: ./src/System/Nix/StorePath.hs