Skip to content

Commit 92dd2f8

Browse files
committed
fix: work around name conflict between modules
This should be properly fixed in the future, but for now let's just get these working.
1 parent d2bcad9 commit 92dd2f8

5 files changed

Lines changed: 12 additions & 14 deletions

File tree

projects/CNSPRCY/default.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,17 @@
2020
};
2121

2222
nixos.modules.programs.cnsprcy = {
23-
name = "cnsprcy";
2423
module = ./programs/cnsprcy/module.nix;
25-
examples.basic = {
24+
examples."Enable CNSPRCY program" = {
2625
module = ./programs/cnsprcy/examples/basic.nix;
2726
description = "Checks for cnspr executable";
2827
tests.basic.module = ./programs/cnsprcy/tests/basic.nix;
2928
};
3029
};
3130

32-
nixos.modules.services.cnsprcy = {
33-
name = "cnsprcy";
31+
nixos.modules.services.cnsprcy-server = {
3432
module = ./services/cnsprcy/module.nix;
35-
examples.basic = {
33+
examples."Enable CNSPRCY service" = {
3634
module = ./services/cnsprcy/examples/basic.nix;
3735
description = "Checks that cnsprcy systemd service is running";
3836
tests.basic.module = ./services/cnsprcy/tests/basic.nix;

projects/CNSPRCY/programs/cnsprcy/tests/basic.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
imports = [
1414
sources.modules.ngipkgs
1515
sources.modules.programs.cnsprcy
16-
sources.examples.CNSPRCY.basic
16+
sources.examples.CNSPRCY."Enable CNSPRCY program"
1717
];
1818
};
1919
};

projects/CNSPRCY/services/cnsprcy/tests/basic.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
{
1212
imports = [
1313
sources.modules.ngipkgs
14-
sources.modules.services.cnsprcy
15-
sources.examples.CNSPRCY.basic
14+
sources.modules.services.cnsprcy-server
15+
sources.examples.CNSPRCY."Enable CNSPRCY service"
1616
];
1717
networking.firewall.enable = false;
1818
};
@@ -21,8 +21,8 @@
2121
{
2222
imports = [
2323
sources.modules.ngipkgs
24-
sources.modules.services.cnsprcy
25-
sources.examples.CNSPRCY.basic
24+
sources.modules.services.cnsprcy-server
25+
sources.examples.CNSPRCY."Enable CNSPRCY service"
2626
];
2727
networking.firewall.enable = false;
2828
};

projects/kbin/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
};
2727

2828
nixos.modules.services = {
29-
kbin = {
29+
kbin-service = {
3030
name = "kbin";
3131
module = ./services/kbin/module.nix;
32-
examples.basic = {
32+
examples.basic-service = {
3333
module = ./services/kbin/examples/basic.nix;
3434
description = "";
3535
tests.basic.module = ./services/kbin/tests/basic.nix;

projects/kbin/services/kbin/tests/basic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ in
2121
{
2222
imports = [
2323
sources.modules.ngipkgs
24-
sources.modules.services.kbin
25-
sources.examples.kbin.basic
24+
sources.modules.services.kbin-service
25+
sources.examples.kbin.basic-service
2626
];
2727

2828
services.phpfpm.pools.kbin = {

0 commit comments

Comments
 (0)