diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/ci-nix.yml index 6277b73a..7e127997 100644 --- a/.github/workflows/ci-nix.yml +++ b/.github/workflows/ci-nix.yml @@ -8,8 +8,6 @@ on: # Triggers the workflow on push or pull request events but only for the "main" branch push: branches: [ "main", "master", "devel" ] - pull_request: - branches: [ "main", "master", "devel" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -21,9 +19,9 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@V28 + - uses: cachix/install-nix-action@v30 with: - nix_path: nixpkgs=channel:nixos-23.05 + nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v15 with: name: cargo-crev @@ -47,9 +45,9 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@V28 + - uses: cachix/install-nix-action@v30 with: - nix_path: nixpkgs=channel:nixos-23.05 + nix_path: nixpkgs=channel:nixos-unstable - uses: cachix/cachix-action@v15 with: name: cargo-crev diff --git a/flake.lock b/flake.lock index 03efc991..8b00a41e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,16 +107,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678972866, - "narHash": "sha256-YV8BcNWfNVgS449B6hFYFUg4kwVIQMNehZP+FNDs1LY=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd34d6ed7ba7d5c4e44b04a53dc97edb52f2766c", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 05255cd1..f30dcbd2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Cryptographically verifiable Code REviews"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; crane.url = "github:ipetkov/crane"; crane.inputs.nixpkgs.follows = "nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; @@ -24,18 +24,17 @@ }; lib = pkgs.lib; - fenix-channel = fenix.packages.${system}.stable; + fenix-channel = fenix.packages.${system}.latest; fenix-toolchain = (fenix-channel.withComponents [ "rustc" "cargo" "clippy" - "rust-analysis" "rust-src" "llvm-tools-preview" ]); - craneLib = crane.lib.${system}.overrideToolchain fenix-toolchain; + craneLib = (crane.mkLib pkgs).overrideToolchain fenix-toolchain; # filter source code at path `src` to include only the list of `modules` filterModules = modules: src: