From 4155672b5dd19cf289bcc3d33167181435cc8a73 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:40:54 +0900 Subject: [PATCH 1/6] python3Packages.twitter-common-collections: remove twitter-common-collections has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-collections/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-collections/default.nix diff --git a/pkgs/development/python-modules/twitter-common-collections/default.nix b/pkgs/development/python-modules/twitter-common-collections/default.nix deleted file mode 100644 index 89137a326391..000000000000 --- a/pkgs/development/python-modules/twitter-common-collections/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.collections"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "ede4caff74928156f7ff38dac9b0811893de41966c39cd5b2fdea53418349ca8"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Twitter's common collections"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4b887b0e4249..185110624bdd 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 + twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..694e1a528246 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; From 7980a8230f4c570d190a1188c597f637f429f7fd Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:41:37 +0900 Subject: [PATCH 2/6] python3Packages.twitter-common-confluence: remove twitter-common-confluence has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-confluence/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-confluence/default.nix diff --git a/pkgs/development/python-modules/twitter-common-confluence/default.nix b/pkgs/development/python-modules/twitter-common-confluence/default.nix deleted file mode 100644 index f7b900f2ca11..000000000000 --- a/pkgs/development/python-modules/twitter-common-confluence/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-log, -}: - -buildPythonPackage rec { - pname = "twitter.common.confluence"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "323dde2c519f85020569d7a343432f3aac16bce6ebe5e34774dbde557296697c"; - }; - - propagatedBuildInputs = [ twitter-common-log ]; - - meta = with lib; { - description = "Twitter's API to the confluence wiki"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 185110624bdd..44acb379dcc0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 694e1a528246..15e299820cb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; From 9fb5d8ca4a2431fddff04971780f55152e841bb6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:42:46 +0900 Subject: [PATCH 3/6] python3Packages.twitter-common-dirutil: remove twitter-common-dirutil has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-dirutil/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-dirutil/default.nix diff --git a/pkgs/development/python-modules/twitter-common-dirutil/default.nix b/pkgs/development/python-modules/twitter-common-dirutil/default.nix deleted file mode 100644 index 10043c7ead8f..000000000000 --- a/pkgs/development/python-modules/twitter-common-dirutil/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-lang, -}: - -buildPythonPackage rec { - pname = "twitter.common.dirutil"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "49aeecad2434ac23c16abbfc1fccffd3790c056a9eb01468ec26c83e65a10119"; - }; - - propagatedBuildInputs = [ twitter-common-lang ]; - - meta = with lib; { - description = "Utilities for manipulating and finding files and directories"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 44acb379dcc0..b3732a3d0ea7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -565,6 +565,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15e299820cb2..c74a508b23db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; From 75e249cecbe250d1ef3e922ef8342e6c3d7c4c89 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:43:33 +0900 Subject: [PATCH 4/6] python3Packages.twitter-common-lang: remove twitter-common-lang has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-lang/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-lang/default.nix diff --git a/pkgs/development/python-modules/twitter-common-lang/default.nix b/pkgs/development/python-modules/twitter-common-lang/default.nix deleted file mode 100644 index 975b6d128d0b..000000000000 --- a/pkgs/development/python-modules/twitter-common-lang/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.lang"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "6e967ca2b5bb96ea749d21052f45b18e37deb5cc160eb12c64a8f1cb9dba7a22"; - }; - - meta = with lib; { - description = "Twitter's 2.x / 3.x compatibility swiss-army knife"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b3732a3d0ea7..1c50987c7456 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -566,6 +566,7 @@ mapAliases ({ twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c74a508b23db..f327bdd98db6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; From 811f3347fe215489fd2423ed75c6935426e72a11 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:44:05 +0900 Subject: [PATCH 5/6] python3Packages.twitter-common-log: remove twitter-common-log has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-log/default.nix | 29 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-log/default.nix diff --git a/pkgs/development/python-modules/twitter-common-log/default.nix b/pkgs/development/python-modules/twitter-common-log/default.nix deleted file mode 100644 index bd7a2fec8198..000000000000 --- a/pkgs/development/python-modules/twitter-common-log/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - twitter-common-options, - twitter-common-dirutil, -}: - -buildPythonPackage rec { - pname = "twitter.common.log"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "7160a864eed30044705e05b816077dd193aec0c66f50ef1c077b7f8490e0d06a"; - }; - - propagatedBuildInputs = [ - twitter-common-options - twitter-common-dirutil - ]; - - meta = with lib; { - description = "Twitter's common logging library"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1c50987c7456..b102f5f74367 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f327bdd98db6..798d20ac3298 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; twitterapi = callPackage ../development/python-modules/twitterapi { }; From d2adf58973a45f9afe8b3e21daf1f56e9cfb40d4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jul 2024 15:44:27 +0900 Subject: [PATCH 6/6] python3Packages.twitter-common-options: remove twitter-common-options has been removed because it is abandoned and unmaintained https://github.com/twitter-archive/commons --- .../twitter-common-options/default.nix | 22 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/python-modules/twitter-common-options/default.nix diff --git a/pkgs/development/python-modules/twitter-common-options/default.nix b/pkgs/development/python-modules/twitter-common-options/default.nix deleted file mode 100644 index 47aa9e70824e..000000000000 --- a/pkgs/development/python-modules/twitter-common-options/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "twitter.common.options"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "a495bcdffc410039bc4166f1a30c2caa3c92769d7a161a4a39d3651836dd27e1"; - }; - - meta = with lib; { - description = "Twitter's optparse wrapper"; - homepage = "https://twitter.github.io/commons/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b102f5f74367..34fa065b9945 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -568,6 +568,7 @@ mapAliases ({ twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14 twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14 + twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 798d20ac3298..0c901f150027 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15740,8 +15740,6 @@ self: super: with self; { twitter = callPackage ../development/python-modules/twitter { }; - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - twitterapi = callPackage ../development/python-modules/twitterapi { }; twofish = callPackage ../development/python-modules/twofish { };