From ff83117733481f168602a3903f360ebecaa328a8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 11:40:50 +0200 Subject: [PATCH] haskellPackages.nix-linter: unbreak for hnix 0.14 Change to pname is necessary in order to not confuse jailbreak-cabal. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/tools/analysis/nix-linter/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 872a7786c5c1..c3607406f3d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1921,4 +1921,8 @@ EOT assert pkgs.lib.versionOlder self.hspec.version "2.8.2"; doJailbreak super.graphql; + # Too strict bounds on hnix + # https://github.com/Synthetica9/nix-linter/issues/56 + nix-linter = doJailbreak super.nix-linter; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index f01886c883bc..6d758c2c30b8 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -20,8 +20,8 @@ }: mkDerivation rec { - pname = "nix-linter-unstable"; - version = "2021-06-16"; + pname = "nix-linter"; + version = "unstable-2021-06-16"; src = fetchFromGitHub { owner = "Synthetica9";