From 149e46703960f9f01f3ff808e60b598a944187c8 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:58:33 +0100 Subject: [PATCH] bins: remove Gna.org forge is closed and upstream repo was not relocated --- pkgs/tools/graphics/bins/bins_edit-isa.patch | 20 -------- pkgs/tools/graphics/bins/cp-dash-f.patch | 11 ----- pkgs/tools/graphics/bins/default.nix | 50 -------------------- pkgs/tools/graphics/bins/hashref.patch | 13 ----- pkgs/top-level/all-packages.nix | 2 - 5 files changed, 96 deletions(-) delete mode 100644 pkgs/tools/graphics/bins/bins_edit-isa.patch delete mode 100644 pkgs/tools/graphics/bins/cp-dash-f.patch delete mode 100644 pkgs/tools/graphics/bins/default.nix delete mode 100644 pkgs/tools/graphics/bins/hashref.patch diff --git a/pkgs/tools/graphics/bins/bins_edit-isa.patch b/pkgs/tools/graphics/bins/bins_edit-isa.patch deleted file mode 100644 index 68aad10ddff4..000000000000 --- a/pkgs/tools/graphics/bins/bins_edit-isa.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/bins_edit 2005-08-25 14:34:39.000000000 -0400 -+++ b/bins_edit 2016-05-18 20:25:40.913460314 -0400 -@@ -26,7 +26,7 @@ - - use Getopt::Long; - use IO::File; --use UNIVERSAL qw(isa); -+use Scalar::Util 'reftype'; - - # XML parsing & writing - use XML::Grove; -@@ -198,7 +198,7 @@ - my $fieldValue; - foreach my $element - (@{$document->at_path('/'.$fileType.'/description')->{Contents}}) { -- if (isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") { -+ if (reftype($element) eq 'XML::Grove::Element' && $element->{Name} eq "field") { - $fieldName = $element->{Attributes}{'name'}; - $fieldValue = ""; - if ($fieldName eq $field) { diff --git a/pkgs/tools/graphics/bins/cp-dash-f.patch b/pkgs/tools/graphics/bins/cp-dash-f.patch deleted file mode 100644 index e280e5349c1f..000000000000 --- a/pkgs/tools/graphics/bins/cp-dash-f.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bins 2016-05-18 20:45:49.513330005 -0400 -+++ b/bins 2016-05-18 20:58:58.957830874 -0400 -@@ -1332,7 +1332,7 @@ - mkdir $destDir, 0755 - or die("\nCannot create $destDir: $?"); - } -- system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0 -+ system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0 - or die("\nCannot copy $staticDir directory content to $destDir: $?"); - } else { - beVerboseN(" Cannot find any static template directory.", 4); diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix deleted file mode 100644 index b43e99c42a14..000000000000 --- a/pkgs/tools/graphics/bins/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: - -let - version = "1.1.29"; - -in - -#note: bins-edit-gui does not work - -stdenv.mkDerivation { - name = "bins-${version}"; - - src = fetchurl { - url = "http://download.gna.org/bins/bins-${version}.tar.gz"; - sha256 = "0n4pcssyaic4xbk25aal0b3g0ibmi2f3gpv0gsnaq61sqipyjl94"; - }; - - buildInputs = with perlPackages; [ makeWrapper perl - ImageSize ImageInfo PerlMagick - URI HTMLParser HTMLTemplate HTMLClean - XMLGrove XMLHandlerYAWriter - TextIconv TextUnaccent - DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui - - patches = [ ./bins_edit-isa.patch - ./hashref.patch - ./cp-dash-f.patch ]; - - installPhase = '' - export DESTDIR=$out; - export PREFIX=.; - - echo | ./install.sh - - for f in bins bins_edit bins-edit-gui; do - substituteInPlace $out/bin/$f \ - --replace /usr/bin/perl ${perl}/bin/perl \ - --replace /etc/bins $out/etc/bins \ - --replace /usr/local/share $out/share; - wrapProgram $out/bin/$f --set PERL5LIB "$PERL5LIB"; - done - ''; - - meta = { - description = "Generates static HTML photo albums"; - homepage = http://bins.sautret.org; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/graphics/bins/hashref.patch b/pkgs/tools/graphics/bins/hashref.patch deleted file mode 100644 index e16d3a78c52d..000000000000 --- a/pkgs/tools/graphics/bins/hashref.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/bins 2016-05-18 20:45:49.513330005 -0400 -+++ b/bins 2016-05-18 20:58:58.957830874 -0400 -@@ -3643,8 +3643,8 @@ - - my @descTable; - foreach my $tagName (@mainFields) { -- if (${%$hashref}{$tagName}) { -- my $value=${%$hashref}{$tagName}; -+ if (${$hashref}{$tagName}) { -+ my $value=${$hashref}{$tagName}; - $value =~ s/'/'/g ; # in case it's used in javascript code - push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'}, - DESC_FIELD_VALUE => $value, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c1cddd0bc63..dc7477ba3e1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -934,8 +934,6 @@ with pkgs; bindfs = callPackage ../tools/filesystems/bindfs { }; - bins = callPackage ../tools/graphics/bins { }; - bitbucket-cli = python2Packages.bitbucket-cli; bittornado = callPackage ../tools/networking/p2p/bittornado { };