diff options
Diffstat (limited to 'pkgs/applications/misc')
40 files changed, 253 insertions, 178 deletions
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 148031273bed..6e0152c71ed0 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - version = "20180623"; + version = "20180707"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; - sha256 = "0s7b5w98rblqfcpvaxkkri0sfqxmqjwgdf8syzva50vm7swrg946"; + sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix new file mode 100644 index 000000000000..679724ed0622 --- /dev/null +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -0,0 +1,33 @@ +{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +let + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ]; +in +stdenv.mkDerivation rec { + name = "clipmenu-${version}"; + version = "5.4.0"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = "clipmenu"; + rev = version; + sha256 = "1qbpca0wny6i222vbikfl2znn3fynhbl4100qs8v4wn27ra5p0mi"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp clipdel clipmenu clipmenud $out/bin + + for bin in $out/bin/*; do + wrapProgram "$bin" --prefix PATH : "${runtimePath}" + done + ''; + + meta = with stdenv.lib; { + description = "Clipboard management using dmenu"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.publicDomain; + }; +} diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 33b16e3242c6..4d9975192461 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , jsoncpp -, libjson_rpc_cpp +, libjson-rpc-cpp , curl , boost , leveldb @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake jsoncpp - libjson_rpc_cpp + libjson-rpc-cpp curl boost leveldb diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 3b00bba709a0..f97b83a85075 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,20 +2,20 @@ mkDerivation rec { name = "cura-${version}"; - version = "3.3.1"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0a2xxiw1h5cq4nd4pdkq757hap85p2i29msxs57kbfdd78izrjlx"; + sha256 = "03s9nf1aybbnbf1rzqja41m9g6991bbvrcly1lcrfqksianfn06w"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = "3.3.0"; - sha256 = "0vf7s4m14aqhdg4m2yjj87kjxi2gpa46mgx86p0a91jwvkxa8a1q"; + rev = "3.4.1"; + sha256 = "1pw30clxqd7qgnidsyx6grizvlgfn8rhj6rd5ppkvv3rdjh0gj28"; }; buildInputs = [ qtbase qtquickcontrols2 ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index ac4c68f9b536..ba9a98c616b3 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, libarcus }: +{ stdenv, fetchFromGitHub, cmake, libarcus, stb }: stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1dj80lk58qb54apdv7n9cmcck4smb00lidgqld21xnndnnqqb4lw"; + sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libarcus ]; + buildInputs = [ libarcus stb ]; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ed08356fdc5a..d23b789780b3 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.2"; + version = "5.1.3"; 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 = "1p1klrasasc440qzxsn96lcgfib5qwhl508gvwrbslvmija6m6b2"; + sha256 = "1znkr28pfpclq2gl2prllb3hwq9v9rj5xl7xarq0hsggzfg9n071"; }; installPhase = '' diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 144e1fa566ca..daea20835c8a 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }: +{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: stdenv.mkDerivation rec { version = "2.1.3"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase poppler_qt5 ]; + buildInputs = [ qtbase poppler ]; preConfigure = '' - substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev} + substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev} lrelease diffpdf.pro ''; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 09b6db3abf9a..3e6a6ab53f77 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libevent , libtool , libqrencode -, libudev +, udev , libusb , makeWrapper , pkgconfig @@ -67,12 +67,12 @@ in stdenv.mkDerivation rec { qttools ]; - buildInputs = with stdenv.lib; [ + buildInputs = [ # TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio. libcap libevent libtool - libudev + udev libusb libqrencode diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index d115d1ae1d24..e0535eeca387 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -84,8 +84,9 @@ in mv $out/usr/bin/glava $out/bin/.glava-unwrapped rm -rf $out/usr - patchelf $out/bin/.glava-unwrapped \ + patchelf \ --set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \ + $out/bin/.glava-unwrapped substitute ${wrapperScript} $out/bin/glava --subst-var out chmod +x $out/bin/glava diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 7a04bd7194f2..8ab840221815 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + sha256 = "1v26q1m3bx7mdmmwgd6p601ncf13rr4rrx9s06fiy8vnd0ar1vlf"; }; - cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + cargoSha256 = "0cdy0wvibkpnmlqwxvn02a2k2vqy6zdqzflj2dh6g1cjbz1j8qh5"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "An opinionated static site generator with everything built-in"; homepage = https://www.getgutenberg.io; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 69c91d257558..ec041902b256 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, xorg, glib, xneur_0_13, libglade, GConf, pcre }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { - name = "gxneur-0.13.0"; - + name = "gxneur-0.20.0"; + src = fetchurl { - url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; - sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; + url = https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz; + sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13 - libglade GConf pcre + xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur + libglade GConf pcre libappindicator-gtk2 ]; - preConfigure = '' - sed -e 's@-Werror@@' -i configure - sed -e 's@"xneur"@"${xneur_0_13}/bin/xneur"@' -i src/misc.c - ''; - meta = { description = "GUI for XNEUR keyboard layout switcher"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 65b85868bc59..a70506f7aaaa 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 638765840cb9..58fcd59a2b2f 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "IPMIView-${version}"; - version = "2.13.0"; - buildVersion = "170504"; + version = "2.14.0"; + buildVersion = "180213"; src = fetchurl { url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6"; + sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; }; buildInputs = [ patchelf makeWrapper ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 97b60080365f..c4f10a1c35bb 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13996"; + version = "14026"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; + sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0a2a051223ac..b16507c8b7bd 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte -, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs }: let version = "0.3.1"; in @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf intltool pkgconfig - libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; buildInputs = [ gtk3 vte ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 56cbb338a403..7d48b61793ca 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ag, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, stdenv, pandocSupport ? true, pandoc ? null , ... }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ + --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 42f1b58061ef..5aaaa7a0e37b 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, perl -, alsaLib, libevdev, libopus, libudev, SDL2 +, alsaLib, libevdev, libopus, udev, SDL2 , ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - alsaLib libevdev libopus libudev SDL2 + alsaLib libevdev libopus udev SDL2 ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid ]; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index fdb236194f9c..d6153d2268b6 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: let version = "0.9.2"; @@ -10,7 +10,7 @@ let rev = version; sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; }; - + postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ @@ -69,7 +69,9 @@ in stdenv.mkDerivation { installPhase = '' mkdir $out tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 - wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + wrapProgram $out/bin/mucommander \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --set JAVA_HOME ${jre} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index 4ac152c26694..12f8c12b5864 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: +{ stdenv, mkDerivation, fetchFromGitHub, boost +, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}: mkDerivation rec { name = "nixnote2-${version}"; @@ -11,7 +12,7 @@ mkDerivation rec { sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; }; - buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + buildInputs = [ boost qtbase qtwebkit poppler hunspell ]; enableParallelBuilding = true; @@ -28,7 +29,7 @@ mkDerivation rec { substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' ''; - + postInstal = '' cp images/windowIcon.png $out/share/pixmaps/nixnote2.png ''; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index de64705d832b..78105ea535d6 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -16,7 +16,7 @@ , intltool , isocodes , libcanberra-gtk3 -, libudev +, udev , libxkbcommon , pkgconfig , procps @@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec { hunspell isocodes libcanberra-gtk3 - libudev + udev libxkbcommon wrapGAppsHook xorg.libXtst diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 58e80e7f7264..e1cc70e42779 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, x11 }: +{ stdenv, fetchurl, xorg, xlibsWrapper }: stdenv.mkDerivation rec { version = "1.2.sakura.5"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; }; - buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; - + buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ]; + configurePhase = "xmkmf"; installPhase = '' @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index f836ce5b8085..dfaa90d43adf 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -12,7 +12,7 @@ let }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 1d0c7d28de6e..3ef5a6c4e345 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext +{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext , gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , pkgconfig, python, pythonPackages, vte @@ -22,13 +22,13 @@ in stdenv.mkDerivation rec { buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt - makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib + 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_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; + "-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 [ diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index d2a2936680f9..6df81aa11729 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -2,13 +2,13 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb - libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat udev libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/misc/termite/add_errno_header.patch new file mode 100644 index 000000000000..81283f86a21d --- /dev/null +++ b/pkgs/applications/misc/termite/add_errno_header.patch @@ -0,0 +1,24 @@ +From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:03:09 +1000 +Subject: [PATCH] Add errno.h header which isn't always included automatically. + +--- + termite.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/termite.cc b/termite.cc +index 160fe82..13e2572 100644 +--- a/termite.cc ++++ b/termite.cc +@@ -21,6 +21,7 @@ + #include <cstdlib> + #include <cstring> + #include <cmath> ++#include <errno.h> + #include <functional> + #include <limits> + #include <map> +-- +2.17.1 + diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 46276bbb03fb..560dff594275 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin +{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin , configFile ? null }: @@ -7,16 +7,17 @@ let termite = stdenv.mkDerivation { name = "termite-${version}"; - src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "termite"; + rev = "v${version}"; sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; + fetchSubmodules = true; }; # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ]; - - postPatch = "sed '1i#include <math.h>' -i termite.cc"; + patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch + ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/misc/termite/remove_ldflags_macos.patch new file mode 100644 index 000000000000..f8c68518bb4d --- /dev/null +++ b/pkgs/applications/misc/termite/remove_ldflags_macos.patch @@ -0,0 +1,25 @@ +From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:01:51 +1000 +Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b115f42..ab301ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++) + CXXFLAGS += -Wimplicit-fallthrough + endif + +-LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} ++LDFLAGS := -s -Wl ${LDFLAGS} + LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} + + termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh +-- +2.17.1 + diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 9df2a2dde765..48e0d19e20b9 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter: $ make NOGUI=1 */ -{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper, +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2, wxGUI ? true }: @@ -86,7 +86,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse devicemapper wxGTK nasm ]; + buildInputs = [ fuse lvm2 wxGTK nasm ]; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 1c5c4d1dcaac..bc5b19e77370 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself, +{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, wxGUI ? true }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeself yasm pkgconfig ]; - buildInputs = [ fuse devicemapper ] + buildInputs = [ fuse lvm2 ] ++ optional wxGUI wxGTK30; makeFlags = optionalString (!wxGUI) "NOGUI=1"; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 84f7d4fd2913..d8628b794d71 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.3"; + version = "1.4"; name = "wikicurses-${version}"; - src = fetchurl { - url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz"; - sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8"; + src = fetchFromGitHub { + owner = "ids1024"; + repo = "wikicurses"; + rev = "v${version}"; + sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm"; }; - patches = [ - # This is necessary to build without a config file. - # It can be safely removed after updating to wikicurses to 1.4 - # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included - (fetchurl { - url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch"; - sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; meta = { @@ -26,6 +18,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/ids1024/wikicurses/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix index 311983e8f527..23be3a5dc4fa 100644 --- a/pkgs/applications/misc/wsjtx/default.nix +++ b/pkgs/applications/misc/wsjtx/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "wsjtx-${version}"; - version = "1.9.0"; + version = "1.9.1"; # This is a composite source tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz"; - sha256 = "1qxwiylnykh37kw780hh9xfphzbj8ndpfqz4xazld16v3qx2g0jc"; + sha256 = "143r17fri08mwz28g17wcfxy60h3xgfk46mln5lmdr9k6355aqqc"; }; # Hamlib builds with autotools, wsjtx builds with cmake diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix new file mode 100644 index 000000000000..3ba7062b7bb1 --- /dev/null +++ b/pkgs/applications/misc/xlog/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +stdenv.mkDerivation rec { + name = "xlog-${version}"; + version = "2.0.15"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; + sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; + }; + + buildInputs = [ glib pkgconfig gtk2 hamlib ]; + + meta = with stdenv.lib; { + description = "An amateur radio logging program"; + longDescription = + '' Xlog is an amateur radio logging program. + It supports cabrillo, ADIF, trlog (format also used by tlf), + and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. + Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, + location in latitude and longitude and distance and heading in kilometers or miles, + both for short and long path. + ''; + homepage = http://www.nongnu.org/xlog; + maintainers = [ maintainers.mafo ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 340d84fd2aaf..f61cbf397597 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b"; + sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index aacf71e17b6c..c013a9cc44ec 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn"; + sha256 = "0h6ihrrkgwi8k642iqq13qx3zlxl9r8q7wm417hb7j35rnmwn8lq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix deleted file mode 100644 index 897c861e40a1..000000000000 --- a/pkgs/applications/misc/xneur/0.8.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, pcre, gstreamer, glib, libxml2, aspell -, imlib2, xorg, xosd }: - -stdenv.mkDerivation { - name = "xneur-0.8.0"; - - src = fetchurl { - url = https://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; - sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; - }; - - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext - ]; - - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - ''; - - meta = { - description = "Utility for switching between keyboard layouts"; - platforms = stdenv.lib.platforms.linux; - }; - -} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ff7c6a9e9767..c6438a21f2c3 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,44 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, - gdk_pixbuf}: - -let s = import ./src-for-default.nix; in +{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }: stdenv.mkDerivation rec { - inherit (s) version name; + name = "xneur-${version}"; + version = "0.20.0"; + src = fetchurl { - inherit(s) url; - sha256 = s.hash; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/xneur_0.20.0.orig.tar.gz"; + sha256 = "1lg3qpi9pkx9f5xvfc8yf39wwc98f769yb7i2438vqn66kla1xpr"; }; - buildInputs = - [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo - xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk2 pango enchant gdk_pixbuf - ]; + nativeBuildInputs = [ + pkgconfig intltool wrapGAppsHook + ]; - preConfigure = '' - sed -e 's/-Werror//' -i configure - sed -e 's@for aspell_dir in@for aspell_dir in ${aspell} @' -i configure - sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure - sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure + buildInputs = [ + xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib + xosd xorg.libXext xorg.libXi libnotify + enchant gdk_pixbuf + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include" - - export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" + postPatch = '' + sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; - meta = { + meta = with stdenv.lib; { description = "Utility for switching between keyboard layouts"; homepage = https://xneur.ru; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xneur/src-for-default.nix b/pkgs/applications/misc/xneur/src-for-default.nix deleted file mode 100644 index a7db13bd81d1..000000000000 --- a/pkgs/applications/misc/xneur/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="0.13.0"; - name="xneur-0.13.0"; - hash="19z8nnfj9paf877k0nrqy6dih69l81svxymqg6llh7ndgkw20hgd"; - url="http://dists.xneur.ru/release-${version}/tgz/xneur-${version}.tar.bz2"; - advertisedUrl="http://dists.xneur.ru/release-0.13.0/tgz/xneur-0.13.0.tar.bz2"; - - -} diff --git a/pkgs/applications/misc/xneur/src-info-for-default.nix b/pkgs/applications/misc/xneur/src-info-for-default.nix deleted file mode 100644 index 0de3e83baf71..000000000000 --- a/pkgs/applications/misc/xneur/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://xneur.ru/downloads"; - baseName = "xneur"; - versionReferenceCreator = "$(replaceAllVersionOccurences)"; -} diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix new file mode 100644 index 000000000000..28ce4a0d500d --- /dev/null +++ b/pkgs/applications/misc/xscope/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libXt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xscope"; + version = "1.4.1"; + + src = fetchurl { + url = "mirror://xorg/individual/app/${name}.tar.bz2"; + sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt ]; + + meta = with stdenv.lib; { + description = "program to monitor X11/Client conversations"; + homepage = https://cgit.freedesktop.org/xorg/app/xscope/; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index 300281761a4d..06fa8d2bd0dd 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -18,7 +18,7 @@ python27Packages.buildPythonApplication rec { # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary # support that the yubicommon library uses to load libykpers - makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; postInstall = '' mkdir -p $out/share/applications |