From e747d0a3683629d878ad86c344abf3b33ae27742 Mon Sep 17 00:00:00 2001 From: Madoura Date: Sun, 6 Nov 2022 09:05:55 -0600 Subject: [PATCH] protonup-ng: init at 0.2.1 Co-authored-by: IceDBorn --- .../manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ .../{protonup => protonup-ng}/default.nix | 10 +++++----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{protonup => protonup-ng}/default.nix (72%) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 9eaf08d63d5c..77cdb578ece4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -148,6 +148,13 @@ PHP now defaults to PHP 8.1, updated from 8.0. + + + protonup has been aliased to and replaced + by protonup-ng due to upstream not + maintaining it. + + Perl has been updated to 5.36, and its core module diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 3a2a2a0c9f97..ebc76724aa1d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -63,6 +63,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. + - Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to diff --git a/pkgs/development/python-modules/protonup/default.nix b/pkgs/development/python-modules/protonup-ng/default.nix similarity index 72% rename from pkgs/development/python-modules/protonup/default.nix rename to pkgs/development/python-modules/protonup-ng/default.nix index ad760063248f..f79285ce96a7 100644 --- a/pkgs/development/python-modules/protonup/default.nix +++ b/pkgs/development/python-modules/protonup-ng/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, pythonOlder, fetchPypi, requests, configparser }: buildPythonPackage rec { - pname = "protonup"; - version = "0.1.4"; + pname = "protonup-ng"; + version = "0.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0z5q0s9h51w2bqm9lkafml14g13v2dgm4nm9x06v7nxqc9msmyyy"; + hash = "sha256-rys9Noa3+w4phttfcI1OGEDfHMy8s80bm8kM8TzssQA="; }; postPatch = '' @@ -21,9 +21,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "protonup" ]; meta = with lib; { - homepage = "https://github.com/AUNaseef/protonup"; + homepage = "https://github.com/cloudishBenne/protonup-ng"; description = "CLI program and API to automate the installation and update of GloriousEggroll's Proton-GE"; license = licenses.gpl3Only; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ Madouura ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cbf77de74f44..915d928c6aa4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1197,6 +1197,7 @@ mapAliases ({ prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 + protonup = protonup-ng; # Added 2022-11-06 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5760db7071a5..ec1f68319394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34419,7 +34419,7 @@ with pkgs; inherit winetricks steam-run yad; }; - protonup = with python3Packages; toPythonApplication protonup; + protonup-ng = with python3Packages; toPythonApplication protonup-ng; steam-rom-manager = callPackage ../tools/games/steam-rom-manager {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f1c0483890eb..b6b57cfa60b7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -123,6 +123,7 @@ mapAliases ({ privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 + protonup = protonup-ng; # Added 2022-11-06 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcb31505fc7f..f0cb72d94cd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7408,7 +7408,7 @@ in { proton-client = callPackage ../development/python-modules/proton-client { }; - protonup = callPackage ../development/python-modules/protonup { }; + protonup-ng = callPackage ../development/python-modules/protonup-ng { }; protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { pkgs-systemd = pkgs.systemd;