Skip to content

Commit

Permalink
Elm 0.15.
Browse files Browse the repository at this point in the history 
elm-get and elm-server were deprecated, and the CLI tool elm
was rolled into elm-package, so those recipes are deleted.
  • Loading branch information
@krisajenkins
krisajenkins committed Apr 25, 2015
1 parent 1cdbde9 commit 2daaa0e
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 140 deletions.
9 changes: 9 additions & 0 deletions nixos/doc/manual/release-notes/rl-unstable.xml
View file
Expand Up @@ -49,6 +49,15 @@ was accordingly renamed to <literal>bomi</literal>
</para>
</listitem>

<listitem>Elm has been updated to v0.15, bringing significant
changes. <literal>elm-server</literal> has been replaced by
<literal>elm-reactor</literal>; <literal>elm-get</literal> by
<literal>elm-package</literal>; and <literal>elm-package</literal> now
contains the standalone <literal>elm</literal> command. See the
announcements for Elm <link xlink:href="http://elm-lang.org/blog/announce/0.14.elm">v0.14</link>
and <link xlink:href="http://elm-lang.org/blog/announce/0.15.elm">v0.15</link>
for migration details.</listitem>

</itemizedlist>
</para>

Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/compilers/elm/elm-compiler.nix
View file
Expand Up @@ -4,27 +4,28 @@
, cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
, languageGlsl, mtl, parsec, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
, unionFind, unorderedContainers
, unionFind, unorderedContainers, editDistance
}:

cabal.mkDerivation (self: {
pname = "elm-compiler";
version = "0.14.1";
sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
version = "0.15";
sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
indents languageEcmascript languageGlsl mtl parsec text
transformers unionFind unorderedContainers
transformers unionFind unorderedContainers editDistance
];
testDepends = [
aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
filepath HUnit indents languageEcmascript languageGlsl mtl parsec
QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text transformers unionFind
unorderedContainers
unorderedContainers
];
doCheck = false;
meta = {
homepage = "http://elm-lang.org";
description = "Values to help with elm-package, elm-make, and elm-lang.org.";
Expand Down
25 changes: 0 additions & 25 deletions pkgs/development/compilers/elm/elm-get.nix
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/compilers/elm/elm-make.nix
View file
Expand Up @@ -6,8 +6,8 @@

cabal.mkDerivation (self: {
pname = "elm-make";
version = "0.1.1";
sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
version = "0.1.2";
sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
isLibrary = false;
isExecutable = true;
buildDepends = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/elm/elm-package.nix
View file
Expand Up @@ -8,8 +8,8 @@

cabal.mkDerivation (self: {
pname = "elm-package";
version = "0.4";
sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
version = "0.5";
sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
isLibrary = true;
isExecutable = true;
buildDepends = [
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/elm/elm-reactor-exact-dependencies.json
View file
@@ -1,6 +1,6 @@
{
"evancz/virtual-dom": "1.1.0",
"evancz/elm-markdown": "1.1.2",
"evancz/elm-html": "1.1.0",
"elm-lang/core": "1.1.0"
}
"evancz/virtual-dom": "1.2.3",
"evancz/elm-markdown": "1.1.4",
"evancz/elm-html": "3.0.0",
"elm-lang/core": "2.0.0"
}
39 changes: 20 additions & 19 deletions pkgs/development/compilers/elm/elm-reactor.nix
View file
Expand Up @@ -6,51 +6,52 @@

cabal.mkDerivation (self: rec {
pname = "elm-reactor";
version = "0.3";
version = "0.3.1";
isLibrary = false;
isExecutable = true;
buildTools = [ unzip ];

src = fetchFromGitHub {
owner = "elm-lang";
repo = "elm-reactor";
rev = "176ff8e05e4bb7474752da1b3455c83d6181d594";
sha256 = "1marjqlmmq3a74g9f3ngk90h9mkhillcdwfsys6x0nqj6qirw4ph";
rev = "ec35c68d075cf1a6712cd3c01fc343deb6b897bd";
sha256 = "0wbnxradp9bidca6vhp7hqhc22nxhs9im74v0crgpi67pysk7nn5";
};
elmLangCore = fetchurl {
url = "https://github.com/elm-lang/core/archive/1.1.0.zip";
sha256 = "1fhvghjsay1p82k13039wbd02k439yplv2rh9zr77zvcbih6a31j";
url = "https://github.com/elm-lang/core/archive/2.0.0.zip";
sha256 = "1h1zbsmav25lbkdbm3zrc1n7ad04b7nhc4qqdnjps17f44rsc828";
};
elmHtml = fetchurl {
url = "https://github.com/evancz/elm-html/archive/1.1.0.zip";
sha256 = "01wshabxsdrxcxs2nn3dhk7n8720sp3prpkahhx36vvprdh05l4q";
url = "https://github.com/evancz/elm-html/archive/3.0.0.zip";
sha256 = "0yysaqn6bxk13bggmdimkb3jx28k2hkrnii8wfhjhlf3khz9m7kg";
};
elmMarkdown = fetchurl {
url = "https://github.com/evancz/elm-markdown/archive/1.1.2.zip";
sha256 = "14y1wp28za50zypdzyvl5d57hkm0v3rgnzm5klv3jcbd625kr9bg";
url = "https://github.com/evancz/elm-markdown/archive/1.1.4.zip";
sha256 = "0az1a2z7yndpx1jijlnw1k2zslq4b2wy7q2z4rlvxy99m4mygxjm";
};
virtualDom = fetchurl {
url = "https://github.com/evancz/virtual-dom/archive/1.1.0.zip";
sha256 = "08dr7q0x1ycgj5b15s2kn1a45iw350gzq65c3lxp47xfffq1vz91";
url = "https://github.com/evancz/virtual-dom/archive/1.2.3.zip";
sha256 = "07zkr5pk7925lhmzllnnzp1vda6k2iildwd8m404m4sfz6zyr7qp";
};

elmStuff = ./elm-reactor-exact-dependencies.json;

preConfigure = ''
unzip -d $TEMPDIR -q ${elmLangCore}
mkdir -p elm-stuff/packages/elm-lang/core/1.1.0
cp -pr $TEMPDIR/core-1.1.0/* elm-stuff/packages/elm-lang/core/1.1.0/
mkdir -p elm-stuff/packages/elm-lang/core/2.0.0
cp -pr $TEMPDIR/core-2.0.0/* elm-stuff/packages/elm-lang/core/2.0.0/
unzip -d $TEMPDIR -q ${elmHtml}
mkdir -p elm-stuff/packages/evancz/elm-html/1.1.0
cp -pr $TEMPDIR/elm-html-1.1.0/* elm-stuff/packages/evancz/elm-html/1.1.0
mkdir -p elm-stuff/packages/evancz/elm-html/3.0.0
cp -pr $TEMPDIR/elm-html-3.0.0/* elm-stuff/packages/evancz/elm-html/3.0.0
unzip -d $TEMPDIR -q ${elmMarkdown}
mkdir -p elm-stuff/packages/evancz/elm-markdown/1.1.2
cp -pr $TEMPDIR/elm-markdown-1.1.2/* elm-stuff/packages/evancz/elm-markdown/1.1.2
mkdir -p elm-stuff/packages/evancz/elm-markdown/1.1.4
cp -pr $TEMPDIR/elm-markdown-1.1.4/* elm-stuff/packages/evancz/elm-markdown/1.1.4
unzip -d $TEMPDIR -q ${virtualDom}
mkdir -p elm-stuff/packages/evancz/virtual-dom/1.1.0
cp -pr $TEMPDIR/virtual-dom-1.1.0/* elm-stuff/packages/evancz/virtual-dom/1.1.0
mkdir -p elm-stuff/packages/evancz/virtual-dom/1.2.3
cp -pr $TEMPDIR/virtual-dom-1.2.3/* elm-stuff/packages/evancz/virtual-dom/1.2.3
cp ${elmStuff} elm-stuff/exact-dependencies.json
'';
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/compilers/elm/elm-repl.nix
View file
@@ -1,21 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!

{ cabal, bytestringTrie, cmdargs, Elm, filepath, haskeline, HUnit
{ cabal, bytestringTrie, cmdargs, elmCompiler, elmPackage, filepath, haskeline, HUnit
, mtl, parsec, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2
}:

cabal.mkDerivation (self: {
pname = "elm-repl";
version = "0.3";
sha256 = "10a4a2ybg5dlshpklnisb957lknb0w8s3ppaq5p5y6ylqik8ak0a";
version = "0.4.1";
sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
isLibrary = false;
isExecutable = true;
buildDepends = [
bytestringTrie cmdargs Elm filepath haskeline mtl parsec
bytestringTrie cmdargs elmCompiler elmPackage filepath haskeline mtl parsec
];
testDepends = [
bytestringTrie cmdargs Elm filepath haskeline HUnit mtl parsec
bytestringTrie cmdargs elmCompiler filepath haskeline HUnit mtl parsec
QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
Expand Down
23 changes: 0 additions & 23 deletions pkgs/development/compilers/elm/elm-server.nix
View file

This file was deleted.

40 changes: 0 additions & 40 deletions pkgs/development/compilers/elm/elm.nix
View file

This file was deleted.

18 changes: 4 additions & 14 deletions pkgs/top-level/haskell-packages.nix
View file
Expand Up @@ -764,28 +764,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in

elerea = callPackage ../development/libraries/haskell/elerea {};

Elm = callPackage ../development/compilers/elm/elm.nix {};

elmCompiler = callPackage ../development/compilers/elm/elm-compiler.nix {};

elmMake = callPackage ../development/compilers/elm/elm-make.nix {
optparseApplicative = self.optparseApplicative_0_10_0;
elmCompiler = callPackage ../development/compilers/elm/elm-compiler.nix {
cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
};

elmPackage = callPackage ../development/compilers/elm/elm-package.nix {
optparseApplicative = self.optparseApplicative_0_10_0;
};
elmMake = callPackage ../development/compilers/elm/elm-make.nix {};

elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
elmPackage = callPackage ../development/compilers/elm/elm-package.nix {};

elmRepl = callPackage ../development/compilers/elm/elm-repl.nix {};

elmReactor = callPackage ../development/compilers/elm/elm-reactor.nix {};

elmGet = callPackage ../development/compilers/elm/elm-get.nix {
optparseApplicative = self.optparseApplicative_0_10_0;
};

emailValidate = callPackage ../development/libraries/haskell/email-validate {};

enclosedExceptions = callPackage ../development/libraries/haskell/enclosed-exceptions {};
Expand Down

0 comments on commit 2daaa0e

Please sign in to comment.