nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

hadolint: build with language-docker >= 13

Browse Source
This commit is contained in:
sternenseemann
2025-02-24 22:46:19 +01:00
parent 1ee8e4b88e
commit a2c86d93f4
3 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/haskell-modules/configuration-common.nix
View File

@@ -2010,10 +2010,15 @@ self: super: {
# 2025-02-11: Too strict bounds on bytestring
streamly-bytestring = doJailbreak super.streamly-bytestring;
# Stackage LTS 19 still has 10.*
hadolint = super.hadolint.override {
language-docker = self.language-docker_11_0_0;
};
# Allow building with language-docker >= 13 (!); waiting for 2.13 release.
hadolint = doJailbreak (appendPatches [
(pkgs.fetchpatch {
name = "hadolint-language-docker-12.patch";
url = "https://github.com/hadolint/hadolint/commit/593ccde5af13c9b960b3ea815c47ce028a2e8adc.patch";
sha256 = "07v5c1k8if72j04m017jpsf7gvc5kwyi1q3a532n0zhxqc7w1zjn";
includes = [ "**/DL3011.hs" "**/DL3011Spec.hs" ];
})
] super.hadolint);
# Too strict lower bounds on (test) deps
# https://github.com/phadej/puresat/issues/6

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@@ -82,7 +82,6 @@ extra-packages:
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS
- hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover
- language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16
- language-javascript == 0.7.0.0 # required by purescript
- lsp == 2.1.* # 2024-02-28: need for dhall-lsp-server
- lsp-types == 2.1.* # 2024-02-28: need for dhall-lsp-server and koka

23
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@@ -187751,29 +187751,6 @@ self: {
mainProgram = "emd";
}) {};
"language-docker_11_0_0" = callPackage
({ mkDerivation, base, bytestring, containers, data-default
, data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec
, prettyprinter, QuickCheck, split, text, time
}:
mkDerivation {
pname = "language-docker";
version = "11.0.0";
sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948";
libraryHaskellDepends = [
base bytestring containers data-default data-default-class
megaparsec prettyprinter split text time
];
testHaskellDepends = [
base bytestring containers data-default data-default-class hspec
hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split
text time
];
description = "Dockerfile parser, pretty-printer and embedded DSL";
license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
}) {};
"language-docker" = callPackage
({ mkDerivation, base, bytestring, containers, data-default
, data-default-class, hspec, hspec-discover, hspec-megaparsec