From 5d294db3b2bc205f536eb2c9ac62332050297fa9 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 1 Oct 2014 09:19:40 +0200 Subject: [PATCH] shellcheck is packaged twice I removed development/libraries/haskell/ShellCheck and kept development/tools/misc/ShellCheck. --- .../libraries/haskell/ShellCheck/default.nix | 20 ------------------- .../tools/misc/ShellCheck/default.nix | 1 + pkgs/top-level/haskell-packages.nix | 2 -- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ShellCheck/default.nix diff --git a/pkgs/development/libraries/haskell/ShellCheck/default.nix b/pkgs/development/libraries/haskell/ShellCheck/default.nix deleted file mode 100644 index d93383171dd..00000000000 --- a/pkgs/development/libraries/haskell/ShellCheck/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: - -cabal.mkDerivation (self: { - pname = "ShellCheck"; - version = "0.3.4"; - sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; - isLibrary = true; - isExecutable = true; - buildDepends = [ json mtl parsec QuickCheck regexCompat ]; - testDepends = [ json mtl parsec QuickCheck regexCompat ]; - meta = { - homepage = "http://www.shellcheck.net/"; - description = "Shell script analysis tool"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; - }; -}) diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index 8beca12325b..d93383171dd 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -15,5 +15,6 @@ cabal.mkDerivation (self: { description = "Shell script analysis tool"; license = "unknown"; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 83f29fa5396..4387cf23aa0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2223,8 +2223,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in setlocale = callPackage ../development/libraries/haskell/setlocale {}; - shellCheck = callPackage ../development/libraries/haskell/ShellCheck {}; - shellish = callPackage ../development/libraries/haskell/shellish {}; shellmate = callPackage ../development/libraries/haskell/shellmate {};