diff options
| author | Marek Fajkus <marek.faj@gmail.com> | 2024-01-06 14:31:32 +0100 |
|---|---|---|
| committer | Marek Fajkus <marek.faj@gmail.com> | 2024-01-06 14:31:32 +0100 |
| commit | 6f3ec49a11c50e6b36f48d520e18d80d8ddd0f94 (patch) | |
| tree | 34474164e1210d52e05a840f19cf1a6ddef05370 | |
| parent | 910829801085e98d9617be19da13dd916f290973 (diff) | |
Move comment and fix elmLib
| -rw-r--r-- | pkgs/development/compilers/elm/default.nix | 4 | ||||
| -rwxr-xr-x | pkgs/development/compilers/elm/update.sh | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index c28a231760e4..6815eb71e25f 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -69,8 +69,6 @@ let license = licenses.bsd3; maintainers = [ maintainers.turbomack ]; }) (self.callPackage ./packages/elm-instrument.nix {})); - - elmVersion = elmPkgs.elm.version; }; in elmPkgs // { inherit elmPkgs; @@ -141,7 +139,7 @@ in lib.makeScope pkgs.newScope (self: with self; { `patchNpmElm` function also defined in `packages/lib.nix`. */ elmLib = let - hsElmPkgs = hs810Pkgs self; + hsElmPkgs = (hs810Pkgs self) // (hs96Pkgs self); in import ./packages/lib.nix { inherit lib; inherit (pkgs) writeScriptBin stdenv; diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh index 60ddacb3108a..ecd24de46f67 100755 --- a/pkgs/development/compilers/elm/update.sh +++ b/pkgs/development/compilers/elm/update.sh @@ -1,9 +1,15 @@ #!/usr/bin/env nix-shell #!nix-shell -p cabal2nix elm2nix -i bash ../../.. +# We're building binaries from commit that npm installer is using since +# November 1st release called 0.19.1-6 in npm registry. +# 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. 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" elm2nix convert > $OLDPWD/packages/elm-srcs.nix popd |