Skip to content

Commit 7de873e

Browse files
committed
upgrade nix dependencies
This updates the flake and since we haven't hacked on this for ages the overlays aren't needed any more since all of them are now available as builds.
1 parent e3a6937 commit 7de873e

13 files changed

+71
-168
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 7a1346f32cba7028846e88cc6c56c4123ab5faad Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?R=C3=B3man=20Joost?= <roman@bromeco.de>
3+
Date: Wed, 1 Jan 2025 10:05:46 +1000
4+
Subject: [PATCH] use newer ubuntu image
5+
6+
Currently a bug in the older versions prevents the caching step to
7+
work:
8+
9+
/__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
10+
---
11+
.github/workflows/haskell-ci.yml | 4 ++--
12+
1 file changed, 2 insertions(+), 2 deletions(-)
13+
14+
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
15+
index 4e6aede..0feae24 100644
16+
--- a/.github/workflows/haskell-ci.yml
17+
+++ b/.github/workflows/haskell-ci.yml
18+
@@ -19,11 +19,11 @@ on:
19+
jobs:
20+
linux:
21+
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22+
- runs-on: ubuntu-20.04
23+
+ runs-on: ubuntu-22.04
24+
timeout-minutes:
25+
60
26+
container:
27+
- image: buildpack-deps:bionic
28+
+ image: buildpack-deps:jammy
29+
continue-on-error: ${{ matrix.allow-failure }}
30+
strategy:
31+
matrix:
32+
--
33+
2.47.0
34+

.github/workflows/haskell-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci '--haddock' '--apt' 'elinks tmux vim less notmuch libnotmuch-dev libtalloc-dev' '--github-patches' '.github/haskell-ci-github.patch' 'github' 'purebred.cabal'
3+
# haskell-ci 'github' 'purebred.cabal' '--config' 'cabal.haskell-ci'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
@@ -211,7 +211,7 @@ jobs:
211211
${CABAL} -vnormal check
212212
- name: haddock
213213
run: |
214-
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
214+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
215215
- name: unconstrained build
216216
run: |
217217
rm -f cabal.project.local

.nix/bimap.nix

Lines changed: 0 additions & 15 deletions
This file was deleted.

.nix/brick.nix

Lines changed: 0 additions & 26 deletions
This file was deleted.

.nix/hsnotmuch.nix

Lines changed: 0 additions & 18 deletions
This file was deleted.

.nix/overlays.nix

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
let
2-
haskellCompilerVersion = "ghc924";
2+
haskellCompilerVersion = "ghc92";
33
haskellPackagesOverlay = self: super: with super.haskell.lib; {
44
haskellPackages = super.haskell.packages.${haskellCompilerVersion}.override {
55
overrides = hself: hsuper: {
66
purebred = hsuper.callPackage ./purebred.nix { };
7-
purebred-email = hsuper.callPackage ./purebred-email.nix { };
87
purebred-icu = hsuper.callPackage ./purebred-icu.nix { };
9-
brick = hsuper.callPackage ./brick.nix { };
10-
text-zipper = hsuper.callPackage ./text-zipper.nix { };
11-
bimap = hsuper.callPackage ./bimap.nix { };
12-
vty = hsuper.callPackage ./vty.nix { };
13-
vty-unix = hsuper.callPackage ./vty-unix.nix { };
14-
vty-crossplatform = hsuper.callPackage ./vty-crossplatform.nix { };
15-
notmuch = hsuper.callPackage ./hsnotmuch.nix {
16-
notmuch = self.pkgs.notmuch;
17-
talloc = self.pkgs.talloc;
18-
};
198
};
209
};
2110
make-purebred-with-packages = with-icu:

.nix/purebred-email.nix

Lines changed: 0 additions & 25 deletions
This file was deleted.

.nix/text-zipper.nix

Lines changed: 0 additions & 13 deletions
This file was deleted.

.nix/vty-crossplatform.nix

Lines changed: 0 additions & 11 deletions
This file was deleted.

.nix/vty-unix.nix

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)