commit 910829801085e98d9617be19da13dd916f290973 · pyrox.dev/nixpkgs

+10 -7

pkgs/development/compilers/elm/default.nix

···

       7
       7
        
       let

     

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

     

       9
       9
        
       

     

       10
       10
       -
         # Haskell packages that require ghc 9.2

     

       10
       10
       +
         # Haskell packages that require ghc 9.6

     

       11
       11
        
         hs96Pkgs = self: pkgs.haskell.packages.ghc96.override {

     

       12
       12
        
           overrides = self: super: with pkgs.haskell.lib.compose; with lib;

     

       13
       13
        
           let elmPkgs = rec {

     
···

       34
       34
        
             inherit fetchElmDeps;

     

       35
       35
        
             elmVersion = elmPkgs.elm.version;

     

       36
       36
        
           };

     

       37
       37
       -
           in {

     

       37
       37
       +
           in elmPkgs // {

     

       38
       38
        
             inherit elmPkgs;

     

       39
       39
        
           };

     

       40
       40
        
         };

     

       41
       41
        
       

     

       42
       42
       +
         # Haskell packages that require ghc 8.10

     

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

     

       43
       44
        
           overrides = self: super: with pkgs.haskell.lib.compose; with lib;

     

       44
       44
       -
           let elmPkgs = {

     

       45
       45
       +
           let elmPkgs = rec {

     

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

     

       46
       47
        
               prePatch = ''

     

       47
       48
        
                 substituteInPlace package.yaml --replace "- -Werror" ""

     
···

       59
       60
        
               prePatch = ''

     

       60
       61
        
                 sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place

     

       61
       62
        
               '';

     

       63
       63
       +
               jailbreak = true;

     

       62
       64
        
               # Tests are failing because of missing instances for Eq and Show type classes

     

       63
       65
        
               doCheck = false;

     

       64
       64
       -
               jailbreak = true;

     

       65
       66
        
       

     

       66
       67
        
               description = "Instrument Elm code as a preprocessing step for elm-coverage";

     

       67
       68
        
               homepage = "https://github.com/zwilias/elm-instrument";

     

       68
       69
        
               license = licenses.bsd3;

     

       69
       70
        
               maintainers = [ maintainers.turbomack ];

     

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

     

       72
       72
       +
       

     

       73
       73
       +
             elmVersion = elmPkgs.elm.version;

     

       71
       74
        
           };

     

       72
       75
        
           in elmPkgs // {

     

       73
       76
        
             inherit elmPkgs;

     
···

       89
       92
        
         # Haskell packages that require ghc 9.2

     

       90
       93
        
         hs92Pkgs = self: pkgs.haskell.packages.ghc92.override {

     

       91
       94
        
           overrides = self: super: with pkgs.haskell.lib.compose; with lib;

     

       92
       92
       -
           let elmPkgs = {

     

       95
       95
       +
           let elmPkgs = rec {

     

       93
       96
        
             /*

     

       94
       97
        
             The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:

     

       95
       98
        
             `package/nix/build.sh`

     
···

       138
       141
        
               `patchNpmElm` function also defined in `packages/lib.nix`.

     

       139
       142
        
         */

     

       140
       143
        
         elmLib = let

     

       141
       141
       -
           hsElmPkgs = hs96Pkgs self;

     

       144
       144
       +
           hsElmPkgs = hs810Pkgs self;

     

       142
       145
        
         in import ./packages/lib.nix {

     

       143
       146
        
           inherit lib;

     

       144
       147
        
           inherit (pkgs) writeScriptBin stdenv;

     
···

       150
       153
        
         elm-test-rs = callPackage ./packages/elm-test-rs.nix { };

     

       151
       154
        
       

     

       152
       155
        
         elm-test = callPackage ./packages/elm-test.nix { };

     

       153
       153
       -
       } // (hs96Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; {

     

       156
       156
       +
       } // (hs96Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (hs810Pkgs self).elmPkgs // (with elmLib; with (hs96Pkgs self).elmPkgs; {

     

       154
       157
        
         elm-verify-examples = let

     

       155
       158
        
           patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // {

     

       156
       159
        
           meta = with lib; nodePkgs.elm-verify-examples.meta // {

+1 -2

pkgs/development/compilers/elm/fetchElmDeps.nix

···

       3
       3
        
       {elmPackages, registryDat, elmVersion}:

     

       4
       4
        
       

     

       5
       5
        
       let

     

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

     

       7
       7
       -
       

     

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

     

       8
       7
        
       in

     

       9
       8
        
       ''

     

       10
       9
        
         export ELM_HOME=`pwd`/.elm

+3 -6

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

···

       8
       8
        
       }:

     

       9
       9
        
       mkDerivation {

     

       10
       10
        
         pname = "elm";

     

       11
       11
       -
         # We're building binaries from commit that npm installer is using since

     

       12
       12
       -
         # November 1st release called 0.19.1-6.

     

       13
       13
       -
         # These binaries are built with newer ghc version and also support Aarch64 for Linux and Darwin.

     

       14
       14
       -
         # Upstream git tag for 0.19.1 is still pointing to original commit from 2019.

     

       15
       15
       -
         version = "0.19.1-6";

     

       11
       11
       +
         version = "0.19.1";

     

       16
       12
        
         src = fetchgit {

     

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

     

       14
       14
       +
           sha256 = "1h9jhwlv1pqqna5s09vd72arwhhjn0dlhv0w9xx5771x0xryxxg8";

     

       18
       15
        
           rev = "2f6dd29258e880dbb7effd57a829a0470d8da48b";

     

       19
       19
       -
           sha256 = "sha256-6PXucwc9nFN6TxxsSBuwEkKelThtJ6CLshjfsCmHMsE=";

     

       16
       16
       +
           fetchSubmodules = true;

     

       20
       17
        
         };

     

       21
       18
        
         isLibrary = false;

     

       22
       19
        
         isExecutable = true;

pkgs/development/compilers/elm/registry.dat

This is a binary file and will not be displayed.

+1 -1

pkgs/development/compilers/elm/update.sh

···

       1
       1
        
       #!/usr/bin/env nix-shell

     

       2
       2
        
       #!nix-shell -p cabal2nix elm2nix -i bash ../../..

     

       3
       3
        
       

     

       4
       4
       -
       cabal2nix https://github.com/elm/compiler --revision c9aefb6230f5e0bda03205ab0499f6e4af924495 > packages/elm.nix

     

       4
       4
       +
       cabal2nix https://github.com/elm/compiler --revision 2f6dd29258e880dbb7effd57a829a0470d8da48b > packages/elm.nix

     

       5
       5
        
       echo "need to manually copy registry.dat from an existing elm project"

     

       6
       6
        
       #elm2nix snapshot > registry.dat

     

       7
       7
        
       pushd "$(nix-build -A elmPackages.elm.src --no-out-link ../../../..)/reactor"