haskellPackages.haskell-ci{,-unstable}: adjust overrides to >= 0.14
The following pinned packages are no longer needed: haskellPackages.ShellCheck_0_7_1: drop haskellPackages.cabal-install-parsers_0_4_2: drop
This commit is contained in:
parent
6a34e454be
commit
7a8250dd3b
|
@ -1866,26 +1866,23 @@ self: super: {
|
|||
# https://github.com/haskell-CI/haskell-ci/issues/507
|
||||
# 2021-09-05 haskell-ci needs Cabal 3.4,
|
||||
# cabal-install-parsers uses Cabal 3.6 since 0.4.3
|
||||
haskell-ci = super.haskell-ci.override {
|
||||
ShellCheck = self.ShellCheck_0_7_1;
|
||||
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 rec {
|
||||
version = "0.13.20211116-${builtins.substring 0 7 src.rev}";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell-CI";
|
||||
repo = "haskell-ci";
|
||||
rev = "b61df11e7f6010ce09920c231321ab1545a990b5";
|
||||
sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy";
|
||||
};
|
||||
} super.haskell-ci).overrideScope (self: super: {
|
||||
haskell-ci = super.haskell-ci.overrideScope (self: super: {
|
||||
attoparsec = self.attoparsec_0_14_4;
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
});
|
||||
|
||||
# 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 rec {
|
||||
version = "0.14.1-${builtins.substring 0 7 src.rev}";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "haskell-CI";
|
||||
repo = "haskell-ci";
|
||||
rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";
|
||||
sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";
|
||||
};
|
||||
} self.haskell-ci;
|
||||
|
||||
Frames-streamly = super.Frames-streamly.override {
|
||||
relude = super.relude_1_0_0_1;
|
||||
};
|
||||
|
|
|
@ -158,8 +158,6 @@ extra-packages:
|
|||
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
|
||||
- sbv == 7.13 # required for pkgs.petrinizer
|
||||
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
|
||||
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
|
||||
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
|
||||
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
|
||||
- ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
|
||||
- ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version
|
||||
|
|
|
@ -18360,34 +18360,6 @@ self: {
|
|||
broken = true;
|
||||
}) {};
|
||||
|
||||
"ShellCheck_0_7_1" = callPackage
|
||||
({ mkDerivation, aeson, array, base, bytestring, containers
|
||||
, deepseq, Diff, directory, filepath, mtl, parsec, process
|
||||
, QuickCheck, regex-tdfa
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ShellCheck";
|
||||
version = "0.7.1";
|
||||
sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec process QuickCheck regex-tdfa
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec QuickCheck regex-tdfa
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec QuickCheck regex-tdfa
|
||||
];
|
||||
description = "Shell script analysis tool";
|
||||
license = lib.licenses.gpl3Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ShellCheck" = callPackage
|
||||
({ mkDerivation, aeson, array, base, bytestring, containers
|
||||
, deepseq, Diff, directory, filepath, mtl, parsec, process
|
||||
|
@ -50529,35 +50501,6 @@ self: {
|
|||
broken = true;
|
||||
}) {};
|
||||
|
||||
"cabal-install-parsers_0_4_2" = callPackage
|
||||
({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
|
||||
, binary, binary-instances, bytestring, Cabal, containers
|
||||
, criterion, cryptohash-sha256, deepseq, directory, filepath, lukko
|
||||
, network-uri, parsec, pretty, tar, tasty, tasty-golden
|
||||
, tasty-hunit, text, time, transformers, tree-diff
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "cabal-install-parsers";
|
||||
version = "0.4.2";
|
||||
sha256 = "08ny95sryii4nzyy8b2zf15vk329y84gbvpy7302hnjxanc6awx5";
|
||||
libraryHaskellDepends = [
|
||||
aeson base base16-bytestring binary binary-instances bytestring
|
||||
Cabal containers cryptohash-sha256 deepseq directory filepath lukko
|
||||
network-uri parsec pretty tar text time transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
ansi-terminal base base16-bytestring bytestring Cabal containers
|
||||
directory filepath pretty tar tasty tasty-golden tasty-hunit
|
||||
tree-diff
|
||||
];
|
||||
benchmarkHaskellDepends = [
|
||||
base bytestring Cabal containers criterion directory filepath
|
||||
];
|
||||
description = "Utilities to work with cabal-install files";
|
||||
license = "GPL-2.0-or-later AND BSD-3-Clause";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"cabal-install-parsers" = callPackage
|
||||
({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
|
||||
, binary, binary-instances, bytestring, Cabal, containers
|
||||
|
|
Loading…
Reference in a new issue