bb850947 · 60848da4 · 08aca38f · 6cbdb238 · e7526d82 · 843d1fc5
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 stages:
- generate
- flake
- cache
+- build
+- devour
+- cachix

-generate-flake-ci:
-  stage: generate
+build:
+  stage: build
  script:
-  - nix run "git+https://gitlab.nixica.dev/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.4.1" > flake-ci-x86_64-linux.yml
-  artifacts:
-    paths:
-      - flake-ci-x86_64-linux.yml
+  - nix build .#packages.$SYSTEM.$PACKAGE -L
+  parallel:
+    matrix:
+      - SYSTEM:
+         - aarch64-darwin
+         - x86_64-linux
+        PACKAGE:
+         - aeson
+         - beam-postgres
+         - composite-base
+         - dhall
+         - hedgehog
+         - hoauth2-providers
+         - log-effectful
+         - persistent-postgresql
+         - polysemy
+         - servant
+         - souffle-haskell
+         - sydtest
+         - tasty
+         - wai-app-static
+         - warp
+      - SYSTEM:
+         - x86_64-linux
+        PACKAGE:
+         - streamly

-x86_64-linux-ci:
-  stage: flake
-  trigger:
-    include:
-      - artifact: flake-ci-x86_64-linux.yml
-        job: generate-flake-ci
-    strategy: depend
+devour:
+  stage: devour
+  script:
+  - nix build github:srid/devour-flake#packages.$SYSTEM.default -L --no-link --print-out-paths --override-input flake . --keep-going
+  parallel:
+    matrix:
+      - SYSTEM:
+         - aarch64-darwin
+         - x86_64-linux

 cachix:
-  stage: cache
-  only:
-    refs:
-    - master
-    - cachix
+  stage: cachix
+  rules:
+    - if: $CI_COMMIT_REF_PROTECTED == "true"
  script:
-  - nix-shell -p cachix --command "nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake . | xargs cat | cachix push horizon"
+    - nix-shell -p cachix --command "nix build github:srid/devour-flake#packages.$SYSTEM.default -L --no-link --print-out-paths --override-input flake . | xargs cat | cachix push horizon"
+  parallel:
+    matrix:
+      - SYSTEM:
+         - aarch64-darwin
+         - x86_64-linux
--- a/README.md
+++ b/README.md
@@ -2,41 +2,48 @@

 [horizon-haskell.net](https://horizon-haskell.net).

-Horizon is a haskell package set targetting new builds of GHC.
-
-## Package Set Policy
-
-This package set has the following policy.
-
-* GHC will advance as often as possible
-* Nonversioned locations (git, unversioned tarballs) are permitted to allow
-  GHC to advance.
-* The following packages must always build:
-  * aeson
-  * beam-postgres
-  * composite-base
-  * dhall
-  * haskell-language-server
-  * hedgehog
-  * pandoc
-  * persistent-postgresql
-  * polysemy
-  * servant
-  * sydtest
-  * tasty
-  * wai-app-static
-  * warp
+horizon-platform is a haskell package set targetting new builds of GHC. This package set extends [horizon-platform](https://gitlab.horizon-haskell.net/package-sets/horizon-platform).
+
+
+The following things are expected to be here:
+* aeson
+* beam-postgres
+* composite-base
+* dhall
+* hedgehog
+* hoauth2-providers
+* log-effectful
+* persistent-postgresql
+* polysemy
+* servant
+* souffle-haskell
+* streamly
+* sydtest
+* tasty
+* wai-app-static
+* warp

 ## Updating the Package Set

 Generating the nix expressions for the package set is a two step process.

 1. Edit the `horizon.dhall` file.
-2. Generate the nix expressions with `nix run develop/#horizon-gen-nix`.
+2. Generate the nix expressions with
+
+```
+nix run develop/#horizon-gen-nix -- -jN
+```

 You can edit the `horizon.dhall` file in one of two ways: manually using a text
 editor, or programatically using `horizon-shell`.

+If you want to bumping everything listed in the `horizon.dhall` file to the latest
+bounds, run
+
+```
+nix run develop/#try-to-upgrade-everything
+```
+
 ### Using horizon-shell.

 To use `horizon-shell`.
@@ -60,9 +67,6 @@ If you need to do additional manual overrides to the nix code, such as
 `addPkgconfigDepends`, edit the `configuration/common.nix` overlay, which is
 applied over the generated derivations.

-If you need to nullify libraries, use the `configuration/hacking.nix` overlay.
-Try to leave a note as to why this library has been nullified.
-
 ## Feedback

 To build all packages, run
@@ -73,8 +77,8 @@ nix run develop/#feedback -- build

 ## Hoogle

-To run a hoogle server containing the entire package set. Do
+To get a hoogle instance for the entire package set, you can run:

 ```
-nix run .#run-hoogle
+nix run .#apps.x86_64-linux.run-hoogle
 ```
--- a/configuration/aarch64-darwin.nix
+++ b/configuration/aarch64-darwin.nix
@@ -12,7 +12,11 @@ final: prev: {

  libsystemd-journal = null;

+  llvm-hs = null;
+
  sdl2-mixer = null;

+  streamly = null;
+
 }

--- a/configuration/aarch64-linux.nix
+++ b/configuration/aarch64-linux.nix
+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+final: prev: {
+
+  dhall-docs = null;
+
+  hfsevents = null;
+  
+  mmark = null;
+
+  stripeapi = null;
+}
--- a/configuration/common.nix
+++ b/configuration/common.nix
@@ -6,30 +6,15 @@ final: prev: {

  cheapskate = null;

-  digits = overrideCabal
-    prev.digits
-    (_:
-      {
-        patches = [
-          ./patches/digits-01.patch
-      ];
-    });
+  hasql-explain-tests = null;

-  libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
-
-  saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
+  sandwich = null;

  text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; };

-  xml-conduit-writer = overrideCabal
-    prev.xml-conduit-writer
-    (_:
-      {
-        patches = [
-          ./patches/xml-conduit-writer-01.patch
-      ];
-    });
+  thyme = null;

+  tmp-postgres = null;

  X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ];


--- a/configuration/patches/digits-01.patch
+++ b/configuration/patches/digits-01.patch
-commit 1217673c07de672edee01d1befb7243ec2de6ca6
-Author: Daniel Firth <dan.firth@homotopic.tech>
-Date:   Sat Nov 4 10:32:11 2023 +0000
-
-    fix build
-
-diff --git a/Setup.lhs b/Setup.lhs
-index 384dfce..76660fd 100644
--- a/Setup.lhs
-+++ b/Setup.lhs
-@@ -2,6 +2,5 @@
- 
- > import Distribution.Simple
- > import System.Cmd
-> tests _ _ _ _ = system "runhaskell src/Tests.hs" >> return ()
-> main = defaultMainWithHooks (simpleUserHooks {runTests = tests})
-+> main = defaultMainWithHooks simpleUserHooks
- 
--- a/configuration/patches/xml-conduit-writer-01.patch
+++ b/configuration/patches/xml-conduit-writer-01.patch
-commit d986482ef065a8762ae880585c6c2b8e4aab9dcb
-Author: Daniel Firth <dan.firth@homotopic.tech>
-Date:   Sat Dec 2 23:56:50 2023 +0000
-
-    ghc 9.6 compat
-
-diff --git a/src/Text/XML/Writer.hs b/src/Text/XML/Writer.hs
-index 65e8f66..13fda5d 100644
--- a/src/Text/XML/Writer.hs
-+++ b/src/Text/XML/Writer.hs
-@@ -36,6 +36,7 @@ module Text.XML.Writer
-     ) where
- 
- import Text.XML
-+import Control.Monad
- import Control.Monad.Writer.Strict
- import Data.Default ()
- import qualified Data.DList as DL
--- a/configuration/x86_64-darwin.nix
+++ b/configuration/x86_64-darwin.nix
@@ -8,11 +8,18 @@ final: prev: {

  alsa-mixer = null;

+  hfsevents = prev.callPackage ../pkgs/hfsevents.nix {
+    Cocoa = pkgs.darwin.apple_sdk.frameworks.Cocoa;
+    CoreServices = pkgs.darwin.apple_sdk.frameworks.CoreServices;
+  };
+
  iwlib = null;

  libsystemd-journal = null;

  sdl2-mixer = null;

+  hinotify = final.hfsevents;
+
 }

--- a/configuration/x86_64-linux.nix
+++ b/configuration/x86_64-linux.nix
@@ -4,4 +4,6 @@ with haskellLib;

 final: prev: {

+  hfsevents = null;
+
 }
--- a/develop/flake.lock
+++ b/develop/flake.lock
--- a/feedback.yaml
+++ b/feedback.yaml
-loops:
-  build:
-    command: nix run develop/#devour-flake
-    filter:
-      find: '*.nix'
-  check: nix flake check -L
-  gen:
-    command: dhall format horizon.dhall && nix run develop/#horizon-gen-nix && git add pkgs && nix flake show
-    filter:
-      find: horizon.dhall
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
        "type": "github"
      },
      "original": {
@@ -23,11 +23,11 @@
        "nixpkgs-lib": "nixpkgs-lib_2"
      },
      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
        "type": "github"
      },
      "original": {
@@ -36,307 +36,268 @@
        "type": "github"
      }
    },
-    "flake-utils": {
+    "flake-parts_3": {
      "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": "nixpkgs-lib_3"
      },
      "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "lastModified": 1717285511,
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
        "type": "github"
      }
    },
    "horizon-advance": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": [
+          "horizon-advance",
+          "horizon-core",
+          "flake-parts"
+        ],
        "horizon-core": "horizon-core",
-        "lint-utils": "lint-utils_2",
+        "horizon-hoogle": "horizon-hoogle_2",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1701559370,
-        "narHash": "sha256-cx2NEHatySFfvXI7mBtFbnWVht82nDt8rGu/Q0JMPWw=",
-        "ref": "lts/ghc-9.6.x",
-        "rev": "2fb306e266c34df0778aa797b8eb401fe9f847b6",
-        "revCount": 101,
+        "lastModified": 1719751316,
+        "narHash": "sha256-exJ80zZPyiSxiYQb4IreK7LDpjfBLOCPb77QUn3TGR8=",
+        "ref": "lts/ghc-9.10.x",
+        "rev": "36784235da4dd828b3e139a855dc8410fff91376",
+        "revCount": 259,
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
      },
      "original": {
-        "ref": "lts/ghc-9.6.x",
+        "ref": "lts/ghc-9.10.x",
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
      }
    },
-    "horizon-core": {
+    "horizon-build-packages": {
      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "lint-utils": "lint-utils",
+        "flake-parts": [
+          "horizon-advance",
+          "horizon-core",
+          "horizon-build-packages",
+          "horizon-ghc",
+          "flake-parts"
+        ],
+        "horizon-ghc": "horizon-ghc",
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1701552836,
-        "narHash": "sha256-nUYNnU4xx0Wbm6Qg3mREX2zTmPuKvUpLJVULqaKo9vg=",
-        "ref": "lts/ghc-9.6.x",
-        "rev": "93c8fd653cda7ec59673588bbfff45fc9730b209",
-        "revCount": 1189,
+        "lastModified": 1718969469,
+        "narHash": "sha256-0Q8v/yNwcLZy0znegLXx/SQmbfd2d/4TBSrFYh7g7+0=",
+        "ref": "refs/heads/master",
+        "rev": "23fa82740dc197706a3737c8830b724ccabafac4",
+        "revCount": 96,
        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
      },
      "original": {
-        "ref": "lts/ghc-9.6.x",
        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
      }
    },
-    "horizon-hoogle": {
+    "horizon-core": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "horizon-build-packages": "horizon-build-packages",
+        "horizon-hoogle": "horizon-hoogle",
+        "nixpkgs": "nixpkgs_3"
+      },
      "locked": {
-        "lastModified": 1701521742,
-        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
+        "lastModified": 1718977916,
+        "narHash": "sha256-sssWF/XjZga4asgwvovPLAbg8E2EyLDQOYSFgUbKg6c=",
        "ref": "refs/heads/master",
-        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
-        "revCount": 2,
+        "rev": "81674e75e63548341ebe0cb94127044255affb55",
+        "revCount": 1375,
        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
      },
      "original": {
        "type": "git",
-        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
      }
    },
-    "lint-utils": {
+    "horizon-ghc": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-parts": "flake-parts_3",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1699441004,
-        "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=",
+        "lastModified": 1718969245,
+        "narHash": "sha256-eeMsOK3Hmm23SH45GdbuWRtpEcMWZPC/JCYvKL2LOos=",
        "ref": "refs/heads/master",
-        "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c",
-        "revCount": 52,
+        "rev": "0bcfe994903359aef81338915706bf6b2f38aaa4",
+        "revCount": 109,
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
      },
      "original": {
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
      }
    },
-    "lint-utils_2": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_3"
-      },
+    "horizon-hoogle": {
      "locked": {
-        "lastModified": 1699441004,
-        "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=",
+        "lastModified": 1701521742,
+        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
        "ref": "refs/heads/master",
-        "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c",
-        "revCount": 52,
+        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+        "revCount": 2,
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      },
      "original": {
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      }
    },
-    "lint-utils_3": {
-      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_5"
+    "horizon-hoogle_2": {
+      "locked": {
+        "lastModified": 1701521742,
+        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
+        "ref": "refs/heads/master",
+        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+      }
+    },
+    "horizon-hoogle_3": {
      "locked": {
-        "lastModified": 1699441004,
-        "narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=",
+        "lastModified": 1701521742,
+        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
        "ref": "refs/heads/master",
-        "rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c",
-        "revCount": 52,
+        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+        "revCount": 2,
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      },
      "original": {
        "type": "git",
-        "url": "https://gitlab.nixica.dev/nix/lint-utils"
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1644525281,
-        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
+        "lastModified": 1718928808,
+        "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
+        "rev": "564000ae34c6af8549f3729051bbae33403e298c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs-lib": {
      "locked": {
-        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
      },
      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
      }
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
+        "lastModified": 1717284937,
+        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      },
      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-lib_3": {
      "locked": {
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
+        "lastModified": 1717284937,
+        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
      }
    },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1644525281,
-        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
+        "lastModified": 1718928808,
+        "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
+        "rev": "564000ae34c6af8549f3729051bbae33403e298c",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "nixos",
+        "lastModified": 1718928808,
+        "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
+        "rev": "564000ae34c6af8549f3729051bbae33403e298c",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "owner": "NixOS",
+        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1644525281,
-        "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=",
+        "lastModified": 1719706517,
+        "narHash": "sha256-ynXAAr5AJgTQHQAJW4GH3i8auqnZVzcjCokZMdEKjcs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
+        "rev": "01da4c59cc4879540b7a5d73230475b4616a0dc8",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1701336116,
-        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
+        "lastModified": 1739138025,
+        "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
+        "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
        "type": "github"
      },
      "original": {
@@ -350,24 +311,8 @@
      "inputs": {
        "flake-parts": "flake-parts",
        "horizon-advance": "horizon-advance",
-        "horizon-hoogle": "horizon-hoogle",
-        "lint-utils": "lint-utils_3",
-        "nixpkgs": "nixpkgs_6"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "horizon-hoogle": "horizon-hoogle_3",
+        "nixpkgs": "nixpkgs_5"
      }
    }
  },

--- a/flake.nix
+++ b/flake.nix
@@ -9,57 +9,40 @@

  inputs = {
    flake-parts.url = "github:hercules-ci/flake-parts";
-    horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance?ref=lts/ghc-9.6.x";
+    horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance?ref=lts/ghc-9.10.x";
    horizon-hoogle.url = "git+https://gitlab.horizon-haskell.net/nix/horizon-hoogle";
-    lint-utils.url = "git+https://gitlab.nixica.dev/nix/lint-utils";
    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
  };

-  outputs =
-    inputs@
-    { self
-    , flake-parts
-    , horizon-advance
-    , lint-utils
-    , nixpkgs
-    , ...
-    }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
+  outputs = inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
      systems = [
        "aarch64-darwin"
+        "aarch64-linux"
        "x86_64-darwin"
        "x86_64-linux"
      ];
      imports = [
        inputs.horizon-hoogle.flakeModule
      ];
-      perSystem = { config, system, ... }:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-
-        in
+      perSystem = { pkgs, config, system, ... }:
        with pkgs.lib;
        let
          haskellLib = pkgs.haskell.lib;
-
+          modifiers = import ./modifiers.nix { inherit pkgs; };
          overrides = composeManyExtensions [
-            (import ./overlay.nix { inherit pkgs; })
+            (import ./overlay.nix { inherit pkgs; f = modifiers; })
            (import ./configuration/common.nix { inherit pkgs haskellLib; })
            (import (./configuration + "/${system}.nix") { inherit pkgs haskellLib; })
          ];

-          legacyPackages = horizon-advance.legacyPackages.${system}.extend overrides;
+          legacyPackages = inputs.horizon-advance.legacyPackages.${system}.extend overrides;

          packages = filterAttrs (_: isDerivation) legacyPackages;

        in
        {

-          checks = with lint-utils.linters.${system}; {
-            dhall-format = dhall-format { src = self; };
-            nixpkgs-fmt = nixpkgs-fmt { src = self; find = "flake.nix"; };
-          };
-
          inherit legacyPackages;

          inherit packages;

--- a/horizon.dhall
+++ b/horizon.dhall
--- a/horizon.lock
+++ b/horizon.lock
--- a/modifiers.nix
+++ b/modifiers.nix
+{ pkgs, ... }:
+
+with pkgs.lib;
+
+_: prev: name: v: if hasAttr name prev then warn "${name} exists in parent set" v else v
--- a/overlay.nix
+++ b/overlay.nix
--- a/pkgs/HTTP.nix
+++ b/pkgs/HTTP.nix
-{ mkDerivation, HUnit, array, base, bytestring, deepseq, httpd-shed
-, lib, mtl, network, network-uri, parsec, pureMD5, split
-, test-framework, test-framework-hunit, time, transformers
-}:
-mkDerivation {
-  pname = "HTTP";
-  version = "4000.4.1";
-  sha256 = "df31d8efec775124dab856d7177ddcba31be9f9e0836ebdab03d94392f2dd453";
-  revision = "3";
-  editedCabalFile = "0nsg7j94f8wz9pv4c221c744sncac7hp5x0hlvbljgklj0jmfdqf";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base bytestring mtl network network-uri parsec time
-    transformers
-  ];
-  testHaskellDepends = [
-    base bytestring deepseq httpd-shed HUnit mtl network network-uri
-    pureMD5 split test-framework test-framework-hunit
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/haskell/HTTP";
-  description = "A library for client-side HTTP";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
--- a/pkgs/HUnit.nix
+++ b/pkgs/HUnit.nix
-{ mkDerivation, base, call-stack, deepseq, filepath, lib }:
-mkDerivation {
-  pname = "HUnit";
-  version = "1.6.2.0";
-  sha256 = "b0b7538871ffc058486fc00740886d2f3172f8fa6869936bfe83a5e10bd744ab";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [ base call-stack deepseq ];
-  testHaskellDepends = [ base call-stack deepseq filepath ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/hspec/HUnit#readme";
-  description = "A unit testing framework for Haskell";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
--- a/pkgs/HaskellNet.nix
+++ b/pkgs/HaskellNet.nix
-{ mkDerivation, array, base, base64, bytestring, cryptohash-md5
-, lib, mime-mail, mtl, network, network-bsd, old-time, pretty, text
-}:
-mkDerivation {
-  pname = "HaskellNet";
-  version = "0.6.1.2";
-  sha256 = "658bd4a6e91b1b7aa0c092e238fa55b37c9e2c139fba33f6346b2b9798b1a079";
-  revision = "1";
-  editedCabalFile = "1j5g09v40rvsk4crfjabs0mma5nlwsbzbny25803bc6805jh9058";
-  isLibrary = true;
-  isExecutable = false;
-  enableSeparateDataOutput = false;
-  libraryHaskellDepends = [
-    array base base64 bytestring cryptohash-md5 mime-mail mtl network
-    network-bsd old-time pretty text
-  ];
-  enableLibraryProfiling = true;
-  enableExecutableProfiling = true;
-  doHaddock = true;
-  jailbreak = true;
-  doCheck = false;
-  doBenchmark = false;
-  hyperlinkSource = false;
-  homepage = "https://github.com/qnikst/HaskellNet";
-  description = "Client support for POP3, SMTP, and IMAP";
-  license = lib.licenses.bsd3;
-  broken = false;
-}
\ No newline at end of file
No results found