diff options
Diffstat (limited to 'pkgs/applications/misc')
26 files changed, 320 insertions, 121 deletions
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 5e6931ce78e..9a1bedd8927 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,16 +2,20 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.8.7.2"; + version = "0.8.8"; src = fetchFromGitHub { owner = "manuelschneid3r"; repo = "albert"; rev = "v${version}"; - sha256 = "04k6cawil6kqkmsilq5mpjy8lwgk0g08s0v23d5a83calpq3ljpc"; + sha256 = "1mqxy5xbvgzykg2vvr2d1p9kr2viga1pqxslkg9y1x05kdhr2zal"; }; - buildInputs = [ cmake qtbase qtsvg qtx11extras muparser makeQtWrapper ]; + nativeBuildInputs = [ cmake makeQtWrapper ]; + + buildInputs = [ qtbase qtsvg qtx11extras muparser ]; + + enableParallelBuilding = true; fixupPhase = '' wrapQtProgram $out/bin/albert diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index ccebb8bfc11..79b4e787eaa 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -3,14 +3,14 @@ }: pythonPackages.buildPythonApplication rec { - version = "1.8"; + version = "1.9"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; - rev = "53d48ee56a3abfb53b94ed25fb620ee759141c96"; - sha256 = "185d3gndw20c3l6f3mf0iq4qapm8g30bl0hn0wsqpp36vl0bpq28"; + rev = "e99844876d0d871df80770b1bd76c161276116eb"; + sha256 = "1qwkff61gdjd6w337a5ipfiybzqdwkxdyfa1l4zzm9dj7lsklgq2"; }; buildInputs = stdenv.lib.optional encryptionSupport pythonPackages.pycrypto; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7b789b3881d..7c6f3cfdffb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite , makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - version = "2.54.0"; + version = "2.55.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79"; + sha256 = "12412d5vjp141xp5qvif50fskd1vsmr15h956z3bh6j99n8z5953"; }; inherit python; @@ -26,7 +26,14 @@ stdenv.mkDerivation rec { setup/build_environment.py ''; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + dontUseQmakeConfigure = true; + # hack around a build problem + preBuild = '' + mkdir -p ../tmp.*/lib + ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/ + ''; + + nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ]; buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 2168a21f7da..be6989b7e33 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, acl, libcap }: stdenv.mkDerivation rec { - name = "cdrtools-3.02a03"; + name = "cdrtools-${version}"; + version = "3.02a06"; src = fetchurl { url = "mirror://sourceforge/cdrtools/${name}.tar.bz2"; - sha256 = "02gjxib0sgzsdicnb7496x0a175w1sb34v8zc9mdi8cfw7skw996"; + sha256 = "1cayhfbhj5g2vgmkmq5scr23k0ka5fsn0dhn0n9yllj386csnygd"; }; patches = [ ./fix-paths.patch ]; @@ -26,10 +27,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/cdrtools/; description = "Highly portable CD/DVD/BluRay command line recording software"; - # Licensing issues: This package contains code licensed under CDDL, GPL2 - # and LGPL2. There is debate regarding the legality of this licensing. - # Marked as unfree to avoid any possible legal issues. - license = licenses.unfree; + license = with licenses; [ gpl2 lgpl2 cddl ]; platforms = platforms.linux; + # Licensing issues: This package contains code licensed under CDDL, GPL2 + # and LGPL2. There is a debate regarding the legality of distributing this + # package in binary form. + hydraPlatforms = []; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index ca807f80e1b..d5442a2ded8 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -5,7 +5,7 @@ let version = "0.1.7"; name = "jsonrpclib-${version}"; src = fetchurl { - url = "https://pypi.python.org/packages/source/j/jsonrpclib/${name}.tar.gz"; + url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; }; propagatedBuildInputs = [ pythonPackages.cjson ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 5c471919f24..8d4339516a6 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -2,9 +2,10 @@ , qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; - version = "V4.0-DEV1603"; + version = "4.0-DEV1603"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/${version}.tar.gz"; + name = "${name}.tar.gz"; + url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah"; }; buildInputs = [ @@ -17,12 +18,13 @@ stdenv.mkDerivation rec { echo 'QMAKE_LRELEASE = ${qttools}/bin/lrelease' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; - postConfigure = - with (config.golden-cheetah); - stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' - echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri - echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri - ''; + #postConfigure = + # + ( + # with (config.golden-cheetah); + # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' + # echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri + # echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri + # ''); installPhase = '' mkdir -p $out/bin cp src/GoldenCheetah $out/bin diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index a6ea5b054c3..789f2d7c3fa 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.3"; + version = "18.4"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1sas5n4k3afryg3k6y40w39kifs3d0yrnnk46nqp7axs4ay2aqim"; + sha256 = "0wrkvff3c1w66373m2w2ib07rkn3rmbp3n7ixz72qd1swvbk6xx1"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix new file mode 100644 index 00000000000..e4074547d78 --- /dev/null +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + version = "0.3.1"; + name = "haxor-news-${version}"; + + src = fetchurl { + url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz"; + sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m"; + }; + + propagatedBuildInputs = with pythonPackages; [ + click + colorama + requests2 + pygments + prompt_toolkit_52 + six + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/donnemartin/haxor-news"; + description = "Browse Hacker News like a haxor"; + license = licenses.asl20; + maintainers = with maintainers; [ matthiasbeyer ]; + }; + +} diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index f48912aeb1e..8c69e36a4e4 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig -, shared_mime_info, libvorbis, taglib , flac, libsamplerate +{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig +, shared_mime_info, libvorbis, taglib, flac, libsamplerate , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, cdrtools, dvdplusrwtools, vcdimager, cdparanoia , kdelibs +, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg , kdemultimedia, phonon, libkcddb ? null }: -stdenv.mkDerivation rec { - name = "k3b-2.0.3a"; +let + # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, + # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, + # vcdxminfo, and vcdxrip + binPath = lib.makeBinPath [ cdrdao dvdplusrwtools transcode vcdimager ]; + +in stdenv.mkDerivation rec { + name = "k3b-${version}"; + version = "2.0.3a"; src = fetchurl { url = "http://download.kde.org/stable/k3b/${name}.tar.xz"; @@ -19,18 +26,16 @@ stdenv.mkDerivation rec { shared_mime_info libvorbis taglib flac libsamplerate libdvdread lame libsndfile libmad stdenv.cc.libc kdelibs kdemultimedia phonon libkcddb makeWrapper cdparanoia + libdvdcss ffmpeg ]; enableParallelBuilding = true; - # at runtime, k3b needs the executables cdrdao, cdrecord, dvd+rw-format, - # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, - # vcdxminfo, and vcdxrip - propagatedUserEnvPkgs = [ cdrdao cdrtools dvdplusrwtools transcode vcdimager ]; + NIX_CFLAGS_LINK = [ "-lcdda_interface" "-lcdda_paranoia" "-ldvdcss" ]; postInstall = '' wrapProgram $out/bin/k3b \ - --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" + --prefix PATH ":" "${binPath}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix new file mode 100644 index 00000000000..486d3fb7ddf --- /dev/null +++ b/pkgs/applications/misc/k3b/wrapper.nix @@ -0,0 +1,15 @@ +{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }: + +let + binPath = lib.makeBinPath [ cdrtools ]; +in symlinkJoin { + name = "k3b-${k3b-original.version}"; + + paths = [ k3b-original ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/k3b \ + --prefix PATH ':' ${binPath} + ''; +} diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 9f083592c40..e1786cc1b08 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "khal-${version}"; src = fetchurl { - url = "https://pypi.python.org/packages/source/k/khal/khal-${version}.tar.gz"; + url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66"; }; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix new file mode 100644 index 00000000000..5450f5f2fc8 --- /dev/null +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -0,0 +1,29 @@ +{ stdenv, libusb1, pkgconfig, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ltwheelconf"; + version = "0.2.7"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "thk"; + repo = "ltwheelconf"; + rev = "df55451f059d593b0259431662612ab5c2bef859"; + sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; + }; + + buildInputs = [ libusb1 pkgconfig ]; + + installPhase = '' + mkdir -p $out/bin + cp ltwheelconf $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/thk/LTWheelConf; + description = "Logitech wheels configuration tool"; + license = licenses.gpl3; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 3ba0faef968..b1b4e66cfe4 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mv makeself.sh $out/bin/makeself mv makeself.1 $out/share/man/man1/ mv makeself-header.sh $out/share/${name} - sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself + sed -e 's|HEADER=`dirname "$0"`/makeself-header.sh|HEADER=`dirname $0`/../share/${name}/makeself-header.sh|' -i $out/bin/makeself ''; meta = with stdenv.lib; { homepage = http://megastep.org/makeself; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b9b6c10a13f..3178ea5684d 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -34,7 +34,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://octoprint.org/; + homepage = "http://octoprint.org/"; description = "The snappy web interface for your 3D printer"; platforms = platforms.all; license = licenses.agpl3; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 7ff6686a937..852ec5b444d 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -8,13 +8,13 @@ in { m3d-fio = buildPlugin rec { name = "M3D-Fio-${version}"; - version = "0.30.2"; + version = "0.32"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M3D-Fio"; rev = "V${version}"; - sha256 = "1knm41hwjf6v4yjx8khr2zd9ryndmw8bkp3y80hgjc5p4nqxrmg3"; + sha256 = "1s15nx6v56yjwd88b19fx0gk1l0abp76nz10yicspdn91fpr1sf4"; }; patches = [ @@ -31,8 +31,8 @@ in { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Fio; - description = " OctoPrint plugin for the Micro 3D printer"; + homepage = "https://github.com/donovan6000/M3D-Fio"; + description = "OctoPrint plugin for the Micro 3D printer"; platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 70be67a4d28..36218b6d507 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to edit resource files (BRF)"; - homepage = https://github.com/cfcohen/openbrf; + homepage = "https://github.com/cfcohen/openbrf"; maintainers = with stdenv.lib.maintainers; [ abbradar ]; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 894aeaab425..2f33edc9adc 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }: +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; @@ -11,12 +11,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ]; + buildInputs = [ postgresql wxGTK openssl zlib ]; preConfigure = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; + configureFlags = [ + "--with-libxml2=${libxml2}" + "--with-libxslt=${libxslt}" + ]; + meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; homepage = http://www.pgadmin.org; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index 1eb65a59470..dcb36082231 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { namePrefix = ""; src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pitz/${name}.tar.gz"; + url = "mirror://pypi/p/pitz/${name}.tar.gz"; sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr"; }; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 7de4e3e55a1..a8613f917eb 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,36 +1,33 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook }: +{ stdenv, fetchurl, qt5 }: let - version = "1.08.03"; + version = "1.10.01"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchFromGitHub { - owner = "JulyIGHOR"; - repo = "QtBitcoinTrader"; - rev = "ee30cf158fa8535f2155a387558d3b8994728c28"; - sha256 = "0kxb0n11agqid0nyqdspfndm03b8l0nl8x4yx2hsrizs6m5z08h4"; + src = fetchurl { + url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; + sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; }; - buildInputs = [ qt4 ]; - - nativeBuildHooks = [ qmake4Hook ]; + buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; postUnpack = "sourceRoot=\${sourceRoot}/src"; - preConfigure = '' - qmakeFlags="$qmakeFlags \ + configurePhase = '' + qmake $qmakeFlags \ + PREFIX=$out \ DESKTOPDIR=$out/share/applications \ ICONDIR=$out/share/pixmaps \ - " + QtBitcoinTrader_Desktop.pro ''; meta = with stdenv.lib; - { description = "Secure bitcoin trading client"; + { description = "Bitcoin trading client"; homepage = https://centrabit.com/; license = licenses.lgpl3; - platforms = qt4.meta.platforms; + platforms = qt5.qtbase.meta.platforms; maintainers = [ maintainers.ehmry ]; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 15f249ac906..342a03f8984 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: +{ stdenv, fetchzip, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchurl { + src = fetchzip { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; + sha256 = "1x1ic9as0a60gz664sf8d1qiq64ji7q60g19x0rlm3bvcp2612c8"; }; - buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ]; + buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; + + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; preConfigure = '' qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out" @@ -18,9 +20,12 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out/bin mv $out/qtpass $out/bin + install -D {,$out/share/applications/}qtpass.desktop + install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg + runHook postInstall ''; - postFixup = '' + postInstall = '' wrapQtProgram $out/bin/qtpass \ --suffix PATH : ${git}/bin \ --suffix PATH : ${gnupg}/bin \ @@ -29,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; - homepage = https://github.com/IJHack/qtpass; + homepage = https://qtpass.org; license = licenses.gpl3; maintainers = [ maintainers.hrdinka ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix new file mode 100644 index 00000000000..7a1ed08ebf6 --- /dev/null +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -0,0 +1,81 @@ +{ stdenv, lib, fetchgit, pkgconfig , libssh2 +, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols +, qtsvg, qttools, qtquick1 +, makeQtWrapper, qmakeHook +}: + +let + breakpad_lss = fetchgit { + url = "https://chromium.googlesource.com/linux-syscall-support"; + rev = "08056836f2b4a5747daff75435d10d649bed22f6"; + sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz"; + }; + +in + +stdenv.mkDerivation rec { + name = "redis-desktop-manager-${version}"; + version = "0.8.3"; + + src = fetchgit { + url = "https://github.com/uglide/RedisDesktopManager.git"; + fetchSubmodules = true; + rev = "refs/tags/${version}"; + sha256 = "08969xwqpjgvfa195dxskpr54p4mnapgfykcffpqpczp990ak1l6"; + }; + + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + + buildInputs = [ + pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats + qtquick1 qtquickcontrols qtsvg qttools + ]; + + configurePhase = "true"; + + buildPhase = '' + srcdir=$PWD + + substituteInPlace src/resources/qml/ValueTabs.qml \ + --replace "import QtQuick.Controls 1.4" \ + "import QtQuick.Controls 1.2" + + cat <<EOF > src/version.h +#ifndef RDM_VERSION + #define RDM_VERSION "${version}-120" +#endif // !RDM_VERSION +EOF + + cd $srcdir/3rdparty/gbreakpad + cp -r ${breakpad_lss} src/third_party/lss + chmod +w -R src/third_party/lss + touch README + + cd $srcdir/3rdparty/crashreporter + qmake CONFIG+=release DESTDIR="$srcdir/rdm/bin/linux/release" QMAKE_LFLAGS_RPATH="" + make + + cd $srcdir/3rdparty/gbreakpad + ./configure + make + + cd $srcdir/src + qmake + make + ''; + + installPhase = '' + mkdir -p $out/bin + instdir="$srcdir/bin/linux/release" + cp $instdir/rdm $out/bin + wrapQtProgram $out/bin/rdm + ''; + + meta = with lib; { + description = "Cross-platform open source Redis DB management tool"; + homepage = "http://redisdesktop.com/"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index a5b90890df2..974c593d37c 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,18 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6"; + sha256 = "1wi9ikwmc9jfilj8adad3rcb7rmmxkpkfcp2gkfxvdyw6n0mzcnf"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411"; + sha256 = "074yivz7rz1ac1962dix0aahpyqvsrkizh32kk5hyw5az0vqpcjs"; }; in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.8.9.1170"; + name = "rescuetime-2.9.10.1255"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' @@ -24,7 +24,11 @@ stdenv.mkDerivation { dpkg-deb -x $src pkg sourceRoot=pkg ''; - installPhase = '' + installPhase = let + + lib = p: stdenv.lib.makeLibraryPath [ p ]; + + in '' mkdir -p $out/bin cp usr/bin/rescuetime $out/bin @@ -33,7 +37,7 @@ stdenv.mkDerivation { $out/bin/rescuetime wrapProgram $out/bin/rescuetime \ - --prefix LD_PRELOAD : ${qt4}/lib/libQtGui.so.4:${qt4}/lib/libQtCore.so.4:${libXtst}/lib/libXtst.so.6:${libXext}/lib/libXext.so.6:${libX11}/lib/libX11.so.6:${libXScrnSaver}/lib/libXss.so.1 + --prefix LD_PRELOAD : ${lib qt4}/libQtGui.so.4:${lib qt4}/libQtCore.so.4:${lib libXtst}/libXtst.so.6:${lib libXext}/libXext.so.6:${lib libX11}/libX11.so.6:${lib libXScrnSaver}/libXss.so.1 ''; meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 9f11a141ff4..e1ee9b2d145 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,21 +1,31 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig -, libX11, libXinerama, pango, cairo +, libX11, libxkbcommon, pango, cairo, glib +, libxcb, xcbutil, xcbutilwm, which, git , libstartup_notification, i3Support ? false, i3 }: stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "0.15.12"; + version = "1.0.0"; src = fetchurl { - url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz"; - sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5"; + url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; + sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5"; }; - buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango - cairo libstartup_notification + preConfigure = '' + patchShebangs "script" + # root not present in build /etc/passwd + sed -i 's/~root/~nobody/g' test/helper-expand.c + ''; + + buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango + cairo libstartup_notification libxcb xcbutil xcbutilwm + which git ] ++ stdenv.lib.optional i3Support i3; + doCheck = true; + meta = { description = "Window switcher, run dialog and dmenu replacement"; homepage = https://davedavenport.github.io/rofi; diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index d30c2761f73..8f195555cf1 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -4,7 +4,7 @@ let name = "rxvt-unicode"; - version = "9.21"; + version = "9.22"; n = "${name}-${version}"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "0swmi308v5yxsddrdhvi4cch88k2bbs2nffpl5j5m2f55gbhw9vm"; + sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; }; buildInputs = diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index 2f68e4ec5f1..c9b0823fb51 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -1,28 +1,21 @@ -{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }: +{ stdenv, symlinkJoin, rxvt_unicode, makeWrapper, plugins }: let rxvt = rxvt_unicode.override { perlSupport = true; }; - drv = buildEnv { - name = "${rxvt.name}-with-plugins"; +in symlinkJoin { + name = "${rxvt.name}-with-plugins"; - paths = [ rxvt ] ++ plugins; + paths = [ rxvt ] ++ plugins; - postBuild = '' - # TODO: This could be avoided if buildEnv could be forced to create all directories - if [ -L $out/bin ]; then - rm $out/bin - mkdir $out/bin - for i in ${rxvt}/bin/*; do - ln -s $i $out/bin - done - fi - wrapProgram $out/bin/urxvt \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - wrapProgram $out/bin/urxvtd \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - ''; - }; -in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/urxvt \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + ''; +} diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index f0f0b00c927..e9e34518932 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,33 +1,45 @@ -{ stdenv, fetchurl, autoconf, automake, gettext, intltool, libtool, pkgconfig, - libXtst, cheetah, libXScrnSaver, - glib, glibmm, - gtk, gtkmm, - atk, - pango, pangomm, - cairo, cairomm, - dbus, dbus_glib, - GConf, gconfmm, - gdome2, gstreamer, libsigcxx }: +{ stdenv, fetchFromGitHub, fetchpatch +, autoconf, automake, gettext, intltool, libtool, pkgconfig +, libICE, libSM, libXScrnSaver, libXtst, cheetah +, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm +, dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { - version = "v1_10_6"; name = "workrave-${version}"; + version = "1.10.7"; - src = fetchurl { - url = "http://github.com/rcaelers/workrave/archive/${version}.tar.gz"; - sha256 = "0q2p83n33chbqzdcdm7ykfsy73frfi6drxzm4qidxwzpzsxrysgq"; + src = let + in fetchFromGitHub { + sha256 = "1mxg882rfih7xzadrpj51m9r33f6s3rzwv61nfwi94vzd68qjnxb"; + rev = with stdenv.lib; + "v" + concatStringsSep "_" (splitString "." version); + repo = "workrave"; + owner = "rcaelers"; }; - buildInputs = [ - autoconf automake gettext intltool libtool pkgconfig libXtst cheetah - libXScrnSaver + patches = [ + # Building with gtk{,mm}3 works just fine, but let's be conservative for once: + (fetchpatch { + name = "workrave-fix-compilation-with-gtk2.patch"; + url = "https://github.com/rcaelers/workrave/commit/" + + "271efdcd795b3592bfede8b1af2162af4b1f0f26.patch"; + sha256 = "1a3d4jj8516m3m24bl6y8alanl1qnyzv5dv1hz5v3hjgk89fj6rk"; + }) + ]; + nativeBuildInputs = [ + autoconf automake gettext intltool libtool pkgconfig + ]; + buildInputs = [ + libICE libSM libXScrnSaver libXtst cheetah glib glibmm gtk gtkmm atk pango pangomm cairo cairomm dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx ]; preConfigure = "./autogen.sh"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A program to help prevent Repetitive Strain Injury"; longDescription = '' @@ -38,7 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.workrave.org/; downloadPage = https://github.com/rcaelers/workrave/releases; license = licenses.gpl3; - maintainers = with maintainers; [ prikhi ]; + maintainers = with maintainers; [ nckx prikhi ]; platforms = platforms.linux; }; } |