Merge remote-tracking branch 'origin/master'

Author: peterpeterparker

infra/default.nix

@@ -5,15 +5,8 @@ with { pkgs = import ./nix {}; };
 #       -> https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html
 
 rec
-{ function = pkgs.runCommand "build-function" {}
-  ''
-    cp ${./main.js} main.js
-    # Can't be called 'main' otherwise lambda tries to load it
-    cp ${handler}/bin/deckdeckgo-handler main_hs
-    mkdir $out
-    ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs
-  '';
+{ function =
+    pkgs.wai-lambda.wai-lambda-js-build-lambda "${handler}/bin/deckdeckgo-handler";
 
   handler = pkgs.haskellPackagesStatic.deckdeckgo-handler;
-  wai-lambda = pkgs.haskellPackages.wai-lambda;
 }

infra/nix/default.nix

@@ -2,6 +2,7 @@
 with rec
 { sources = import ./sources.nix;
   pkgs = import sources.nixpkgs {};
+  wai-lambda = pkgs.callPackage "${sources.wai-lambda}/nix/packages.nix" {};
 
   pkgsStatic =
     (import "${sources.static-haskell-nix}/survey"
@@ -12,18 +13,19 @@ with rec
       with
         { mkPackage = name: path:
             { "${name}" =
-              pkgs'.haskell.lib.disableLibraryProfiling (
-              pkgs'.haskell.lib.disableExecutableProfiling (
-              pkgs'.haskell.lib.failOnAllWarnings (
+                with pkgs'.haskell.lib;
+                disableLibraryProfiling (
+                disableExecutableProfiling (
+                failOnAllWarnings (
                 super.callCabal2nix name (pkgs'.lib.cleanSource path) {}
               )));
             };
         };
 
       super //
         mkPackage "deckdeckgo-handler" ../handler //
-        mkPackage "wai-lambda" ../wai-lambda ;
-
+        ( mkPackage "wai-lambda" wai-lambda.wai-lambda-source
+        );
     };
   normalHaskellPackages = pkgsStatic.pkgsMusl.haskellPackages.override
     (haskellOverride pkgsStatic.pkgsMusl);
@@ -38,6 +40,6 @@ with rec
 };
 
 pkgs //
-{ inherit haskellPackagesStatic haskellPackages sources;
+{ inherit haskellPackagesStatic haskellPackages sources wai-lambda;
   inherit (import sources.niv {}) niv;
 }

infra/nix/sources.json

@@ -1,4 +1,15 @@
 {
+    "wai-lambda": {
+        "url": "https://github.com/deckgo/wai-lambda/archive/7f139047addff89e9d30e55b7eebb07c0e846456.tar.gz",
+        "owner": "deckgo",
+        "branch": "master",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "repo": "wai-lambda",
+        "type": "tarball",
+        "sha256": "0qqi6wlg8v35dkh6gh9mrj0kb9kpzrz2pc7k0dykk2ahcj6m22k6",
+        "description": "Haskell Webapps on AWS Lambda",
+        "rev": "7f139047addff89e9d30e55b7eebb07c0e846456"
+    },
     "nixpkgs": {
         "url": "https://github.com/NixOS/nixpkgs/archive/88ae8f7d55efa457c95187011eb410d097108445.tar.gz",
         "owner": "NixOS",