From 2d95c11e1c7c8876099779ecf4ce40fe5f564a7c Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 16 Jun 2021 13:16:23 +0800 Subject: [PATCH] nix-linter: 2020-09-25 -> 2021-06-16 Also add to haskellPackages --- .../haskell-modules/non-hackage-packages.nix | 2 ++ .../tools/analysis/nix-linter/default.nix | 15 +++------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 1882d68f234..6bbcabbf5a5 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -22,6 +22,8 @@ self: super: { # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { }; + nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; # cabal2nix --revision https://github.com/hasura/ci-info-hs.git diff --git a/pkgs/development/tools/analysis/nix-linter/default.nix b/pkgs/development/tools/analysis/nix-linter/default.nix index 279a69327fa..f01886c883b 100644 --- a/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/pkgs/development/tools/analysis/nix-linter/default.nix @@ -17,18 +17,17 @@ , containers , hnix , bytestring -, fetchpatch }: mkDerivation rec { pname = "nix-linter-unstable"; - version = "2020-09-25"; + version = "2021-06-16"; src = fetchFromGitHub { owner = "Synthetica9"; repo = "nix-linter"; - rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de"; - sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb"; + rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344"; + sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3"; }; isLibrary = false; @@ -37,14 +36,6 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; - 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"; license = lib.licenses.bsd3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e1fc030ea0..774d62aeb4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30873,7 +30873,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - nix-linter = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/analysis/nix-linter { }); + nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter); nix-pin = callPackage ../tools/package-management/nix-pin { };