diffuse: remove

wip/yesman
worldofpeace 5 years ago
parent 0ea42c7af6
commit 69d5fd868d
  1. 33
      pkgs/applications/version-management/diffuse/default.nix
  2. 1
      pkgs/top-level/aliases.nix
  3. 2
      pkgs/top-level/all-packages.nix

@ -1,33 +0,0 @@
{ stdenv, fetchurl, python27Packages, makeWrapper }:
let
inherit (python27Packages) pygtk python;
in stdenv.mkDerivation rec {
version = "0.4.8";
pname = "diffuse";
src = fetchurl {
url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2";
sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
};
buildInputs = [ python pygtk makeWrapper ];
buildPhase = ''
python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
'';
# no-op, everything is done in buildPhase
installPhase = "true";
# NOTE: diffuse installs a .desktop file itself
meta = with stdenv.lib; {
description = "Graphical diff and merge tool";
homepage = http://diffuse.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}

@ -83,6 +83,7 @@ mapAliases ({
dbus_daemon = dbus.daemon; # added 2018-04-25
dbus_glib = dbus-glib; # added 2018-02-25
dbus_libs = dbus; # added 2018-04-25
diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;

@ -18371,8 +18371,6 @@ in
inherit (pkgs.gnome2) libart_lgpl libgnomeui;
};
diffuse = callPackage ../applications/version-management/diffuse { };
direwolf = callPackage ../applications/misc/direwolf { };
dirt = callPackage ../applications/audio/dirt {};

Loading…
Cancel
Save