public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm: get to compile on GHC 8.6.3

Browse Source
This commit is contained in:
Domen Kožar 2019-01-04 13:03:24 +00:00
parent 6da4584acf
commit fb0e49a9a7
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/compilers/elm/default.nix
View File

@ -4,7 +4,7 @@
let let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
hsPkgs = haskell.packages.ghc822.override { hsPkgs = haskell.packages.ghc863.override {
overrides = self: super: with haskell.lib; overrides = self: super: with haskell.lib;
let elmPkgs = { let elmPkgs = {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
@ -15,12 +15,7 @@ let
versionsDat = ./versions.dat; versionsDat = ./versions.dat;
}; };
buildTools = drv.buildTools or [] ++ [ makeWrapper ]; buildTools = drv.buildTools or [] ++ [ makeWrapper ];
patches = [ jailbreak = true;
(fetchpatch {
url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
})
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/elm \ wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]} --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
@ -31,16 +26,16 @@ let
The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
`pacakge/nix/build.sh` `pacakge/nix/build.sh`
*/ */
elm-format = self.callPackage ./packages/elm-format.nix {}; elm-format = doJailbreak (self.callPackage ./packages/elm-format.nix {});
inherit fetchElmDeps; inherit fetchElmDeps;
elmVersion = elmPkgs.elm.version;
}; };
in elmPkgs // { in elmPkgs // {
inherit elmPkgs; inherit elmPkgs;
elmVersion = elmPkgs.elm.version;
# Needed for elm-format # Needed for elm-format
indents = self.callPackage ./packages/indents.nix {}; indents = self.callPackage ./packages/indents.nix {};
tasty-quickcheck = self.callPackage ./packages/tasty-quickcheck.nix {};
}; };
}; };
in hsPkgs.elmPkgs in hsPkgs.elmPkgs

14
pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
View File

@ -1,14 +0,0 @@
{ mkDerivation, base, pcre-light, QuickCheck, random, stdenv
, tagged, tasty, tasty-hunit
}:
mkDerivation {
pname = "tasty-quickcheck";
version = "0.9.2";
sha256 = "c5920adeab6e283d5e3ab45f3c80a1b011bedfbe4a3246a52606da2e1da95873";
libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
doCheck = false;
homepage = "https://github.com/feuerbach/tasty";
description = "QuickCheck support for the Tasty test framework";
license = stdenv.lib.licenses.mit;
}