elmPackages update from 0.15.1 to 0.16

+80 -86
-9
pkgs/development/compilers/elm/default.nix
··· 43 43 44 44 elm-reactor = hlib.overrideCabal elmPkgs'.elm-reactor (drv: { 45 45 buildTools = drv.buildTools or [] ++ [ self.elm-make ]; 46 - patches = [ (fetchpatch { 47 - url = "https://github.com/elm-lang/elm-reactor/commit/ca4d91d3fc7c6f72aa802d79fd1563ab5f3c4f2c.patch"; 48 - sha256 = "0cjcv5rvrq7v1j8n8w87ljgza522cm32cy4n4rq5ysjq3qnaxwcq"; 49 - }) ]; 50 46 preConfigure = makeElmStuff (import ./packages/elm-reactor-elm.nix); 51 - }); 52 - 53 - elm-package = hlib.appendPatch elmPkgs'.elm-package (fetchpatch { 54 - url = "https://github.com/elm-lang/elm-package/commit/af517f2ffe15f8ec1d8c38f01ce188bbdefea47a.patch"; 55 - sha256 = "1l66i4qssp0mcq8yypcn1ps3n2bskyfiqf0qr8gan6wz3znafpy9"; 56 47 }); 57 48 58 49 elm-repl = hlib.overrideCabal elmPkgs'.elm-repl (drv: {
+23 -22
pkgs/development/compilers/elm/packages/elm-compiler.nix
··· 1 - { mkDerivation, aeson, aeson-pretty, ansi-terminal, base, binary 2 - , blaze-html, blaze-markup, bytestring, cmdargs, containers 3 - , directory, edit-distance, fetchgit, filemanip, filepath, HUnit 4 - , indents, language-ecmascript, language-glsl, mtl, parsec, pretty 5 - , process, QuickCheck, stdenv, test-framework, test-framework-hunit 6 - , test-framework-quickcheck2, text, transformers, union-find 7 - , unordered-containers 1 + { mkDerivation, aeson, aeson-pretty, ansi-terminal, ansi-wl-pprint 2 + , base, binary, bytestring, containers, directory, edit-distance 3 + , fetchgit, filemanip, filepath, HUnit, indents 4 + , language-ecmascript, language-glsl, mtl, parsec, pretty, process 5 + , QuickCheck, stdenv, test-framework, test-framework-hunit 6 + , test-framework-quickcheck2, text, union-find, wl-pprint 8 7 }: 9 8 mkDerivation { 10 9 pname = "elm-compiler"; 11 - version = "0.15.1"; 10 + version = "0.16"; 12 11 src = fetchgit { 13 12 url = "https://github.com/elm-lang/elm-compiler"; 14 - sha256 = "379a38db4f240ab206a2bbedc49d4768d7cf6fdf497b2d25dea71fca1d58efaa"; 15 - rev = "7fbdee067b494c0298d07c944629aaa5d3fa82f5"; 13 + sha256 = "696413b69fa5e66f878ed189094be5f74dfaced42121c82ac88bbab1c2bb9861"; 14 + rev = "cb1bad3b6ebaa02d5af47e9b98eab7d475a3a48d"; 16 15 }; 17 16 isLibrary = true; 18 17 isExecutable = true; 19 - buildDepends = [ 20 - aeson aeson-pretty ansi-terminal base binary blaze-html 21 - blaze-markup bytestring cmdargs containers directory edit-distance 22 - filepath indents language-ecmascript language-glsl mtl parsec 23 - pretty process text transformers union-find unordered-containers 18 + libraryHaskellDepends = [ 19 + aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary 20 + bytestring containers directory edit-distance filepath indents 21 + language-ecmascript language-glsl mtl parsec pretty process text 22 + union-find wl-pprint 24 23 ]; 25 - testDepends = [ 26 - aeson aeson-pretty ansi-terminal base binary blaze-html 27 - blaze-markup bytestring cmdargs containers directory edit-distance 28 - filemanip filepath HUnit indents language-ecmascript language-glsl 29 - mtl parsec pretty process QuickCheck test-framework 30 - test-framework-hunit test-framework-quickcheck2 text transformers 31 - union-find 24 + executableHaskellDepends = [ 25 + aeson base binary directory filepath process text 26 + ]; 27 + testHaskellDepends = [ 28 + aeson aeson-pretty ansi-terminal ansi-wl-pprint base binary 29 + bytestring containers directory edit-distance filemanip filepath 30 + HUnit indents language-ecmascript language-glsl mtl parsec pretty 31 + process QuickCheck test-framework test-framework-hunit 32 + test-framework-quickcheck2 text union-find wl-pprint 32 33 ]; 33 34 jailbreak = true; 34 35 homepage = "http://elm-lang.org";
+11 -11
pkgs/development/compilers/elm/packages/elm-make.nix
··· 1 - { mkDerivation, aeson, ansi-wl-pprint, base, binary, blaze-html 2 - , blaze-markup, bytestring, containers, directory, elm-compiler 3 - , elm-package, fetchgit, filepath, mtl, optparse-applicative 4 - , stdenv, text 1 + { mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base, binary 2 + , blaze-html, blaze-markup, bytestring, containers, directory 3 + , elm-compiler, elm-package, fetchgit, filepath, mtl 4 + , optparse-applicative, stdenv, text, time 5 5 }: 6 6 mkDerivation { 7 7 pname = "elm-make"; 8 - version = "0.2"; 8 + version = "0.16"; 9 9 src = fetchgit { 10 10 url = "https://github.com/elm-lang/elm-make"; 11 - sha256 = "b618e827ca01ddeae38624f4bf5baa3dc4cb6e9e3c9bf15f2dda5a7c756bca33"; 12 - rev = "d9bedfdadc9cefce8e5249db6a316a5e712158d0"; 11 + sha256 = "bae1206c8066fb4e191345a3da79b89a5ec488929370b210203c8b4dcb35cebc"; 12 + rev = "e3bfc3e3d04c9b47e18fac289c796caec88d4fef"; 13 13 }; 14 14 isLibrary = false; 15 15 isExecutable = true; 16 - buildDepends = [ 17 - aeson ansi-wl-pprint base binary blaze-html blaze-markup bytestring 18 - containers directory elm-compiler elm-package filepath mtl 19 - optparse-applicative text 16 + executableHaskellDepends = [ 17 + aeson ansi-terminal ansi-wl-pprint base binary blaze-html 18 + blaze-markup bytestring containers directory elm-compiler 19 + elm-package filepath mtl optparse-applicative text time 20 20 ]; 21 21 jailbreak = true; 22 22 homepage = "http://elm-lang.org";
+13 -8
pkgs/development/compilers/elm/packages/elm-package.nix
··· 1 1 { mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, base, binary 2 2 , bytestring, containers, directory, elm-compiler, fetchgit 3 3 , filepath, HTTP, http-client, http-client-tls, http-types, mtl 4 - , network, optparse-applicative, pretty, process, stdenv, text 5 - , time, unordered-containers, vector, zip-archive 4 + , network, optparse-applicative, pretty, stdenv, text, time 5 + , unordered-containers, vector, zip-archive 6 6 }: 7 7 mkDerivation { 8 8 pname = "elm-package"; 9 - version = "0.5.1"; 9 + version = "0.16"; 10 10 src = fetchgit { 11 11 url = "https://github.com/elm-lang/elm-package"; 12 - sha256 = "0d69e68831f4a86c6c02aed33fc3a6aca87636a7fb0bb6e39ffc74ddd15b5435"; 13 - rev = "365e2d86a8222c92e50951c7d30b3c5db44c383d"; 12 + sha256 = "836789a823ab1d97a37907396856d8808c5573e295315c0a55e5bb44915fba4b"; 13 + rev = "6305a7954a45d1635d6a7185f2dcf136c376074f"; 14 14 }; 15 15 isLibrary = true; 16 16 isExecutable = true; 17 - buildDepends = [ 17 + libraryHaskellDepends = [ 18 + aeson aeson-pretty base binary bytestring containers directory 19 + elm-compiler filepath HTTP http-client http-client-tls http-types 20 + mtl network text time unordered-containers vector zip-archive 21 + ]; 22 + executableHaskellDepends = [ 18 23 aeson aeson-pretty ansi-wl-pprint base binary bytestring containers 19 24 directory elm-compiler filepath HTTP http-client http-client-tls 20 - http-types mtl network optparse-applicative pretty process text 21 - time unordered-containers vector zip-archive 25 + http-types mtl network optparse-applicative pretty text time 26 + unordered-containers vector zip-archive 22 27 ]; 23 28 jailbreak = true; 24 29 homepage = "http://github.com/elm-lang/elm-package";
+8 -8
pkgs/development/compilers/elm/packages/elm-reactor-elm.nix
··· 1 1 { 2 2 "evancz/virtual-dom" = { 3 - version = "1.2.3"; 4 - sha256 = "03iv9fpng3gvia00v3gl8rs83j5b112hx0vm36az13zjr378b1jr"; 3 + version = "2.1.0"; 4 + sha256 = "0x072vk2x9md5pxwc3f3v7gm738wr996d54avzzadfvj3qcjxpfs"; 5 5 }; 6 6 "evancz/elm-markdown" = { 7 - version = "1.1.5"; 8 - sha256 = "01vdaz56i064lah7kd8485j0y33di8wa134sr4292wb3na990a8r"; 7 + version = "2.0.0"; 8 + sha256 = "1x1kvwag7idxif4gsznnx0lp1c49dl9pin3aj0dq21lzradggn3g"; 9 9 }; 10 10 "evancz/elm-html" = { 11 - version = "3.0.0"; 12 - sha256 = "0a2iw45x3qwxkgibkc6qx1csfa06gpkfc9b04vkq1h7ynw2g5577"; 11 + version = "4.0.2"; 12 + sha256 = "05hzsnsqp2krd9s4xjwhmvyafpky4dc40bbk9sgsr301450cfgw6"; 13 13 }; 14 14 "elm-lang/core" = { 15 - version = "2.1.0"; 16 - sha256 = "10fg7bcc310b5bwv6sq7gjhy9r5xzc98nbk4zhs4jqykn36i6l43"; 15 + version = "3.0.0"; 16 + sha256 = "1bc4wibcmv6sxf3wq83avhzwj137wac1gf3zx52rfwnb5jm3lipm"; 17 17 }; 18 18 }
+9 -11
pkgs/development/compilers/elm/packages/elm-reactor.nix
··· 1 1 { mkDerivation, base, blaze-html, blaze-markup, bytestring, cmdargs 2 - , containers, directory, elm-compiler, fetchgit, filepath, fsnotify 3 - , HTTP, mtl, process, snap-core, snap-server, stdenv 4 - , system-filepath, text, time, transformers, unordered-containers 2 + , directory, elm-compiler, fetchgit, filepath, fsnotify, mtl 3 + , snap-core, snap-server, stdenv, text, time, transformers 5 4 , websockets, websockets-snap 6 5 }: 7 6 mkDerivation { 8 7 pname = "elm-reactor"; 9 - version = "0.3.2"; 8 + version = "0.16"; 10 9 src = fetchgit { 11 10 url = "https://github.com/elm-lang/elm-reactor"; 12 - sha256 = "a7775971ea6634f13436f10098c462d39c6e115dbda79e537831a71975451e9a"; 13 - rev = "b6c11be539734e72015ce151a9189d06dfc9db76"; 11 + sha256 = "dbf881808ff00772d464675f1dd88a40273569ab0e9298805133a3b8f3ed4f26"; 12 + rev = "ff4ad13ea6b55c63b2d2099b738fd1d5ec2d29b4"; 14 13 }; 15 14 isLibrary = false; 16 15 isExecutable = true; 17 - buildDepends = [ 18 - base blaze-html blaze-markup bytestring cmdargs containers 19 - directory elm-compiler filepath fsnotify HTTP mtl process snap-core 20 - snap-server system-filepath text time transformers 21 - unordered-containers websockets websockets-snap 16 + executableHaskellDepends = [ 17 + base blaze-html blaze-markup bytestring cmdargs directory 18 + elm-compiler filepath fsnotify mtl snap-core snap-server text time 19 + transformers websockets websockets-snap 22 20 ]; 23 21 jailbreak = true; 24 22 homepage = "http://elm-lang.org";
+9 -10
pkgs/development/compilers/elm/packages/elm-repl.nix
··· 1 1 { mkDerivation, base, binary, bytestring, bytestring-trie, cmdargs 2 2 , containers, directory, elm-compiler, elm-package, fetchgit 3 - , filepath, haskeline, HUnit, mtl, parsec, process, QuickCheck 4 - , stdenv, test-framework, test-framework-hunit 5 - , test-framework-quickcheck2 3 + , filepath, haskeline, HUnit, mtl, parsec, QuickCheck, stdenv 4 + , test-framework, test-framework-hunit, test-framework-quickcheck2 6 5 }: 7 6 mkDerivation { 8 7 pname = "elm-repl"; 9 - version = "0.4.2"; 8 + version = "0.16"; 10 9 src = fetchgit { 11 10 url = "https://github.com/elm-lang/elm-repl"; 12 - sha256 = "a6eadbef7886c4c65243723f101910909bb0d53b2c48454ed7b39cf700f9649c"; 13 - rev = "0c434fdb24b86a93b06c33c8f26857ce47caf165"; 11 + sha256 = "36d50cf1f86815900afd4b75da6e5cd15008b2652e97ffed0f321a28e6442874"; 12 + rev = "265de7283488964f44f0257a8b4a055ad8af984d"; 14 13 }; 15 14 isLibrary = false; 16 15 isExecutable = true; 17 - buildDepends = [ 16 + executableHaskellDepends = [ 18 17 base binary bytestring bytestring-trie cmdargs containers directory 19 - elm-compiler elm-package filepath haskeline mtl parsec process 18 + elm-compiler elm-package filepath haskeline mtl parsec 20 19 ]; 21 - testDepends = [ 20 + testHaskellDepends = [ 22 21 base bytestring bytestring-trie cmdargs directory elm-compiler 23 - elm-package filepath haskeline HUnit mtl parsec process QuickCheck 22 + elm-package filepath haskeline HUnit mtl parsec QuickCheck 24 23 test-framework test-framework-hunit test-framework-quickcheck2 25 24 ]; 26 25 jailbreak = true;
+1 -1
pkgs/development/compilers/elm/packages/release.nix
··· 1 1 { callPackage }: 2 2 { 3 - version = "0.15.1"; 3 + version = "0.16.0"; 4 4 packages = { 5 5 elm-compiler = callPackage ./elm-compiler.nix { }; 6 6 elm-package = callPackage ./elm-package.nix { };
+6 -6
pkgs/development/compilers/elm/update-elm.rb
··· 1 1 #!/usr/bin/env ruby 2 2 3 3 # Take those from https://github.com/elm-lang/elm-platform/blob/master/installers/BuildFromSource.hs 4 - $elm_version = "0.15.1" 5 - $elm_packages = { "elm-compiler" => "0.15.1", 6 - "elm-package" => "0.5.1", 7 - "elm-make" => "0.2", 8 - "elm-reactor" => "0.3.2", 9 - "elm-repl" => "0.4.2" 4 + $elm_version = "0.16.0" 5 + $elm_packages = { "elm-compiler" => "0.16", 6 + "elm-package" => "0.16", 7 + "elm-make" => "0.16", 8 + "elm-reactor" => "0.16", 9 + "elm-repl" => "0.16" 10 10 } 11 11 12 12 for pkg, ver in $elm_packages