diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f4953d1..428f967 100644 --- 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 index 7c90a89..8597140 100644 --- 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 index 355407b..ed9948f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -19,9 +19,31 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", + "selfup": "selfup", "unstable-nixpkgs": "unstable-nixpkgs" } }, + "selfup": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732585313, + "narHash": "sha256-V8XQ65K8zdIfwync6wrJ9h47YqdPi91jfH9tNgDQiWI=", + "owner": "kachick", + "repo": "selfup", + "rev": "6955f98516ff63b945b445ecaeb3b5a4849be4cc", + "type": "github" + }, + "original": { + "owner": "kachick", + "ref": "v1.1.7", + "repo": "selfup", + "type": "github" + } + }, "unstable-nixpkgs": { "locked": { "lastModified": 1732014248, diff --git a/flake.nix b/flake.nix index 6285484..c3863b0 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,11 @@ { 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 = @@ -9,6 +13,7 @@ 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