diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/haskell')
12 files changed, 98 insertions, 48 deletions
diff --git a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 4d7dca12f8fc..02c4c96bd8e7 100644 --- a/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/nixpkgs/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,5 +1,5 @@ { mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, stdenv, template-haskell, text +, optparse-applicative, parsec, lib, stdenv, template-haskell, text }: mkDerivation { pname = "dconf2nix"; @@ -20,5 +20,5 @@ mkDerivation { base containers hedgehog parsec template-haskell text ]; description = "Convert dconf files to Nix, as expected by Home Manager"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix index e33d731dae43..512aec84eead 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -2,21 +2,23 @@ , bytestring, containers, data-default, deepseq, directory, extra , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api -, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec -, hspec-core, lens, lsp-test, mtl, optparse-applicative +, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin +, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin +, hls-tactics-plugin, hslogger, hspec, hspec-core +, hspec-expectations, lens, lsp-test, mtl, optparse-applicative , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions -, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, shake, lib, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml , tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun -, temporary, text, time, transformers, unordered-containers, yaml +, temporary, text, transformers, unordered-containers, with-utf8 +, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.7.1.0"; + version = "0.8.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; isLibrary = true; @@ -29,22 +31,23 @@ mkDerivation { executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin - hls-tactics-plugin hslogger lens mtl optparse-applicative - optparse-simple ormolu process regex-tdfa safe-exceptions shake - stylish-haskell temporary text time transformers - unordered-containers + gitrev hashable haskell-lsp hie-bios hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin + hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens + mtl optparse-applicative optparse-simple ormolu process regex-tdfa + safe-exceptions shake stylish-haskell temporary text transformers + unordered-containers with-utf8 ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default directory extra filepath haskell-lsp hie-bios hls-plugin-api - hslogger hspec hspec-core lens lsp-test process stm tasty - tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit - tasty-rerun temporary text transformers unordered-containers yaml + hslogger hspec hspec-core hspec-expectations lens lsp-test process + stm tasty tasty-ant-xml tasty-expected-failure tasty-golden + tasty-hunit tasty-rerun temporary text transformers + unordered-containers yaml ]; testToolDepends = [ ghcide ]; homepage = "https://github.com/haskell/haskell-language-server#readme"; description = "LSP server for GHC"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix new file mode 100644 index 000000000000..c51689343903 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-class-plugin.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, base, containers, fetchgit, ghc +, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake +, lib, stdenv, text, transformers, unordered-containers +}: +mkDerivation { + pname = "hls-class-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-exactprint ghcide haskell-lsp + hls-plugin-api lens shake text transformers unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix new file mode 100644 index 000000000000..b5774ddcbfd3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-eval-plugin.nix @@ -0,0 +1,27 @@ +{ mkDerivation, aeson, base, containers, deepseq, Diff, directory +, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide +, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api +, parser-combinators, pretty-simple, QuickCheck, safe-exceptions +, shake, lib, stdenv, temporary, text, time, transformers +, unordered-containers +}: +mkDerivation { + pname = "hls-eval-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq Diff directory extra filepath ghc + ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types + hls-plugin-api parser-combinators pretty-simple QuickCheck + safe-exceptions shake temporary text time transformers + unordered-containers + ]; + description = "Eval plugin for Haskell Language Server"; + license = lib.licenses.asl20; +} diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix index 7c3b22cf1d0a..1c7d31004b6a 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc -, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text +, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, stdenv, text , unordered-containers }: mkDerivation { @@ -7,8 +7,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; @@ -17,5 +17,5 @@ mkDerivation { hls-plugin-api shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 8bfcf034bd2b..4a90933d1e7f 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -2,7 +2,7 @@ , containers, data-default, deepseq, Diff, directory, extra , fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens -, regex-tdfa, shake, stdenv, temporary, text, transformers +, regex-tdfa, shake, lib, stdenv, temporary, text, transformers , unordered-containers }: mkDerivation { @@ -10,8 +10,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; @@ -22,5 +22,5 @@ mkDerivation { regex-tdfa shake temporary text transformers unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix index 7a44903f9870..311a26633a5c 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, containers, deepseq, directory, extra , fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types -, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text +, hls-plugin-api, retrie, safe-exceptions, shake, lib, stdenv, text , transformers, unordered-containers }: mkDerivation { @@ -8,8 +8,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; @@ -19,5 +19,5 @@ mkDerivation { shake text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 326e8ce0cdf9..4f476431d9b7 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -2,7 +2,7 @@ , directory, extra, fetchgit, filepath, fingertree, generic-lens , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide , haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover -, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, lens, mtl, QuickCheck, refinery, retrie, shake, lib, stdenv, syb, text , transformers }: mkDerivation { @@ -10,8 +10,8 @@ mkDerivation { version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; - rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588"; + rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; @@ -28,5 +28,5 @@ mkDerivation { testToolDepends = [ hspec-discover ]; description = "Tactics plugin for Haskell Language Server"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = lib.platforms.none; } diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh index f14a97221ff8..aaccf8b9b9fe 100755 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -41,11 +41,10 @@ hls_new_version=$hls_latest_release echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." echo "Running cabal2nix and outputting to ${hls_derivation_file}..." - cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix" -cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix" +for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do + cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix" +done echo "Finished." diff --git a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix index df889d43d463..6b1399046166 100644 --- a/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenv, fetchFromGitHub, jshon, electron_3 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let - binPath = stdenv.lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); + binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); electron = electron_3; in stdenv.mkDerivation rec { pname = "hyper-haskell"; @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { chmod 755 $out/bin/hyper-haskell ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The strongly hyped graphical interpreter for the Haskell programming language"; homepage = "https://github.com/HeinrichApfelmus/hyper-haskell"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 60f8c2ecb252..875d5a8a4a8d 100644 --- a/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/nixpkgs/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: +{ lib, stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }: let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" + export PATH="${lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in diff --git a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix index 1d901cb723cf..42cf33224201 100644 --- a/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,7 +1,7 @@ { mkDerivation, async, base, bytestring, connection, containers , directory, hpack, hspec, hspec-discover, hspec-expectations , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl -, optparse-applicative, parser-combinators, retry, stdenv, text +, optparse-applicative, parser-combinators, retry, lib, stdenv, text , unix, unordered-containers, utf8-string, fetchzip, dotenv }: mkDerivation rec { @@ -37,6 +37,6 @@ mkDerivation rec { preConfigure = "hpack"; homepage = "https://github.com/channable/vaultenv#readme"; description = "Runs processes with secrets from HashiCorp Vault"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lnl7 manveru ]; } |