Merge pull request 'add a nix-flake runner' (#1) from pjjw/nix-flake-runner into master

Reviewed-on: #1

.github/workflows/nix.yml

@@ -16,13 +16,14 @@ jobs:
       matrix:
         channel:
           - nixos-unstable
-          - nixos-22.05
           - nixos-22.11
-    runs-on: ubuntu-latest
+          - nixos-23.05
+    runs-on: native
+    container: pjjw/nix-flake-runner:1
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v20
       - run: nix-shell --run ./ci.sh
         env:
+          CI_PROJECT_PATH: pjjw
           CI_REGISTRY_AUTH: '${{ secrets.REGISTRY_AUTH }}'
           NIXPKGS_CHANNEL: '${{ matrix.channel }}'

.gitlab-ci.yml

@@ -3,12 +3,12 @@ stages:
 
 build:
   stage: build
-  image: nixpkgs/nix:nixos-22.05
+  image: nixpkgs/nix:nixos-22.11
   script: nix-shell --run ./ci.sh
   parallel:
     matrix:
       - NIXPKGS_CHANNEL: nixos-unstable
         IMAGE_TAG: latest
       - NIXPKGS_CHANNEL:
-          - nixos-22.05
           - nixos-22.11
+          - nixos-23.05

README.md

@@ -39,8 +39,8 @@ nixpkgs channel describes.
 
 | Channel        | Image Tag   | Description                                       |
 | ---            | ---         | ---                                               |
-| nixos-22.05    | nixos-22.05 | only minor versions that include security updates |
 | nixos-22.11    | nixos-22.11 | only minor versions that include security updates |
+| nixos-23.05    | nixos-23.05 | only minor versions that include security updates |
 | nixos-unstable | latest      | latest and greatest, major versions might change  |
 
 ## List of images

images/devcontainer/default.nix

@@ -55,7 +55,12 @@ let
       shadow
 
       # for the vscode extension
-      gcc-unwrapped
+
+      # HACK: don't include the "libgcc" output. It has overlapping files with
+      #       the "lib" output, and that breaks the build.
+      (gcc-unwrapped // {
+        outputs = builtins.filter (x: x != "libgcc") gcc-unwrapped.outputs;
+      })
       iproute
     ];
   };

images/nix-flakes-runner/default.nix

@@ -0,0 +1,10 @@
+{ docker-nixpkgs
+, nodejs
+, extraContents ? [ ]
+}:
+docker-nixpkgs.nix-flakes.override {
+  extraContents = [
+    # nodejs for runner
+    nodejs
+  ] ++ extraContents;
+}