diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 27b31c27..d8b41162 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: graalvm: strategy: matrix: - os: [ubuntu-latest, macos-15-intel, macos-14] + os: [ubuntu-latest, macos-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -45,7 +45,7 @@ jobs: name: Nix ❄ strategy: matrix: - os: [ubuntu-latest, macos-15-intel, macos-14] + os: [ubuntu-latest, macos-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/flake.lock b/flake.lock index bc792608..e26f54b0 100644 --- a/flake.lock +++ b/flake.lock @@ -110,16 +110,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1780734595, + "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f59b2203..abbac616 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "scalals"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nix-filter.url = "github:numtide/nix-filter"; flake-compat = { url = "github:edolstra/flake-compat"; @@ -144,7 +144,7 @@ ]; in { - formatter = pkgs.nixfmt-rfc-style; + formatter = pkgs.nixfmt; packages = rec { inherit (pkgs) scalafmt; @@ -233,7 +233,7 @@ nix-fmt = { enable = true; name = "nix fmt"; - entry = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + entry = "${pkgs.nixfmt}/bin/nixfmt"; types = [ "nix" ]; }; scalafmt = {