Skip to content

Commit

Permalink
bitmagnet: pin Go 1.22, module fixes (NixOS#349760)
Browse files Browse the repository at this point in the history
  • Loading branch information
K900 authored Oct 19, 2024
2 parents c710c5b + fcc185b commit 7793d48
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1359,6 +1359,7 @@
./services/system/uptimed.nix
./services/system/userborn.nix
./services/system/zram-generator.nix
./services/torrent/bitmagnet.nix
./services/torrent/deluge.nix
./services/torrent/flexget.nix
./services/torrent/flood.nix
Expand Down
13 changes: 11 additions & 2 deletions nixos/modules/services/torrent/bitmagnet.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,48 +40,57 @@ in
options = {
http_server = mkOption {
default = { };
description = "HTTP server settings";
type = submodule {
inherit freeformType;
options = {
port = mkOption {
type = str;
default = ":3333";
description = "HTTP server listen port";
};
};
};
};
dht_server = mkOption {
default = { };
description = "DHT server settings";
type = submodule {
inherit freeformType;
options = {
port = mkOption {
type = port;
default = 3334;
description = "DHT listen port";
};
};
};
};
postgres = mkOption {
default = { };
description = "PostgreSQL database configuration";
type = submodule {
inherit freeformType;
options = {
host = mkOption {
type = str;
default = "";
description = "Address, hostname or Unix socket path of the database server";
};
name = mkOption {
type = str;
default = "bitmagnet";
description = "Database name to connect to";
};
user = mkOption {
type = str;
default = "";
description = "User to connect as";
};
password = mkOption {
type = str;
default = "";
description = "Password for database user";
};
};
};
Expand Down Expand Up @@ -163,8 +172,8 @@ in
};
users.groups = mkIf (cfg.group == "bitmagnet") { bitmagnet = { }; };
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.dht_server.port ];
allowedUDPPorts = [ cfg.dht_server.port ];
allowedTCPPorts = [ cfg.settings.dht_server.port ];
allowedUDPPorts = [ cfg.settings.dht_server.port ];
};
services.postgresql = mkIf cfg.useLocalPostgresDB {
enable = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/bi/bitmagnet/package.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ lib
, buildGoModule
, buildGo122Module # builds, but does not start on 1.23
, fetchFromGitHub
, nix-update-script
}:

buildGoModule rec {
buildGo122Module rec {
pname = "bitmagnet";
version = "0.9.5";

Expand Down

0 comments on commit 7793d48

Please sign in to comment.