diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix deleted file mode 100644 index aa0f317787f8..000000000000 --- a/pkgs/tools/filesystems/buttersink/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, python2 }: - -python2.pkgs.buildPythonApplication rec { - pname = "buttersink"; - version = "0.6.9"; - - src = python2.pkgs.fetchPypi { - inherit pname version; - sha256 = "a797b6e92ad2acdf41e033c1368ab365aa268f4d8458b396a5770fa6c2bc3f54"; - }; - - propagatedBuildInputs = with python2.pkgs; [ boto crcmod psutil ]; - - # No tests implemented - doCheck = false; - - meta = with lib; { - description = "Synchronise btrfs snapshots"; - longDescription = '' - ButterSink is like rsync, but for btrfs subvolumes instead of files, - which makes it much more efficient for things like archiving backup - snapshots. It is built on top of btrfs send and receive capabilities. - Sources and destinations can be local btrfs file systems, remote btrfs - file systems over SSH, or S3 buckets. - ''; - homepage = "https://github.com/AmesCornish/buttersink/wiki"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d12c09c93e90..842387bc87c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -102,6 +102,8 @@ mapAliases ({ bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 + bird2 = bird; # Added 2022-02-21 + bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 @@ -112,10 +114,9 @@ mapAliases ({ brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 bro = zeek; # Added 2019-09-29 - bird2 = bird; # Added 2022-02-21 - bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 + buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) bitwarden_rs = vaultwarden; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb0495322d7d..af8053340ced 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2484,8 +2484,6 @@ with pkgs; bustle = haskellPackages.bustle; - buttersink = callPackage ../tools/filesystems/buttersink { }; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { };