From 42b458209261b42ae4ac7ccc0eaa5f2c644c47d5 Mon Sep 17 00:00:00 2001
From: "Agatha V. Lovelace" <agatha@technogothic.net>
Date: Mon, 8 Jan 2024 21:35:03 +0100
Subject: [PATCH] Update CI; Clean up flake.nix

---
 .github/workflows/build_nix.yml | 26 ++++++++++++++++++--------
 flake.nix                       |  6 +++---
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
index f02ef62..ede845d 100644
--- a/.github/workflows/build_nix.yml
+++ b/.github/workflows/build_nix.yml
@@ -1,19 +1,29 @@
-name: "Build legacy Nix package on Ubuntu"
+on: push
+name: "Build Nix package on Ubuntu"
 
-on:
-  push:
+env:
+  RUSTFLAGS: "-Dwarnings"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v12
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v23
       - name: Building package
-        run:  nix-build . -A defaultPackage.x86_64-linux
+        run:  nix build
+      - name: Get repository name
+        run: echo "REPO_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
       - name: Get commit hash
         run:  echo "COMMIT_HASH=${GITHUB_SHA::6}" >> $GITHUB_ENV
       - uses: actions/upload-artifact@v3
         with:
-          name: url-eater-${{ env.COMMIT_HASH }}-x86_64-linux
-          path: result/bin/url-eater
\ No newline at end of file
+          name: ${{ env.REPO_NAME }}-${{ env.COMMIT_HASH }}-x86_64-linux
+          path: result/bin/${{ env.REPO_NAME }}
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v23
+      - name: Lint
+        run: nix develop --command cargo clippy --all-targets --all-features
diff --git a/flake.nix b/flake.nix
index 573f9b1..8d5ce2e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,8 @@
         pkgs = import nixpkgs { inherit system; };
         naersk-lib = pkgs.callPackage naersk { };
       in {
-        defaultPackage = naersk-lib.buildPackage ./.;
-        devShell = with pkgs;
+        packages.default = naersk-lib.buildPackage ./.;
+        devShells.default = with pkgs;
           mkShell {
             buildInputs = [
               cargo
@@ -25,7 +25,7 @@
             RUST_SRC_PATH = rustPlatform.rustLibSrc;
           };
       }) // {
-        nixosModule = { config, lib, pkgs, ... }:
+        nixosModules.default = { config, lib, pkgs, ... }:
           with lib;
           let cfg = config.services.url-eater;
           in {