about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix')
-rw-r--r--nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix23
1 files changed, 15 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
index 5895be0208b5..138933ebb57f 100644
--- a/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
+++ b/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix
@@ -1,20 +1,19 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
-, parallel-io
+, fetchpatch
 , fixplate
-, pandoc
 , tasty
 , tasty-hunit
 , tasty-th
 , streamly
 , mtl
-, path-io
 , path
 , pretty-terminal
 , text
 , base
 , aeson
+, path-io
 , cmdargs
 , containers
 , hnix
@@ -23,21 +22,29 @@
 
 mkDerivation rec {
   pname = "nix-linter-unstable";
-  version = "2019-04-26";
+  version = "2020-09-25";
 
   src = fetchFromGitHub {
     owner = "Synthetica9";
     repo = "nix-linter";
-    rev = "4aaf60195cd2d9f9e2345fbdf4aac48e1451292c";
-    sha256 = "0c7rcjaxd8z0grwambsw46snv7cg66h3pszw3549z4xz0i60yq87";
+    rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de";
+    sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb";
   };
 
   isLibrary = false;
   isExecutable = true;
-  libraryHaskellDepends = [ parallel-io fixplate pandoc ];
-  executableHaskellDepends = [ streamly mtl path-io path pretty-terminal text base aeson cmdargs containers hnix bytestring ];
+  libraryHaskellDepends = [ fixplate ];
+  executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
   testHaskellDepends = [ tasty tasty-hunit tasty-th ];
 
+  patches = [
+    # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46
+    (fetchpatch {
+      url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch";
+      sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j";
+    })
+  ];
+
   description = "Linter for Nix(pkgs), based on hnix";
   homepage = "https://github.com/Synthetica9/nix-linter";
   license = lib.licenses.bsd3;