From ad6105c381e92fae2927b6e192386e1dd649bb73 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Thu, 10 Sep 2020 23:13:19 -0500 Subject: [PATCH] use elm2nix to avoid re-downloading packages --- .gitignore | 1 + default.nix | 9 ++-- nix/elm-srcs.nix | 87 +++++++++++++++++++++++++++++++ registry.dat => nix/registry.dat | Bin 99471 -> 100376 bytes shell.nix | 1 + 5 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 nix/elm-srcs.nix rename registry.dat => nix/registry.dat (89%) diff --git a/.gitignore b/.gitignore index dc9feb4..2684511 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /dist /elm-stuff +/result diff --git a/default.nix b/default.nix index f333e7e..103ba02 100644 --- a/default.nix +++ b/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation { src = gitignore.gitignoreSource ./.; buildInputs = [ elmPackages.elm elmPackages.elm-test ]; - buildPhase = '' - env ELM_HOME=.elm make dist - ''; + buildPhase = pkgs.elmPackages.fetchElmDeps { + elmPackages = import ./nix/elm-srcs.nix; + elmVersion = "0.19.1"; + registryDat = ./nix/registry.dat; + }; doCheck = true; checkPhase = '' @@ -19,6 +21,7 @@ stdenv.mkDerivation { ''; installPhase = '' + make dist mkdir -p $out/share/ mv dist $out/share/elo-anything ''; diff --git a/nix/elm-srcs.nix b/nix/elm-srcs.nix new file mode 100644 index 0000000..a2b5ffa --- /dev/null +++ b/nix/elm-srcs.nix @@ -0,0 +1,87 @@ +{ + + "elm/file" = { + sha256 = "1rljcb41dl97myidyjih2yliyzddkr2m7n74x7gg46rcw4jl0ny8"; + version = "1.0.5"; + }; + + "elm/json" = { + sha256 = "0kjwrz195z84kwywaxhhlnpl3p251qlbm5iz6byd6jky2crmyqyh"; + version = "1.1.3"; + }; + + "elm/html" = { + sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k"; + version = "1.0.0"; + }; + + "elm/browser" = { + sha256 = "0nagb9ajacxbbg985r4k9h0jadqpp0gp84nm94kcgbr5sf8i9x13"; + version = "1.0.2"; + }; + + "rtfeldman/elm-css" = { + sha256 = "05sgz21jnnmz6m5s74515337n1aanab2zzn8jpw3bhdjc9cwwfcj"; + version = "16.0.1"; + }; + + "elm/core" = { + sha256 = "19w0iisdd66ywjayyga4kv2p1v9rxzqjaxhckp8ni6n8i0fb2dvf"; + version = "1.0.5"; + }; + + "tesk9/accessible-html-with-css" = { + sha256 = "0yb7zpmyn1v8lyvkpqw6abpywc7dqbj50ijcy9bgnhzrijinrlb6"; + version = "2.1.1"; + }; + + "elm-community/list-extra" = { + sha256 = "1rvr1c8cfb3dwf3li17l9ziax6d1fshkliasspnw6rviva38lw34"; + version = "8.2.4"; + }; + + "elm/random" = { + sha256 = "138n2455wdjwa657w6sjq18wx2r0k60ibpc4frhbqr50sncxrfdl"; + version = "1.0.0"; + }; + + "BrianHicks/elm-css-reset" = { + sha256 = "1cbdhm9pmzrb6ch2wfrxqma5h6cska557abg85bbdk4m88fy7ry9"; + version = "1.0.1"; + }; + + "elm/bytes" = { + sha256 = "02ywbf52akvxclpxwj9n04jydajcbsbcbsnjs53yjc5lwck3abwj"; + version = "1.0.8"; + }; + + "rtfeldman/elm-hex" = { + sha256 = "1y0aa16asvwdqmgbskh5iba6psp43lkcjjw9mgzj3gsrg33lp00d"; + version = "1.0.0"; + }; + + "elm/url" = { + sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4"; + version = "1.0.0"; + }; + + "elm/time" = { + sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1"; + version = "1.0.0"; + }; + + "Skinney/murmur3" = { + sha256 = "1iiia68w8wlp2qjilyqgnzgjcxby47gla3rw5minj8i5c64zk18j"; + version = "2.0.8"; + }; + + "elm/virtual-dom" = { + sha256 = "0q1v5gi4g336bzz1lgwpn5b1639lrn63d8y6k6pimcyismp2i1yg"; + version = "1.0.2"; + }; + + "elm-explorations/test" = { + sha256 = "1fsd7bajm7qa93r5pn3mdafqh3blpzya601jbs9l238p0hmvh576"; + version = "1.2.2"; + }; +} diff --git a/registry.dat b/nix/registry.dat similarity index 89% rename from registry.dat rename to nix/registry.dat index b2a8be875cdceebd3c5d62ea296ddcb052bbe676..405a75393b099402d9fece149cbf1838850c63eb 100644 GIT binary patch delta 1311 zcmZWoON`r86n)oDJh5wMl1x4`$&_J4Rdt{)bYNNpDxyLah>wJzgQomO5Bp8x#Ghb0 z$rQTjqGI?+AfAvBsFm2TEtQ45Y>^O%j}ToHG6)HFumIEz3q%n-J9Q=%cVp|kd(S!d zzWd&MRe1L;p@5RO^{LS}cl<)(1Nq22F)bC_&7O(fwx?=6&vz`9n8YHs4+uud2-uJE zfMfgk$&;SX4&7a>kbZKey7xx77W0vf4Wjv;YI#j{!)1JJkNzXi6$_JxzG0CVEfo{g zbsbl=i09#E0?V-gD^zvt<2X;u#Q?L_qX*BF!>{Bmu9i#vp;8W^DTD-svOEf(pO$k= zyB>5*opo`%x8ctuWVnlM;t|z9*){CuxHfFn_EqNi>#d^mG6yn;WI!?k8KLmK{l8`F zg)YWgM|Fwi_$2nUQ~vVu2`J8wXLZj!LJd~-)15M>j9Gc$Q26JH1$izNLL3`wXdOOW z%xA}#oMENsA3C5Y>}M1ru$F#V{WZ@ljiSV}!lAxLVm?Qa;}L{eXR#!wiq#x&;q9m2 z7o;?Y1A6(DV|AXepn!r9lwyA&ZcxH~H#dh>xQz3<{`Azq#&m~^ZZp1s)2G^ShFG>O@3P%qDtZ#by_gdJ$`m{W89pU%azU3FoN#k9z zscJ3kvS(u&c4zYGy>k}!PE>vTCG6%K({a@c&Zernc#v#!DhSb!JS-F!B+Kv|-?0xJ zT9M*pm-s!`PP0(-R~atz!SX&RMc>WBVu7AISC8^bus%E9D#RXs)ISPWC3-H_&cMF^JmzbjoKK#;DQS# z%vD=N^@#81J!~4ADjs;M*CkqTlLocmaUGsh(kny~TeK+Bffs_?9tJtM)&?>7x(&Ak uMII`_RtJ9O*f^WLMgOeiDDPsRMSWk)2dKcg1gwz zk0U%mUAPk${oTbt!9}6Ac4aArN&;QhO~Iz6xU9isUOJnZd+z1jbI!b<(`HLrnEXFi zYmM8uy&V2*i*F&W(*}Y&p*hNftWgo-;LEUW;8HvtvlK?Y;-Bk>!IjQI;0Yhh;K(hT zT1_58C{A_dfdi-sz>`c@ga=ejIA;29ghKu<11J#_-(xs^f7>zDSOl|=Qt+ZqLf=&Fmw{gz0CSFu->P_Kdv6A%PzbaRRMdj;j{C=tY-JD!&bFD?$KawuWPw2klgk>o5qZ!CKbh|p9 z;d6TB=`|RS`&km1zXL~>*m-tAz8iubn=v3_zSot9!%$|T_ScoOBXAsOB@&f0qp(FI zjHtv|U35K7Z$1k-OM%3c`WP_H+kFaAFIj-glz>;vgDXc1@IW)v2guFmuxiOKub^oB E1H8e0-v9sr diff --git a/shell.nix b/shell.nix index 453fd79..f481613 100644 --- a/shell.nix +++ b/shell.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { elmPackages.elm elmPackages.elm-format elmPackages.elm-test + elm2nix # Build Stuff gnumake