From bdc75c92355879a463c549a04716faa703cb00d5 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 13:47:11 -0700 Subject: [PATCH] elm.hs810Pkgs: remove with statements --- .../compilers/elm/packages/ghc8_10/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix index f68e582b3d0b..ef6e5142b2f1 100644 --- a/pkgs/development/compilers/elm/packages/ghc8_10/default.nix +++ b/pkgs/development/compilers/elm/packages/ghc8_10/default.nix @@ -1,8 +1,9 @@ { pkgs, lib }: self: pkgs.haskell.packages.ghc810.override { - overrides = self: super: with pkgs.haskell.lib.compose; with lib; + overrides = self: super: let + inherit (pkgs.haskell.lib.compose) justStaticExecutables overrideCabal doJailbreak; elmPkgs = rec { elmi-to-json = justStaticExecutables (overrideCabal (drv: { @@ -22,8 +23,8 @@ self: pkgs.haskell.packages.ghc810.override { description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; homepage = "https://github.com/stoeffel/elmi-to-json"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.turbomack ]; }) (self.callPackage ./elmi-to-json { })); @@ -55,8 +56,8 @@ self: pkgs.haskell.packages.ghc810.override { description = "Instrument Elm code as a preprocessing step for elm-coverage"; homepage = "https://github.com/zwilias/elm-instrument"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.turbomack ]; }) (self.callPackage ./elm-instrument { })); };