Simplify Nix derivations, gh-actions (#50)

Author: anmonteiro

.github/workflows/test.yml

@@ -2,18 +2,24 @@ name: "Build"
 on:
   pull_request:
   push:
+    branches:
+      - master
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ocamlVersion: [406, 407, 408, 409]
+        ocamlVersion: [4_06, 4_07, 4_08, 4_09]
     steps:
     - uses: actions/checkout@v2
     - uses: cachix/install-nix-action@v6
     - uses: cachix/cachix-action@v3
       with:
         name: anmonteiro
-        file: nix/ci/${{ matrix.ocamlVersion }}.nix
+        skipNixBuild: true
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - name: Build / Test
+      shell: bash
+      run: nix-build ./nix/ci/test.nix --argstr ocamlVersion ${{ matrix.ocamlVersion }}
+
 

nix/ci/406.nix

@@ -1,10 +1,8 @@
-{ pkgs ? import <nixpkgs> {}, ocamlVersion }:
+{ ocamlVersion }:
 
 let
-  inherit (pkgs) lib stdenv fetchTarball;
-  overlays = builtins.fetchTarball https://github.com/anmonteiro/nix-overlays/archive/master.tar.gz;
-  ocamlPackages = pkgs.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope'
-    (pkgs.callPackage "${overlays}/ocaml" { });
+  pkgs = import ../sources.nix { inherit ocamlVersion; };
+  inherit (pkgs) lib stdenv fetchTarball ocamlPackages;
 
   lambda-pkgs = import ./.. { inherit pkgs ocamlVersion; };
   lambda-drvs = lib.filterAttrs (_: value: lib.isDerivation value) lambda-pkgs;

nix/ci/407.nix

@@ -1,19 +1,37 @@
-{ pkgs ? import <nixpkgs> {}, ocamlVersion ? "4_09" }:
+{ pkgs ? import ./sources.nix { inherit ocamlVersion; }
+, ocamlVersion ? "4_09" }:
 
 let
-  gitignoreSrc = pkgs.fetchFromGitHub {
-    owner = "hercules-ci";
-    repo = "gitignore";
-    rev = "7415c4f";
-    sha256 = "1zd1ylgkndbb5szji32ivfhwh04mr1sbgrnvbrqpmfb67g2g3r9i";
-  };
-  inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource;
-  overlays = builtins.fetchTarball https://github.com/anmonteiro/nix-overlays/archive/master.tar.gz;
-
-  ocamlPackages = pkgs.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope'
-    (pkgs.callPackage "${overlays}/ocaml" { });
+  inherit (pkgs) lib stdenv ocamlPackages;
 in
-  pkgs.callPackage ./generic.nix {
-    inherit ocamlPackages gitignoreSource;
-  }
 
+  with ocamlPackages;
+  let
+    build-lambda-runtime = args: buildDunePackage ({
+      version = "0.1.0-dev";
+      src = lib.gitignoreSource ./..;
+    } // args);
+
+  in rec {
+    lambda-runtime = build-lambda-runtime {
+      pname = "lambda-runtime";
+      buildInputs = [ alcotest ];
+      doCheck = false;
+      propagatedBuildInputs = [ yojson ppx_deriving_yojson piaf uri logs lwt4 ];
+    };
+
+    now = build-lambda-runtime {
+      pname = "now";
+      buildInputs = [ alcotest ];
+      # tests lambda-runtime too
+      doCheck = true;
+      propagatedBuildInputs = [
+        lambda-runtime
+        httpaf
+        yojson
+        ppx_deriving_yojson
+        lwt4
+        base64
+      ];
+    };
+}

nix/ci/408.nix

@@ -0,0 +1,20 @@
+{ ocamlVersion ? "4_09" }:
+
+let
+  overlays = builtins.fetchTarball {
+    url = https://github.com/anmonteiro/nix-overlays/archive/98b6ee7.tar.gz;
+    sha256 = "12vqdghlz2v7ln28jmrnxy210zv5x21g8kw2s0dvszfmz0p2inkh";
+  };
+
+  pkgs = import <nixpkgs> {
+    overlays = [
+      (import overlays)
+      (self: super: {
+        ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope'
+            (super.callPackage "${overlays}/ocaml" {});
+      })
+    ];
+  };
+
+in
+  pkgs

nix/ci/409.nix

@@ -0,0 +1,23 @@
+
+let
+  pkgs = import ./nix/sources.nix {};
+  inherit (pkgs) stdenv lib;
+  lambdaPkgs = pkgs.recurseIntoAttrs (import ./nix { inherit pkgs; });
+  lambdaDrvs = lib.filterAttrs (_: value: lib.isDerivation value) lambdaPkgs;
+
+in
+  (pkgs.mkShell {
+    inputsFrom = lib.attrValues lambdaDrvs;
+    buildInputs = with pkgs.ocamlPackages; [ merlin pkgs.ocamlformat ];
+  }).overrideAttrs (o : {
+    propagatedBuildInputs = lib.filter
+      (drv:
+        # we wanna filter our own packages so we don't build them when entering
+        # the shell. They always have `pname`
+        !(lib.hasAttr "pname" drv) ||
+        drv.pname == null ||
+        !(lib.any (name: name == drv.pname) (lib.attrNames lambdaDrvs)))
+      o.propagatedBuildInputs;
+  })
+
+