From a7de9e82d297e0f61cedd160e14bbc4d2b2f475f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 13:36:53 +0000 Subject: [PATCH] git-annex-remote-b2: remove --- .../git-annex-remote-b2/default.nix | 17 ---------------- .../git-annex-remote-b2/deps.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix deleted file mode 100644 index c32d29f2561a..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "git-annex-remote-b2"; - version = "unstable-2015-12-12"; - - goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - - src = fetchFromGitHub { - owner = "encryptio"; - repo = "git-annex-remote-b2"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; - sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; - }; - - goDeps = ./deps.nix; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix deleted file mode 100644 index 479b3e7d6372..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; - sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; - }; - } - { - goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/kothar/go-backblaze.v0"; - rev = "373819725fc560fa962c6cd883b533d2ebec4844"; - sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..da4f1683a9cc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -457,6 +457,7 @@ mapAliases ({ gfm = throw "gfm has been removed"; # Added 2021-01-15 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 + git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 gitAndTools = self // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..c8de3b5b4303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6216,8 +6216,6 @@ with pkgs; inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; }; - git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { }; - git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx { inherit (python3Packages) buildPythonApplication