From 1deb709fcf5a5fd5978b33fa5174cd29fda199d8 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 11 Dec 2019 01:03:44 +0100 Subject: hexen: remove abandoned software --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ec0b1f1b3e..79e9d2fcc0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -165,6 +165,7 @@ mapAliases ({ gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 + hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 -- cgit 1.4.1 From cd6c028a1b5604ab80076f85646512908e1681e5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:33:09 -0500 Subject: cinepaint: remove --- pkgs/applications/graphics/cinepaint/default.nix | 38 ---------------------- pkgs/applications/graphics/cinepaint/install.patch | 24 -------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/applications/graphics/cinepaint/default.nix delete mode 100644 pkgs/applications/graphics/cinepaint/install.patch (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix deleted file mode 100644 index 2b70ea3b450..00000000000 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, - flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11, - pythonPackages, gettext, intltool, babl, gegl, - glib, makedepend, xorgproto, libXmu, openexr, - libGLU, libGL, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : - -let - inherit (pythonPackages) python pygtk; -in stdenv.mkDerivation rec { - name = "cinepaint-1.1"; - - src = fetchurl { - url = "mirror://sourceforge/cinepaint/${name}.tgz"; - sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; - }; - - buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg - libexif zlib libX11 python pygtk gettext intltool babl - gegl glib makedepend xorgproto libXmu openexr libGLU libGL - libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk - ] ++ (with perlPackages; [ perl XMLParser ]); - - hardeningDisable = [ "format" ]; - - patches = [ ./install.patch ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - NIX_LDFLAGS = "-lm -llcms -ljpeg -lpng -lX11"; - - meta = { - homepage = http://www.cinepaint.org/; - license = stdenv.lib.licenses.free; - description = "Image editor which supports images over 8bpp and ICC profiles"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch deleted file mode 100644 index f15ff1c4414..00000000000 --- a/pkgs/applications/graphics/cinepaint/install.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dfb182f..5adaaa5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX}) - # Note that for MacOS this needs to be revised - # for the @OSX_ICC...@ variables - ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc - COMMAND sed -e s/\@platform\@//g - -e s/\@prefix\@/${ESCAPEDPREFIX}/g - -e s/\@exec_prefix\@/\${prefix}/g -@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND( - - ADD_CUSTOM_TARGET(RCFile ALL echo - "" -- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install -- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install -+ ${CMAKE_CURRENT_BINARY_DIR}/gimprc - ) - - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ec0b1f1b3e..b254caf61d9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 cide = throw "deprecated in 2019-09-11: abandoned by upstream"; + cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 cifs_utils = cifs-utils; # added 2016-08 ckb = ckb-next; # added 2018-10-21 clangAnalyzer = clang-analyzer; # added 2015-02-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed15aab8b21..7cb0c4fbc42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18287,12 +18287,6 @@ in python = python27; }; - cinepaint = callPackage ../applications/graphics/cinepaint { - fltk = fltk13; - libpng = libpng12; - cmake = cmake_2_8; - }; - codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; -- cgit 1.4.1 From 28d42831217fb8661c3b7a5756998326f0605360 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 5 Dec 2019 05:58:31 -0500 Subject: mcomix: remove --- pkgs/applications/graphics/mcomix/default.nix | 34 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/applications/graphics/mcomix/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix deleted file mode 100644 index c16c0d88b46..00000000000 --- a/pkgs/applications/graphics/mcomix/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, python27Packages }: - -python27Packages.buildPythonApplication rec { - name = "mcomix-${version}"; - version = "1.2.1"; - - src = fetchurl { - url = "mirror://sourceforge/mcomix/${name}.tar.bz2"; - sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy"; - }; - - propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ]; - - doCheck = false; - - meta = { - description = "Image viewer designed to handle comic books"; - longDescription = '' - MComix is an user-friendly, customizable image viewer. It is specifically - designed to handle comic books, but also serves as a generic viewer. - It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image - files. It is written in Python and uses GTK through the PyGTK bindings, - and runs on both Linux and Windows. - - MComix is a fork of the Comix project, and aims to add bug fixes and - stability improvements after Comix development came to a halt in late 2009. - ''; - homepage = http://mcomix.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ AndersonTorres ]; - }; -} -# TODO: -# - error in check phase diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b254caf61d9..227fd8aa3b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -225,6 +225,7 @@ mapAliases ({ mariadb-client = hiPrio mariadb.client; #added 2019.07.28 mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 + mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb0c4fbc42..7ab11f149d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19965,8 +19965,6 @@ in meme = callPackage ../applications/graphics/meme { }; - mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; -- cgit 1.4.1 From b99ca2f33f40eba766b652d302f98f8be1e19b6c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 26 Nov 2019 15:39:56 -0500 Subject: mirage: remove --- pkgs/applications/graphics/mirage/default.nix | 31 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/applications/graphics/mirage/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix deleted file mode 100644 index fbe8f10c72f..00000000000 --- a/pkgs/applications/graphics/mirage/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pythonPackages, libX11, gettext }: - -pythonPackages.buildPythonApplication rec { - pname = "mirage"; - version = "0.9.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2"; - sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; - }; - - doCheck = false; - - nativeBuildInputs = [ gettext ]; - - buildInputs = [ stdenv libX11 gettext ]; - - patchPhase = '' - sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py - ''; - - propagatedBuildInputs = with pythonPackages; [ pygtk pillow ]; - - meta = { - description = "Simple image viewer written in PyGTK"; - - homepage = http://mirageiv.sourceforge.net/; - - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 227fd8aa3b6..a2068fb9576 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -226,6 +226,7 @@ mapAliases ({ mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 mysql-client = hiPrio mariadb.client; memtest86 = memtest86plus; # added 2019-05-08 mesa_noglu = mesa; # added 2019-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ab11f149d3..ce9223fafa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20014,8 +20014,6 @@ in meh = callPackage ../applications/graphics/meh {}; - mirage = callPackage ../applications/graphics/mirage { }; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; }; -- cgit 1.4.1 From af7a1dad842fabdaa6a86b319a537c9200947543 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:33:52 -0500 Subject: gnome15: remove --- pkgs/applications/misc/gnome15/default.nix | 39 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/misc/gnome15/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix deleted file mode 100644 index 41d535b3510..00000000000 --- a/pkgs/applications/misc/gnome15/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: - -stdenv.mkDerivation { - name = "gnome15-2016-06-10"; - - src = fetchFromGitHub { - owner = "achilleas-k"; - repo = "gnome15"; - rev = "1077c890d9ba8ef7a5e448e70a792de5c7443c84"; - sha256 = "0z5k2rgvv5zyi3lbbk6svncypidj44qzfchivb4vlr7clmh16m95"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig python2.pkgs.wrapPython ]; - buildInputs = [ python2 ]; - propagatedBuildInputs = with python2.pkgs; [ - pygtk keyring virtkey pillow dbus-python pyinotify lxml pyxdg pyusb gnome_python gnome_python_desktop - python-uinput xlib pyudev pyinputevent - ]; - - postPatch = '' - touch README - export UDEV_RULES_PATH="$out/lib/udev/rules.d" - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = with stdenv.lib; { - description = "A set of tools for configuring the Logitech G15 keyboard"; - # Doesn't work with new `keyring` library which is Python 3-only now. - # https://github.com/Gnome15/gnome15/issues/29 - broken = true; - license = licenses.gpl3; - homepage = https://gnome15.org/; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2068fb9576..320091f1351 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -130,6 +130,7 @@ mapAliases ({ git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 gnome-mpv = celluloid; # added 2019-08-22 + gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce9223fafa0..c27a67c91fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3550,10 +3550,6 @@ in gnirehtet = callPackage ../tools/networking/gnirehtet { }; - gnome15 = callPackage ../applications/misc/gnome15 { - inherit (gnome2) gnome_python gnome_python_desktop; - }; - gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; -- cgit 1.4.1 From 30b5b7944cc5740fa2aa7fd3ba20817a5bbcf7ad Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:34:30 -0500 Subject: batti: remove This one was already marked as broken. --- pkgs/applications/misc/batti/default.nix | 51 -------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/applications/misc/batti/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix deleted file mode 100644 index 8b994c55de3..00000000000 --- a/pkgs/applications/misc/batti/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchurl -, pkgconfig, gettext, pythonPackages -, gtk2, gdk-pixbuf, upower -, makeWrapper }: - -let - inherit (pythonPackages) dbus-python pygtk python; -in stdenv.mkDerivation rec { - - pname = "batti"; - version = "0.3.8"; - - src = fetchurl { - url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz"; - sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6"; - }; - - buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk2 pygtk dbus-python gdk-pixbuf upower makeWrapper ]; - - dontConfigure = true; - - buildPhase = '' - python setup.py build - ''; - - installPhase = '' - python setup.py install --prefix $out - wrapProgram "$out/bin/batti" \ - --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out)" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - - meta = with stdenv.lib; { - description = "An {UPower,GTK}-based battery monitor for the system tray"; - longDescription = '' - Batti is a simple battery monitor for the system tray. Batti - uses UPower, and if that is missing DeviceKit.Power, for it's - power information. - ''; - homepage = http://batti-gtk.googlecode.com/; - license = licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520 - }; -} - -# TODO: fix the "icon not found" problems... diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 320091f1351..68730943dff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ at_spi2_core = at-spi2-core; # added 2018-02-25 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 + batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c27a67c91fa..819a81a7370 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18014,8 +18014,6 @@ in batik = callPackage ../applications/graphics/batik { }; - batti = callPackage ../applications/misc/batti { }; - baudline = callPackage ../applications/audio/baudline { }; -- cgit 1.4.1 From 517872a227923cacb25b11f1a1c9fc8238c430ad Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:35:03 -0500 Subject: hamster-time-tracker: remove This package actually uses the old abandoned code base. However the code base has been revieved by new maintainers * https://github.com/projecthamster/ if there is a request for it could be re-added to nixpkgs. --- .../misc/hamster-time-tracker/default.nix | 42 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/applications/misc/hamster-time-tracker/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix deleted file mode 100644 index 9360e220ab6..00000000000 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils -, intltool, dbus-glib, gnome_python -, hicolor-icon-theme -, wafHook -}: - -# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes -# this message: -# -# WARNING:root:Could not import wnck - workspace tracking will be disabled - -pythonPackages.buildPythonApplication rec { - name = "hamster-time-tracker-1.04"; - - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/projecthamster/hamster/archive/${name}.tar.gz"; - sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; - }; - - nativeBuildInputs = [ wafHook intltool ]; - buildInputs = [ - docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme - ]; - - propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; - - postFixup = '' - wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath" - ''; - - # error: invalid command 'test' - doCheck = false; - - meta = with stdenv.lib; { - description = "Time tracking application"; - homepage = https://projecthamster.wordpress.com/; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68730943dff..2019ebead3a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -166,6 +166,7 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 + hamster-time-traker = throw "hamster-time-tracker has been removed from nixpkgs, as it was unmaintained."; # added 2019-12-10 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 819a81a7370..3d32867da76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19237,10 +19237,6 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; - hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker { - inherit (gnome2) gnome_python; - }; - hashit = callPackage ../tools/misc/hashit { }; hello = callPackage ../applications/misc/hello { }; -- cgit 1.4.1 From d7159adcbabaf4769dfd1661a82d185a6c65579c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:37:14 -0500 Subject: keymon: remove --- pkgs/applications/video/key-mon/default.nix | 28 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/applications/video/key-mon/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix deleted file mode 100644 index 7dc350da647..00000000000 --- a/pkgs/applications/video/key-mon/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }: - -pythonPackages.buildPythonApplication rec { - pname = "key-mon"; - version = "1.17"; - namePrefix = ""; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz"; - sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; - }; - - propagatedBuildInputs = - [ gnome2.python_rsvg librsvg pythonPackages.pygtk pythonPackages.xlib ]; - - doCheck = false; - - preFixup = '' - export makeWrapperArgs="--set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE" - ''; - - meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/key-mon; - description = "Utility to show live keyboard and mouse status for teaching and screencasts"; - license = licenses.asl20; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2019ebead3a..528d6e1430e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,6 +188,7 @@ mapAliases ({ keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 krename-qt5 = krename; # added 2017-02-18 + keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 letsencrypt = certbot; # added 2016-05-16 libaudit = audit; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d32867da76..1f824cf8b99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19637,8 +19637,6 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - keymon = callPackage ../applications/video/key-mon { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; -- cgit 1.4.1 From f4119fffddcdecf0ae1569d498086fd0b142bfa2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:37:44 -0500 Subject: libsexy: remove People have only been using this for the spell-entry widget, i.e even hexchat just has the code vendored and are maintaining it themselves. There is a continuation that could be packaged if anyone needs it * https://github.com/TingPing/libsexy3 but currently no package within nixpkgs has a use for this. --- pkgs/development/libraries/libsexy/default.nix | 24 ------------------- .../development/python-modules/libsexy/default.nix | 27 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/python-packages.nix | 4 ---- 5 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/libraries/libsexy/default.nix delete mode 100644 pkgs/development/python-modules/libsexy/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix deleted file mode 100644 index cb22d9f97bc..00000000000 --- a/pkgs/development/libraries/libsexy/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, glib, gtk2, libxml2, pango -}: - -stdenv.mkDerivation { - name = "libsexy-0.1.11"; - - src = fetchurl { - url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz; - sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ glib gtk2 libxml2 pango ]; - - meta = with stdenv.lib; { - description = "A collection of GTK widgets"; - homepage = https://blog.chipx86.com/tag/libsexy/; - license = licenses.lgpl21; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix deleted file mode 100644 index 78e0dae2634..00000000000 --- a/pkgs/development/python-modules/libsexy/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, glib, python }: - -buildPythonPackage rec { - pname = "libsexy"; - version = "0.1.9"; - format = "other"; - - src = fetchurl { - url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz"; - sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; - }; - - nativeBuildInputs = [ pkgconfig pygtk ]; - - propagatedBuildInputs = [ - pygtk libsexy glib pango libxml2 - ]; - - postInstall = '' - ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages} - ''; - - meta = { - description = "Python libsexy bindings"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 528d6e1430e..f3abc0a6e24 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -215,6 +215,7 @@ mapAliases ({ libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 libudev = udev; # added 2018-04-25 + libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f824cf8b99..25de14fd25e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5846,8 +5846,6 @@ in pythonIRClib = pythonPackages.pythonIRClib; - pythonSexy = pythonPackages.libsexy; - pyditz = callPackage ../applications/misc/pyditz { pythonPackages = python27Packages; }; @@ -16570,8 +16568,6 @@ in libsass = callPackage ../development/libraries/libsass { }; - libsexy = callPackage ../development/libraries/libsexy { }; - libsepol = callPackage ../os-specific/linux/libsepol { }; libsmbios = callPackage ../os-specific/linux/libsmbios { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index afe689167ac..face76e104b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2668,10 +2668,6 @@ in { latexcodec = callPackage ../development/python-modules/latexcodec {}; - libsexy = callPackage ../development/python-modules/libsexy { - inherit (pkgs) libsexy pkgconfig; - }; - libselinux = pipe pkgs.libselinux [ toPythonModule -- cgit 1.4.1 From 865b2034717725a3299474e2637e923d76695886 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:38:19 -0500 Subject: winswitch: remove --- pkgs/tools/X11/winswitch/default.nix | 47 ------------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/tools/X11/winswitch/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix deleted file mode 100644 index 404cef72a3e..00000000000 --- a/pkgs/tools/X11/winswitch/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pythonPackages -, which, xpra, xmodmap }: - -let - base = pythonPackages.buildPythonApplication rec { - pname = "winswitch"; - namePrefix = ""; - version = "0.12.23"; - - src = fetchurl { - url = "http://winswitch.org/src/${pname}-${version}.src.tar.bz2"; - sha256 = "1m0akjcdlsgng426rwvzlcl76kjm993icj0pggvha40cizig1yd9"; - }; - - propagatedBuildInputs = with pythonPackages; [ - pygtk twisted pycrypto pyasn1 which xpra xmodmap - ]; - - patchPhase = '' - sed -i -r -e 's|(PREFIX_DIR *= *).*|\1"'"$out"'"|' \ - -e 's|(PREFIX_SEARCH_ORDER *= *).*|\1["'"$out"'"]|' \ - -e 's|(ETC_SEARCH_ORDER *= *).*|\1["'"$out/etc"'"]|' \ - -e 's|(BIN_SEARCH_ORDER *= *).*|\1["'"$out/bin"'"]|' \ - winswitch/util/paths.py - - sed -i -e '/elif *LINUX:/,/distro_helper/{ - s/elif *LINUX:.*/else: name = "NixOS"/p - /distro_helper/!d - }' winswitch/util/distro_packaging_util.py - ''; - - preInstall = '' - # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix - python setup.py install_data --install-dir=$out --root=$out - sed -i '/data_files = data_files/d' setup.py - ''; - - doCheck = false; - - meta.platforms = stdenv.lib.platforms.linux; - meta.broken = true; - }; -in stdenv.lib.overrideDerivation base (b: { - postFixup = b.postFixup + '' - sed -i -e 's/\''${PATH:+:}\$PATH//g' "$out/bin"/* - ''; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3abc0a6e24..6afbafe4f1b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -443,6 +443,7 @@ mapAliases ({ weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 + winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 xfceUnstable = xfce4-14; # added 2019-09-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25de14fd25e..d4cb1fa9d61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21875,8 +21875,6 @@ in wily = callPackage ../applications/editors/wily { }; - winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { erlang = erlangR21; }; -- cgit 1.4.1 From 69d5fd868d426596be3bbe88e872d4145fdc12c5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:39:04 -0500 Subject: diffuse: remove --- .../version-management/diffuse/default.nix | 33 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/applications/version-management/diffuse/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix deleted file mode 100644 index fc591dd710e..00000000000 --- a/pkgs/applications/version-management/diffuse/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6afbafe4f1b..16eb3f150d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4cb1fa9d61..e07dbde9f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; -- cgit 1.4.1 From c00538ae3abbd0bbcc6559da17324042d4ac06e5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:39:37 -0500 Subject: recordmydesktop: remove The qt version is using qt4 pyqt and the gtk version gtk2 pygtk. Not seeing any activity at all at https://sourceforge.net/p/recordmydesktop/bugs/ --- .../applications/video/recordmydesktop/default.nix | 29 ----------------- pkgs/applications/video/recordmydesktop/gtk.nix | 37 ---------------------- pkgs/applications/video/recordmydesktop/qt.nix | 37 ---------------------- pkgs/top-level/aliases.nix | 3 ++ pkgs/top-level/all-packages.nix | 10 ------ 5 files changed, 3 insertions(+), 113 deletions(-) delete mode 100644 pkgs/applications/video/recordmydesktop/default.nix delete mode 100644 pkgs/applications/video/recordmydesktop/gtk.nix delete mode 100644 pkgs/applications/video/recordmydesktop/qt.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix deleted file mode 100644 index e4d6e14d098..00000000000 --- a/pkgs/applications/video/recordmydesktop/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchsvn, autoreconfHook, zlib, popt, alsaLib, libvorbis, libtheora -, libICE, libSM, libX11, libXext, libXfixes, libXdamage }: - -stdenv.mkDerivation rec { - pname = "recordmydesktop"; - version = "0.3.8.1-svn${rev}"; - rev = "602"; - - src = fetchsvn { - url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/recordmydesktop; - inherit rev; - sha256 = "1avirkc4ymrd575m616pi6wpgq1i0r5sb3qahps1g18sjpxks0lf"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ - zlib popt alsaLib libICE libSM libX11 libXext - libXfixes libXdamage libvorbis libtheora - ]; - - meta = with stdenv.lib; { - description = "Desktop session recorder"; - homepage = http://recordmydesktop.sourceforge.net/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix deleted file mode 100644 index cf02825501f..00000000000 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig -, pythonPackages, jack2, xwininfo }: - -let - binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; - -in stdenv.mkDerivation { - pname = "gtk-recordmydesktop"; - version = "0.3.8-svn${recordmydesktop.rev}"; - - src = fetchsvn { - url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/gtk-recordmydesktop; - inherit (recordmydesktop) rev; - sha256 = "010aykgjfxhyiixq9a9fg3p1a1ixz59m1vkn16hpy0lybgf4dsby"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - buildInputs = with pythonPackages; [ - python pygtk wrapPython - ]; - - pythonPath = with pythonPackages; [ pygtk ]; - - postInstall = '' - makeWrapperArgs="--prefix PATH : ${binPath}" - wrapPythonPrograms - ''; - - meta = with stdenv.lib; { - description = "GTK frontend for recordmydesktop"; - homepage = http://recordmydesktop.sourceforge.net/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix deleted file mode 100644 index 573a18f62ce..00000000000 --- a/pkgs/applications/video/recordmydesktop/qt.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig -, glib, pythonPackages, qt4, jack2, xwininfo }: - -let - binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ]; - -in stdenv.mkDerivation { - pname = "qt-recordmydesktop"; - version = "0.3.8-svn${recordmydesktop.rev}"; - - src = fetchsvn { - url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/qt-recordmydesktop; - inherit (recordmydesktop) rev; - sha256 = "0vz7amrmz317sbx2cv2186d0r57as4l26xa9rpim5gbvzk20caqc"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - buildInputs = [ glib qt4 ] ++ (with pythonPackages; [ - python wrapPython pyqt4 - ]); - - pythonPath = with pythonPackages; [ pyqt4 ]; - - postInstall = '' - makeWrapperArgs="--prefix PATH : ${binPath}" - wrapPythonPrograms - ''; - - meta = with stdenv.lib; { - description = "GTK frontend for recordmydesktop"; - homepage = http://recordmydesktop.sourceforge.net/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16eb3f150d1..b9240b7be20 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -341,6 +341,9 @@ mapAliases ({ rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 rssglx = rss-glx; #added 2015-03-25 + recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 + gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 + qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e07dbde9f91..bac8613b5f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5979,18 +5979,8 @@ in reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; - recordmydesktop = callPackage ../applications/video/recordmydesktop { }; - rx = callPackage ../applications/graphics/rx { }; - gtk-recordmydesktop = callPackage ../applications/video/recordmydesktop/gtk.nix { - jack2 = jack2Full; - }; - - qt-recordmydesktop = callPackage ../applications/video/recordmydesktop/qt.nix { - jack2 = jack2Full; - }; - qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { }; recutils = callPackage ../tools/misc/recutils { }; -- cgit 1.4.1 From 5027d9f9e2815220c62353066def1093ac3520c5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:40:18 -0500 Subject: oblogout: remove The repo is archived. https://github.com/nikdoof/oblogout --- pkgs/tools/X11/oblogout/default.nix | 36 ------------- pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch | 66 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 pkgs/tools/X11/oblogout/default.nix delete mode 100644 pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/tools/X11/oblogout/default.nix b/pkgs/tools/X11/oblogout/default.nix deleted file mode 100644 index 9acd113d0ab..00000000000 --- a/pkgs/tools/X11/oblogout/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, intltool, file, pythonPackages, cairo }: - -pythonPackages.buildPythonApplication { - pname = "oblogout-unstable"; - version = "2009-11-18"; - - src = fetchFromGitHub { - owner = "nikdoof"; - repo = "oblogout"; - rev = "ee023158c03dee720a1af9b1307b14ed5a95f5a0"; - sha256 = "0nj87q94idb5ki4wnb2xipfgc6k6clr3rmm4xxh46b58z4zhhbmj"; - }; - - nativeBuildInputs = [ intltool file pythonPackages.distutils_extra ]; - - buildInputs = [ cairo ]; - - propagatedBuildInputs = [ pythonPackages.pygtk pythonPackages.pillow pythonPackages.dbus-python ]; - - patches = [ ./oblogout-0.3-fixes.patch ]; - - postPatch = '' - substituteInPlace data/oblogout --replace sys.prefix \"$out/${pythonPackages.python.sitePackages}\" - substituteInPlace oblogout/__init__.py --replace sys.prefix \"$out\" - mkdir -p $out/share/doc - cp -a README $out/share/doc - ''; - - meta = { - description = "Openbox logout script"; - homepage = https://launchpad.net/oblogout; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch b/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch deleted file mode 100644 index c58103c6d40..00000000000 --- a/pkgs/tools/X11/oblogout/oblogout-0.3-fixes.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/data/oblogout b/data/oblogout -index 8058c4a..dfe5285 100755 ---- a/data/oblogout -+++ b/data/oblogout -@@ -77,8 +77,10 @@ def main(argv = None): - config = 'data/oblogout.conf' - elif os.path.isfile('%s/.config/oblogout.conf' % os.getenv("HOME")): - config = '%s/.config/oblogout.conf' % os.getenv("HOME") -- else: -+ elif os.path.isfile('/etc/oblogout.conf'): - config = '/etc/oblogout.conf' -+ else: -+ config = sys.prefix + '/etc/oblogout.conf' - - # Check config in local path, if it exists pass it on - if not os.path.isfile(config): -diff --git a/data/oblogout.conf b/data/oblogout.conf -index 810872c..b1c1009 100644 ---- a/data/oblogout.conf -+++ b/data/oblogout.conf -@@ -1,11 +1,11 @@ - [settings] --usehal = true -+usehal = false - - [looks] - opacity = 70 - bgcolor = black - buttontheme = simplistic --buttons = cancel, logout, restart, shutdown, suspend, lock -+buttons = cancel, logout, restart, shutdown, suspend - - [shortcuts] - cancel = Escape -@@ -17,11 +17,11 @@ lock = K - hibernate = H - - [commands] --shutdown = shutdown -h now --restart = reboot --suspend = pmi action suspend --hibernate = pmi action hibernate --safesuspend = safesuspend --lock = gnome-screensaver-command -l --switchuser = gdm-control --switch-user -+shutdown = systemctl poweroff -+restart = systemctl reboot -+suspend = systemctl suspend -+hibernate = systemctl hibernate -+# safesuspend = safesuspend -+# lock = gnome-screensaver-command -l -+# switchuser = gdm-control --switch-user - logout = openbox --exit -diff --git a/oblogout/__init__.py b/oblogout/__init__.py -index b9e4e01..12f521f 100644 ---- a/oblogout/__init__.py -+++ b/oblogout/__init__.py -@@ -138,7 +138,7 @@ class OpenboxLogout(): - self.logger.debug("Rendering Fade") - # Convert Pixbuf to PIL Image - wh = (pb.get_width(),pb.get_height()) -- pilimg = Image.fromstring("RGB", wh, pb.get_pixels()) -+ pilimg = Image.frombytes("RGB", wh, pb.get_pixels()) - - pilimg = pilimg.point(lambda p: (p * self.opacity) / 255 ) - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b9240b7be20..18cf4f6673e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -272,6 +272,7 @@ mapAliases ({ nxproxy = nx-libs; # added 2019-02-15 nylas-mail-bin = throw "deprecated in 2019-09-11: abandoned by upstream"; opencascade_oce = opencascade; # added 2018-04-25 + oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 openjpeg_2_1 = openjpeg_2; # added 2018-10-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bac8613b5f8..e8c8def8d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20416,8 +20416,6 @@ in inherit (gnome2) libglade; }; - oblogout = callPackage ../tools/X11/oblogout { }; - obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; -- cgit 1.4.1 From 7cae93c29c12f41b9e10eed32e27b7825a6e1c72 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:40:44 -0500 Subject: bootchart: remove --- pkgs/tools/system/bootchart/default.nix | 31 ------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/tools/system/bootchart/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix deleted file mode 100644 index d3f692b70e7..00000000000 --- a/pkgs/tools/system/bootchart/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }: - -stdenv.mkDerivation rec { - version = "0.14.8"; - pname = "bootchart"; - - src = fetchFromGitHub { - owner = "mmeeks"; - repo = "bootchart"; - rev = version; - sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ]; - pythonPath = with python2Packages; [ pygtk pycairo ]; - - installPhase = '' - make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix} - wrapProgram $out/bin/pybootchartgui \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - meta = with stdenv.lib; { - homepage = http://www.bootchart.org/; - description = "Performance analysis and visualization of the GNU/Linux boot process"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 18cf4f6673e..bccaa01eae8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -52,6 +52,7 @@ mapAliases ({ beegfs = throw "beegfs has been removed."; # added 2019-11-24 bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 + bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 btrfsProgs = btrfs-progs; # added 2016-01-03 bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8c8def8d10..840771a5f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1226,8 +1226,6 @@ in boot = callPackage ../development/tools/build-managers/boot { }; - bootchart = callPackage ../tools/system/bootchart { }; - bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; boxfs = callPackage ../tools/filesystems/boxfs { }; -- cgit 1.4.1 From 249a4896316a33f38691fb9be158b6c319a8fd14 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:41:24 -0500 Subject: libindicate: remove --- pkgs/development/libraries/libindicate/default.nix | 66 ---------------------- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/libraries/libindicate/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix deleted file mode 100644 index 2d7cad84f21..00000000000 --- a/pkgs/development/libraries/libindicate/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -# TODO: Resolve the issues with the Mono bindings. - -{ stdenv, fetchurl, lib, file -, pkgconfig, autoconf -, glib, dbus-glib, libdbusmenu -, gtkVersion ? "3", gtk2 ? null, gtk3 ? null -, python2Packages, gobject-introspection, vala, gnome-doc-utils -, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null - }: - -with lib; - -let - inherit (python2Packages) python pygobject2 pygtk; -in stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; - in "libindicate-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "1"; - - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicate-${version}.tar.gz"; - sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; - }; - - nativeBuildInputs = [ pkgconfig autoconf gobject-introspection vala gnome-doc-utils ]; - - buildInputs = [ - glib dbus-glib libdbusmenu - python pygobject2 pygtk - ] ++ (if gtkVersion == "2" - then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ gtk3 ]); - - postPatch = '' - substituteInPlace configure.ac \ - --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \ - --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python' - autoconf - for f in {configure,ltmain.sh,m4/libtool.m4}; do - substituteInPlace $f \ - --replace /usr/bin/file ${file}/bin/file - done - ''; - - configureFlags = [ - "CFLAGS=-Wno-error" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-gtk=${gtkVersion}" - ]; - - installFlags = [ - "sysconfdir=\${out}/etc" - "localstatedir=\${TMPDIR}" - ]; - - meta = { - description = "Library for raising indicators via DBus"; - homepage = https://launchpad.net/libindicate; - license = with licenses; [ lgpl21 lgpl3 ]; - platforms = platforms.linux; - maintainers = [ maintainers.msteen ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bccaa01eae8..720d9305586 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -198,6 +198,9 @@ mapAliases ({ libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 + libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 840771a5f7d..bb11f473090 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12443,10 +12443,6 @@ in libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; - libindicate-gtk2 = libindicate.override { gtkVersion = "2"; }; - libindicate-gtk3 = libindicate.override { gtkVersion = "3"; }; - libindicate = callPackage ../development/libraries/libindicate { }; - libindicator-gtk2 = libindicator.override { gtkVersion = "2"; }; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; -- cgit 1.4.1 From 419dacd3d48366ee60c448446d851fdce5d39924 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 10 Dec 2019 22:42:06 -0500 Subject: pmenu: remove Got the ok from romildo to remove this as jgmenu [0] is more complete, and has a module based off pmenu. [0]: https://github.com/johanmalm/jgmenu --- pkgs/applications/misc/pmenu/default.nix | 36 -------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/applications/misc/pmenu/default.nix (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix deleted file mode 100644 index bd3796a572b..00000000000 --- a/pkgs/applications/misc/pmenu/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }: - -stdenv.mkDerivation { - pname = "pmenu"; - version = "2018-01-01"; - - src = fetchFromGitLab { - owner = "o9000"; - repo = "pmenu"; - rev = "f98a5bdf20deb0b7f0543e5ce6a8f5574f695e07"; - sha256 = "131nqafbmbfpgsgss27pz4cyb9fb29m5h1ai1fyvcn286rr9dnp2"; - }; - - nativeBuildInputs = [ python2Packages.wrapPython ]; - - buildInputs = [ python2Packages.pygtk gnome-menus ]; - - pythonPath = [ python2Packages.pygtk ]; - - installPhase = '' - mkdir -p $out/bin $out/share/applications - ./install.sh $out - ''; - - postFixup = '' - wrapPythonPrograms - ''; - - meta = { - homepage = https://gitlab.com/o9000/pmenu; - description = "Start menu for Linux/BSD"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 720d9305586..b0d8b0dd0dd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -332,6 +332,7 @@ mapAliases ({ processing3 = processing; # added 2019-08-16 procps-ng = procps; # added 2018-06-08 pyo3-pack = maturin; + pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 phonon-backend-gstreamer = throw "Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb11f473090..cff5ed262b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20656,8 +20656,6 @@ in plugin-torture = callPackage ../applications/audio/plugin-torture { }; - pmenu = callPackage ../applications/misc/pmenu { }; - polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; -- cgit 1.4.1 From a8df1b12307b41a0bc1bbc1598be8bb882c3a41e Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 11 Dec 2019 10:55:40 +0100 Subject: mbedtls_1_3: clarify deprecation message --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/top-level/aliases.nix') diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8599df2d3f3..e8897be2dbb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -234,7 +234,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 - mbedtls_1_3 = throw "End of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 + mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 -- cgit 1.4.1