alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #11174 from codedmart/elm-0.16

Browse source 
elmPackages update from 0.15.1 to 0.16
This commit is contained in:
Peter Simons 2015-11-22 18:49:18 +01:00
parent f591a171f8 e32defcdac
commit 09b7a691f7
9 changed files with 80 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/elm/default.nix
View file

@ -43,18 +43,9 @@ let
elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: {
buildTools = drv.buildTools or [] ++ [ self.elm-make ];
patches = [ (fetchpatch {
url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch";
sha256 = "0cjcv5rvrq7v1j8n8w87ljgza522cm32cy4n4rq5ysjq3qnaxwcq";
}) ];
preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix);
});
elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch {
url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch";
sha256 = "1l66i4qssp0mcq8yypcn1ps3n2bskyfiqf0qr8gan6wz3znafpy9";
});
elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
doCheck = false;
buildTools = drv.buildTools or [] ++ [ makeWrapper ];

45
pkgs/development/compilers/elm/packages/elm-compiler.nix
View file

@ -1,34 +1,35 @@
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, base, binary
, blaze-html, blaze-markup, bytestring, cmdargs, containers
, directory, edit-distance, fetchgit, filemanip, filepath, HUnit
, indents, language-ecmascript, language-glsl, mtl, parsec, pretty
, process, QuickCheck, stdenv, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, transformers, union-find
, unordered-containers
{ mkDerivation, aeson, aeson-pretty, ansi-terminal, ansi-wl-pprint
, base, binary, bytestring, containers, directory, edit-distance
, fetchgit, filemanip, filepath, HUnit, indents
, language-ecmascript, language-glsl, mtl, parsec, pretty, process
, QuickCheck, stdenv, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, union-find, wl-pprint
}:
mkDerivation {
pname = "elm-compiler";
version = "0.15.1";
version = "0.16";
src = fetchgit {
url = "https://github.com/elm-lang/elm-compiler";
sha256 = "379a38db4f240ab206a2bbedc49d4768d7cf6fdf497b2d25dea71fca1d58efaa";
rev = "7fbdee067b494c0298d07c944629aaa5d3fa82f5";
sha256 = "696413b69fa5e66f878ed189094be5f74dfaced42121c82ac88bbab1c2bb9861";
rev = "cb1bad3b6ebaa02d5af47e9b98eab7d475a3a48d";
};
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson aeson-pretty ansi-terminal base binary blaze-html
blaze-markup bytestring cmdargs containers directory edit-distance
filepath indents language-ecmascript language-glsl mtl parsec
pretty process text transformers union-find unordered-containers
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary
bytestring containers directory edit-distance filepath indents
language-ecmascript language-glsl mtl parsec pretty process text
union-find wl-pprint
];
testDepends = [
aeson aeson-pretty ansi-terminal base binary blaze-html
blaze-markup bytestring cmdargs containers directory edit-distance
filemanip filepath HUnit indents language-ecmascript language-glsl
mtl parsec pretty process QuickCheck test-framework
test-framework-hunit test-framework-quickcheck2 text transformers
union-find
executableHaskellDepends = [
aeson base binary directory filepath process text
];
testHaskellDepends = [
aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary
bytestring containers directory edit-distance filemanip filepath
HUnit indents language-ecmascript language-glsl mtl parsec pretty
process QuickCheck test-framework test-framework-hunit
test-framework-quickcheck2 text union-find wl-pprint
];
jailbreak = true;
homepage = "http://elm-lang.org";

22
pkgs/development/compilers/elm/packages/elm-make.nix
View file

@ -1,22 +1,22 @@
{ mkDerivation, aeson, ansi-wl-pprint, base, binary, blaze-html
, blaze-markup, bytestring, containers, directory, elm-compiler
, elm-package, fetchgit, filepath, mtl, optparse-applicative
, stdenv, text
{ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary
, blaze-html, blaze-markup, bytestring, containers, directory
, elm-compiler, elm-package, fetchgit, filepath, mtl
, optparse-applicative, stdenv, text, time
}:
mkDerivation {
pname = "elm-make";
version = "0.2";
version = "0.16";
src = fetchgit {
url = "https://github.com/elm-lang/elm-make";
sha256 = "b618e827ca01ddeae38624f4bf5baa3dc4cb6e9e3c9bf15f2dda5a7c756bca33";
rev = "d9bedfdadc9cefce8e5249db6a316a5e712158d0";
sha256 = "bae1206c8066fb4e191345a3da79b89a5ec488929370b210203c8b4dcb35cebc";
rev = "e3bfc3e3d04c9b47e18fac289c796caec88d4fef";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson ansi-wl-pprint base binary blaze-html blaze-markup bytestring
containers directory elm-compiler elm-package filepath mtl
optparse-applicative text
executableHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base binary blaze-html
blaze-markup bytestring containers directory elm-compiler
elm-package filepath mtl optparse-applicative text time
];
jailbreak = true;
homepage = "http://elm-lang.org";

21
pkgs/development/compilers/elm/packages/elm-package.nix
View file

@ -1,24 +1,29 @@
{ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary
, bytestring, containers, directory, elm-compiler, fetchgit
, filepath, HTTP, http-client, http-client-tls, http-types, mtl
, network, optparse-applicative, pretty, process, stdenv, text
, time, unordered-containers, vector, zip-archive
, network, optparse-applicative, pretty, stdenv, text, time
, unordered-containers, vector, zip-archive
}:
mkDerivation {
pname = "elm-package";
version = "0.5.1";
version = "0.16";
src = fetchgit {
url = "https://github.com/elm-lang/elm-package";
sha256 = "0d69e68831f4a86c6c02aed33fc3a6aca87636a7fb0bb6e39ffc74ddd15b5435";
rev = "365e2d86a8222c92e50951c7d30b3c5db44c383d";
sha256 = "836789a823ab1d97a37907396856d8808c5573e295315c0a55e5bb44915fba4b";
rev = "6305a7954a45d1635d6a7185f2dcf136c376074f";
};
isLibrary = true;
isExecutable = true;
buildDepends = [
libraryHaskellDepends = [
aeson aeson-pretty base binary bytestring containers directory
elm-compiler filepath HTTP http-client http-client-tls http-types
mtl network text time unordered-containers vector zip-archive
];
executableHaskellDepends = [
aeson aeson-pretty ansi-wl-pprint base binary bytestring containers
directory elm-compiler filepath HTTP http-client http-client-tls
http-types mtl network optparse-applicative pretty process text
time unordered-containers vector zip-archive
http-types mtl network optparse-applicative pretty text time
unordered-containers vector zip-archive
];
jailbreak = true;
homepage = "http://github.com/elm-lang/elm-package";

16
pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
View file

@ -1,18 +1,18 @@
{
"evancz/virtual-dom" = {
version = "1.2.3";
sha256 = "03iv9fpng3gvia00v3gl8rs83j5b112hx0vm36az13zjr378b1jr";
version = "2.1.0";
sha256 = "0x072vk2x9md5pxwc3f3v7gm738wr996d54avzzadfvj3qcjxpfs";
};
"evancz/elm-markdown" = {
version = "1.1.5";
sha256 = "01vdaz56i064lah7kd8485j0y33di8wa134sr4292wb3na990a8r";
version = "2.0.0";
sha256 = "1x1kvwag7idxif4gsznnx0lp1c49dl9pin3aj0dq21lzradggn3g";
};
"evancz/elm-html" = {
version = "3.0.0";
sha256 = "0a2iw45x3qwxkgibkc6qx1csfa06gpkfc9b04vkq1h7ynw2g5577";
version = "4.0.2";
sha256 = "05hzsnsqp2krd9s4xjwhmvyafpky4dc40bbk9sgsr301450cfgw6";
};
"elm-lang/core" = {
version = "2.1.0";
sha256 = "10fg7bcc310b5bwv6sq7gjhy9r5xzc98nbk4zhs4jqykn36i6l43";
version = "3.0.0";
sha256 = "1bc4wibcmv6sxf3wq83avhzwj137wac1gf3zx52rfwnb5jm3lipm";
};
}

20
pkgs/development/compilers/elm/packages/elm-reactor.nix
View file

@ -1,24 +1,22 @@
{ mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs
, containers, directory, elm-compiler, fetchgit, filepath, fsnotify
, HTTP, mtl, process, snap-core, snap-server, stdenv
, system-filepath, text, time, transformers, unordered-containers
, directory, elm-compiler, fetchgit, filepath, fsnotify, mtl
, snap-core, snap-server, stdenv, text, time, transformers
, websockets, websockets-snap
}:
mkDerivation {
pname = "elm-reactor";
version = "0.3.2";
version = "0.16";
src = fetchgit {
url = "https://github.com/elm-lang/elm-reactor";
sha256 = "a7775971ea6634f13436f10098c462d39c6e115dbda79e537831a71975451e9a";
rev = "b6c11be539734e72015ce151a9189d06dfc9db76";
sha256 = "dbf881808ff00772d464675f1dd88a40273569ab0e9298805133a3b8f3ed4f26";
rev = "ff4ad13ea6b55c63b2d2099b738fd1d5ec2d29b4";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
base blaze-html blaze-markup bytestring cmdargs containers
directory elm-compiler filepath fsnotify HTTP mtl process snap-core
snap-server system-filepath text time transformers
unordered-containers websockets websockets-snap
executableHaskellDepends = [
base blaze-html blaze-markup bytestring cmdargs directory
elm-compiler filepath fsnotify mtl snap-core snap-server text time
transformers websockets websockets-snap
];
jailbreak = true;
homepage = "http://elm-lang.org";

19
pkgs/development/compilers/elm/packages/elm-repl.nix
View file

@ -1,26 +1,25 @@
{ mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs
, containers, directory, elm-compiler, elm-package, fetchgit
, filepath, haskeline, HUnit, mtl, parsec, process, QuickCheck
, stdenv, test-framework, test-framework-hunit
, test-framework-quickcheck2
, filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv
, test-framework, test-framework-hunit, test-framework-quickcheck2
}:
mkDerivation {
pname = "elm-repl";
version = "0.4.2";
version = "0.16";
src = fetchgit {
url = "https://github.com/elm-lang/elm-repl";
sha256 = "a6eadbef7886c4c65243723f101910909bb0d53b2c48454ed7b39cf700f9649c";
rev = "0c434fdb24b86a93b06c33c8f26857ce47caf165";
sha256 = "36d50cf1f86815900afd4b75da6e5cd15008b2652e97ffed0f321a28e6442874";
rev = "265de7283488964f44f0257a8b4a055ad8af984d";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
executableHaskellDepends = [
base binary bytestring bytestring-trie cmdargs containers directory
elm-compiler elm-package filepath haskeline mtl parsec process
elm-compiler elm-package filepath haskeline mtl parsec
];
testDepends = [
testHaskellDepends = [
base bytestring bytestring-trie cmdargs directory elm-compiler
elm-package filepath haskeline HUnit mtl parsec process QuickCheck
elm-package filepath haskeline HUnit mtl parsec QuickCheck
test-framework test-framework-hunit test-framework-quickcheck2
];
jailbreak = true;

2
pkgs/development/compilers/elm/packages/release.nix
View file

@ -1,6 +1,6 @@
{ callPackage }:
{
version = "0.15.1";
version = "0.16.0";
packages = {
elm-compiler = callPackage ./elm-compiler.nix { };
elm-package = callPackage ./elm-package.nix { };

12
pkgs/development/compilers/elm/update-elm.rb
View file

@ -1,12 +1,12 @@
#!/usr/bin/env ruby
# Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs
$elm_version = "0.15.1"
$elm_packages = { "elm-compiler" => "0.15.1",
"elm-package" => "0.5.1",
"elm-make" => "0.2",
"elm-reactor" => "0.3.2",
"elm-repl" => "0.4.2"
$elm_version = "0.16.0"
$elm_packages = { "elm-compiler" => "0.16",
"elm-package" => "0.16",
"elm-make" => "0.16",
"elm-reactor" => "0.16",
"elm-repl" => "0.16"
}
for pkg, ver in $elm_packages