Skip to content

Commit b1b9e44

Browse files
committed
move packages to its own flake-parts module
1 parent d57014b commit b1b9e44

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

flake.nix

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
./devShells/flake-module.nix
3232
./nixosModules/flake-module.nix
3333
./checks/flake-module.nix
34+
./packages/flake-module.nix
3435
]
3536
++ inputs.nixpkgs.lib.optional (inputs.treefmt-nix ? flakeModule) ./formatter/flake-module.nix
3637
++ inputs.nixpkgs.lib.optionals (inputs.hercules-ci-effects ? flakeModule) [
@@ -75,23 +76,10 @@
7576
perSystem =
7677
{
7778
self',
78-
pkgs,
7979
system,
8080
...
8181
}:
8282
{
83-
packages =
84-
{
85-
# useful for checking what buildbot version is used.
86-
buildbot = pkgs.buildbot;
87-
buildbot-nix = pkgs.python3.pkgs.callPackage ./nix/buildbot-nix.nix { };
88-
buildbot-gitea = pkgs.python3.pkgs.callPackage ./nix/buildbot-gitea.nix {
89-
buildbot = pkgs.buildbot;
90-
};
91-
}
92-
// lib.optionalAttrs pkgs.stdenv.isLinux {
93-
buildbot-effects = pkgs.python3.pkgs.callPackage ./nix/buildbot-effects.nix { };
94-
};
9583
checks =
9684
let
9785
nixosMachines = lib.mapAttrs' (
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/flake-module.nix

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
perSystem =
3+
{
4+
lib,
5+
pkgs,
6+
...
7+
}:
8+
{
9+
packages =
10+
{
11+
# useful for checking what buildbot version is used.
12+
buildbot = pkgs.buildbot;
13+
buildbot-nix = pkgs.python3.pkgs.callPackage ./buildbot-nix.nix { };
14+
buildbot-gitea = pkgs.python3.pkgs.callPackage ./buildbot-gitea.nix {
15+
buildbot = pkgs.buildbot;
16+
};
17+
}
18+
// lib.optionalAttrs pkgs.stdenv.isLinux {
19+
buildbot-effects = pkgs.python3.pkgs.callPackage ./buildbot-effects.nix { };
20+
};
21+
};
22+
}

0 commit comments

Comments
 (0)