From fd90988cb05a44370374c3dbec78d5f066f13dc4 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:43:17 +0100 Subject: [PATCH 1/7] blackshades-elite-svn: remove Gna.org forge is closed and upstream repo was not relocated --- pkgs/games/blackshadeselite/default.nix | 38 ------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 40 deletions(-) delete mode 100644 pkgs/games/blackshadeselite/default.nix diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix deleted file mode 100644 index 25b9321bec3..00000000000 --- a/pkgs/games/blackshadeselite/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image, popt}: - -stdenv.mkDerivation rec { - name = "blackshades-elite-svn-29"; - src = fetchsvn { - url = svn://svn.gna.org/svn/blackshadeselite/trunk; - rev = "29"; - sha256 = "1lkws5pqpgcgdlar11waikp6y41z678457n9jcik7nhn53cjjr1s"; - }; - - NIX_LDFLAGS = "-lSDL_image"; - NIX_CFLAGS_COMPILE = "-fpermissive"; - - buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut popt ]; - - patchPhase = '' - sed -i -e s,Data/,$out/opt/$name/Data/,g \ - -e s,Data:,$out/opt/$name/Data/,g \ - Source/*.cpp - sed -i -e s/-march=pentium-m// Makefile - sed -i -e '/include "Window.h"/a#include ' -e 's/strcmp/std::strcmp/' \ - Source/Window.cpp - ''; - - installPhase = '' - mkdir -p $out/bin $out/opt/$name - cp objs/blackshades $out/bin/blackshadeselite - cp -R Data IF* Readme $out/opt/$name/ - ''; - - meta = { - homepage = http://home.gna.org/blackshadeselite/; - description = "Fork of Black Shades"; - license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bfe527ec13..d90d69bf7ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20200,8 +20200,6 @@ with pkgs; blackshades = callPackage ../games/blackshades { }; - blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby { }; boohu = callPackage ../games/boohu { }; From bd73a3f1c7867d3ea986517bc8cffde8566df847 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:48:52 +0100 Subject: [PATCH 2/7] smbldap-tools: remove Gna.org forge is closed and upstream repo was not relocated --- .../tools/networking/smbldaptools/default.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 4 --- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/tools/networking/smbldaptools/default.nix diff --git a/pkgs/tools/networking/smbldaptools/default.nix b/pkgs/tools/networking/smbldaptools/default.nix deleted file mode 100644 index 81f8361fa2a..00000000000 --- a/pkgs/tools/networking/smbldaptools/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}: - -let - version = "0.9.11"; -in -stdenv.mkDerivation { - name = "smbldap-tools-${version}"; - src = fetchurl { - url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz"; - sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz"; - }; - - buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ]; - - preConfigure = '' - export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl" - ''; - - postInstall = '' - for i in $out/sbin/*; do - wrapProgram $i \ - --prefix PERL5LIB : $PERL5LIB:$out/lib/perl5/site_perl - done - ''; - - meta = { - homepage = http://gna.org/projects/smbldap-tools/; - description = "SAMBA LDAP tools"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90d69bf7ed..ef0c35efd57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5415,10 +5415,6 @@ with pkgs; smarty3 = callPackage ../development/libraries/smarty3 { }; smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { }; - smbldaptools = callPackage ../tools/networking/smbldaptools { - inherit (perlPackages) perlldap CryptSmbHash DigestSHA1; - }; - smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; smenu = callPackage ../tools/misc/smenu { }; From cc7e724b9117ff2c5488f5beec4c93830808feff Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:52:12 +0100 Subject: [PATCH 3/7] remember: remove Gna.org forge is closed and upstream repo was not relocated + remember-mode is part of the base Emacs since 26.1 --- .../editors/emacs-modes/remember/default.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 47 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/remember/default.nix diff --git a/pkgs/applications/editors/emacs-modes/remember/default.nix b/pkgs/applications/editors/emacs-modes/remember/default.nix deleted file mode 100644 index 7c0bc517755..00000000000 --- a/pkgs/applications/editors/emacs-modes/remember/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, stdenv, texinfo, emacs, bbdb }: - -stdenv.mkDerivation rec { - # Note: Remember is part of GNU Emacs 23. - name = "remember-2.0"; - - src = fetchurl { - url = "http://download.gna.org/remember-el/${name}.tar.gz"; - sha256 = "04bp071xjbb6mbspjpwcza0krgx2827v6rfxbsdcpn0qcjgad9wm"; - }; - - # FIXME: It also has a (soft) dependency on Planner and Bibl-mode. - buildInputs = [ emacs bbdb texinfo ]; - - patchPhase = '' - sed -i "Makefile.defs" \ - -e"s|^ *PREFIX *=.*$|PREFIX = $out|g ; - s|^ *ELISPDIR *=.*$|ELISPDIR = $out/share/emacs/site-lisp|g ; - s|^ *EMACS *=.*$|EMACS = emacs -L \"${bbdb}/share/emacs/site-lisp\"|g" - ''; - - meta = { - description = "Remember, an Emacs mode for quickly remembering data"; - - longDescription = '' - Remember is an Emacs mode for quickly remembering data. It uses - whatever back-end is appropriate to record and correlate the - data, but its main intention is to allow you to express as - little structure as possible up front. - - When you enter data, either by typing it into a buffer, or using - the contents of the selected region, Remember will store that - data -- unindexed, uninterpreted -- in a data pool. It will - also try to remember as much context information as possible - (any text properties that were set, where you copied it from, - when, how, etc). Later, you can walk through your accumulated - set of data (both organized, and unorganized) and easily begin - moving things around, and making annotations that will express - the full meaning of that data, as far as you know it. - ''; - - homepage = http://gna.org/projects/remember-el/; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0c35efd57..0581f95600f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16548,8 +16548,6 @@ with pkgs; rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { }; - remember = callPackage ../applications/editors/emacs-modes/remember { }; - rudel = callPackage ../applications/editors/emacs-modes/rudel { }; s = callPackage ../applications/editors/emacs-modes/s { }; From d870a2d85fa4965071957cd48946e03314627d67 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:55:14 +0100 Subject: [PATCH 4/7] poker-eval: remove Gna.org forge is closed and upstream repo was not relocated --- .../libraries/poker-eval/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/poker-eval/default.nix diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix deleted file mode 100644 index 51cc72ffd40..00000000000 --- a/pkgs/development/libraries/poker-eval/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation rec { - name = "poker-eval-138.0"; - - src = fetchurl { - url = "http://download.gna.org/pokersource/sources/${name}.tar.gz"; - sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj"; - }; - - patchPhase = '' - sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in - sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in - sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in - ''; - - meta = { - homepage = http://pokersource.sourceforge.net; - description = "Poker hand evaluator"; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.mtreskin]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0581f95600f..8c1cddd0bc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11807,8 +11807,6 @@ with pkgs; podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; - poker-eval = callPackage ../development/libraries/poker-eval { }; - polkit = callPackage ../development/libraries/polkit { }; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; From 149e46703960f9f01f3ff808e60b598a944187c8 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 18:58:33 +0100 Subject: [PATCH 5/7] 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 68aad10ddff..00000000000 --- 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 e280e5349c1..00000000000 --- 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 b43e99c42a1..00000000000 --- 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 e16d3a78c52..00000000000 --- 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 8c1cddd0bc6..dc7477ba3e1 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 { }; From 2c12a92234996e2b61ed597701bfbee54a99e413 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sun, 18 Nov 2018 19:02:34 +0100 Subject: [PATCH 6/7] pdfshuffler: remove Gna.org forge is closed --- .../applications/misc/pdfshuffler/default.nix | 41 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 43 deletions(-) delete mode 100644 pkgs/applications/misc/pdfshuffler/default.nix diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix deleted file mode 100644 index 35e52f7b977..00000000000 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchsvn -, wrapGAppsHook, makeWrapper, gettext -, python3Packages, gtk3, poppler_gi -, gnome3, gsettings-desktop-schemas, shared-mime-info, -}: - -python3Packages.buildPythonApplication rec { - name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years - - src = fetchsvn { - url = "http://svn.gna.org/svn/pdfshuffler/trunk"; - rev = "20"; - sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc"; - }; - - nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; - - buildInputs = [ - gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme - ]; - - propagatedBuildInputs = with python3Packages; [ - pygobject3 - pycairo - pypdf2 - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") - ''; - - doCheck = false; # no tests - - meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/pdfshuffler/wiki/Home; - description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; - platforms = platforms.linux; - maintainers = with maintainers; [ mic92 ]; - license = licenses.gpl3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc7477ba3e1..e3f6f5f3225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4760,8 +4760,6 @@ with pkgs; inherit (pythonPackages) pillow; }; - pdfshuffler = callPackage ../applications/misc/pdfshuffler { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { From db8991b2cb487cc780628fe1c4689ffd6367cb66 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Tue, 20 Nov 2018 20:53:46 +0100 Subject: [PATCH 7/7] haskellPackages.poker-eval: obsolete libpoker-eval is removed from nixpkgs --- pkgs/development/haskell-modules/hackage-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3a8687eecbe..e4edb59171f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -166283,7 +166283,7 @@ self: { librarySystemDepends = [ poker-eval ]; description = "Binding to libpoker-eval"; license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) poker-eval;}; + }) {poker-eval = null;}; "pokitdok" = callPackage ({ mkDerivation, aeson, base, base64-string, bytestring