Skip to content
Snippets Groups Projects
Commit 9307f4b9 authored by Matthew Pickering's avatar Matthew Pickering
Browse files

Fix CI

parent 4b924bb4
Branches
Tags
No related merge requests found
Pipeline #93446 failed
......@@ -77,7 +77,6 @@ variables:
- GHC_TARBALL="https://downloads.haskell.org/~ghc/9.6.3/ghc-9.6.3-x86_64-fedora33-linux.tar.xz"
tags:
- x86_64-linux
- maurer
rules:
- if: '$UPSTREAM_COMMIT_SHA || $UPSTREAM_PIPELINE_ID'
when: never
......@@ -94,7 +93,6 @@ build-9.6:
tags:
- x86_64-linux
- maurer
image: "nixos/nix:$DOCKER_TAG"
......@@ -150,7 +148,6 @@ update-repo:
tags:
- x86_64-linux
- maurer
image: "nixos/nix:$DOCKER_TAG"
......@@ -180,7 +177,6 @@ pages:
stage: deploy
tags:
- x86_64-linux
- maurer
image: "nixos/nix:$DOCKER_TAG"
script:
......
......@@ -41,7 +41,7 @@ let
buildDeps = import ./build-deps.nix { pkgs = nixpkgs; };
cabalDependencies = [ "Cabal" "cabal-install-solver" "Cabal-syntax" "Cabal-described" "Cabal-QuickCheck" "Cabal-tree-diff" "cabal-install" ];
cabalDependencies = [ "Cabal-tests" "Cabal" "cabal-install-solver" "Cabal-syntax" "Cabal-described" "Cabal-QuickCheck" "Cabal-tree-diff" "cabal-install" ];
cabalDependenciesOverrides = self:
builtins.listToAttrs (builtins.map (pn: { name = "${pn}"; value = self.callCabal2nixWithOptions pn "${cabalSrc}/${pn}" "--no-check" {};} ) cabalDependencies);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment