Merge pull request #4 from nikstur/update

treewide: update

Author: nikstur

.github/renovate.json

@@ -1,15 +1,14 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    ":dependencyDashboard",
+    ":semanticCommitsDisabled",
     "group:all",
-    "schedule:monthly"
+    "schedule:monthly",
+    ":maintainLockFilesMonthly"
   ],
-  "dependencyDashboard": false,
-  "lockFileMaintenance": {
-    "enabled": true
-  },
   "nix": {
     "enabled": true
-  }
+  },
+  "separateMajorMinor": false
 }

.github/workflows/ci.yml

@@ -10,14 +10,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@v13
-        with:
-          diagnostic-endpoint: ""
-          source-url: "https://install.lix.systems/lix/lix-installer-x86_64-linux"
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
-        with:
-          diagnostic-endpoint: ""
+      - uses: actions/checkout@v7
+      - uses: samueldr/lix-gha-installer-action@v2026-06-15
       - run: nix flake check --log-format raw-with-logs -L
 
 env:

Cargo.toml

@@ -8,7 +8,7 @@ homepage = "https://github.com/nikstur/uapi-version"
 repository = "https://github.com/nikstur/uapi-version"
 readme = "README.md"
 license = "MIT"
-edition = "2021"
+edition = "2024"
 
 [lints.rust]
 unsafe_code = "forbid"

flake.lock

@@ -5,93 +5,94 @@
 
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    systems.url = "github:nix-systems/default";
-
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-      inputs.systems.follows = "systems";
-    };
-
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
-
-    pre-commit-hooks-nix = {
+    pre-commit = {
       url = "github:cachix/pre-commit-hooks.nix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
       };
     };
 
   };
 
-  outputs = inputs@{ self, flake-parts, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } {
-    systems = import systems;
-
-    imports = [
-      inputs.pre-commit-hooks-nix.flakeModule
-    ];
-
-    perSystem = { config, system, pkgs, lib, ... }:
-      let
-        uapiVersion = pkgs.callPackage ./nix/build.nix { };
-      in
-      {
-
-        packages = {
-          # This is mostly here for development
-          inherit uapiVersion;
-          default = uapiVersion;
-        };
-
-        checks = {
-          clippy = uapiVersion.overrideAttrs (_: previousAttrs: {
-            nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.clippy ];
-            checkPhase = "cargo clippy";
-          });
-          rustfmt = uapiVersion.overrideAttrs (_: previousAttrs: {
-            nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.rustfmt ];
-            checkPhase = "cargo fmt --check";
-          });
-        };
-
-        pre-commit = {
-          check.enable = true;
-
-          settings = {
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      ...
+    }:
+    let
+      eachSystem = nixpkgs.lib.genAttrs [
+        "aarch64-darwin"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ];
+    in
+
+    {
+      packages = eachSystem (system: {
+        uapiVersion = nixpkgs.legacyPackages.${system}.callPackage ./nix/build.nix { };
+        default = self.packages.${system}.uapiVersion;
+      });
+
+      checks = eachSystem (
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          clippy = self.packages.${system}.uapiVersion.overrideAttrs (
+            _: previousAttrs: {
+              pname = "${previousAttrs.pname}-clippy";
+              nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.clippy ];
+              checkPhase = "cargo clippy";
+            }
+          );
+          rustfmt = self.packages.${system}.uapiVersion.overrideAttrs (
+            _: previousAttrs: {
+              pname = "${previousAttrs.pname}-rustfmt";
+              nativeCheckInputs = (previousAttrs.nativeCheckInputs or [ ]) ++ [ pkgs.rustfmt ];
+              checkPhase = "cargo fmt --check";
+            }
+          );
+          pre-commit = inputs.pre-commit.lib.${system}.run {
+            src = ./.;
             hooks = {
-              nixpkgs-fmt.enable = true;
-              typos.enable = true;
-              statix = {
-                enable = true;
-                settings.ignore = [ "sources.nix" ];
-              };
+              nixfmt.enable = true;
+              deadnix.enable = true;
             };
           };
-        };
-
-        devShells.default = pkgs.mkShell {
-          shellHook = ''
-            ${config.pre-commit.installationScript}
-          '';
-
-          packages = [
-            pkgs.clippy
-            pkgs.rustfmt
-            pkgs.cargo-machete
-            pkgs.cargo-edit
-            pkgs.cargo-bloat
-            pkgs.cargo-deny
-            pkgs.cargo-cyclonedx
-          ];
-
-          inputsFrom = [ uapiVersion ];
-
-          RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
-        };
+        }
+      );
+
+      devShells = eachSystem (
+        system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        {
+          default = pkgs.mkShell {
+            shellHook = ''
+              ${self.checks.${system}.pre-commit.shellHook}
+            '';
+
+            packages = [
+              pkgs.nixfmt
+              pkgs.clippy
+              pkgs.rustfmt
+              pkgs.cargo-machete
+              pkgs.cargo-edit
+              pkgs.cargo-bloat
+              pkgs.cargo-deny
+              pkgs.cargo-cyclonedx
+            ];
+
+            inputsFrom = [ self.packages.${system}.uapiVersion ];
+
+            RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+          };
+        }
+      );
 
-      };
-  };
+    };
 }