From 944c6691fc7e7a49f3980f252eb8c184a534a4b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= <kubukoz@gmail.com>
Date: Wed, 21 Sep 2022 19:06:36 +0200
Subject: [PATCH] aws: remove, recommend `awscli` / `awscli2` (#176707)

Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com>
---
 .../from_md/release-notes/rl-2211.section.xml |  8 +++++
 .../manual/release-notes/rl-2211.section.md   |  2 ++
 pkgs/tools/virtualization/aws/default.nix     | 29 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/virtualization/aws/default.nix

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 6c4bc01cc16..f93f56898d1 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
@@ -508,6 +508,14 @@
           been removed due to lack of upstream maintenance.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <literal>aws</literal> package has been removed due to
+          being abandoned by the upstream. It is recommended to use
+          <literal>awscli</literal> or <literal>awscli2</literal>
+          instead.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The <literal>meta.mainProgram</literal> attribute of packages
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 720603ef1ad..f8f42abacc2 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -176,6 +176,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
   `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
   maintenance.
 
+- The `aws` package has been removed due to being abandoned by the upstream. It is recommended to use `awscli` or `awscli2` instead.
+
 - The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.
 
 - The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone.
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
deleted file mode 100644
index d09e001ec6e..00000000000
--- a/pkgs/tools/virtualization/aws/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, perl, curl }:
-
-stdenv.mkDerivation {
-  pname = "aws";
-  version = "2019.06.18";
-
-  src = fetchurl {
-    url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";
-    sha256 = "02bym9wicqpdr7mdim13zw5ssh97xfswzab9q29rsbg7058ddbil";
-  };
-
-  buildInputs = [ perl ];
-
-  dontUnpack = true;
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws
-      chmod +x $out/bin/aws
-    '';
-
-  meta = {
-    homepage = "https://www.timkay.com/aws/";
-    description = "Command-line utility for working with Amazon EC2, S3, SQS, ELB, IAM and SDB";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0df3ba637ae..61263109006 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -95,6 +95,7 @@ mapAliases ({
   avldrums-lv2 = x42-avldrums; # Added 2020-03-29
   avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18
   awesome-4-0 = awesome; # Added 2022-05-05
+  aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21
   awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30
   aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;
   axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac351e13aba..07ed8daa9bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2899,8 +2899,6 @@ with pkgs;
 
   avro-cpp = callPackage ../development/libraries/avro-c++ { };
 
-  aws = callPackage ../tools/virtualization/aws { };
-
   aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
 
   awsls = callPackage ../tools/admin/awsls { };