nix-linter: 2020-09-25 -> 2021-06-16

Also add to haskellPackages
This commit is contained in:
Joe Hermaszewski 2021-06-16 13:16:23 +08:00 committed by sterni
parent ae6480a721
commit 2d95c11e1c
3 changed files with 6 additions and 13 deletions

View file

@ -22,6 +22,8 @@ self: super: {
# https://github.com/spacchetti/spago/issues/512 # https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago/spago.nix { }; 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 { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git

View file

@ -17,18 +17,17 @@
, containers , containers
, hnix , hnix
, bytestring , bytestring
, fetchpatch
}: }:
mkDerivation rec { mkDerivation rec {
pname = "nix-linter-unstable"; pname = "nix-linter-unstable";
version = "2020-09-25"; version = "2021-06-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Synthetica9"; owner = "Synthetica9";
repo = "nix-linter"; repo = "nix-linter";
rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de"; rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344";
sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb"; sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3";
}; };
isLibrary = false; isLibrary = false;
@ -37,14 +36,6 @@ mkDerivation rec {
executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
testHaskellDepends = [ tasty tasty-hunit tasty-th ]; 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"; description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter"; homepage = "https://github.com/Synthetica9/nix-linter";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;

View file

@ -30873,7 +30873,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security; 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 { }; nix-pin = callPackage ../tools/package-management/nix-pin { };