diff options
author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2021-08-19 03:18:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-19 09:18:18 +0200 |
commit | 808125fff694e4eb4c73952d501e975778ffdacd (patch) | |
tree | 737b89ef93d06a6eb9f1cbfb92d412bec58b8ca4 /nixos | |
parent | 1246ff606b02d220cab6c1166cb425860df64937 (diff) | |
download | nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar.gz nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar.bz2 nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar.lz nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar.xz nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.tar.zst nixpkgs-808125fff694e4eb4c73952d501e975778ffdacd.zip |
deluge-1_x: Remove older version of Deluge (#134448)
Deluge 1.x requires Python 2 which upstream has end-of-lifed. Deluge depends on pythonPackages.twisted, Python 2 support for which upstream has nowdropped. If pythonPackages.twisted is upgraded then Deluge 1.x breaks. So, remove it instead of leaving it broken. Deluge 2.x (deluge-2_x) is available and continues to work.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/torrent/deluge.nix | 9 | ||||
-rw-r--r-- | nixos/tests/deluge.nix | 35 |
2 files changed, 8 insertions, 36 deletions
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 7ca4fdcf64d..151a1dd638d 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -149,7 +149,7 @@ in { package = mkOption { type = types.package; - example = literalExample "pkgs.deluge-1_x"; + example = literalExample "pkgs.deluge-2_x"; description = '' Deluge package to use. ''; @@ -184,6 +184,13 @@ in { if versionAtLeast config.system.stateVersion "20.09" then pkgs.deluge-2_x else + # deluge-1_x is no longer packaged and this will resolve to an error + # thanks to the alias for this name. This is left here so that anyone + # using NixOS older than 20.09 receives that error when they upgrade + # and is forced to make an intentional choice to switch to deluge-2_x. + # That might be slightly inconvenient but there is no path to + # downgrade from 2.x to 1.x so NixOS should not automatically perform + # this state migration. pkgs.deluge-1_x ); diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 300bc0a1157..f673ec2db5a 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -5,41 +5,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - simple1 = { - services.deluge = { - enable = true; - package = pkgs.deluge-1_x; - web = { - enable = true; - openFirewall = true; - }; - }; - }; - - declarative1 = { - services.deluge = { - enable = true; - package = pkgs.deluge-1_x; - openFirewall = true; - declarative = true; - config = { - allow_remote = true; - download_location = "/var/lib/deluge/my-download"; - daemon_port = 58846; - listen_ports = [ 6881 6889 ]; - }; - web = { - enable = true; - port = 3142; - }; - authFile = pkgs.writeText "deluge-auth" '' - localclient:a7bef72a890:10 - andrew:password:10 - user3:anotherpass:5 - ''; - }; - }; - simple2 = { services.deluge = { enable = true; |