Merge pull request #39 from kachick/nixos-24.11

Update to nixos-24.11 and setup selfup in devshell
kachick · Nov 26, 2024 · 84c0a19 · 84c0a19
2 parents b9bab3a + 2101f94
commit 84c0a19
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 7 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.21.0 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["typos", "--version"], "nth": 2}
+      - uses: crate-ci/typos@v1.27.3 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["typos", "--version"], "nth": 2}
         with:
           files: |
             .

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -28,11 +28,15 @@ tasks:
       - typos . .github .vscode
       # nix fmt doesn't have check: https://github.com/NixOS/nix/issues/6918
       - git ls-files '*.nix' | xargs nixfmt --check
+      - git ls-files | xargs selfup list -check
   dogfooding: # Intentionally failing
     deps:
       - task: build
     cmds:
       - dprint check --config=dprint-dogfooding.json --plugins=./target/wasm32-unknown-unknown/release/dprint_plugin_typstyle.wasm
+  selfup:
+    cmds:
+      - git ls-files | xargs selfup run
   deps:
     cmds:
       - rustc --version

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,14 +1,19 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     unstable-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    selfup = {
+      url = "github:kachick/selfup/v1.1.7";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
       unstable-nixpkgs,
+      selfup,
     }:
     let
       lib = nixpkgs.lib;
@@ -44,7 +49,8 @@
                 dprint
                 typst
                 typstyle
-              ]);
+              ])
+              ++ [ selfup.packages.${system}.default ];
 
             nativeBuildInputs = with pkgs; [
               rustc-wasm32.llvmPackages.bintools # rust-lld