mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-20 05:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Nix expressions for 24.05 ()

Browse Source 
* Clean up Nix expressions for 24.05
This commit is contained in:
Vaibhav Sagar 2024-06-03 23:33:24 +10:00 committed by GitHub
parent b47e6a24f3
commit 116cdedade
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 56 deletions

13
.github/workflows/nix.yml vendored

@ -42,30 +42,27 @@ jobs:
- ihaskell-env-ghc98
- ihaskell-env-display-ghc96
- ihaskell-env-display-ghc98
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
with:
install_url: https://releases.nixos.org/nix/nix-2.19.2/install
install_url: https://releases.nixos.org/nix/nix-2.22.1/install
- uses: cachix/cachix-action@v14
with:
name: ihaskell
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
- name: Use latest Nixpkgs 23.11
run: nix flake update nixpkgs23_11
- name: Build environment ${{matrix.env}}
run: |
nix build .#${{matrix.env}}
- name: Check acceptance test for ${{matrix.env}}
# Disable GHC 9.8 here since we don't have hlint support yet
# Also, don't bother running it with the display envs since we already run it with the
# basic envs, and it doesn't test any display stuff.
if: ${{ !contains(fromJSON('["ihaskell-env-ghc98"]'), matrix.env) && !contains(matrix.env, fromJSON('"display"')) }}
# Don't bother running it with the display envs since we already run it
# with the basic envs, and it doesn't test any display stuff.
if: ${{ !contains(matrix.env, fromJSON('"display"')) }}
run: |
nix build .#checks.x86_64-linux.${{matrix.env}} -L

4
flake.nix

@ -33,8 +33,8 @@
};
in
pkgsMaster.lib.listToAttrs [
(mkVersion nixpkgs24_05 "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgsMaster "ghc98" [(import ./nix/overlay-9.8.nix)] { enableHlint = false; })
(mkVersion nixpkgs24_05 "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgs24_05 "ghc98" [(import ./nix/overlay-9.8.nix)] {})
];
# Helper function for building environments with a given set of packages

13
nix/overlay-9.4.nix

@ -1,13 +0,0 @@
sel: sup: {
haskell = sup.haskell // {
packages = sup.haskell.packages // {
ghc94 = sup.haskell.packages.ghc94.override {
overrides = self: super: {
ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_10_0;
ghc-lib-parser = super.ghc-lib-parser_9_6_3_20231014;
ghc-lib-parser-ex = super.ghc-lib-parser-ex_9_6_0_2;
};
};
};
};
}

8
nix/overlay-9.6.nix

@ -4,13 +4,7 @@ sel: sup: {
ghc96 = sup.haskell.packages.ghc96.override {
overrides = self: super: {
# https://github.com/amcphail/plot/pull/23
plot = super.callCabal2nix "plot" (sup.fetchFromGitHub {
owner = "codedownio";
repo = "haskell-plot";
rev = "dfa26022b5815bcd6a5dd6c818fcd2c4d25c6d44";
sha256 = "1snk70l7q98cqflgaqf6l75g4hpcnf284flm9rsmk8kkzd5nnh5k";
}) {};
plot = self.callHackage "plot" "0.2.3.12" {};
singletons-base = sup.haskell.lib.dontCheck (self.callHackage "singletons-base" "3.2" {});
singletons-th = self.callHackage "singletons-th" "3.2" {};

27
nix/overlay-9.8.nix

@ -3,40 +3,15 @@ sel: sup: {
packages = sup.haskell.packages // {
ghc98 = sup.haskell.packages.ghc98.override {
overrides = self: super: {
ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
});
# For display libs
diagrams-lib = sup.haskell.lib.doJailbreak super.diagrams-lib;
svg-builder = sup.haskell.lib.doJailbreak super.svg-builder;
singletons-base = self.callHackage "singletons-base" "3.3" {};
singletons-th = sup.haskell.lib.doJailbreak (self.callHackage "singletons-th" "3.3" {});
th-desugar = self.callHackage "th-desugar" "1.16" {};
newtype-generics = sup.haskell.lib.doJailbreak super.newtype-generics;
microlens-th = sup.haskell.lib.doJailbreak super.microlens-th;
# These ones have a non-working version of gtk2hs-buildtools added via addBuildTool
# in Nixpkgs. Override their cabal files to remove it.
cairo = sup.haskell.lib.overrideCabal (sup.haskell.lib.doJailbreak super.cairo) (_: { buildTools = []; });
pango = sup.haskell.lib.overrideCabal (sup.haskell.lib.doJailbreak super.pango) (_: { buildTools = []; });
glib = sup.haskell.lib.overrideCabal (sup.haskell.lib.doJailbreak super.glib) (_: { buildTools = []; });
# https://github.com/amcphail/plot/pull/23
plot = super.callCabal2nix "plot" (sup.fetchFromGitHub {
owner = "codedownio";
repo = "haskell-plot";
rev = "dfa26022b5815bcd6a5dd6c818fcd2c4d25c6d44";
sha256 = "1snk70l7q98cqflgaqf6l75g4hpcnf284flm9rsmk8kkzd5nnh5k";
}) {};
force-layout = sup.haskell.lib.doJailbreak super.force-layout;
active = sup.haskell.lib.doJailbreak super.active;
diagrams-svg = sup.haskell.lib.doJailbreak super.diagrams-svg;
diagrams-cairo = sup.haskell.lib.doJailbreak super.diagrams-cairo;
diagrams-contrib = sup.haskell.lib.doJailbreak super.diagrams-contrib;
plot = self.callHackage "plot" "0.2.3.12" {};
};
};
};