make nix-build work

garbas · garbas · commit 82d9d2a7d1cb · 2020-06-12T13:53:11.000+02:00
use elm2nix to fetch elm dependencies fixes #43
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,16 +15,14 @@ jobs:
     - name: Installing Nix
       uses: cachix/install-nix-action@v8
     - name: Building search.nixos.org
-      run: |
-        nix-shell --run "yarn prod"
-        cp netlify.toml ./dist/
+      run: nix-build
     - name: Deploy to Netlify
       uses: nwtgck/actions-netlify@v1.0.5
       env:
         NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
       with:
-        publish-dir: './dist'
+        publish-dir: './result/'
         production-branch: 'master'
         github-token: ${{ secrets.GITHUB_TOKEN }}
         deploy-message: 'Deploy from GitHub Actions'
diff --git a/.gitignore b/.gitignore
@@ -28,5 +28,6 @@ example/dist
 
 ignore
 dist
-tests/VerifyExamples
 package-lock.json
+result
+scripts/eval-*
diff --git a/default.nix b/default.nix
@@ -62,15 +62,13 @@ in pkgs.stdenv.mkDerivation {
       elm-analyse
     ]);
 
-  # TODO: elm-webpack-loader is trying to download the packages instead of using 
-  # configurePhase = pkgs.elmPackages.fetchElmDeps {
-  #   elmPackages = import ./elm-srcs.nix;
-  #   elmVersion = pkgs.elmPackages.elm.version;
-  #   registryDat = ./registry.dat;
-  # };
+  configurePhase = pkgs.elmPackages.fetchElmDeps {
+    elmPackages = import ./elm-srcs.nix;
+    elmVersion = pkgs.elmPackages.elm.version;
+    registryDat = ./registry.dat;
+  };
 
   patchPhase = ''
-    rm -rf elm-stuff
     rm -rf node_modules
     ln -sf ${yarnPkg}/libexec/${package.name}/node_modules .
   '';
@@ -84,6 +82,7 @@ in pkgs.stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out
     cp -R ./dist/* $out/
+    cp netlify.toml $out/
   '';
   shellHook = ''
     rm -rf node_modules
diff --git a/elm-srcs.nix b/elm-srcs.nix
@@ -0,0 +1,97 @@
+{
+
+      "krisajenkins/remotedata" = {
+        sha256 = "0m5bk0qhsjv14vajqrkph386696pnhj5rn51kgma8lwyvvx9ihw1";
+        version = "6.0.1";
+      };
+
+      "elm/json" = {
+        sha256 = "0kjwrz195z84kwywaxhhlnpl3p251qlbm5iz6byd6jky2crmyqyh";
+        version = "1.1.3";
+      };
+
+      "truqu/elm-base64" = {
+        sha256 = "12w68b4idbs2vn0gm0lj354pm745jb7n0fj69408mpvh5r1z4m1b";
+        version = "2.0.4";
+      };
+
+      "elm/html" = {
+        sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+        version = "1.0.0";
+      };
+
+      "elm/browser" = {
+        sha256 = "0nagb9ajacxbbg985r4k9h0jadqpp0gp84nm94kcgbr5sf8i9x13";
+        version = "1.0.2";
+      };
+
+      "elm/core" = {
+        sha256 = "0gyk7lx3b6vx2jlfbxdsb4xffn0wdvg5yxldq50jr2kk5dzc2prj";
+        version = "1.0.4";
+      };
+
+      "elm/url" = {
+        sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+        version = "1.0.0";
+      };
+
+      "elm/http" = {
+        sha256 = "008bs76mnp48b4dw8qwjj4fyvzbxvlrl4xpa2qh1gg2kfwyw56v1";
+        version = "2.0.0";
+      };
+
+      "NoRedInk/elm-json-decode-pipeline" = {
+        sha256 = "0y25xn0yx1q2xlg1yx1i0hg4xq1yxx6yfa99g272z8162si75hnl";
+        version = "1.0.0";
+      };
+
+      "hecrj/html-parser" = {
+        sha256 = "1fbr3f8j8jjmjknyaq55jlnfazrljqf1128xrc5gzsw3x56fwrbf";
+        version = "2.3.4";
+      };
+
+      "elm/bytes" = {
+        sha256 = "02ywbf52akvxclpxwj9n04jydajcbsbcbsnjs53yjc5lwck3abwj";
+        version = "1.0.8";
+      };
+
+      "elm/file" = {
+        sha256 = "1rljcb41dl97myidyjih2yliyzddkr2m7n74x7gg46rcw4jl0ny8";
+        version = "1.0.5";
+      };
+
+      "elm/regex" = {
+        sha256 = "0lijsp50w7n1n57mjg6clpn9phly8vvs07h0qh2rqcs0f1jqvsa2";
+        version = "1.0.0";
+      };
+
+      "rtfeldman/elm-hex" = {
+        sha256 = "1y0aa16asvwdqmgbskh5iba6psp43lkcjjw9mgzj3gsrg33lp00d";
+        version = "1.0.0";
+      };
+
+      "elm/parser" = {
+        sha256 = "0a3cxrvbm7mwg9ykynhp7vjid58zsw03r63qxipxp3z09qks7512";
+        version = "1.1.0";
+      };
+
+      "elm/time" = {
+        sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+        version = "1.0.0";
+      };
+
+      "elm/virtual-dom" = {
+        sha256 = "0q1v5gi4g336bzz1lgwpn5b1639lrn63d8y6k6pimcyismp2i1yg";
+        version = "1.0.2";
+      };
+
+      "elm-explorations/test" = {
+        sha256 = "1fsd7bajm7qa93r5pn3mdafqh3blpzya601jbs9l238p0hmvh576";
+        version = "1.2.2";
+      };
+
+      "elm/random" = {
+        sha256 = "138n2455wdjwa657w6sjq18wx2r0k60ibpc4frhbqr50sncxrfdl";
+        version = "1.0.0";
+      };
+}
diff --git a/registry.dat b/registry.dat
diff --git a/versions.dat b/versions.dat
