Merge pull request #294 from haskell-nix/srk/refresh

Bounds & CI

Author: Ericson2314

.github/workflows/ci.dhall

@@ -10,11 +10,18 @@ in    haskellCi.generalCi
               with extraSteps.pre
                    =
                     defSteps.extraSteps.pre
-                  # [ haskellCi.installCachixStep "hnix-store" ]
+                  # [ haskellCi.installCachixStep "hnix-store"
+                    , haskellCi.BuildStep.NameIf
+                        { name = "Allow unprivileged userns"
+                        , run =
+                            "sudo sysctl kernel.apparmor_restrict_unprivileged_userns=0"
+                        , `if` = "matrix.os == 'ubuntu-latest'"
+                        }
+                    ]
             )
         )
         haskellCi.DhallMatrix::{
-        , ghc = [ haskellCi.GHC.GHC982, haskellCi.GHC.GHC966 ]
+        , ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
         , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
         }
     : haskellCi.CI.Type

.github/workflows/ci.dhall.frozen

@@ -1,6 +1,6 @@
 let haskellCi =
       https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
-        sha256:eff4d52e4243777fbe2c800778b24092ace8cd83165cf46b90d5c22e3ebfdd81
+        sha256:1f1a5102e99ea92eb585b4d36aaeabb0bd93d39e62ba82f3080250fdc234e33a
 
 let defSteps = haskellCi.defaultCabalSteps
 
@@ -11,11 +11,18 @@ in    haskellCi.generalCi
               with extraSteps.pre
                    =
                     defSteps.extraSteps.pre
-                  # [ haskellCi.installCachixStep "hnix-store" ]
+                  # [ haskellCi.installCachixStep "hnix-store"
+                    , haskellCi.BuildStep.NameIf
+                        { name = "Allow unprivileged userns"
+                        , run =
+                            "sudo sysctl kernel.apparmor_restrict_unprivileged_userns=0"
+                        , `if` = "matrix.os == 'ubuntu-latest'"
+                        }
+                    ]
             )
         )
         haskellCi.DhallMatrix::{
-        , ghc = [ haskellCi.GHC.GHC982, haskellCi.GHC.GHC966 ]
+        , ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
         , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
         }
     : haskellCi.CI.Type

.github/workflows/ci.yaml

@@ -4,13 +4,16 @@ jobs:
     name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
     "runs-on": "${{ matrix.os }}"
     steps:
-    - uses: "cachix/install-nix-action@v27"
+    - uses: "cachix/install-nix-action@v31"
       with:
         nix_path: "nixpkgs=channel:nixos-unstable"
     - uses: "cachix/cachix-action@v15"
       with:
         name: "hnix-store"
         signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+    - if: "matrix.os == 'ubuntu-latest'"
+      name: Allow unprivileged userns
+      run: sudo sysctl kernel.apparmor_restrict_unprivileged_userns=0
     - uses: "actions/checkout@v4"
       with:
         submodules: recursive
@@ -45,10 +48,10 @@ jobs:
     strategy:
       matrix:
         cabal:
-        - '3.12'
+        - '3.16'
         ghc:
-        - '9.8.2'
-        - '9.6.6'
+        - '9.10.2'
+        - '9.8.4'
         os:
         - "ubuntu-latest"
         - "macos-latest"

cabal.project

@@ -10,10 +10,6 @@ packages:
   ./hnix-store-remote/hnix-store-remote.cabal
   ./hnix-store-tests/hnix-store-tests.cabal
 
--- till https://github.com/obsidiansystems/dependent-sum/pull/80
-allow-newer:
-  dependent-sum:some
-
 package hnix-store-db
   flags: +build-readme +build-bench
 

default.nix

@@ -1,4 +1,7 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? import (fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/tarball/c23193b943c6c689d70ee98ce3128239ed9e32d1"; # nixos-unstable
+    sha256 = "0vgk8mrprrh6w7zw2id3hc858kqw5pwdc52ma2f95rz36gchxcc4";
+  }) {}
 , compiler ? null
 }:
 let

hnix-store-db/CHANGELOG.md

@@ -1,3 +1,7 @@
+# [0.1.0.1](https://github.com/haskell-nix/hnix-store/compare/db-0.1.0.0...db-0.1.0.1) 2025-09-03
+
+* Relax upper bounds on `esqueleto` and `persistent` [#294](https://github.com/haskell-nix/hnix-store/pull/294)
+
 # 0.1.0.0 2024-07-31
 
 * Initial release

hnix-store-db/hnix-store-db.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.2
 name:                hnix-store-db
-version:             0.1.0.0
+version:             0.1.0.1
 synopsis:            Nix store database support
 description:         Implementation of the Nix store database
 homepage:            https://github.com/haskell-nix/hnix-store
@@ -80,8 +80,8 @@ library
     , data-default-class
     , text
     , time
-    , esqueleto >= 3.5.10 && < 3.6
-    , persistent >= 2.14.5 && < 2.15
+    , esqueleto >= 3.5.10 && < 3.7
+    , persistent >= 2.14.5 && < 2.18
     , persistent-sqlite >= 2.13.1 && < 2.14
     , template-haskell
     , monad-logger

overlay.nix

@@ -15,11 +15,17 @@ let
       } // (lib.filterAttrs (n: v: n != "url") x));
 in
 {
-  # srk 2024-07-28: allow template-haskell 2.22 (GHC 9.8)
-  # https://github.com/obsidiansystems/dependent-sum-template/pull/13
-  dependent-sum-template =
-    haskellLib.doJailbreak
-      hsuper.dependent-sum-template_0_2_0_1;
+  # srk 2025-09-03: until revised version lands in unstable
+  # (due to filepath bound https://github.com/Gabriella439/Haskell-Nix-Derivation-Library/pull/29)
+  nix-derivation = hself.callHackageDirect
+    { pkg = "nix-derivation";
+      ver = "1.1.3";
+      sha256 = "sha256-pklIwd0Atp45AT9x2n3PWAV7tFRqTzv89ViG2iAjoe0=";
+      rev =
+        { revision = "2";
+          sha256 = "sha256-Vv0NIHevaQOyFWBn79Q8OAYZa/Yhas/N1lBHfjANAm4=";
+        };
+    } {};
 
   hnix-store-core =
     lib.pipe