Skip to content

Commit

Permalink
Merge pull request #123104 from marsam/fix-nix-linter
Browse files Browse the repository at this point in the history
nix-linter: fix compatibility with hnix≥0.13.0
  • Loading branch information
domenkozar committed May 15, 2021
2 parents 31404dd + 96178f4 commit 7435004
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions pkgs/development/tools/analysis/nix-linter/default.nix
Expand Up @@ -17,6 +17,7 @@
, containers
, hnix
, bytestring
, fetchpatch
}:

mkDerivation rec {
Expand All @@ -36,10 +37,13 @@ mkDerivation rec {
executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
testHaskellDepends = [ tasty tasty-hunit tasty-th ];

# Relax upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
postPatch = ''
substituteInPlace nix-linter.cabal --replace "hnix >=0.8 && < 0.11" "hnix >=0.8"
'';
patches = [
# Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51
(fetchpatch {
url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch";
sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc";
})
];

description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter";
Expand Down

0 comments on commit 7435004

Please sign in to comment.