Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • tchoutri/horizon-platform
  • raoulhc/horizon-platform
  • jonge/horizon-platform
  • package-sets/horizon-platform
Show changes
Commits on Source (172)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1826 additions and 2668 deletions
.gitlab-ci.yml
View file @ d910fc78
stages: stages:
- generate - build
- flake - devour
- cache - cachix
generate-flake-ci: build:
stage: generate stage: build
script: 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 - nix build .#packages.$SYSTEM.$PACKAGE -L
artifacts: parallel:
paths: matrix:
- flake-ci-x86_64-linux.yml - 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: devour:
stage: flake stage: devour
trigger: script:
include: - nix build github:srid/devour-flake#packages.$SYSTEM.default -L --no-link --print-out-paths --override-input flake . --keep-going
- artifact: flake-ci-x86_64-linux.yml parallel:
job: generate-flake-ci matrix:
strategy: depend - SYSTEM:
- aarch64-darwin
- x86_64-linux
cachix: cachix:
stage: cache stage: cachix
only: rules:
refs: - if: $CI_COMMIT_REF_PROTECTED == "true"
- master
- cachix
script: 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
View file @ d910fc78
...@@ -2,41 +2,48 @@ ...@@ -2,41 +2,48 @@
[horizon-haskell.net](https://horizon-haskell.net). [horizon-haskell.net](https://horizon-haskell.net).
Horizon is a haskell package set targetting new builds of GHC. 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).
## Package Set Policy
The following things are expected to be here:
This package set has the following policy. * aeson
* beam-postgres
* GHC will advance as often as possible * composite-base
* Nonversioned locations (git, unversioned tarballs) are permitted to allow * dhall
GHC to advance. * hedgehog
* The following packages must always build: * hoauth2-providers
* aeson * log-effectful
* beam-postgres * persistent-postgresql
* composite-base * polysemy
* dhall * servant
* haskell-language-server * souffle-haskell
* hedgehog * streamly
* pandoc * sydtest
* persistent-postgresql * tasty
* polysemy * wai-app-static
* servant * warp
* sydtest
* tasty
* wai-app-static
* warp
## Updating the Package Set ## Updating the Package Set
Generating the nix expressions for the package set is a two step process. Generating the nix expressions for the package set is a two step process.
1. Edit the `horizon.dhall` file. 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 You can edit the `horizon.dhall` file in one of two ways: manually using a text
editor, or programatically using `horizon-shell`. 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. ### Using horizon-shell.
To use `horizon-shell`. To use `horizon-shell`.
...@@ -60,9 +67,6 @@ If you need to do additional manual overrides to the nix code, such as ...@@ -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 `addPkgconfigDepends`, edit the `configuration/common.nix` overlay, which is
applied over the generated derivations. 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 ## Feedback
To build all packages, run To build all packages, run
...@@ -73,8 +77,8 @@ nix run develop/#feedback -- build ...@@ -73,8 +77,8 @@ nix run develop/#feedback -- build
## Hoogle ## 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
View file @ d910fc78
...@@ -12,7 +12,11 @@ final: prev: { ...@@ -12,7 +12,11 @@ final: prev: {
libsystemd-journal = null; libsystemd-journal = null;
llvm-hs = null;
sdl2-mixer = null; sdl2-mixer = null;
streamly = null;
} }
configuration/aarch64-linux.nix 0 → 100644
View file @ d910fc78
{ pkgs, haskellLib }:
with haskellLib;
final: prev: {
dhall-docs = null;
hfsevents = null;
mmark = null;
stripeapi = null;
}
configuration/common.nix
View file @ d910fc78
...@@ -6,30 +6,15 @@ final: prev: { ...@@ -6,30 +6,15 @@ final: prev: {
cheapskate = null; cheapskate = null;
digits = overrideCabal hasql-explain-tests = null;
prev.digits
(_:
{
patches = [
./patches/digits-01.patch
];
});
libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; }; sandwich = null;
saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; }; text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
xml-conduit-writer = overrideCabal thyme = null;
prev.xml-conduit-writer
(_:
{
patches = [
./patches/xml-conduit-writer-01.patch
];
});
tmp-postgres = null;
X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ]; X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ];
......
configuration/patches/digits-01.patch deleted 100644 → 0
View file @ b242aaf5
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 deleted 100644 → 0
View file @ b242aaf5
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
View file @ d910fc78
...@@ -8,11 +8,18 @@ final: prev: { ...@@ -8,11 +8,18 @@ final: prev: {
alsa-mixer = null; 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; iwlib = null;
libsystemd-journal = null; libsystemd-journal = null;
sdl2-mixer = null; sdl2-mixer = null;
hinotify = final.hfsevents;
} }
configuration/x86_64-linux.nix
View file @ d910fc78
...@@ -4,4 +4,6 @@ with haskellLib; ...@@ -4,4 +4,6 @@ with haskellLib;
final: prev: { final: prev: {
hfsevents = null;
} }
develop/flake.lock
View file @ d910fc78
This diff is collapsed.
feedback.yaml deleted 100644 → 0
View file @ b242aaf5
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.lock
View file @ d910fc78
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1701473968, "lastModified": 1738453229,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1701473968, "lastModified": 1717285511,
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -36,307 +36,268 @@ ...@@ -36,307 +36,268 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": { "flake-parts_3": {
"inputs": { "inputs": {
"systems": "systems" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1717285511,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "hercules-ci",
"repo": "flake-utils", "repo": "flake-parts",
"type": "github" "type": "github"
} }
}, },
"horizon-advance": { "horizon-advance": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-parts": [
"horizon-advance",
"horizon-core",
"flake-parts"
],
"horizon-core": "horizon-core", "horizon-core": "horizon-core",
"lint-utils": "lint-utils_2", "horizon-hoogle": "horizon-hoogle_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1701559370, "lastModified": 1719751316,
"narHash": "sha256-cx2NEHatySFfvXI7mBtFbnWVht82nDt8rGu/Q0JMPWw=", "narHash": "sha256-exJ80zZPyiSxiYQb4IreK7LDpjfBLOCPb77QUn3TGR8=",
"ref": "lts/ghc-9.6.x", "ref": "lts/ghc-9.10.x",
"rev": "2fb306e266c34df0778aa797b8eb401fe9f847b6", "rev": "36784235da4dd828b3e139a855dc8410fff91376",
"revCount": 101, "revCount": 259,
"type": "git", "type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
}, },
"original": { "original": {
"ref": "lts/ghc-9.6.x", "ref": "lts/ghc-9.10.x",
"type": "git", "type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance" "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
} }
}, },
"horizon-core": { "horizon-build-packages": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": [
"lint-utils": "lint-utils", "horizon-advance",
"horizon-core",
"horizon-build-packages",
"horizon-ghc",
"flake-parts"
],
"horizon-ghc": "horizon-ghc",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1701552836, "lastModified": 1718969469,
"narHash": "sha256-nUYNnU4xx0Wbm6Qg3mREX2zTmPuKvUpLJVULqaKo9vg=", "narHash": "sha256-0Q8v/yNwcLZy0znegLXx/SQmbfd2d/4TBSrFYh7g7+0=",
"ref": "lts/ghc-9.6.x", "ref": "refs/heads/master",
"rev": "93c8fd653cda7ec59673588bbfff45fc9730b209", "rev": "23fa82740dc197706a3737c8830b724ccabafac4",
"revCount": 1189, "revCount": 96,
"type": "git", "type": "git",
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core" "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
}, },
"original": { "original": {
"ref": "lts/ghc-9.6.x",
"type": "git", "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": { "locked": {
"lastModified": 1701521742, "lastModified": 1718977916,
"narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=", "narHash": "sha256-sssWF/XjZga4asgwvovPLAbg8E2EyLDQOYSFgUbKg6c=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e", "rev": "81674e75e63548341ebe0cb94127044255affb55",
"revCount": 2, "revCount": 1375,
"type": "git", "type": "git",
"url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle" "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
}, },
"original": { "original": {
"type": "git", "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": { "inputs": {
"flake-utils": "flake-utils_2", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1699441004, "lastModified": 1718969245,
"narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "narHash": "sha256-eeMsOK3Hmm23SH45GdbuWRtpEcMWZPC/JCYvKL2LOos=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", "rev": "0bcfe994903359aef81338915706bf6b2f38aaa4",
"revCount": 52, "revCount": 109,
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
} }
}, },
"lint-utils_2": { "horizon-hoogle": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": { "locked": {
"lastModified": 1699441004, "lastModified": 1701521742,
"narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
"revCount": 52, "revCount": 2,
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
} }
}, },
"lint-utils_3": { "horizon-hoogle_2": {
"inputs": { "locked": {
"flake-utils": "flake-utils_4", "lastModified": 1701521742,
"nixpkgs": "nixpkgs_5" "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": { "locked": {
"lastModified": 1699441004, "lastModified": 1701521742,
"narHash": "sha256-7v7CH8ZiB2RClPtpgDLfQxeR+14KXoFl2qTdXd27sL0=", "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "226003d10c2d192b088f7c3c9ee7ca549c421a9c", "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
"revCount": 52, "revCount": 2,
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://gitlab.nixica.dev/nix/lint-utils" "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1644525281, "lastModified": 1718928808,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "rev": "564000ae34c6af8549f3729051bbae33403e298c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "haskell-updates",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1738452942,
"lastModified": 1701253981, "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
}, },
"original": { "original": {
"dir": "lib", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"dir": "lib", "lastModified": 1717284937,
"lastModified": 1701253981, "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
}, },
"original": { "original": {
"dir": "lib", "type": "tarball",
"owner": "NixOS", "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-lib_3": {
"locked": { "locked": {
"lastModified": 1701253981, "lastModified": 1717284937,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
"owner": "nixos", "type": "tarball",
"repo": "nixpkgs", "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github"
}, },
"original": { "original": {
"owner": "nixos", "type": "tarball",
"ref": "nixos-unstable", "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1644525281, "lastModified": 1718928808,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "rev": "564000ae34c6af8549f3729051bbae33403e298c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "haskell-updates",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1701253981, "lastModified": 1718928808,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "narHash": "sha256-MjVGflb3qXOrJRTJ5siQZHYuMCsRHaqYgTSKSik+/sE=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "rev": "564000ae34c6af8549f3729051bbae33403e298c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "haskell-updates",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1644525281, "lastModified": 1719706517,
"narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", "narHash": "sha256-ynXAAr5AJgTQHQAJW4GH3i8auqnZVzcjCokZMdEKjcs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", "rev": "01da4c59cc4879540b7a5d73230475b4616a0dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "haskell-updates",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1701336116, "lastModified": 1739138025,
"narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=", "narHash": "sha256-M4ilIfGxzbBZuURokv24aqJTbdjPA9K+DtKUzrJaES4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5c27c6136db4d76c30e533c20517df6864c46ee", "rev": "b2243f41e860ac85c0b446eadc6930359b294e79",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -350,24 +311,8 @@ ...@@ -350,24 +311,8 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"horizon-advance": "horizon-advance", "horizon-advance": "horizon-advance",
"horizon-hoogle": "horizon-hoogle", "horizon-hoogle": "horizon-hoogle_3",
"lint-utils": "lint-utils_3", "nixpkgs": "nixpkgs_5"
"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"
} }
} }
}, },
......
flake.nix
View file @ d910fc78
...@@ -9,57 +9,40 @@ ...@@ -9,57 +9,40 @@
inputs = { inputs = {
flake-parts.url = "github:hercules-ci/flake-parts"; 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"; 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"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
}; };
outputs = outputs = inputs:
inputs@ inputs.flake-parts.lib.mkFlake { inherit inputs; } {
{ self
, flake-parts
, horizon-advance
, lint-utils
, nixpkgs
, ...
}:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ systems = [
"aarch64-darwin" "aarch64-darwin"
"aarch64-linux"
"x86_64-darwin" "x86_64-darwin"
"x86_64-linux" "x86_64-linux"
]; ];
imports = [ imports = [
inputs.horizon-hoogle.flakeModule inputs.horizon-hoogle.flakeModule
]; ];
perSystem = { config, system, ... }: perSystem = { pkgs, config, system, ... }:
let
pkgs = nixpkgs.legacyPackages.${system};
in
with pkgs.lib; with pkgs.lib;
let let
haskellLib = pkgs.haskell.lib; haskellLib = pkgs.haskell.lib;
modifiers = import ./modifiers.nix { inherit pkgs; };
overrides = composeManyExtensions [ overrides = composeManyExtensions [
(import ./overlay.nix { inherit pkgs; }) (import ./overlay.nix { inherit pkgs; f = modifiers; })
(import ./configuration/common.nix { inherit pkgs haskellLib; }) (import ./configuration/common.nix { inherit pkgs haskellLib; })
(import (./configuration + "/${system}.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; packages = filterAttrs (_: isDerivation) legacyPackages;
in 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 legacyPackages;
inherit packages; inherit packages;
......
horizon.dhall
View file @ d910fc78
This diff is collapsed.
horizon.lock
View file @ d910fc78
This diff is collapsed.
modifiers.nix 0 → 100644
View file @ d910fc78
{ pkgs, ... }:
with pkgs.lib;
_: prev: name: v: if hasAttr name prev then warn "${name} exists in parent set" v else v
overlay.nix
View file @ d910fc78
This diff is collapsed.
pkgs/HTTP.nix deleted 100644 → 0
View file @ b242aaf5
{ 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 deleted 100644 → 0
View file @ b242aaf5
{ 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 deleted 100644 → 0
View file @ b242aaf5
{ 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