diff options
Diffstat (limited to 'pkgs/applications/misc')
28 files changed, 111 insertions, 59 deletions
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 13539169dece..a4f6b1ce9881 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation rec { LUPDATE="${qttools.dev}/bin/lupdate"; LRELEASE="${qttools.dev}/bin/lrelease"; MOC="${qtbase.dev}/bin/moc"; - QTDIR="${qtbase.dev}"; + QTDIR=qtbase.dev; RCC="${qtbase.dev}/bin/rcc"; UIC="${qtbase.dev}/bin/uic"; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c48d458567dc..0ebeb1beffa1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication { --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ - --replace ${libzbar_name} ${zbar}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} '' else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index a5e4bd74a6eb..0a28efbc28cd 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "electrum-ltc"; - version = "3.1.3.1"; + version = "3.3.8.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index d0d3c2b424d3..d8b355efe86d 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "geistesk"; repo = "et"; - rev = "${version}"; + rev = version; sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; }; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index 265181d7db3a..b2a992b850e1 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; + buildInputs = [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; homepage = https://njw.me.uk/getxbook/; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 464e0ba53346..41cdf267f5de 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; - rev = "${version}"; + rev = version; ignoreExternals = true; }; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0026cac52e0..273be11ac63a 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; - rev = "${version}"; + rev = version; sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; }; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 2af091b0df38..4c4b461303fb 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -1,24 +1,24 @@ -{ stdenv, requireFile, unzip, rlwrap, bash }: +{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: assert (stdenv.hostPlatform.system == "i686-linux"); let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc ]; + [ stdenv.cc.libc stdenv.cc.cc zlib ]; in stdenv.mkDerivation rec { pname = "kdbplus"; - version = "3.3"; + version = "3.6"; - src = requireFile { + src = requireFile rec { message = '' Nix can't download kdb+ for you automatically. Go to http://kx.com and download the free, 32-bit version for - Linux. Then run "nix-prefetch-url file://\$PWD/linux.zip" in - the directory where you saved it. Note you need version 3.3. + Linux. Then run "nix-prefetch-url file://\$PWD/${name}" in + the directory where you saved it. Note you need version ${version}. ''; - name = "linux.zip"; - sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940"; + name = "linuxx86.zip"; + sha256 = "0w6znd9warcqx28vf648n0vgmxyyy9kvsfpsfw37d1kp5finap4p"; }; dontStrip = true; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index b1c849b6bcee..22e6cd2f6667 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; - rev = "${version}"; + rev = version; sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; }; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index ab40dfc8131b..2334221f926d 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -104,6 +104,9 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux + + # Winetricks + fribidi ] ++ xorgDeps pkgs; extraInstallCommands = '' diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 744d124f84d5..f7964e4e5c6d 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch +{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.3.0"; pname = "lyx"; @@ -30,10 +30,9 @@ stdenv.mkDerivation rec { doCheck = true; # python is run during runtime to do various tasks - postFixup = '' - wrapProgram "$out/bin/lyx" \ - --prefix PATH : '${python}/bin' - ''; + qtWrapperArgs = [ + " --prefix PATH : ${python}/bin" + ]; patches = [ (fetchpatch { @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with stdenv.lib; { + meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index ed0bbc4cb488..3749f568aef2 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; - rev = "${version}"; + rev = version; sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp"; }; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index a234af740f3c..ad59b1be10e0 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; + meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; description = "String internment library for netsurf browser"; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index e5d73672eb75..a795c4485160 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # for finding the nlopt library, which doesn't pick up the package in the nix store. # We need to set the path via the NLOPT environment variable instead. - NLOPT = "${nlopt}"; + NLOPT = nlopt; prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 48a05091ca85..1f35643dd761 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -11,7 +11,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "shundhammer"; repo = "qdirstat"; - rev = "${version}"; + rev = version; sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; }; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index ab15855b910b..b7c137258fd9 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase -, qtmultimedia, qttools, qtwebengine }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +, qtbase, qtmultimedia, qttools, qtwebengine }: -stdenv.mkDerivation { +mkDerivation { pname = "qolibri"; - version = "2018-11-14"; + version = "2019-07-22"; src = fetchFromGitHub { owner = "ludios"; repo = "qolibri"; - rev = "133a1c33e74d931ad54407f70d84a0016d96981f"; - sha256 = "16ifix0q8ww4l3xflgxr9j81c0lzlnkjr8fj961x3nxz7288pdg2"; + rev = "b58f9838d39300cba444eba725a369181c5d746b"; + sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; nativeBuildInputs = [ pkgconfig cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/ludios/qolibri; description = "EPWING reader for viewing Japanese dictionaries"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 71a433bded79..46b446b429bf 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "sieren"; repo = "QSyncthingTray"; - rev = "${version}"; + rev = version; sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b6676a0bf70e..7c239a9b7543 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -8,12 +8,12 @@ let description = "A clone of the well-known terminal emulator rxvt"; desktopItem = makeDesktopItem { - name = "${pname}"; + name = pname; exec = "urxvt"; icon = "utilities-terminal"; comment = description; desktopName = "URxvt"; - genericName = "${pname}"; + genericName = pname; categories = "System;TerminalEmulator;"; }; in diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index c116b5874069..9550a8d4fd7b 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "IgnorantGuru"; repo = "spacefm"; - rev = "${version}"; + rev = version; sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; }; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 6cacb6215179..ba898932f06c 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jmhobbs"; repo = "terminal-parrot"; - rev = "${version}"; + rev = version; sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix new file mode 100644 index 000000000000..8d84ab59d479 --- /dev/null +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, sqlite, zlib, perl }: + +stdenv.mkDerivation rec { + pname = "tippecanoe"; + version = "1.34.3"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = version; + sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i"; + }; + + buildInputs = [ sqlite zlib ]; + checkInputs = [ perl ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + doCheck = true; + + meta = with stdenv.lib; { + description = "Build vector tilesets from large collections of GeoJSON features"; + homepage = https://github.com/mapbox/tippecanoe; + license = licenses.bsd2; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix index 240ad6e5fca4..669c06a9480e 100644 --- a/pkgs/applications/misc/todolist/default.nix +++ b/pkgs/applications/misc/todolist/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "gammons"; repo = "todolist"; - rev = "${version}"; + rev = version; sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; }; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index df9ed8973702..425ea8d237b3 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; - rev = "${version}"; + rev = version; sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 8764c41c8a4c..ad29c8f94d8b 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -31,10 +31,21 @@ stdenv.mkDerivation rec { patches = debianPatches; - meta = { + postPatch = '' + substituteInPlace urlview.c \ + --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh" + ''; + + postInstall = '' + install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh + patchShebangs $out/etc/urlview + ''; + + meta = with stdenv.lib; { description = "Extract URLs from text"; homepage = https://packages.qa.debian.org/u/urlview.html; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index cda3b1a6f850..2d8a860e7e86 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme -, geoclue2, liboauth }: +, geoclue2, liboauth, nettle }: stdenv.mkDerivation rec { pname = "viking"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme - geoclue2 liboauth + geoclue2 liboauth nettle ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index a7a6500fd22a..6a5e62f54e1e 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -1,22 +1,30 @@ -{stdenv, fetchurl, wxGTK, chmlib}: +{ stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: -stdenv.mkDerivation { - name = "xchm-1.23"; - src = fetchurl { - url = mirror://sourceforge/xchm/xchm-1.23.tar.gz; - sha256 = "0qn0fyxcrn30ndq2asx31k0qkx3grbm16fb1y580wd2gjmh5r3wg"; +stdenv.mkDerivation rec { + pname = "xchm"; + version = "1.30"; + + src = fetchFromGitHub { + owner = "rzvncj"; + repo = "xCHM"; + rev = version; + sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v"; }; - buildInputs = [wxGTK chmlib]; - postConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS $(${wxGTK}/lib/wx/config/* --libs | sed -e s@-pthread@@)" - echo $NIX_LDFLAGS + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 chmlib ]; + + configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; + + preConfigure = '' + export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" ''; meta = with stdenv.lib; { description = "A viewer for Microsoft HTML Help files"; - homepage = http://xchm.sourceforge.net; + homepage = "https://github.com/rzvncj/xCHM"; license = licenses.gpl2; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index b7c6f938b19e..2e81e9b05d34 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; - rev = "${version}"; + rev = version; sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index be42127e2548..4d7b54536e4a 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -17,7 +17,7 @@ stdenv'.mkDerivation rec { src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; - rev = "${version}"; + rev = version; sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm"; }; |