From 1c97e5cbf2b8c65246d949917fa661c11954dc58 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Mon, 1 Jan 2024 17:34:39 +0100 Subject: [PATCH] Removed hlint specific nix fixes They break the build on my m3 mac --- NixSupport/haskell-packages/hlint.nix | 27 ------------------- .../haskell-packages/hls-hlint-plugin.nix | 25 ----------------- 2 files changed, 52 deletions(-) delete mode 100644 NixSupport/haskell-packages/hlint.nix delete mode 100644 NixSupport/haskell-packages/hls-hlint-plugin.nix diff --git a/NixSupport/haskell-packages/hlint.nix b/NixSupport/haskell-packages/hlint.nix deleted file mode 100644 index eab07541b..000000000 --- a/NixSupport/haskell-packages/hlint.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs -, containers, cpphs, data-default, deriving-aeson, directory, extra -, file-embed, filepath, filepattern, ghc-lib-parser -, ghc-lib-parser-ex, hscolour, lib, process, refact, text -, transformers, uniplate, unordered-containers, utf8-string, vector -, yaml -}: -mkDerivation { - pname = "hlint"; - version = "3.5"; - sha256 = "0kxdrqybnma508g1z42s3rc3cay11m8nl5ziddyw31m020515gcq"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default deriving-aeson directory extra file-embed filepath - filepattern ghc-lib-parser ghc-lib-parser-ex hscolour process - refact text transformers uniplate unordered-containers utf8-string - vector yaml - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = lib.licenses.bsd3; - mainProgram = "hlint"; -} \ No newline at end of file diff --git a/NixSupport/haskell-packages/hls-hlint-plugin.nix b/NixSupport/haskell-packages/hls-hlint-plugin.nix deleted file mode 100644 index d30f27a1f..000000000 --- a/NixSupport/haskell-packages/hls-hlint-plugin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ mkDerivation, aeson, apply-refact, base, binary, bytestring -, containers, data-default, deepseq, Diff, directory, extra -, filepath, ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex -, ghcide, hashable, hlint, hls-plugin-api, hls-test-utils, lens -, lib, lsp, lsp-types, mtl, refact, regex-tdfa, row-types, stm -, temporary, text, transformers, unordered-containers -}: -mkDerivation { - pname = "hls-hlint-plugin"; - version = "2.2.0.0"; - sha256 = "0qrygjvgm5x88j7cjw9dhzli38by0gzmda8f8bkqi8v1qx09ny76"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser - ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api lens lsp mtl - refact regex-tdfa stm temporary text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson base containers filepath hls-plugin-api hls-test-utils lens - lsp-types row-types text - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; -} \ No newline at end of file