Skip to content

Commit 1d0c06d

Browse files
committed
update flake build
1 parent b635e54 commit 1d0c06d

File tree

3 files changed

+61
-44
lines changed

3 files changed

+61
-44
lines changed

.github/workflows/nix-build-flake.yml

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,28 @@ jobs:
1919
- "x86_64-linux"
2020
- "aarch64-linux"
2121
nix_channel:
22-
- "nixos-unstable"
23-
- "nixos-22.11"
24-
- "nixos-23.05"
22+
- nixos-unstable
23+
- nixos-24.05
24+
- nixos-24.11
25+
- nixos-25.05
2526
target_image:
2627
- bash
27-
# - busybox
28-
# - cachix
29-
# - cachix-flakes
30-
# - caddy
31-
# - curl
28+
- busybox
29+
- cachix
30+
- cachix-flakes
31+
- caddy
32+
- curl
3233
- devcontainer
33-
# - docker-compose
34-
# - hugo
35-
# - kubectl
36-
# - kubernetes-helm
37-
# - nginx
38-
# - nix
39-
# - nix-flakes
40-
# - nix-unstable
41-
# - nix-unstable-static
34+
- devenv
35+
- docker-compose
36+
- hugo
37+
- kubectl
38+
- kubernetes-helm
39+
- nginx
40+
- nix
41+
- nix-flakes
42+
- nix-unstable
43+
- nix-unstable-static
4244
steps:
4345
- uses: actions/checkout@v3
4446
- name: Set up QEMU
@@ -74,26 +76,28 @@ jobs:
7476
strategy:
7577
matrix:
7678
nix_channel:
77-
- "nixos-unstable"
78-
- "nixos-22.11"
79-
- "nixos-23.05"
79+
- nixos-unstable
80+
- nixos-24.05
81+
- nixos-24.11
82+
- nixos-25.05
8083
target_image:
8184
- bash
82-
# - busybox
83-
# - cachix
84-
# - cachix-flakes
85-
# - caddy
86-
# - curl
85+
- busybox
86+
- cachix
87+
- cachix-flakes
88+
- caddy
89+
- curl
8790
- devcontainer
88-
# - docker-compose
89-
# - hugo
90-
# - kubectl
91-
# - kubernetes-helm
92-
# - nginx
93-
# - nix
94-
# - nix-flakes
95-
# - nix-unstable
96-
# - nix-unstable-static
91+
- devenv
92+
- docker-compose
93+
- hugo
94+
- kubectl
95+
- kubernetes-helm
96+
- nginx
97+
- nix
98+
- nix-flakes
99+
- nix-unstable
100+
- nix-unstable-static
97101
needs:
98102
- build
99103
steps:

flake.nix

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
inputs = {
33
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
4-
nixpkgs-23-05.url = "github:NixOS/nixpkgs/nixos-23.05";
5-
nixpkgs-22-11.url = "github:NixOS/nixpkgs/nixos-22.11";
4+
nixpkgs-24-05.url = "github:NixOS/nixpkgs/nixos-24.05";
5+
nixpkgs-24-11.url = "github:NixOS/nixpkgs/nixos-24.11";
6+
nixpkgs-25-05.url = "github:NixOS/nixpkgs/nixos-25.05";
67
flake-utils.url = "github:numtide/flake-utils";
78
flake-compat = {
89
url = "github:edolstra/flake-compat";
@@ -11,7 +12,7 @@
1112
devshell.url = "github:numtide/devshell";
1213
};
1314

14-
outputs = { self, nixpkgs, nixpkgs-23-05, nixpkgs-22-11, flake-utils, devshell, ... }:
15+
outputs = { self, nixpkgs, nixpkgs-24-05, nixpkgs-24-11, nixpkgs-25-05, flake-utils, devshell, ... }:
1516
flake-utils.lib.eachDefaultSystem (system: {
1617
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
1718
docker-nixpkgs =
@@ -27,33 +28,45 @@
2728
})
2829
];
2930
};
30-
pkgs-23-05 = import nixpkgs-23-05 {
31+
pkgs-24-05 = import nixpkgs-24-05 {
3132
inherit system;
3233
overlays = [
3334
(import ./overlay.nix)
3435
(final: prev: {
3536
flakeParameters = {
36-
nixpkgsChannel = "nixos-23.05";
37+
nixpkgsChannel = "nixos-24.05";
3738
};
3839
})
3940
];
4041
};
41-
pkgs-22-11 = import nixpkgs-22-11 {
42+
pkgs-24-11 = import nixpkgs-24-11 {
4243
inherit system;
4344
overlays = [
4445
(import ./overlay.nix)
4546
(final: prev: {
4647
flakeParameters = {
47-
nixpkgsChannel = "nixos-22.11";
48+
nixpkgsChannel = "nixos-24.11";
49+
};
50+
})
51+
];
52+
};
53+
pkgs-25-05 = import nixpkgs-25-05 {
54+
inherit system;
55+
overlays = [
56+
(import ./overlay.nix)
57+
(final: prev: {
58+
flakeParameters = {
59+
nixpkgsChannel = "nixos-25.05";
4860
};
4961
})
5062
];
5163
};
5264
in
5365
{
5466
"nixos-unstable" = pkgs.docker-nixpkgs;
55-
"nixos-23.05" = pkgs-23-05.docker-nixpkgs;
56-
"nixos-22.11" = pkgs-22-11.docker-nixpkgs;
67+
"nixos-24.05" = pkgs-24-05.docker-nixpkgs;
68+
"nixos-24.11" = pkgs-24-11.docker-nixpkgs;
69+
"nixos-25.05" = pkgs-25-05.docker-nixpkgs;
5770
};
5871
devShell =
5972
let

shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let
2-
nixpkgs = builtins.fetchTarball "channel:nixos-23.11";
2+
nixpkgs = builtins.fetchTarball "channel:nixos-25.05";
33
pkgs = import nixpkgs { config = { }; overlays = [ ]; };
44
in
55
with pkgs;

0 commit comments

Comments
 (0)