Skip to content

Commit

Permalink
Try less outdated nix
Browse files Browse the repository at this point in the history
  • Loading branch information
kornelski committed Nov 11, 2024
1 parent 5405145 commit 1d680ae
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 66 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -23,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@V28
with:
nix_path: nixpkgs=channel:nixos-23.05
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: cargo-crev
Expand All @@ -49,7 +47,7 @@ jobs:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@V28
with:
nix_path: nixpkgs=channel:nixos-23.05
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: cargo-crev
Expand Down
96 changes: 38 additions & 58 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Cryptographically verifiable Code REviews";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
crane.url = "github:ipetkov/crane";
crane.inputs.nixpkgs.follows = "nixpkgs";
flake-utils.url = "github:numtide/flake-utils";
Expand All @@ -24,13 +24,12 @@
};
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"
]);
Expand Down Expand Up @@ -225,7 +224,6 @@
nativeBuildInputs = commonArgs.nativeBuildInputs ++ (with pkgs;
[
fenix-toolchain
fenix.packages.${system}.rust-analyzer

pkgs.nixpkgs-fmt
pkgs.shellcheck
Expand Down

0 comments on commit 1d680ae

Please sign in to comment.