From 910829801085e98d9617be19da13dd916f290973 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 6 Jan 2024 14:21:12 +0100 Subject: fix build --- pkgs/development/compilers/elm/default.nix | 17 ++++++++++------- pkgs/development/compilers/elm/fetchElmDeps.nix | 3 +-- pkgs/development/compilers/elm/packages/elm.nix | 9 +++------ pkgs/development/compilers/elm/registry.dat | Bin 132822 -> 130280 bytes pkgs/development/compilers/elm/update.sh | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 444334306956..c28a231760e4 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -7,7 +7,7 @@ let fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - # Haskell packages that require ghc 9.2 + # Haskell packages that require ghc 9.6 hs96Pkgs = self: pkgs.haskell.packages.ghc96.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; let elmPkgs = rec { @@ -34,14 +34,15 @@ let inherit fetchElmDeps; elmVersion = elmPkgs.elm.version; }; - in { + in elmPkgs // { inherit elmPkgs; }; }; + # Haskell packages that require ghc 8.10 hs810Pkgs = self: pkgs.haskell.packages.ghc810.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; - let elmPkgs = { + let elmPkgs = rec { elmi-to-json = justStaticExecutables (overrideCabal (drv: { prePatch = '' substituteInPlace package.yaml --replace "- -Werror" "" @@ -59,15 +60,17 @@ let prePatch = '' sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place ''; + jailbreak = true; # Tests are failing because of missing instances for Eq and Show type classes doCheck = false; - jailbreak = true; description = "Instrument Elm code as a preprocessing step for elm-coverage"; homepage = "https://github.com/zwilias/elm-instrument"; license = licenses.bsd3; maintainers = [ maintainers.turbomack ]; }) (self.callPackage ./packages/elm-instrument.nix {})); + + elmVersion = elmPkgs.elm.version; }; in elmPkgs // { inherit elmPkgs; @@ -89,7 +92,7 @@ let # Haskell packages that require ghc 9.2 hs92Pkgs = self: pkgs.haskell.packages.ghc92.override { overrides = self: super: with pkgs.haskell.lib.compose; with lib; - let elmPkgs = { + let elmPkgs = rec { /* The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: `package/nix/build.sh` @@ -138,7 +141,7 @@ in lib.makeScope pkgs.newScope (self: with self; { `patchNpmElm` function also defined in `packages/lib.nix`. */ elmLib = let - hsElmPkgs = hs96Pkgs self; + hsElmPkgs = hs810Pkgs self; in import ./packages/lib.nix { inherit lib; inherit (pkgs) writeScriptBin stdenv; @@ -150,7 +153,7 @@ in lib.makeScope pkgs.newScope (self: with self; { elm-test-rs = callPackage ./packages/elm-test-rs.nix { }; elm-test = callPackage ./packages/elm-test.nix { }; -} // (hs96Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; { +} // (hs96Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (with elmLib; with (hs96Pkgs self).elmPkgs; { elm-verify-examples = let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { meta = with lib; nodePkgs.elm-verify-examples.meta // { diff --git a/pkgs/development/compilers/elm/fetchElmDeps.nix b/pkgs/development/compilers/elm/fetchElmDeps.nix index 05dffaa9e2eb..9715bfbe037d 100644 --- a/pkgs/development/compilers/elm/fetchElmDeps.nix +++ b/pkgs/development/compilers/elm/fetchElmDeps.nix @@ -3,8 +3,7 @@ {elmPackages, registryDat, elmVersion}: let - makeDotElm = import ./makeDotElm.nix {inherit stdenv lib fetchurl registryDat;}; - + makeDotElm = import ./makeDotElm.nix { inherit stdenv lib fetchurl registryDat; }; in '' export ELM_HOME=`pwd`/.elm diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index 5b877e8a6a76..1071d50a84c9 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -8,15 +8,12 @@ }: mkDerivation { pname = "elm"; - # We're building binaries from commit that npm installer is using since - # November 1st release called 0.19.1-6. - # These binaries are built with newer ghc version and also support Aarch64 for Linux and Darwin. - # Upstream git tag for 0.19.1 is still pointing to original commit from 2019. - version = "0.19.1-6"; + version = "0.19.1"; src = fetchgit { url = "https://github.com/elm/compiler"; + sha256 = "1h9jhwlv1pqqna5s09vd72arwhhjn0dlhv0w9xx5771x0xryxxg8"; rev = "2f6dd29258e880dbb7effd57a829a0470d8da48b"; - sha256 = "sha256-6PXucwc9nFN6TxxsSBuwEkKelThtJ6CLshjfsCmHMsE="; + fetchSubmodules = true; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/compilers/elm/registry.dat b/pkgs/development/compilers/elm/registry.dat index 248a1503a3c0..a1c3b2f71c3e 100644 Binary files a/pkgs/development/compilers/elm/registry.dat and b/pkgs/development/compilers/elm/registry.dat differ diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh index c2500b462adf..60ddacb3108a 100755 --- a/pkgs/development/compilers/elm/update.sh +++ b/pkgs/development/compilers/elm/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -p cabal2nix elm2nix -i bash ../../.. -cabal2nix https://github.com/elm/compiler --revision c9aefb6230f5e0bda03205ab0499f6e4af924495 > packages/elm.nix +cabal2nix https://github.com/elm/compiler --revision 2f6dd29258e880dbb7effd57a829a0470d8da48b > packages/elm.nix echo "need to manually copy registry.dat from an existing elm project" #elm2nix snapshot > registry.dat pushd "$(nix-build -A elmPackages.elm.src --no-out-link ../../../..)/reactor" -- cgit v1.2.3