Skip to content

Commit a5a9613

Browse files
authored
Merge pull request #543 from cachix/remove-stable
Remove the stable nixpkgs input
2 parents f0f0dc4 + ef1a5f9 commit a5a9613

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

.github/workflows/ci.yaml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
name: "Build"
2+
23
on:
34
pull_request:
45
push:
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
511
jobs:
612
tests:
713
strategy:
@@ -17,6 +23,7 @@ jobs:
1723
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
1824
- run: rm -rf /opt&
1925
- run: nix-build --keep-going
26+
2027
tests-flakes:
2128
strategy:
2229
matrix:
@@ -30,5 +37,26 @@ jobs:
3037
name: pre-commit-hooks
3138
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3239
- run: rm -rf /opt&
33-
- run: nix flake check -L --show-trace
40+
41+
- name: Check nixpkgs-unstable
42+
run: nix flake check -L --show-trace
43+
3444
- run: nix eval .#lib.x86_64-linux.run --show-trace
45+
46+
tests-flakes-stable:
47+
strategy:
48+
matrix:
49+
os: [ubuntu-latest, macos-latest]
50+
runs-on: ${{ matrix.os }}
51+
steps:
52+
- uses: actions/checkout@v4
53+
- uses: cachix/install-nix-action@v30
54+
- uses: cachix/cachix-action@v15
55+
with:
56+
name: pre-commit-hooks
57+
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
58+
- run: rm -rf /opt&
59+
60+
- name: Check nixpkgs-stable
61+
run: nix flake check -L --show-trace --override-input nixpkgs github:NixOS/nixpkgs/nixos-24.11
62+

flake.lock

Lines changed: 1 addition & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
description = "Seamless integration of https://pre-commit.com git hooks with Nix.";
33

44
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
5-
inputs.nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
65
inputs.flake-compat = {
76
url = "github:edolstra/flake-compat";
87
flake = false;
@@ -12,7 +11,7 @@
1211
inputs.nixpkgs.follows = "nixpkgs";
1312
};
1413

15-
outputs = { self, nixpkgs, gitignore, nixpkgs-stable, ... }:
14+
outputs = { self, nixpkgs, gitignore, ... }:
1615
let
1716
lib = nixpkgs.lib;
1817
defaultSystems = [
@@ -24,7 +23,6 @@
2423
depsFor = lib.genAttrs defaultSystems (system: {
2524
pkgs = nixpkgs.legacyPackages.${system};
2625
exposed = import ./nix { inherit nixpkgs system; gitignore-nix-src = gitignore; isFlakes = true; };
27-
exposed-stable = import ./nix { nixpkgs = nixpkgs-stable; inherit system; gitignore-nix-src = gitignore; isFlakes = true; };
2826
});
2927
forAllSystems = fn: lib.genAttrs defaultSystems (system: fn depsFor.${system});
3028
in
@@ -48,11 +46,7 @@
4846
};
4947
});
5048

51-
checks = forAllSystems ({ exposed, exposed-stable, ... }:
52-
lib.filterAttrs (k: v: v != null)
53-
(exposed.checks
54-
// (lib.mapAttrs' (name: value: lib.nameValuePair "stable-${name}" value)
55-
exposed-stable.checks)));
49+
checks = forAllSystems ({ exposed, ... }: lib.filterAttrs (k: v: v != null) exposed.checks);
5650

5751
lib = forAllSystems ({ exposed, ... }: { inherit (exposed) run; });
5852

0 commit comments

Comments
 (0)