.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

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
 ```

configuration/aarch64-darwin.nix

@@ -12,7 +12,11 @@ final: prev: {
 
   libsystemd-journal = null;
 
+  llvm-hs = null;
+
   sdl2-mixer = null;
 
+  streamly = null;
+
 }
 

configuration/aarch64-linux.nix

+{ pkgs, haskellLib }:
+
+with haskellLib;
+
+final: prev: {
+
+  dhall-docs = null;
+
+  hfsevents = null;
+  
+  mmark = null;
+
+  stripeapi = null;
+}

configuration/common.nix

@@ -6,32 +6,15 @@ final: prev: {
 
   cheapskate = null;
 
-  digits = overrideCabal
-    prev.digits
-    (_:
-      {
-        patches = [
-          ./patches/digits-01.patch
-      ];
-    });
-
-  libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
-
-  saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
+  hasql-explain-tests = null;
 
   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 ];
 

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
- 

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

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;
+
 }
 

configuration/x86_64-linux.nix

@@ -4,4 +4,6 @@ with haskellLib;
 
 final: prev: {
 
+  hfsevents = null;
+
 }

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

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";
+    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;

modifiers.nix

+{ pkgs, ... }:
+
+with pkgs.lib;
+
+_: prev: name: v: if hasAttr name prev then warn "${name} exists in parent set" v else v

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

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

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