From 13c28f4f95f83867af0ef45c1cde0e33cf83e044 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Apr 2021 10:40:58 +0200 Subject: [PATCH] esniper: drop broken and unmaintained package Closes https://github.com/NixOS/nixpkgs/issues/116479. --- .../networking/esniper/default.nix | 31 ------------------- .../networking/esniper/find-ca-bundle.patch | 26 ---------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/applications/networking/esniper/default.nix delete mode 100644 pkgs/applications/networking/esniper/find-ca-bundle.patch diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix deleted file mode 100644 index 97b0b1f192b..00000000000 --- a/pkgs/applications/networking/esniper/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: - -stdenv.mkDerivation { - name = "esniper-2.35.0-21-g6379846"; - - src = fetchgit { - url = "https://git.code.sf.net/p/esniper/git"; - rev = "637984623984ef36782d52d8968df7fae7bbb0a7"; - sha256 = "1md3fzs0k88f6mgvrj1yrh96mn0qlca2p6vfqj6dnpyb8pjjwp8w"; - }; - - buildInputs = [ openssl curl ]; - - # Add support for CURL_CA_BUNDLE variable. - # Fix . - patches = [ ./find-ca-bundle.patch ]; - - postInstall = '' - sed <"frontends/snipe" >"$out/bin/snipe" \ - -e "2i export PATH=\"$out/bin:${lib.makeBinPath [ coreutils gawk bash which ]}:\$PATH\"" - chmod 555 "$out/bin/snipe" - ''; - - meta = with lib; { - description = "Simple, lightweight tool for sniping eBay auctions"; - homepage = "http://esniper.sourceforge.net"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 peti ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/esniper/find-ca-bundle.patch b/pkgs/applications/networking/esniper/find-ca-bundle.patch deleted file mode 100644 index e4df272a0c9..00000000000 --- a/pkgs/applications/networking/esniper/find-ca-bundle.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ubr '--exclude=*.o' esniper-2-27-0-orig/http.c esniper-2-27-0-patched/http.c ---- esniper-2-27-0-orig/http.c 2012-02-06 22:04:06.000000000 +0100 -+++ esniper-2-27-0-patched/http.c 2012-07-27 10:54:20.893054646 +0200 -@@ -200,6 +200,9 @@ - int - initCurlStuff(void) - { -+ /* Path to OpenSSL bundle file. */ -+ const char *ssl_capath=NULL; -+ - /* list for custom headers */ - struct curl_slist *slist=NULL; - -@@ -241,6 +244,12 @@ - if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_COOKIEFILE, ""))) - return initCurlStuffFailed(); - -+ /* If the environment variable CURL_CA_BUNDLE is set, pass through its -+ * contents to curl. */ -+ if ((ssl_capath = getenv("CURL_CA_BUNDLE"))) -+ if ((curlrc = curl_easy_setopt(easyhandle, CURLOPT_CAINFO, ssl_capath))) -+ return initCurlStuffFailed(); -+ - slist = curl_slist_append(slist, "Accept: text/*"); - slist = curl_slist_append(slist, "Accept-Language: en"); - slist = curl_slist_append(slist, "Accept-Charset: iso-8859-1,*,utf-8"); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c1ec9f9d114..f9e470aaac0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -179,6 +179,7 @@ mapAliases ({ emacsPackages = emacs.pkgs; # added 2020-12-18 emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01 enblendenfuse = enblend-enfuse; # 2015-09-30 + esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bca83b0bbc..5b99669220f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22580,8 +22580,6 @@ in espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - esniper = callPackage ../applications/networking/esniper { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; etebase-server = with python3Packages; toPythonApplication etebase-server;