From edcbc2a9066e2528c7fe9baaa38277c7e97e0faf Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 Oct 2021 17:06:00 +0200 Subject: [PATCH] haskell-ci-unstable: init at 0.13.20211011 Since this version of haskell-ci is effectively necessary to regenerate the GitHub workflow for cabal2nix, let's not require contributors to build this locally using cabal-install. --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 16 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ad070ee70d91..415776e0602d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1828,6 +1828,21 @@ self: super: { cabal-install-parsers = self.cabal-install-parsers_0_4_2; }; + # Build haskell-ci from git repository, including some useful fixes, + # e. g. required for generating the workflows for the cabal2nix repository + haskell-ci-unstable = (overrideSrc super.haskell-ci { + version = "0.13.20211011"; + src = pkgs.fetchFromGitHub { + owner = "haskell-CI"; + repo = "haskell-ci"; + rev = "c88e67e675bc4a990da53863c7fb42e67bcf9847"; + sha256 = "1zhv1cg047lfyxfs3mvc73vv96pn240zaj7f2yl4lw5yj6y5rfk9"; + }; + }).overrideScope (self: super: { + attoparsec = self.attoparsec_0_14_1; + Cabal = self.Cabal_3_6_2_0; + }); + Frames-streamly = overrideCabal (super.Frames-streamly.override { relude = super.relude_1_0_0_1; }) (drv: { # https://github.com/adamConnerSax/Frames-streamly/issues/1 patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 667b8342510e..b0e775a80de3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14701,6 +14701,7 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci; + haskell-ci-unstable = lowPrio (haskell.lib.justStaticExecutables haskellPackages.haskell-ci-unstable); neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false);