Unverified Commit f3d56826 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #277326 from turboMaCk/elm-ghc-update 

elmPackages.elm: use ghc96
parents 8b061ce7 6f3ec49a

pkgs/development/compilers/elm/default.nix

+16 −8
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
let

  fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };



  # Haskell packages that require ghc 8.10

  hs810Pkgs = self: pkgs.haskell.packages.ghc810.override {

  # 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 {

      elm = overrideCabal (drv: {
@@ -20,7 +20,6 @@ let 
          registryDat = ./registry.dat;

        };

        buildTools = drv.buildTools or [] ++ [ makeWrapper ];

        jailbreak = true;

        postInstall = ''

          wrapProgram $out/bin/elm \

            --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
@@ -32,6 +31,18 @@ let 
        maintainers = with maintainers; [ domenkozar turbomack ];

      }) (self.callPackage ./packages/elm.nix { });



      inherit fetchElmDeps;

      elmVersion = elmPkgs.elm.version;

    };

    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 = rec {

      elmi-to-json = justStaticExecutables (overrideCabal (drv: {

        prePatch = ''

          substituteInPlace package.yaml --replace "- -Werror" ""
@@ -58,9 +69,6 @@ let 
        license = licenses.bsd3;

        maintainers = [ maintainers.turbomack ];

      }) (self.callPackage ./packages/elm-instrument.nix {}));



      inherit fetchElmDeps;

      elmVersion = elmPkgs.elm.version;

    };

    in elmPkgs // {

      inherit elmPkgs;
@@ -131,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;
@@ -143,7 +151,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 { };

} // (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 // {

pkgs/development/compilers/elm/fetchElmDeps.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


let

  makeDotElm = import ./makeDotElm.nix { inherit stdenv lib fetchurl registryDat; };



in

''

  export ELM_HOME=`pwd`/.elm

pkgs/development/compilers/elm/packages/elm.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ mkDerivation { 
  version = "0.19.1";

  src = fetchgit {

    url = "https://github.com/elm/compiler";

    sha256 = "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w";

    rev = "c9aefb6230f5e0bda03205ab0499f6e4af924495";

    sha256 = "1h9jhwlv1pqqna5s09vd72arwhhjn0dlhv0w9xx5771x0xryxxg8";

    rev = "2f6dd29258e880dbb7effd57a829a0470d8da48b";

    fetchSubmodules = true;

  };

  isLibrary = false;

pkgs/development/compilers/elm/packages/elmi-to-json.nix

+2 −3
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ mkDerivation { 
  version = "1.3.0";

  src = fetchgit {

    url = "https://github.com/stoeffel/elmi-to-json";

    sha256 = "11j56vcyhijkwi9hzggkwwmxlhzhgm67ab2m7kxkhcbbqgpasa8n";

    rev = "ae40d1aa1e3d6878f2af514e611d44890e7abc1e";

    fetchSubmodules = true;

    rev = "bd18efb59d247439b362272b480e67a16a4e424e";

    sha256 = "sha256-9fScXRSyTkqzeXwh/Jjza6mnENCThlU6KI366CLFcgY=";

  };

  isLibrary = true;

  isExecutable = true;