CI(vira.hs): Migrate to subflakes config (#465)

Author: srid

flake.nix

@@ -24,82 +24,6 @@
           }
         ];
       };
-
-      # CI spec
-      # https://omnix.page/om/ci.html
-      ci.default =
-        let
-          exampleLock = builtins.fromJSON (builtins.readFile ./example/flake.lock);
-          nixpkgs = "github:nixos/nixpkgs/" + exampleLock.nodes.nixpkgs.locked.rev;
-          flake-parts = "github:hercules-ci/flake-parts/" + exampleLock.nodes.flake-parts.locked.rev;
-          haskell-flake = ./.;
-          haskell-parsers = ./nix/haskell-parsers;
-          haskell-template = "github:srid/haskell-template/554b7c565396cf2d49a248e7e1dc0e0b46883b10";
-        in
-        {
-          dev = {
-            dir = "dev";
-            overrideInputs = { inherit haskell-flake; };
-          };
-
-          doc = {
-            dir = "doc";
-            overrideInputs = { inherit haskell-flake; };
-          };
-
-          example = {
-            dir = "example";
-            overrideInputs = { inherit haskell-flake; };
-          };
-
-          # Tests
-          haskell-parsers-test = {
-            dir = "./nix/haskell-parsers/test";
-            overrideInputs = { inherit haskell-parsers; };
-          };
-
-          test-simple = {
-            dir = "test/simple";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake;
-            };
-          };
-
-          test-cabal2nix = {
-            dir = "test/cabal2nix";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake;
-            };
-          };
-
-          test-with-subdir = {
-            dir = "test/with-subdir";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake;
-            };
-          };
-
-          test-project-module = {
-            dir = "test/project-module";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake;
-            };
-          };
-
-          test-settings-defaults = {
-            dir = "test/settings-defaults";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake haskell-template;
-            };
-          };
-
-          test-otherOverlays = {
-            dir = "test/otherOverlays";
-            overrideInputs = {
-              inherit nixpkgs flake-parts haskell-flake;
-            };
-          };
-        };
     };
   };
 }

test/cabal2nix/flake.nix

@@ -8,8 +8,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
   };
 

test/otherOverlays/flake.nix

@@ -3,8 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
 
     haskell-multi-nix.url = "github:srid/haskell-multi-nix/d6ac6ccab559f886d1fc7da8cab44b99cb0c2c3d";

test/project-module/flake.nix

@@ -3,8 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
 
     haskell-multi-nix.url = "github:srid/haskell-multi-nix/d6ac6ccab559f886d1fc7da8cab44b99cb0c2c3d";

test/settings-defaults/flake.nix

@@ -3,10 +3,10 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
-    haskell-template = { };
+    haskell-template.url = "github:srid/haskell-template/554b7c565396cf2d49a248e7e1dc0e0b46883b10";
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {

test/simple/flake.nix

@@ -3,8 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
 
     haskell-multi-nix.url = "github:srid/haskell-multi-nix/7aed736571714ec12105ec110358998d70d59e34";

test/with-subdir/flake.nix

@@ -3,8 +3,8 @@
   # pinning), we must specify revisions for *all* inputs to ensure
   # reproducibility.
   inputs = {
-    nixpkgs = { };
-    flake-parts = { };
+    nixpkgs.url = "github:nixos/nixpkgs/870493f9a8cb0b074ae5b411b2f232015db19a65";
+    flake-parts.url = "github:hercules-ci/flake-parts/758cf7296bee11f1706a574c77d072b8a7baa881";
     haskell-flake = { };
   };
   outputs = inputs@{ self, nixpkgs, flake-parts, ... }:

vira.hs

@@ -1,8 +1,21 @@
 -- CI configuration <https://vira.nixos.asia/>
 \ctx pipeline ->
-  let 
+  let
     isMaster = ctx.branch == "master"
+    hf = [("haskell-flake", ".")]
   in pipeline
-     { signoff.enable = True
+     { build.flakes =
+         [ "./dev" { overrideInputs = hf }
+         , "./doc" { overrideInputs = hf }
+         , "./example" { overrideInputs = hf }
+         , "./nix/haskell-parsers/test" { overrideInputs = [("haskell-parsers", "path:./nix/haskell-parsers")] }
+         , "./test/simple" { overrideInputs = hf }
+         , "./test/cabal2nix" { overrideInputs = hf }
+         , "./test/with-subdir" { overrideInputs = hf }
+         , "./test/project-module" { overrideInputs = hf }
+         , "./test/settings-defaults" { overrideInputs = hf }
+         , "./test/otherOverlays" { overrideInputs = hf }
+         ]
+     , signoff.enable = True
      , cache.url = if isMaster then Just "https://cache.nixos.asia/oss" else Nothing
      }