Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

elm-format: 0.8.0 -> 0.8.1

authored by

Aaron VonderHaar and committed by
Domen Kožar
67f58eee 28839e4b

+30 -31
+4 -19
pkgs/development/compilers/elm/default.nix
··· 107 107 108 108 109 109 /* 110 - This is not a core Elm package, and it's hosted on GitHub. 111 - To update, run: 112 - 113 - cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix 114 - 115 - where foo is a tag for a new version, for example "0.8.0". 110 + The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: 111 + `pacakge/nix/build.sh` 116 112 */ 117 - elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix { }) (drv: { 118 - # https://github.com/avh4/elm-format/issues/529 119 - patchPhase = '' 120 - cat >Setup.hs <<EOF 121 - import Distribution.Simple 122 - main = defaultMain 123 - EOF 124 - 125 - sed -i '/Build_elm_format/d' elm-format.cabal 126 - sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs 127 - sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs 128 - ''; 129 - }); 113 + elm-format = self.callPackage ./packages/elm-format.nix {}; 130 114 }; 131 115 in elmPkgs // { 132 116 inherit elmPkgs; ··· 134 118 135 119 # Needed for elm-format 136 120 indents = self.callPackage ./packages/indents.nix {}; 121 + tasty-quickcheck = self.callPackage ./packages/tasty-quickcheck.nix {}; 137 122 }; 138 123 }; 139 124 in hsPkgs.elmPkgs
+12 -10
pkgs/development/compilers/elm/packages/elm-format.nix
··· 1 - { mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary 2 - , bytestring, Cabal, cmark, containers, directory, fetchgit 3 - , filepath, free, HUnit, indents, json, mtl, optparse-applicative 4 - , parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty 5 - , tasty-golden, tasty-hunit, tasty-quickcheck, text 1 + { mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary 2 + , bytestring, Cabal, cmark, containers, directory, filepath, free 3 + , HUnit, indents, json, mtl, optparse-applicative, parsec, process 4 + , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden 5 + , tasty-hunit, tasty-quickcheck, text 6 6 }: 7 7 mkDerivation { 8 8 pname = "elm-format"; 9 - version = "0.8.0"; 9 + version = "0.8.1"; 10 10 src = fetchgit { 11 11 url = "http://github.com/avh4/elm-format"; 12 - sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6"; 13 - rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6"; 12 + sha256 = "0p1dy1m6illsl7i04zsv5jqw7i4znv7pfpdfm53zy0k7mq0fk09j"; 13 + rev = "89694e858664329e3cbdaeb71b15c4456fd739ff"; 14 14 }; 15 + postPatch = '' 16 + sed -i "s|desc <-.*||" ./Setup.hs 17 + sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"0.8.1\\\\\"\"|" ./Setup.hs 18 + ''; 15 19 isLibrary = true; 16 20 isExecutable = true; 17 21 setupHaskellDepends = [ base Cabal directory filepath process ]; ··· 26 30 split tasty tasty-golden tasty-hunit tasty-quickcheck text 27 31 ]; 28 32 doHaddock = false; 29 - jailbreak = true; 30 - doCheck = false; 31 33 homepage = "http://elm-lang.org"; 32 34 description = "A source code formatter for Elm"; 33 35 license = stdenv.lib.licenses.bsd3;
+14
pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
··· 1 + { mkDerivation, base, pcre-light, QuickCheck, random, stdenv 2 + , tagged, tasty, tasty-hunit 3 + }: 4 + mkDerivation { 5 + pname = "tasty-quickcheck"; 6 + version = "0.9.2"; 7 + sha256 = "c5920adeab6e283d5e3ab45f3c80a1b011bedfbe4a3246a52606da2e1da95873"; 8 + libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; 9 + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; 10 + doCheck = false; 11 + homepage = "https://github.com/feuerbach/tasty"; 12 + description = "QuickCheck support for the Tasty test framework"; 13 + license = stdenv.lib.licenses.mit; 14 + }
-2
pkgs/development/compilers/elm/update.sh
··· 1 1 cabal2nix https://github.com/elm/compiler --revision 32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix 2 - cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix 3 - cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix