diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/dbeaver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/dfilemanager/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/evtest/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/gallery-dl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/gpscorrelate/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/josm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/kjv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/plank/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/rofi/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/roxterm/default.nix | 69 | ||||
-rw-r--r-- | pkgs/applications/misc/taskell/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/web-media-controller/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/wtf/default.nix | 4 |
13 files changed, 59 insertions, 68 deletions
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index d8cf86461acf2..2e82170121609 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/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/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 5df7c0b067273..1bfb6bbfeaf3d 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/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/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 3d715a1d16bd3..d6d20367b0600 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/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/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 6b57c74c12345..169c5c11b8ce6 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/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/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5bcaccb43bcf4..d10507b104497 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/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/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 56b28dbc8db9b..4b70530987f15 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/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/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 79f0b8dc6df2b..7868e74d010c0 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/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/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 10c8a03fa0a28..dfc92e38f63ce 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/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/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 94381d4f6f962..eabf77f0e951e 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/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/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 1cff3635bf9dd..3dbe7790d185f 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/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/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix index 00b96f459cb77..702c3124d8ab1 100644 --- a/pkgs/applications/misc/taskell/default.nix +++ b/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/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index 6ed2ff10aaa77..e381af4f403e4 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/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/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 52462d1c1f342..1b4c4ac6a34d9 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "wtf"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "03k3x3fnxz23b75n5x8mlr6srr063q3dwq05wh55b4bgqsf7lgzd"; + sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; }; modSha256 = "1nqnjpkrjbb75yfbzh3v3vc4xy5a2aqm9jr40hwq589a4l9p5pw2"; |