diff --git a/main/fourmolu/checks.nix b/main/fourmolu/checks.nix index 4cb5396..9700d1e 100644 --- a/main/fourmolu/checks.nix +++ b/main/fourmolu/checks.nix @@ -28,4 +28,5 @@ in fourmolu-0-13-1 = versionCheck "0.13.1" packages.fourmolu-0-13-1; fourmolu-0-14-0 = versionCheck "0.14.0" packages.fourmolu-0-14-0; fourmolu-0-16-2 = versionCheck "0.16.2" packages.fourmolu-0-16-2; + fourmolu-0-17-0 = versionCheck "0.17.0" packages.fourmolu-0-17-0; } diff --git a/main/fourmolu/haskell-packages/fourmolu-0.17.0.cabal.nix b/main/fourmolu/haskell-packages/fourmolu-0.17.0.cabal.nix new file mode 100644 index 0000000..823adac --- /dev/null +++ b/main/fourmolu/haskell-packages/fourmolu-0.17.0.cabal.nix @@ -0,0 +1,33 @@ +{ mkDerivation, aeson, ansi-terminal, array, base, binary +, bytestring, Cabal-syntax, choice, containers, deepseq, Diff +, directory, file-embed, filepath, ghc-lib-parser, hspec +, hspec-discover, hspec-megaparsec, lib, megaparsec, MemoTrie, mtl +, optparse-applicative, path, path-io, pretty, process, QuickCheck +, scientific, syb, temporary, terminal-size, text, th-env, yaml +}: +mkDerivation { + pname = "fourmolu"; + version = "0.17.0.0"; + sha256 = "1a3a8c39de4f489ab045c6e0094b633c8d35552efe220f2424350697c58defd9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + choice containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative terminal-size text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax choice containers Diff directory + filepath ghc-lib-parser hspec hspec-megaparsec megaparsec path + path-io pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/fourmolu/fourmolu"; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + mainProgram = "fourmolu"; +} diff --git a/main/fourmolu/packages.nix b/main/fourmolu/packages.nix index 0d1fac9..550054e 100644 --- a/main/fourmolu/packages.nix +++ b/main/fourmolu/packages.nix @@ -7,7 +7,14 @@ let inherit (builtins) getFlake; - versions = v0-13 // v0-14 // v0-16 // { fourmolu-default = versions.fourmolu-0-13-x; }; + versions = + v0-13 + // v0-14 + // v0-16 + // v0-17 + // { + fourmolu-default = versions.fourmolu-0-17-x; + }; v0-13 = let @@ -77,7 +84,7 @@ let fourmolu-0-16-2 = justStaticExecutables - (haskell.packages.ghc9101.override { + (haskell.packages.ghc910.override { overrides = self: super: { fourmolu = overrideCabal (super.callPackage ./haskell-packages/fourmolu-0.16.2.cabal.nix { }) @@ -88,5 +95,27 @@ let }).fourmolu; }; + v0-17 = + let + nixpkgs = inputs.nixpkgs-24-11.legacyPackages.${system}; + inherit (nixpkgs) haskell; + inherit (haskell.lib) justStaticExecutables overrideCabal; + in + rec { + fourmolu-0-17-x = fourmolu-0-17-0; + + fourmolu-0-17-0 = + justStaticExecutables + (haskell.packages.ghc910.override { + overrides = self: super: { + fourmolu = + overrideCabal (super.callPackage ./haskell-packages/fourmolu-0.17.0.cabal.nix { }) + (drv: { + doCheck = false; + }); + }; + }).fourmolu; + }; + in versions