Merge #165

165: switch to flake-parts from flake-utils r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

.github/workflows/flake-check.yml

@@ -1,46 +0,0 @@
-name: "Flake checks"
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - release-*
-jobs:
-
-  flake-checks:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          # Nix Flakes doesn't work on shallow clones
-          fetch-depth: 0
-      - uses: cachix/install-nix-action@v18
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - id: set-matrix
-        run: |
-          set -euo pipefail
-
-          matrix="$(nix flake show --json | jq '.checks."x86_64-linux" | keys' | jq -rcM '{attr: ., os: ["ubuntu-latest", "macos-latest"]}')"
-          echo "::set-output name=matrix::$matrix"
-
-  builds:
-    needs: flake-checks
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix: ${{fromJSON(needs.flake-checks.outputs.matrix)}}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          # Nix Flakes doesn't work on shallow clones
-          fetch-depth: 0
-      - uses: cachix/install-nix-action@v18
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - run: |
-          set -euo pipefail
-
-          system=$(nix-instantiate --eval --expr builtins.currentSystem | jq -r)
-          nix build -L .#checks.$system.${{ matrix.attr }}

.github/workflows/tests.yml

@@ -1,9 +1,10 @@
-name: "Development workflow"
+name: "Tests"
 on:
   pull_request:
   push:
     branches:
       - main
+      - staging
       - release-*
 jobs:
   tests:
@@ -17,6 +18,10 @@ jobs:
           # Nix Flakes doesn't work on shallow clones
           fetch-depth: 0
     - uses: cachix/install-nix-action@v18
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+        extra_nix_config: |
+          accept-flake-config = true
     - name: Build
       run: nix develop -c bash -c 'meson build && cd build && ninja'
     - name: Run tests

bors.toml

@@ -1,6 +1,2 @@
 cut_body_after = "" # don't include text from the PR body in the merge commit message
-status = [
-  "flake-checks",
-  "builds (treefmt, ubuntu-latest)",
-  "builds (treefmt, macos-latest)"
-]
+status = ["tests (ubuntu-latest)", "tests (macos-latest)"]

flake.lock

@@ -1,17 +1,22 @@
 {
   "nodes": {
-    "flake-utils": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "lastModified": 1672616755,
+        "narHash": "sha256-dvwU2ORLpiP6ZMXL3CJ/qrqmtLBLF6VAc+Fois7Qfew=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "87673d7c13a799d95ce25ff5dc7b9e15f01af2ea",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
@@ -33,7 +38,7 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -2,20 +2,28 @@
   description = "Hydra's builtin hydra-eval-jobs as a standalone";
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.flake-parts.url = "github:hercules-ci/flake-parts";
+  inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 
-  outputs =
-    { self
-    , nixpkgs
-    , flake-utils
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
+  nixConfig.extra-substituters = [
+    "https://cache.garnix.io"
+  ];
+  nixConfig.extra-trusted-public-keys = [
+    "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+  ];
+
+  outputs = inputs @ { flake-parts, ... }:
     let
-        nixVersion = nixpkgs.lib.fileContents ./.nix-version;
-        pkgs = nixpkgs.legacyPackages.${system};
-        inherit (pkgs) stdenv;
-        devShell = self.devShells.${system}.default;
+      inherit (inputs.nixpkgs) lib;
+      inherit (inputs) self;
+      nixVersion = lib.fileContents ./.nix-version;
+    in
+    flake-parts.lib.mkFlake { inherit inputs; }
+      {
+        systems = inputs.nixpkgs.lib.systems.flakeExposed;
+        perSystem = { pkgs, self', ... }:
+          let
+            devShell = self'.devShells.default;
             drvArgs = {
               srcDir = self;
               nix = if nixVersion == "unstable" then pkgs.nixUnstable else pkgs.nixVersions."nix_${nixVersion}";
@@ -24,7 +32,7 @@
           {
             packages.nix-eval-jobs = pkgs.callPackage ./default.nix drvArgs;
 
-        checks.treefmt = stdenv.mkDerivation {
+            checks.treefmt = pkgs.stdenv.mkDerivation {
               name = "treefmt-check";
               src = self;
               nativeBuildInputs = devShell.nativeBuildInputs;
@@ -39,8 +47,8 @@
               installPhase = "touch $out";
             };
 
-        packages.default = self.packages.${system}.nix-eval-jobs;
+            packages.default = self'.packages.nix-eval-jobs;
             devShells.default = pkgs.callPackage ./shell.nix drvArgs;
-      }
-    );
+          };
+      };
 }

shell.nix

@@ -16,16 +16,13 @@
 
 let
   inherit (pkgs) lib stdenv;
-
-in
-(pkgs.callPackage ./default.nix {
+  nix-eval-jobs = pkgs.callPackage ./default.nix {
     inherit srcDir nix;
-}).overrideAttrs (old: {
-
-  src = null;
-
-  nativeBuildInputs = old.nativeBuildInputs ++ [
-
+  };
+in
+pkgs.mkShell {
+  inherit (nix-eval-jobs) buildInputs;
+  nativeBuildInputs = nix-eval-jobs.nativeBuildInputs ++ [
     pkgs.treefmt
     pkgs.llvmPackages.clang # clang-format
     pkgs.nixpkgs-fmt
@@ -37,10 +34,9 @@ in
     ]))
 
   ];
-
   NODE_PATH = "${pkgs.nodePackages.prettier-plugin-toml}/lib/node_modules";
 
   shellHook = lib.optionalString stdenv.isLinux ''
     export NIX_DEBUG_INFO_DIRS="${pkgs.curl.debug}/lib/debug:${nix.debug}/lib/debug''${NIX_DEBUG_INFO_DIRS:+:$NIX_DEBUG_INFO_DIRS}"
   '';
-})
+}