diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/misc')
93 files changed, 242 insertions, 180 deletions
diff --git a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix index f21438dfcec5..8108b9e4ddb4 100644 --- a/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/antfs-cli/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "antfs-cli"; version = "unstable-2017-02-11"; diff --git a/nixpkgs/pkgs/applications/misc/artha/default.nix b/nixpkgs/pkgs/applications/misc/artha/default.nix index 791e2d0f52e8..b03d2aa208b5 100644 --- a/nixpkgs/pkgs/applications/misc/artha/default.nix +++ b/nixpkgs/pkgs/applications/misc/artha/default.nix @@ -1,6 +1,6 @@ { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "artha"; version = "1.0.3"; diff --git a/nixpkgs/pkgs/applications/misc/autospotting/default.nix b/nixpkgs/pkgs/applications/misc/autospotting/default.nix index 444a8da7036d..b00686fb24f6 100644 --- a/nixpkgs/pkgs/applications/misc/autospotting/default.nix +++ b/nixpkgs/pkgs/applications/misc/autospotting/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "autospotting"; version = "unstable-2018-11-17"; goPackagePath = "github.com/AutoSpotting/AutoSpotting"; diff --git a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix index 4227b4155acf..165bee76b69b 100644 --- a/nixpkgs/pkgs/applications/misc/avrdudess/default.nix +++ b/nixpkgs/pkgs/applications/misc/avrdudess/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "avrdudess-2.2.20140102"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/nixpkgs/pkgs/applications/misc/bemenu/default.nix index 89c32668be9c..8945ffbb384f 100644 --- a/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null; assert waylandSupport -> wayland != null; assert x11Support -> xlibs != null && xorg != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bemenu"; version = "0.1.0"; diff --git a/nixpkgs/pkgs/applications/misc/calibre/default.nix b/nixpkgs/pkgs/applications/misc/calibre/default.nix index b4c8bbb3f311..dd85156b3ef0 100644 --- a/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "calibre"; - version = "3.47.0"; + version = "3.47.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "0mjj47w9pa7ihycialijrfq2qk107dcxwcwriz3b2mg4lixlawy4"; + sha256 = "17lz6rawlv268vv8i5kj59rswsipq3c14066adaz1paw54zr62dk"; }; patches = [ @@ -105,7 +105,7 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; calibreDesktopItem = makeDesktopItem { - name = "calibre"; + name = "calibre-gui"; desktopName = "calibre"; exec = "@out@/bin/calibre --detach %F"; genericName = "E-book library management"; @@ -151,7 +151,7 @@ mkDerivation rec { }; ebookEditDesktopItem = makeDesktopItem { - name = "calibre-edit-ebook"; + name = "calibre-edit-book"; desktopName = "Edit E-book"; genericName = "E-book Editor"; comment = "Edit e-books"; diff --git a/nixpkgs/pkgs/applications/misc/cataract/build.nix b/nixpkgs/pkgs/applications/misc/cataract/build.nix index dae6e404a9dd..5f4e24f4d3cc 100644 --- a/nixpkgs/pkgs/applications/misc/cataract/build.nix +++ b/nixpkgs/pkgs/applications/misc/cataract/build.nix @@ -10,7 +10,7 @@ , sha256 , rev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit version; pname = "cataract"; diff --git a/nixpkgs/pkgs/applications/misc/catclock/default.nix b/nixpkgs/pkgs/applications/misc/catclock/default.nix index 75f5ab406fe0..09c36f9eb2f1 100644 --- a/nixpkgs/pkgs/applications/misc/catclock/default.nix +++ b/nixpkgs/pkgs/applications/misc/catclock/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, xlibsWrapper, motif }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "catclock-2015-10-04"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/cgminer/default.nix b/nixpkgs/pkgs/applications/misc/cgminer/default.nix index 04f32a67b84c..c05c7423d9a5 100644 --- a/nixpkgs/pkgs/applications/misc/cgminer/default.nix +++ b/nixpkgs/pkgs/applications/misc/cgminer/default.nix @@ -1,7 +1,7 @@ { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake , curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "3.7.2"; pname = "cgminer"; diff --git a/nixpkgs/pkgs/applications/misc/clipit/default.nix b/nixpkgs/pkgs/applications/misc/clipit/default.nix index 693ce84c97ac..7a4e25560c7b 100644 --- a/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 xdotool hicolor-icon-theme ]; meta = with stdenv.lib; { - description = "Lightweight GTK+ Clipboard Manager"; + description = "Lightweight GTK Clipboard Manager"; homepage = "http://clipit.rspwn.com"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 589111df78b8..4d32328af8b2 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "libarcus"; version = "3.6.18"; format = "other"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index 7a1781f62ce7..f8ffbf041bda 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsavitar-lulzbot"; name = "libsavitar-lulzbot"; version = "3.6.18"; diff --git a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix index 43869a0edc62..1ad755cdfbdd 100644 --- a/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/nixpkgs/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { version = "3.6.18"; pname = "uranium"; name = "uraniumLulzbot"; diff --git a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index d8cf86461acf..2e8217012160 100644 --- a/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.1.4"; + version = "6.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1l4skcannbzddhm773dm3hwv3a7b3xy569gydcfczgdlgzgmlfjq"; + sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m"; }; installPhase = '' @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.samueldr ]; + maintainers = [ maintainers.jojosch ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix index 5df7c0b06727..1bfb6bbfeaf3 100644 --- a/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/dfilemanager/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: let version = "git-2016-01-10"; in -stdenv.mkDerivation { +mkDerivation { pname = "dfilemanager"; inherit version; src = fetchgit { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ cmake qtbase qttools file solid ]; - cmakeFlags = "-DQT5BUILD=true"; + cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { homepage = http://dfilemanager.sourceforge.net/; diff --git a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix index 283b66318ea5..0016f89746d6 100644 --- a/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix +++ b/nixpkgs/pkgs/applications/misc/diff-pdf/default.nix @@ -7,7 +7,7 @@ let else [ wxGTK ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "diff-pdf"; version = "2017-12-30"; diff --git a/nixpkgs/pkgs/applications/misc/doing/default.nix b/nixpkgs/pkgs/applications/misc/doing/default.nix index 20c802a1cbdf..d72a5b848261 100644 --- a/nixpkgs/pkgs/applications/misc/doing/default.nix +++ b/nixpkgs/pkgs/applications/misc/doing/default.nix @@ -1,7 +1,7 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "doing"; version = (import ./gemset.nix).doing.version; diff --git a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix index 8cfadd77ece9..1332b265d54c 100644 --- a/nixpkgs/pkgs/applications/misc/doomseeker/default.nix +++ b/nixpkgs/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "doomseeker"; version = "2018-03-05"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/dash.nix b/nixpkgs/pkgs/applications/misc/electrum/dash.nix index 98ed10b0c7cc..8ba562de1cb7 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/dash.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/dash.nix @@ -2,7 +2,7 @@ python2Packages.buildPythonApplication rec { version = "2.9.3.1"; - name = "electrum-dash-${version}"; + pname = "electrum-dash"; src = fetchurl { url = "https://github.com/akhavr/electrum-dash/releases/download/${version}/Electrum-DASH-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 8940c8dfd221..c48d458567dc 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -40,7 +40,7 @@ let }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "electrum"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/epdfview/default.nix b/nixpkgs/pkgs/applications/misc/epdfview/default.nix index 1a87b7f5c8be..de922bb39900 100644 --- a/nixpkgs/pkgs/applications/misc/epdfview/default.nix +++ b/nixpkgs/pkgs/applications/misc/epdfview/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://packages.debian.org/wheezy/epdfview; - description = "A lightweight PDF document viewer using Poppler and GTK+"; + description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' - ePDFView is a free lightweight PDF document viewer using Poppler and - GTK+ libraries. The aim of ePDFView is to make a simple PDF document - viewer, in the lines of Evince but without using the Gnome libraries. + ePDFView is a free lightweight PDF document viewer using Poppler and + GTK libraries. The aim of ePDFView is to make a simple PDF document + viewer, in the lines of Evince but without using the Gnome libraries. ''; license = licenses.gpl2; maintainers = [ maintainers.astsmtl ]; diff --git a/nixpkgs/pkgs/applications/misc/evilvte/default.nix b/nixpkgs/pkgs/applications/misc/evilvte/default.nix index d1161aa68226..984ade077a8a 100644 --- a/nixpkgs/pkgs/applications/misc/evilvte/default.nix +++ b/nixpkgs/pkgs/applications/misc/evilvte/default.nix @@ -3,7 +3,7 @@ configH ? "" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "evilvte"; version = "0.5.2-20140827"; diff --git a/nixpkgs/pkgs/applications/misc/evtest/default.nix b/nixpkgs/pkgs/applications/misc/evtest/default.nix index 3d715a1d16bd..d6d20367b060 100644 --- a/nixpkgs/pkgs/applications/misc/evtest/default.nix +++ b/nixpkgs/pkgs/applications/misc/evtest/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: stdenv.mkDerivation rec { - name = "evtest-1.33"; + pname = "evtest"; + version = "1.34"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxml2 ]; src = fetchgit { - url = "git://anongit.freedesktop.org/evtest"; - rev = "refs/tags/evtest-1.33"; + url = "git://anongit.freedesktop.org/${pname}"; + rev = "refs/tags/${pname}-${version}"; sha256 = "168gdhzj11f4nk94a6z696sm8v1njzwww69bn6wr97l17897913g"; }; diff --git a/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/nixpkgs/pkgs/applications/misc/font-manager/default.nix index f0da4e883517..5df34c84f096 100644 --- a/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fontmanager.github.io/; - description = "Simple font management for GTK+ desktop environments"; + description = "Simple font management for GTK desktop environments"; longDescription = '' Font Manager is intended to provide a way for average users to easily manage desktop fonts, without having to resort to command line tools or editing configuration files by hand. While designed primarily with the Gnome Desktop Environment in mind, it should - work well with other Gtk+ desktop environments. + work well with other GTK desktop environments. Font Manager is NOT a professional-grade font management solution. ''; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 6b57c74c1234..169c5c11b8ce 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.10.2"; + version = "1.10.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "09q9l747vv6nrkscj08dv970qs6nm2azjcm015xf3bd5ab91l44r"; + sha256 = "1ippn0zbjy69n178vh4wgyzy6723ynvj2w23mzqw7v2mzcvkhmdz"; }; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/girara/default.nix b/nixpkgs/pkgs/applications/misc/girara/default.nix index 4d990c69b4a3..c2b7487cd72f 100644 --- a/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://pwmt.org/projects/girara/; description = "User interface library"; longDescription = '' - girara is a library that implements a GTK+ based VIM-like user interface + girara is a library that implements a GTK based VIM-like user interface that focuses on simplicity and minimalism. ''; license = licenses.zlib; diff --git a/nixpkgs/pkgs/applications/misc/gksu/default.nix b/nixpkgs/pkgs/applications/misc/gksu/default.nix index b5d008579ac7..4a806cbb183d 100644 --- a/nixpkgs/pkgs/applications/misc/gksu/default.nix +++ b/nixpkgs/pkgs/applications/misc/gksu/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A graphical frontend for libgksu"; longDescription = '' - GKSu is a library that provides a Gtk+ frontend to su and sudo. + GKSu is a library that provides a GTK frontend to su and sudo. It supports login shells and preserving environment when acting as a su frontend. It is useful to menu items or other graphical programs that need to ask a user's password to run another program diff --git a/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/nixpkgs/pkgs/applications/misc/gmrun/default.nix index 8a54cefaab04..50dda9510b91 100644 --- a/nixpkgs/pkgs/applications/misc/gmrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/gmrun/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. - It uses GTK+ interface. + It uses GTK interface. Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; diff --git a/nixpkgs/pkgs/applications/misc/gnome15/default.nix b/nixpkgs/pkgs/applications/misc/gnome15/default.nix index e2cf8245ce67..7a918d961f63 100644 --- a/nixpkgs/pkgs/applications/misc/gnome15/default.nix +++ b/nixpkgs/pkgs/applications/misc/gnome15/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnome15-2016-06-10"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/nixpkgs/pkgs/applications/misc/goldendict/default.nix index 6a5f4c9ce034..e917cc024d5b 100644 --- a/nixpkgs/pkgs/applications/misc/goldendict/default.nix +++ b/nixpkgs/pkgs/applications/misc/goldendict/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell , libao, ffmpeg, libeb, lzo, xz, libtiff, opencc , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: -mkDerivation rec { +mkDerivation { name = "goldendict-2019-08-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 5bcaccb43bcf..d10507b10449 100644 --- a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "prefix=${placeholder ''out''}" + "prefix=${placeholder "out"}" "GTK=3" "CC=cc" "CXX=c++" diff --git a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix index 308f084bd586..d86db7adb9d0 100644 --- a/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/nixpkgs/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "green-pdfviewer"; version = "nightly-2014-04-22"; diff --git a/nixpkgs/pkgs/applications/misc/grip/default.nix b/nixpkgs/pkgs/applications/misc/grip/default.nix index cb407fca66cb..7f2057b2947a 100644 --- a/nixpkgs/pkgs/applications/misc/grip/default.nix +++ b/nixpkgs/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - description = "GTK+-based audio CD player/ripper"; + description = "GTK-based audio CD player/ripper"; homepage = http://nostatic.org/grip; license = stdenv.lib.licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix index 204624f24390..9b8d6a7f976b 100644 --- a/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { preferLocalBuild = true; meta = with stdenv.lib; { - description = "A font selection program for X11 using the GTK2 toolkit"; + description = "A font selection program for X11 using the GTK 2 toolkit"; longDescription = '' - Font selection tool similar to xfontsel implemented using GTK+ 2. + Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; homepage = http://gtk2fontsel.sourceforge.net/; diff --git a/nixpkgs/pkgs/applications/misc/guake/default.nix b/nixpkgs/pkgs/applications/misc/guake/default.nix index 37352915cb84..97303c43fb1a 100644 --- a/nixpkgs/pkgs/applications/misc/guake/default.nix +++ b/nixpkgs/pkgs/applications/misc/guake/default.nix @@ -3,7 +3,7 @@ let version = "3.6.3"; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { name = "guake-${version}"; format = "other"; diff --git a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix index a2d2e8ad735c..a5a9187ab0f2 100644 --- a/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix +++ b/nixpkgs/pkgs/applications/misc/hello-unfree/default.nix @@ -1,6 +1,6 @@ { stdenv, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "example-unfree-package"; version = "1.0"; diff --git a/nixpkgs/pkgs/applications/misc/houdini/default.nix b/nixpkgs/pkgs/applications/misc/houdini/default.nix index 607dff293189..ce35e91d9278 100644 --- a/nixpkgs/pkgs/applications/misc/houdini/default.nix +++ b/nixpkgs/pkgs/applications/misc/houdini/default.nix @@ -2,7 +2,7 @@ let houdini-runtime = callPackage ./runtime.nix { }; -in buildFHSUserEnv rec { +in buildFHSUserEnv { name = "houdini-${houdini-runtime.version}"; extraBuildCommands = '' diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 034b9c79201a..720445be9bea 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.57.2"; + version = "0.58.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1cqvm2fj6hh2n9iv67vamhn23fbxmmwciks0r4h4y0hapzlzpyd8"; + sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d"; }; - modSha256 = "09r7r1s5b2fvnzpzjarpv2lnvp6bxdfschiq6352hw631n7kkyz1"; + modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790"; buildFlags = "-tags extended"; diff --git a/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/nixpkgs/pkgs/applications/misc/jekyll/default.nix index 9ae9ab254e80..4d4dd248bc53 100644 --- a/nixpkgs/pkgs/applications/misc/jekyll/default.nix +++ b/nixpkgs/pkgs/applications/misc/jekyll/default.nix @@ -21,7 +21,7 @@ let # Else: Don't modify the arguments: exec ${ruby}/bin/ruby "$@" ''; -in bundlerApp rec { +in bundlerApp { pname = "jekyll"; exes = [ "jekyll" ]; diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 56b28dbc8db9..4b70530987f1 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15238"; + version = "15322"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0zh84glb4545av0s1qnccqqp8nrnfsr7rnwgbqpwwzvc2ngk91gv"; + sha256 = "1i6cxs6rvqjwh7yfji5701xdzpnaxcv97gsd692fjrwasnsx1f1i"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/nixpkgs/pkgs/applications/misc/kiwix/default.nix index 89778f670ff3..898186b714b6 100644 --- a/nixpkgs/pkgs/applications/misc/kiwix/default.nix +++ b/nixpkgs/pkgs/applications/misc/kiwix/default.nix @@ -82,7 +82,6 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--disable-static" "--disable-staticbins" ]; diff --git a/nixpkgs/pkgs/applications/misc/kjv/default.nix b/nixpkgs/pkgs/applications/misc/kjv/default.nix index 79f0b8dc6df2..7868e74d010c 100644 --- a/nixpkgs/pkgs/applications/misc/kjv/default.nix +++ b/nixpkgs/pkgs/applications/misc/kjv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patches = [ add-apocrypha add-install-target ]; makeFlags = [ - "PREFIX=${placeholder ''out''}" + "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix index 38078d11931b..e9dba4bcf469 100644 --- a/nixpkgs/pkgs/applications/misc/lilyterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/lilyterm/default.nix @@ -29,7 +29,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lilyterm"; inherit (stuff) src version; diff --git a/nixpkgs/pkgs/applications/misc/loxodo/default.nix b/nixpkgs/pkgs/applications/misc/loxodo/default.nix index 291e225d6c4f..f84ac6d600a6 100644 --- a/nixpkgs/pkgs/applications/misc/loxodo/default.nix +++ b/nixpkgs/pkgs/applications/misc/loxodo/default.nix @@ -3,7 +3,7 @@ let py = python27Packages; python = py.python; in -py.buildPythonApplication rec { +py.buildPythonApplication { name = "loxodo-0.20150124"; src = fetchgit { diff --git a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix index 42905fa3cb41..61151cb15506 100644 --- a/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix +++ b/nixpkgs/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,6 +1,6 @@ { stdenv, libusb1, pkgconfig, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ltwheelconf"; version = "0.2.7"; diff --git a/nixpkgs/pkgs/applications/misc/lutris/default.nix b/nixpkgs/pkgs/applications/misc/lutris/default.nix index 5435080e8318..c9ea146f063b 100644 --- a/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -31,13 +31,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.2.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "023yqnzmnkfpq21r6ky6jzwbjxjcw1a5zqrrdl6fwwlr78fdhgpv"; + sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix index 8ce353e85b91..0802a32d92b1 100644 --- a/nixpkgs/pkgs/applications/misc/lxterminal/default.nix +++ b/nixpkgs/pkgs/applications/misc/lxterminal/default.nix @@ -4,7 +4,7 @@ let version = "0.3.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lxterminal"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix index 318c7c252427..a81aec9d0364 100644 --- a/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix +++ b/nixpkgs/pkgs/applications/misc/metamorphose2/default.nix @@ -2,7 +2,7 @@ , python27, python2Packages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamorphose2"; version = "0.9.0beta"; diff --git a/nixpkgs/pkgs/applications/misc/michabo/default.nix b/nixpkgs/pkgs/applications/misc/michabo/default.nix new file mode 100644 index 000000000000..015a326fdc9b --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/michabo/default.nix @@ -0,0 +1,53 @@ +{ lib +, mkDerivation +, makeDesktopItem +, fetchFromGitLab +, qmake +# qt +, qtbase +, qtwebsockets +}: + +let + desktopItem = makeDesktopItem { + type = "Application"; + name = "Michabo"; + desktopName = "Michabo"; + exec = "Michabo"; + }; + +in mkDerivation rec { + pname = "michabo"; + version = "0.1"; + + src = fetchFromGitLab { + domain = "git.pleroma.social"; + owner = "kaniini"; + repo = "michabo"; + rev = "v${version}"; + sha256 = "0pl4ymdb36r0kwlclfjjp6b1qml3fm9ql7ag5inprny5y8vcjpzn"; + }; + + nativeBuildInputs = [ + qmake + ]; + buildInputs = [ + qtbase + qtwebsockets + ]; + + qmakeFlags = [ "michabo.pro" "DESTDIR=${placeholder "out"}/bin" ]; + + postInstall = '' + ln -s ${desktopItem}/share $out/share + ''; + + meta = with lib; { + description = "A native desktop app for Pleroma and Mastodon servers"; + homepage = "https://git.pleroma.social/kaniini/michabo"; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/applications/misc/milu/default.nix b/nixpkgs/pkgs/applications/misc/milu/default.nix index 6c1dcd5e1505..2eee9ad40c16 100644 --- a/nixpkgs/pkgs/applications/misc/milu/default.nix +++ b/nixpkgs/pkgs/applications/misc/milu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "milu-nightly"; version = "2016-05-09"; diff --git a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix index 95ceaddb4f03..eff93c8e99c1 100644 --- a/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate-cli/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.2"; pname = "minergate-cli"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/minergate/default.nix b/nixpkgs/pkgs/applications/misc/minergate/default.nix index fdd1238d8700..a8402d975931 100644 --- a/nixpkgs/pkgs/applications/misc/minergate/default.nix +++ b/nixpkgs/pkgs/applications/misc/minergate/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.1"; pname = "minergate"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/mlterm/default.nix b/nixpkgs/pkgs/applications/misc/mlterm/default.nix index d3e7f9e8cd46..303b9fe5e8bc 100644 --- a/nixpkgs/pkgs/applications/misc/mlterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/mlterm/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { install -D -t $out/share/applications $desktopItem/share/applications/* ''; - desktopItem = makeDesktopItem rec { + desktopItem = makeDesktopItem { name = "mlterm"; exec = "mlterm %U"; icon = "mlterm"; diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index 0f4e72502bba..e734e44a2e04 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "moolticute-${version}"; + pname = "moolticute"; version = "0.30.8"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/mpvc/default.nix b/nixpkgs/pkgs/applications/misc/mpvc/default.nix index fffa95952622..35de284c0baa 100644 --- a/nixpkgs/pkgs/applications/misc/mpvc/default.nix +++ b/nixpkgs/pkgs/applications/misc/mpvc/default.nix @@ -1,6 +1,6 @@ { stdenv, socat, fetchFromGitHub, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mpvc-unstable-2017-03-18"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/omegat.nix b/nixpkgs/pkgs/applications/misc/omegat.nix index 411b318a3925..27d7ad8730b6 100644 --- a/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/nixpkgs/pkgs/applications/misc/omegat.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "4.3.0"; pname = "omegat"; diff --git a/nixpkgs/pkgs/applications/misc/orca/default.nix b/nixpkgs/pkgs/applications/misc/orca/default.nix index 332c696d8da2..1a8d5b76fe3d 100644 --- a/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { access to the graphical desktop via speech and refreshable braille. It works with applications and toolkits that support the Assistive Technology Service Provider Interface (AT-SPI). That includes the GNOME - Gtk+ toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and + GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. diff --git a/nixpkgs/pkgs/applications/misc/osmctools/default.nix b/nixpkgs/pkgs/applications/misc/osmctools/default.nix index 4cbd7cb71190..2dfbb7a23705 100644 --- a/nixpkgs/pkgs/applications/misc/osmctools/default.nix +++ b/nixpkgs/pkgs/applications/misc/osmctools/default.nix @@ -16,7 +16,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osmctools"; version = "0.8.5plus1.4.0"; diff --git a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix index 633c1d82159a..c6cd118aea80 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanfm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.gpl2Plus; - description = "File manager with GTK+ interface"; + description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix index 482ac7ad0667..17253173a5e4 100644 --- a/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/nixpkgs/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://pcman.ptt.cc; license = licenses.gpl2; - description = "Telnet BBS browser with GTK+ interface"; + description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix index bc6f5965e89b..9756d9b42b0a 100644 --- a/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix +++ b/nixpkgs/pkgs/applications/misc/pdf-quench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pdf-quench"; version = "1.0.5"; diff --git a/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 8804e438b7e8..ae81ef3c9f6c 100644 --- a/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -1,18 +1,37 @@ -{ buildGo110Package, fetchzip, lib }: +{ buildGoPackage, fetchurl, fetchFromGitHub, lib }: -buildGo110Package rec { +let + gouiJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; + sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + }; + + publisherJS = fetchurl { + url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; + sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + }; + +in buildGoPackage rec { name = "perkeep-${version}"; - version = "0.10.1"; + version = "unstable-2019-07-29"; - src = fetchzip { - url = "https://perkeep.org/dl/perkeep-${version}-src.zip"; - sha256 = "0rqibc6w4m1r50i2pjcgz1k9dxh18v7jwj4s29y470bc526wv422"; + src = fetchFromGitHub { + owner = "perkeep"; + repo = "perkeep"; + rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; + sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; }; goPackagePath = "perkeep.org"; buildPhase = '' cd "$NIX_BUILD_TOP/go/src/$goPackagePath" + + # Skip network fetches + sed -i '/fetchAllJS/a if true { return nil }' make.go + cp ${publisherJS} app/publisher/publisher.js + cp ${gouiJS} server/perkeepd/ui/goui.js + go run make.go ''; diff --git a/nixpkgs/pkgs/applications/misc/phwmon/default.nix b/nixpkgs/pkgs/applications/misc/phwmon/default.nix index e8ddec91e62a..6fb70f1c9a26 100644 --- a/nixpkgs/pkgs/applications/misc/phwmon/default.nix +++ b/nixpkgs/pkgs/applications/misc/phwmon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "phwmon"; version = "2017-04-10"; diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index 10c8a03fa0a2..dfc92e38f63c 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; # Make plank's application launcher hidden in Pantheon diff --git a/nixpkgs/pkgs/applications/misc/pmenu/default.nix b/nixpkgs/pkgs/applications/misc/pmenu/default.nix index 16c49d5f946c..bd3796a572b0 100644 --- a/nixpkgs/pkgs/applications/misc/pmenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/pmenu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, python2Packages, gnome-menus }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pmenu"; version = "2018-01-01"; diff --git a/nixpkgs/pkgs/applications/misc/posterazor/default.nix b/nixpkgs/pkgs/applications/misc/posterazor/default.nix index 45db856dbb9e..7209ee3e4009 100644 --- a/nixpkgs/pkgs/applications/misc/posterazor/default.nix +++ b/nixpkgs/pkgs/applications/misc/posterazor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "posterazor-1.5.1"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/qolibri/default.nix b/nixpkgs/pkgs/applications/misc/qolibri/default.nix index ecc372dc674c..ab15855b910b 100644 --- a/nixpkgs/pkgs/applications/misc/qolibri/default.nix +++ b/nixpkgs/pkgs/applications/misc/qolibri/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase , qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qolibri"; version = "2018-11-14"; diff --git a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix index 47b4641234f3..702cadfdaa91 100644 --- a/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix +++ b/nixpkgs/pkgs/applications/misc/qt-box-editor/default.nix @@ -7,7 +7,7 @@ , tesseract }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-12"; diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index 94381d4f6f96..eabf77f0e951 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, makeWrapper , autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check @@ -19,11 +19,16 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; + postInstall = '' + wrapProgram $out/bin/rofi-theme-selector \ + --prefix XDG_DATA_DIRS : $out/share + ''; + doCheck = false; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/roxterm/default.nix b/nixpkgs/pkgs/applications/misc/roxterm/default.nix index 1cff3635bf9d..3dbe7790d185 100644 --- a/nixpkgs/pkgs/applications/misc/roxterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/roxterm/default.nix @@ -1,55 +1,40 @@ -{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat -, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme -, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper -, pkgconfig, python, pythonPackages, vte -, wrapGAppsHook}: +{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub +, glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs +, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre +, pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto +}: -# TODO: Still getting following warning. -# WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files -# Seems related to this: -# https://forums.gentoo.org/viewtopic-t-947210-start-0.html - -let version = "3.3.2"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "roxterm"; - inherit version; + version = "3.7.5"; - src = fetchurl { - url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz"; - sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; + src = fetchFromGitHub { + owner = "realh"; + repo = "roxterm"; + rev = version; + sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = - [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus dbus-glib - gdk-pixbuf gsettings-desktop-schemas gtk3 - hicolor-icon-theme vte ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" - "-I${dbus.dev}/include/dbus-1.0" - "-I${dbus.lib}/lib/dbus-1.0/include" ]; - - # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [ - pythonPackages.lockfile + patches = [ + # This is the commit directly after v3.7.5. It is needed to get roxterm to + # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been + # released. + (fetchpatch { + url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; + sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; + }) ]; - buildPhase = '' - # Fix up the LD_LIBRARY_PATH so that expat is on it - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" - - python mscript.py configure --prefix="$out" --disable-nls --disable-translations - python mscript.py build - ''; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; - installPhase = '' - python mscript.py install - ''; + buildInputs = + [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp + utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux + libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit + ]; meta = with stdenv.lib; { - homepage = http://roxterm.sourceforge.net/; + homepage = "https://github.com/realh/roxterm"; license = licenses.gpl3; description = "Tabbed, VTE-based terminal emulator"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix index 17cea90ac27c..b6676a0bf70e 100644 --- a/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/nixpkgs/pkgs/applications/misc/rxvt_unicode/default.nix @@ -18,7 +18,7 @@ let }; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; diff --git a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix index 114404c2597d..e81c0b99264e 100644 --- a/nixpkgs/pkgs/applications/misc/sequelpro/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequelpro/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, undmg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sequel-pro"; version = "1.1.2"; diff --git a/nixpkgs/pkgs/applications/misc/solaar/default.nix b/nixpkgs/pkgs/applications/misc/solaar/default.nix index cb2cd3f1e62f..f2e1aa6bdb68 100644 --- a/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "solaar-unstable"; version = "2019-01-30"; diff --git a/nixpkgs/pkgs/applications/misc/ssocr/default.nix b/nixpkgs/pkgs/applications/misc/ssocr/default.nix index eb408eaf6ee3..bb1655b44632 100644 --- a/nixpkgs/pkgs/applications/misc/ssocr/default.nix +++ b/nixpkgs/pkgs/applications/misc/ssocr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, imlib2, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ssocr"; version = "unstable-2018-08-11"; diff --git a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix index 1fc96e551ac7..ecaf9d5a34a2 100644 --- a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stupidterm"; version = "2019-03-26"; @@ -27,10 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Simple wrapper around the VTE terminal emulator widget for GTK+"; - longDescription = '' - Simple wrapper around the VTE terminal emulator widget for GTK+ - ''; + description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = https://github.com/esmil/stupidterm; license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index a29dad2c4447..960b7b9eeef5 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -6,7 +6,7 @@ let version = "4.8.2"; - libdc = stdenv.mkDerivation rec { + libdc = stdenv.mkDerivation { pname = "libdivecomputer-ssrf"; inherit version; @@ -66,7 +66,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "subsurface"; inherit version; diff --git a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index ee42c1389fcd..9dcdf8fd2b0e 100644 --- a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -71,7 +71,7 @@ let d2u = stdenv.lib.replaceChars ["."] ["_"]; -in rec { +in { application = mkSweetHome3D rec { version = "6.2"; diff --git a/nixpkgs/pkgs/applications/misc/taskell/default.nix b/nixpkgs/pkgs/applications/misc/taskell/default.nix index 00b96f459cb7..702c3124d8ab 100644 --- a/nixpkgs/pkgs/applications/misc/taskell/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskell/default.nix @@ -1,8 +1,8 @@ { lib, haskellPackages, fetchFromGitHub }: let - version = "1.6.0"; - sha256 = "1yq7lbqg759i3hyxcskx3924b7xmw6i4ny6n8yq80k4hikw2k6mf"; + version = "1.6.1"; + sha256 = "047gvpq52pif9sfb4qcfdiwz50x3wlnjvsnnjzypm1qlwyl2rbz1"; in (haskellPackages.mkDerivation { pname = "taskell"; diff --git a/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix index e65ab3451a62..deeeac106943 100644 --- a/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix +++ b/nixpkgs/pkgs/applications/misc/taskjuggler/3.x/gemset.nix @@ -1,5 +1,5 @@ { - "mail" = { + mail = { version = "2.6.3"; source = { type = "gem"; @@ -9,14 +9,14 @@ "mime-types" ]; }; - "mime-types" = { + mime-types = { version = "2.6.1"; source = { type = "gem"; sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; }; - "taskjuggler" = { + taskjuggler = { version = "3.5.0"; source = { type = "gem"; @@ -27,7 +27,7 @@ "term-ansicolor" ]; }; - "term-ansicolor" = { + term-ansicolor = { version = "1.3.2"; source = { type = "gem"; @@ -37,7 +37,7 @@ "tins" ]; }; - "tins" = { + tins = { version = "1.6.0"; source = { type = "gem"; diff --git a/nixpkgs/pkgs/applications/misc/taskopen/default.nix b/nixpkgs/pkgs/applications/misc/taskopen/default.nix index 9f1773b191d2..847092356d28 100644 --- a/nixpkgs/pkgs/applications/misc/taskopen/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskopen/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, which, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taskopen-1.1.4"; src = fetchurl { url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz"; diff --git a/nixpkgs/pkgs/applications/misc/tdrop/default.nix b/nixpkgs/pkgs/applications/misc/tdrop/default.nix index 15ee275c0e19..547eea4f2d23 100644 --- a/nixpkgs/pkgs/applications/misc/tdrop/default.nix +++ b/nixpkgs/pkgs/applications/misc/tdrop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper , xwininfo, xdotool, xprop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tdrop"; version = "unstable-2018-11-13"; diff --git a/nixpkgs/pkgs/applications/misc/tilix/default.nix b/nixpkgs/pkgs/applications/misc/tilix/default.nix index 095681d136d8..aae17905cb71 100644 --- a/nixpkgs/pkgs/applications/misc/tilix/default.nix +++ b/nixpkgs/pkgs/applications/misc/tilix/default.nix @@ -19,7 +19,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tilix"; version = "unstable-2019-08-03"; diff --git a/nixpkgs/pkgs/applications/misc/todiff/default.nix b/nixpkgs/pkgs/applications/misc/todiff/default.nix index 5bb2b5b94616..93f233a4f925 100644 --- a/nixpkgs/pkgs/applications/misc/todiff/default.nix +++ b/nixpkgs/pkgs/applications/misc/todiff/default.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "todiff-${version}"; + pname = "todiff"; version = "0.6.1"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/tootle/default.nix b/nixpkgs/pkgs/applications/misc/tootle/default.nix index 413f082fb22a..4ccf204357ca 100644 --- a/nixpkgs/pkgs/applications/misc/tootle/default.nix +++ b/nixpkgs/pkgs/applications/misc/tootle/default.nix @@ -7,7 +7,7 @@ let pname = "tootle"; version = "0.2.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/twmn/default.nix b/nixpkgs/pkgs/applications/misc/twmn/default.nix index 04c6cc3606e3..2aef45748cac 100644 --- a/nixpkgs/pkgs/applications/misc/twmn/default.nix +++ b/nixpkgs/pkgs/applications/misc/twmn/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "twmn-git-2018-10-01"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/nixpkgs/pkgs/applications/misc/volnoti/default.nix index e482e7e7c02d..3561135ce618 100644 --- a/nixpkgs/pkgs/applications/misc/volnoti/default.nix +++ b/nixpkgs/pkgs/applications/misc/volnoti/default.nix @@ -2,7 +2,7 @@ , pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "volnoti-unstable"; version = "2013-09-23"; diff --git a/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix index 6ed2ff10aaa7..e381af4f403e 100644 --- a/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix +++ b/nixpkgs/pkgs/applications/misc/web-media-controller/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ glib pcre json-glib ]; cmakeFlags = [ - "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder ''out''}/etc/chromium/native-messaging-hosts" - "-DCHROME_MANIFEST_DESTINATION=${placeholder ''out''}/etc/opt/chrome/native-messaging-hosts" - "-DFIREFOX_MANIFEST_DESTINATION=${placeholder ''out''}/lib/mozilla/native-messaging-hosts" + "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts" + "-DCHROME_MANIFEST_DESTINATION=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" + "-DFIREFOX_MANIFEST_DESTINATION=${placeholder "out"}/lib/mozilla/native-messaging-hosts" ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix index 52462d1c1f34..60ff84ffe593 100644 --- a/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -1,30 +1,33 @@ { buildGoModule , fetchFromGitHub , lib +, makeWrapper +, ncurses }: buildGoModule rec { pname = "wtf"; - version = "0.20.0"; + version = "0.21.0"; + + overrideModAttrs = _oldAttrs : _oldAttrs // { + preBuild = ''export GOPROXY="https://gocenter.io"''; + }; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd"; + sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; }; - modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2"; + modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - # As per https://github.com/wtfutil/wtf/issues/501, one of the - # dependencies can't be fetched, so vendored dependencies should - # be used instead - modBuildPhase = '' - runHook preBuild - make build -mod=vendor - runHook postBuild + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix index 9040bb4318d5..295d721d3c5f 100644 --- a/nixpkgs/pkgs/applications/misc/xautoclick/default.nix +++ b/nixpkgs/pkgs/applications/misc/xautoclick/default.nix @@ -3,7 +3,7 @@ , qtSupport ? true, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.31"; pname = "xautoclick"; src = fetchurl { diff --git a/nixpkgs/pkgs/applications/misc/xneur/default.nix b/nixpkgs/pkgs/applications/misc/xneur/default.nix index 0661a625e97f..f3bbbf42d5bc 100644 --- a/nixpkgs/pkgs/applications/misc/xneur/default.nix +++ b/nixpkgs/pkgs/applications/misc/xneur/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xneur"; version = "0.20.0"; diff --git a/nixpkgs/pkgs/applications/misc/xrq/default.nix b/nixpkgs/pkgs/applications/misc/xrq/default.nix index fe65004b32ae..244a2c43a155 100644 --- a/nixpkgs/pkgs/applications/misc/xrq/default.nix +++ b/nixpkgs/pkgs/applications/misc/xrq/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, libX11}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xrq-unstable-2016-01-15"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/applications/misc/yarssr/default.nix b/nixpkgs/pkgs/applications/misc/yarssr/default.nix index 06e12416baa0..f2da2957bd3e 100644 --- a/nixpkgs/pkgs/applications/misc/yarssr/default.nix +++ b/nixpkgs/pkgs/applications/misc/yarssr/default.nix @@ -23,7 +23,7 @@ let gtk2 ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "git-2017-12-01"; pname = "yarssr"; diff --git a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix index 975c6e4a4680..88e4a9043931 100644 --- a/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix +++ b/nixpkgs/pkgs/applications/misc/zathura/wrapper.nix @@ -21,7 +21,7 @@ in symlinkJoin { description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the - poppler rendering library and the gtk+ toolkit. The idea behind zathura + poppler rendering library and the GTK toolkit. The idea behind zathura is an application that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction. ''; |