summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-18 11:40:50 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-18 11:40:50 +0200
commitff83117733481f168602a3903f360ebecaa328a8 (patch)
tree5ed9ff4a74a7ee52393b3e7a051a0a92e98979bf /pkgs
parentf93409efb946fdde8db163ccb55d9b190248a40a (diff)
downloadnixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar.gz
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar.bz2
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar.lz
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar.xz
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.tar.zst
nixpkgs-ff83117733481f168602a3903f360ebecaa328a8.zip
haskellPackages.nix-linter: unbreak for hnix 0.14
Change to pname is necessary in order to not confuse jailbreak-cabal.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
-rw-r--r--pkgs/development/tools/analysis/nix-linter/default.nix4
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 872a7786c5c..c3607406f3d 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 f01886c883b..6d758c2c30b 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";