From 7f3f24555015b84ff915a461b8b59056b7cc7529 Mon Sep 17 00:00:00 2001 From: tdro Date: Thu, 13 Apr 2023 23:11:08 -0400 Subject: .config/nixpkgs: Cleanup debt Move deprecated applications to shell --- .../nixpkgs/packages/beaker-browser/default.nix | 17 ------ .config/nixpkgs/packages/dmenu/default.nix | 1 - .config/nixpkgs/packages/planner/default.nix | 48 --------------- .config/nixpkgs/packages/rofi/default.nix | 49 +++++++++++++++ .config/nixpkgs/packages/rxvt-unicode/default.nix | 1 - .config/nixpkgs/packages/scribus/default.nix | 71 ---------------------- .config/nixpkgs/packages/tilp2/default.nix | 39 ------------ .config/nixpkgs/packages/validatornu/default.nix | 32 ---------- .config/nixpkgs/packages/x11vnc/default.nix | 1 - .config/nixpkgs/packages/xprintidle/default.nix | 1 - .config/nixpkgs/packages/youtube-dl/default.nix | 1 - 11 files changed, 49 insertions(+), 212 deletions(-) delete mode 100644 .config/nixpkgs/packages/beaker-browser/default.nix delete mode 100644 .config/nixpkgs/packages/planner/default.nix create mode 100644 .config/nixpkgs/packages/rofi/default.nix delete mode 100644 .config/nixpkgs/packages/scribus/default.nix delete mode 100644 .config/nixpkgs/packages/tilp2/default.nix delete mode 100644 .config/nixpkgs/packages/validatornu/default.nix (limited to '.config/nixpkgs/packages') diff --git a/.config/nixpkgs/packages/beaker-browser/default.nix b/.config/nixpkgs/packages/beaker-browser/default.nix deleted file mode 100644 index 10a4d06..0000000 --- a/.config/nixpkgs/packages/beaker-browser/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -appimageTools.wrapType2 rec { - name = "beaker-browser"; - version = "1.1.0"; - - src = fetchurl { - url = "https://github.com/beakerbrowser/beaker/releases/download/${version}/Beaker.Browser-${version}.AppImage"; - sha256 = "07hcyr6vyim8vrvw120v5jjfvy5jkcaqc3wgqgyf6prbqdx71dkp"; - }; - - meta = with lib; { - license = licenses.mit; - homepage = "https://beakerbrowser.com"; - description = "An experimental peer-to-peer Web browser"; - }; -} diff --git a/.config/nixpkgs/packages/dmenu/default.nix b/.config/nixpkgs/packages/dmenu/default.nix index 496929f..f0f933c 100644 --- a/.config/nixpkgs/packages/dmenu/default.nix +++ b/.config/nixpkgs/packages/dmenu/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = lib.platforms.all; homepage = "https://tools.suckless.org/dmenu"; - maintainers = with lib.maintainers; [ pSub globin ]; description = "A generic, highly customizable, and efficient menu for the X Window System"; }; } diff --git a/.config/nixpkgs/packages/planner/default.nix b/.config/nixpkgs/packages/planner/default.nix deleted file mode 100644 index 9921372..0000000 --- a/.config/nixpkgs/packages/planner/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenvNoCC, fetchgit, pkgconfig, intltool, automake111x, autoconf -, libtool, gnome2, libxslt, python2, gcc48 }: - -stdenvNoCC.mkDerivation rec { - - pname = "planner"; - version = "de43d655f9f8103993129cde9de3d0e080d0546c"; - - src = fetchgit { - url = "https://gitlab.gnome.org/World/planner.git"; - sha256 = "1zpcswdpcjhllk7phy3z1zyxcgqr4pp0vf5fgpg5f3gqpk4xvwyg"; - rev = version; - }; - - nativeBuildInputs = with gnome2; [ - autoconf - automake111x - gnome-common - gtk-doc - intltool - libtool - pkgconfig - scrollkeeper - ]; - - buildInputs = with gnome2; [ - GConf - gcc48 - gtk - libglade - libgnomecanvas - libgnomeui - libxslt - python2.pkgs.pygtk - ]; - - enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - makeFlags = [ "CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; - configureFlags = [ "--enable-python" "--enable-python-plugin" ]; - - meta = with lib; { - description = "Project management application for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Planner"; - license = licenses.gpl2Plus; - platforms = platforms.all; - }; -} diff --git a/.config/nixpkgs/packages/rofi/default.nix b/.config/nixpkgs/packages/rofi/default.nix new file mode 100644 index 0000000..420d2d2 --- /dev/null +++ b/.config/nixpkgs/packages/rofi/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchgit, autoreconfHook, pkg-config, libxkbcommon, pango +, which, git, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, xcb-util-cursor +, libstartup_notification, bison, flex, librsvg, check }: + +stdenv.mkDerivation rec { + pname = "rofi-unwrapped"; + version = "1.7.0"; + + src = fetchgit { + rev = version; + fetchSubmodules = true; + url = "https://github.com/davatorium/rofi.git"; + sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; + }; + + preConfigure = '' + patchShebangs "script" + # root not present in build /etc/passwd + sed -i 's/~root/~nobody/g' test/helper-expand.c + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ + libxkbcommon + pango + cairo + git + bison + flex + librsvg + check + libstartup_notification + libxcb + xcbutil + xcbutilwm + xcbutilxrm + xcb-util-cursor + which + ]; + + doCheck = false; + + meta = with lib; { + license = licenses.mit; + platforms = with platforms; linux; + homepage = "https://github.com/davatorium/rofi"; + description = "Window switcher, run dialog and dmenu replacement"; + }; +} diff --git a/.config/nixpkgs/packages/rxvt-unicode/default.nix b/.config/nixpkgs/packages/rxvt-unicode/default.nix index 833a359..dd3540c 100644 --- a/.config/nixpkgs/packages/rxvt-unicode/default.nix +++ b/.config/nixpkgs/packages/rxvt-unicode/default.nix @@ -96,7 +96,6 @@ in stdenv.mkDerivation { inherit description; license = lib.licenses.gpl3; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ rnhmjoj ]; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; }; diff --git a/.config/nixpkgs/packages/scribus/default.nix b/.config/nixpkgs/packages/scribus/default.nix deleted file mode 100644 index 10be9e7..0000000 --- a/.config/nixpkgs/packages/scribus/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, gnome2, qt4, python2, cups, fontconfig, libjpeg, zlib, libpng, xorg -, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: - -let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages (ps: [ ps.tkinter ps.pillow ]); -in stdenv.mkDerivation rec { - pname = "scribus"; - version = "1.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; [ - boost - cairo - cups - fontconfig - freetype - gnome2.libart_lgpl - hunspell - imagemagick - lcms - libX11 - libXau - libXaw - libXdmcp - libXext - libXi - libXinerama - libXtst - libjpeg - libpng - libpthreadstubs - libtiff - libxml2 - podofo - pythonEnv - qt4 - zlib - ]; - - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; - }; -} diff --git a/.config/nixpkgs/packages/tilp2/default.nix b/.config/nixpkgs/packages/tilp2/default.nix deleted file mode 100644 index 743514c..0000000 --- a/.config/nixpkgs/packages/tilp2/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkg-config, intltool, glib -, gnome2, gtk2, gfm, libticables2, libticalcs2, libticonv, libtifiles2 }: - -stdenv.mkDerivation rec { - pname = "tilp2"; - version = "1.18"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; - sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; - - buildInputs = [ - glib - gtk2 - gnome2.libglade - gfm - libticables2 - libticalcs2 - libticonv - libtifiles2 - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Transfer data between Texas Instruments graphing calculators and a computer"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/.config/nixpkgs/packages/validatornu/default.nix b/.config/nixpkgs/packages/validatornu/default.nix deleted file mode 100644 index a013c08..0000000 --- a/.config/nixpkgs/packages/validatornu/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchzip, jdk, makeWrapper, ... }: - -stdenv.mkDerivation rec { - pname = "validatornu"; - version = "20.6.30"; - - src = fetchzip { - url = "https://github.com/validator/validator/releases/download/${version}/vnu.jar_${version}.zip"; - sha256 = "1jls0zpkczsqyzibgjxz11cjy8i62sdfi9cmmn3r7qcl1b4iw1p0"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir --parents $out/bin $out/share/{java,licenses,doc}/$pname - cp vnu.jar $out/share/java/$pname/vnu.jar - cp LICENSE $out/share/licenses/$pname/LICENSE - cp README.md $out/share/doc/$pname/README.md - cp index.html $out/share/doc/$pname/index.html - makeWrapper ${jdk}/bin/java $out/bin/${pname} \ - --add-flags "-jar $out/share/java/validatornu/vnu.jar" - runHook postInstall - ''; - - meta = with lib; { - license = licenses.mit; - platforms = platforms.linux; - homepage = "https://github.com/validator/validator#the-nu-html-checker-vnu--"; - description = "Nu Html Checker – Helps you catch problems in your HTML/CSS/SVG"; - }; -} diff --git a/.config/nixpkgs/packages/x11vnc/default.nix b/.config/nixpkgs/packages/x11vnc/default.nix index 0507e45..bc941ca 100644 --- a/.config/nixpkgs/packages/x11vnc/default.nix +++ b/.config/nixpkgs/packages/x11vnc/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ OPNA2608 ]; }; } diff --git a/.config/nixpkgs/packages/xprintidle/default.nix b/.config/nixpkgs/packages/xprintidle/default.nix index fc7c3e9..c4cd11f 100644 --- a/.config/nixpkgs/packages/xprintidle/default.nix +++ b/.config/nixpkgs/packages/xprintidle/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "A command-line tool to print idle time from libXss"; homepage = "https://github.com/g0hl1n/xprintidle"; license = licenses.gpl2; - maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; } diff --git a/.config/nixpkgs/packages/youtube-dl/default.nix b/.config/nixpkgs/packages/youtube-dl/default.nix index 5a0ab1d..31b4aab 100644 --- a/.config/nixpkgs/packages/youtube-dl/default.nix +++ b/.config/nixpkgs/packages/youtube-dl/default.nix @@ -28,7 +28,6 @@ buildPythonPackage rec { meta = with lib; { license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 ]; homepage = "https://github.com/yt-dlp/yt-dlp/"; changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; -- cgit v1.2.3