diff options
Diffstat (limited to 'pkgs/applications')
57 files changed, 381 insertions, 221 deletions
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 46985fd065e..f49d1902edc 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.2.5"; - sha256 = "0q9vgwc0jlja73r4na7yil624iagq1607ac47wh8a7xgfjmjjai1"; - cargoSha256 = "0ibdmyh1jvfq51vhwn4riyhilqwhf71hjd4vyj525smn95p75b14"; + version = "2.3.0"; + sha256 = "0v79nz19riaga6iwj6m59fq8adm5llrkq61xizriz30rw8rkk04z"; + cargoSha256 = "01vdrfqh2nlghbgnbb7qmrazsjmynrb9542qrgchxq589wasb4j2"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 81923849094..de43450a41c 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.1.10"; - sha256 = "1l4yl8i24q8v4hzljzai37f587x8m3cz3byzifhvq3bjky7p8h80"; - cargoSha256 = "04pni9cmz8nhlqznwafz9d81006808kh24aqnb8rjdcr84d11zis"; + version = "2.2.7"; + sha256 = "0bxq4z84vsb8hmbscr41xiw11m9xg6if231v76c2dmkbyqgpqy8p"; + cargoSha256 = "1izwqg87qxhmmkd49m0k09i7r05sfcb18m5jbpvggjzp57ips09r"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 5bc6e717465..51c5cdad69d 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "0.9.909"; + version = "0.9.914"; format = "other"; doCheck = false; @@ -14,10 +14,10 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n"; + sha256 = "0nkwic6mq4fs467c696m5w0wqrii5rzvf2il6vkw861my1bl9wzj"; }; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ appstream-glib desktop-file-utils gobject-introspection diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 5d13aa7daf4..af859702292 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }: +{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac +, usePulseAudio ? false, libpulseaudio }: let - version = "0.2.7025-beta20.1"; + version = "0.4.1"; in stdenv.mkDerivation rec { name = "openmpt123-${version}"; + src = fetchurl { - url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; - sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; + sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; }; + + enableParallelBuilding = true; + doCheck = true; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL2 flac libsndfile ]; - makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ] - ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; - installFlags = "PREFIX=\${out}"; + buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] + ++ stdenv.lib.optional usePulseAudio libpulseaudio; + + configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; homepage = https://lib.openmpt.org/libopenmpt/; license = licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 43cc171e05f..7876ebc244b 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext +{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext , gnome3, libnotify, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror @@ -6,12 +6,15 @@ }: stdenv.mkDerivation rec { - name = "deja-dup-${version}"; - version = "38.1"; + pname = "deja-dup"; + version = "38.3"; - src = fetchurl { - url = "https://launchpad.net/deja-dup/${stdenv.lib.versions.major version}/${version}/+download/deja-dup-${version}.tar.xz"; - sha256 = "0wm7z72qbsljzsysxg8h5sbpg56ignn9mp8v3xynn12dv3gv6rba"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + sha256 = "1bnvmdlm67k1b6115x75j3nl92x5yl4psq5pna2w6cg9npxdd3fa"; }; patches = [ @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; nativeBuildInputs = [ @@ -57,9 +60,9 @@ stdenv.mkDerivation rec { of backing up the Right Way (encrypted, off-site, and regular) \ and uses duplicity as the backend. ''; - homepage = https://launchpad.net/deja-dup; - license = with licenses; gpl3; + homepage = https://wiki.gnome.org/Apps/DejaDup; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar joncojonathan ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 36928a29897..a965ff4c8bb 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager."; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington worldofpeace ]; + maintainers = with maintainers; [ ocharles worldofpeace ]; }; } diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 51cb28d02d2..a3e9554789c 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ ocharles wkennington ]; + maintainers = with maintainers; [ ocharles ]; }; } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 125538e54cf..4b53774662f 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0dracganibnkyapn2pk2qqnxpwmii57371ycri4nccaci9v9pcjw"; }; betaVersion = { - version = "3.4.0.10"; # "Android Studio 3.4 Beta 1" - build = "183.5217543"; - sha256Hash = "0yd9l4py82i3gl1nvfwlhfx12hzf1mih8ylgdl3r85hhlqs7w2dm"; + version = "3.4.0.11"; # "Android Studio 3.4 Beta 2" + build = "183.5240537"; + sha256Hash = "0mv7ayqjkw97jzdifw1cdvjhnzygzkd2a9rc0h99fclhf2nii5yr"; }; latestVersion = { # canary & dev - version = "3.5.0.0"; # "Android Studio 3.5 Canary 1" - build = "183.5215047"; - sha256Hash = "1f7lllj85fia02hgy4ksbqh80sdcml16fv1g892jc6lwykjrdw5y"; + version = "3.5.0.1"; # "Android Studio 3.5 Canary 2" + build = "183.5240547"; + sha256Hash = "0z52ig9v2w9i6bqiqpdvgcr6g6sgl8p5317jamg72d5csm9hgfx3"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 27e27432647..d7932dc4dcf 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -53,6 +53,13 @@ let lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ]; + # nvim --version output retains compilation flags and references to build tools + postPatch = '' + substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; + ''; + # check that the above patching actually works + disallowedReferences = [ stdenv.cc ]; + cmakeFlags = [ "-DLUA_PRG=${luaPackages.lua}/bin/lua" "-DGPERF_PRG=${gperf}/bin/gperf" diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 10cc55d3d2b..669c7c8f961 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ the-kenny wkennington ]; + maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 5220fdf8981..79149dc83cf 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { homepage = http://www.imagemagick.org/; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ the-kenny wkennington ]; + maintainers = with maintainers; [ the-kenny ]; license = licenses.asl20; }; } diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index ce2bdcbd298..c9fdbd255d4 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,13 +8,21 @@ , python3 }: +let + +major = "4.1"; +minor = "7"; +patch = "101"; + +in + mkDerivation rec { name = "krita-${version}"; - version = "4.1.5"; + version = "${major}.${minor}.${patch}"; src = fetchurl { - url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; + url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; + sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 7f118b6adc9..acbbf73465d 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "sxiv-${version}"; - version = "24"; + pname = "sxiv"; + version = "25"; src = fetchFromGitHub { owner = "muennich"; - repo = "sxiv"; + repo = pname; rev = "v${version}"; - sha256 = "020n1bdxbzqncprh8a4rnjzc4frp335yxbqh5w6dr970f7n5qm8d"; + sha256 = "13s1lfar142hq1j7xld0ri616p4bqs57b17yr4d0b9a9w7liz4hp"; }; postUnpack = '' diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix new file mode 100644 index 00000000000..912f18890b5 --- /dev/null +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, perlPackages }: + +let version = "1.1"; +in stdenv.mkDerivation { + name = "asciiquarium-${version}"; + src = fetchurl { + url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz"; + sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perlPackages.perl ]; + + installPhase = '' + mkdir -p $out/bin + cp asciiquarium $out/bin + chmod +x $out/bin/asciiquarium + wrapProgram $out/bin/asciiquarium \ + --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.TermAnimation ] } + ''; + + meta = with stdenv.lib; { + description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; + homepage = https://robobunny.com/projects/asciiquarium/html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.utdemir ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 9b1c99c3eed..cd3ee82aceb 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.37.0"; + version = "3.38.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "12si7jag5ildy08h0nfs4rfpn417i82valxbk2wjkypp226gqi05"; + sha256 = "07fvpnabk17sfg81xn0bsnw36k45hawwz0fcz5cmp5qydm85ncv0"; }; patches = [ diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e90fccefb06..de42f2d9657 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.3.0"; + version = "5.3.2"; 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 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m"; + sha256 = "05ra1bicah588q5n114vd9jqk9qdjix7b0zv5z83cagksb3n52rc"; }; installPhase = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4ca82f1adc3..c6f83104fb1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar }: +{ stdenv, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let qdarkstyle = python3Packages.buildPythonPackage rec { @@ -13,15 +13,20 @@ let in python3Packages.buildPythonApplication rec { - name = "electrum-${version}"; - version = "3.2.4"; + pname = "electrum"; + version = "3.3.2"; - src = fetchurl { - url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0nwipn1alk3r54zpsv2bdwsqxw4f08bxnfmygnwakfkiaifmmhxg"; + src = fetchFromGitHub { + owner = "spesmilo"; + repo = "electrum"; + rev = version; + sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; }; propagatedBuildInputs = with python3Packages; [ + aiorpcx + aiohttp + aiohttp-socks dnspython ecdsa jsonrpclib-pelix @@ -36,7 +41,6 @@ python3Packages.buildPythonApplication rec { qrcode requests tlslite-ng - typing # plugins keepkey @@ -53,6 +57,7 @@ python3Packages.buildPythonApplication rec { # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py + substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; postInstall = '' @@ -65,10 +70,10 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; - doCheck = false; + checkInputs = with python3Packages; [ pytest ]; - doInstallCheck = true; - installCheckPhase = '' + checkPhase = '' + py.test electrum/tests $out/bin/electrum help >/dev/null ''; diff --git a/pkgs/applications/misc/font-manager/correct-post-install.patch b/pkgs/applications/misc/font-manager/correct-post-install.patch new file mode 100644 index 00000000000..47e9800d265 --- /dev/null +++ b/pkgs/applications/misc/font-manager/correct-post-install.patch @@ -0,0 +1,13 @@ +diff --git a/meson_post_install.py b/meson_post_install.py +index 8d00e70..c28d19e 100644 +--- a/meson_post_install.py ++++ b/meson_post_install.py +@@ -7,7 +7,7 @@ prefix = environ['MESON_INSTALL_PREFIX'] + data_dir = path.join(prefix, 'share') + schema_dir = path.join(data_dir, 'glib-2.0', 'schemas') + +-if not environ['DESTDIR']: ++if not environ.get('DESTDIR'): + print('Compiling gsettings schemas...') + call(['glib-compile-schemas', schema_dir]) + print('Updating desktop database...') diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 998074e8aa0..7eb698321c5 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchFromGitHub, automake, autoconf, libtool, - pkgconfig, file, intltool, libxml2, json-glib , sqlite, itstool, - librsvg, vala, gnome3, wrapGAppsHook, gobject-introspection +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, + pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, + vala, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { - name = "font-manager-${version}"; - version = "0.7.3.1"; + pname = "font-manager"; + version = "0.7.4.1"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "0i65br0bk3r6x8wcl8jhc0v0agl0k6fy5g60ss1bnw4md7ldpgyi"; - }; + sha256 = "1zy419zzc95h4gxvl88acqjbwlnmwybj23rx3vkc62j3v3w4nlay"; + }; nativeBuildInputs = [ pkgconfig - automake autoconf libtool - file - intltool + meson + ninja + gettext + python3 itstool + desktop-file-utils vala gnome3.yelp-tools wrapGAppsHook @@ -33,22 +35,20 @@ stdenv.mkDerivation rec { sqlite librsvg gnome3.gtk - gnome3.libgee gnome3.defaultIconTheme ]; - enableParallelBuilding = true; - - preConfigure = '' - NOCONFIGURE=true ./autogen.sh - substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" - ''; + patches = [ ./correct-post-install.patch ]; - configureFlags = [ - "--with-file-roller" - "--disable-pycompile" + mesonFlags = [ + "-Ddisable_pycompile=true" ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + meta = { homepage = https://fontmanager.github.io/; description = "Simple font management for GTK+ desktop environments"; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 96f8cb11614..0fccf83acf7 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -79,6 +79,15 @@ stdenv.mkDerivation rec { for a in $out/opt/google/earth/free/*.so* ; do patchelf --set-rpath "${fullPath}:\$ORIGIN" $a done + + # Add desktop config file and icons + mkdir -p $out/share/{applications,icons/hicolor/{16x16,22x22,24x24,32x32,48x48,64x64,128x128,256x256}/apps,pixmaps} + ln -s $out/opt/google/earth/free/google-earth.desktop $out/share/applications/google-earth.desktop + sed -i -e "s|Exec=.*|Exec=$out/bin/googleearth|g" $out/opt/google/earth/free/google-earth.desktop + for size in 16 22 24 32 48 64 128 256; do + ln -s $out/opt/google/earth/free/product_logo_"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/google-earth.png + done + ln -s $out/opt/google/earth/free/product_logo_256.png $out/share/pixmaps/google-earth.png ''; checkPhase = '' diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 30e36c3dcf0..3260f6a5069 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - pytz six tzlocal keyring argparse dateutil + pytz six tzlocal keyring dateutil parsedatetime pycrypto ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index bac0eaaaba6..d6e05056e1c 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -34,7 +34,6 @@ in with python.pkgs; buildPythonApplication rec { atomicwrites configobj vobject - argparse ruamel_yaml ruamel_base unidecode diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index ab9029512a2..abf4bb05462 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages }: let - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation rec { name = "qdirstat-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = "${version}"; - sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh"; + sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -20,18 +20,9 @@ in stdenv.mkDerivation rec { preBuild = '' substituteInPlace scripts/scripts.pro \ - --replace /bin/true ${coreutils}/bin/true \ - --replace /usr/bin $out/bin - substituteInPlace src/src.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share - for i in doc/doc.pro doc/stats/stats.pro - do - substituteInPlace $i \ - --replace /usr/share $out/share - done + --replace /bin/true ${coreutils}/bin/true - for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp + for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp do substituteInPlace $i \ --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open @@ -45,6 +36,9 @@ in stdenv.mkDerivation rec { substituteInPlace src/StdCleanup.cpp \ --replace /bin/bash ${bash}/bin/bash ''; + postPatch = '' + export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" + ''; postInstall = '' wrapProgram $out/bin/qdirstat-cache-writer \ diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 5417a135dda..7527fe963ab 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -16,6 +16,8 @@ python3Packages.buildPythonApplication rec { sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; + LC_ALL = "en_US.UTF-8"; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix index 680703737c2..ddf8cf18fc7 100644 --- a/pkgs/applications/misc/slic3r/prusa3d.nix +++ b/pkgs/applications/misc/slic3r/prusa3d.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU, - glew, eigen, curl, gtest, nlopt, pcre, xorg }: + glew, eigen, curl, gtest, nlopt, pcre, xorg, makeDesktopItem }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { name = "Alien-wxWidgets-0.69"; @@ -112,6 +112,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin/var cp -r ../resources/icons/* $out/bin/var/ cp -r ../resources $out/bin/ + + + mkdir -p "$out/share/pixmaps/" + ln -s "$out/bin/var/Slic3r.png" "$out/share/pixmaps/slic3r-prusa.png" + mkdir -p "$out/share/applications" + cp "$desktopItem"/share/applications/* "$out/share/applications/" ''; src = fetchFromGitHub { @@ -121,6 +127,16 @@ stdenv.mkDerivation rec { rev = "version_${version}"; }; + desktopItem = makeDesktopItem { + name = "slic3r-Prusa-Edition"; + exec = "slic3r-prusa3d"; + icon = "slic3r-prusa"; + comment = "G-code generator for 3D printers"; + desktopName = "Slic3r Prusa Edition"; + genericName = "3D printer tool"; + categories = "Application;Development;"; + }; + meta = with stdenv.lib; { description = "G-code generator for 3D printer"; homepage = https://github.com/prusa3d/Slic3r; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 5f12bdb4dfc..25855c2a613 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper -, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver +, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver, cf-private , libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: stdenv.mkDerivation rec { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl openssl ] ++ lib.optionals stdenv.isDarwin [ - ApplicationServices Carbon Cocoa CoreServices ScreenSaver + ApplicationServices Carbon Cocoa CoreServices ScreenSaver cf-private ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; installPhase = '' diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index eb7a8e41d4b..ab6ef329470 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus , gsettings-desktop-schemas, desktop-file-utils, gettext, gtkd, libsecret -, perlPackages, wrapGAppsHook, xdg_utils }: +, glib, perlPackages, wrapGAppsHook, xdg_utils }: stdenv.mkDerivation rec { - name = "tilix-${version}"; - version = "1.8.5"; + pname = "tilix"; + version = "1.8.9"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; - sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7"; + rev = version; + sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d"; }; nativeBuildInputs = [ @@ -25,22 +25,20 @@ stdenv.mkDerivation rec { ) ''; - postInstall = with gnome3; '' + postInstall = '' ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - - wrapProgram $out/bin/tilix \ - --prefix LD_LIBRARY_PATH ":" "${libsecret}/lib" ''; - preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH ":" "${libsecret}/lib") + substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop ''; meta = with stdenv.lib; { - description = "Tiling terminal emulator following the Gnome Human Interface Guidelines."; + description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = https://gnunn1.github.io/tilix-web; license = licenses.mpl20; maintainers = with maintainers; [ midchildan ]; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index bc36ffa5e10..b268bdd0962 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco -, qtbase, qtwebkit, qtx11extras, sqlite }: +, qtbase, qtwebengine, qtx11extras, sqlite }: let name = "toggldesktop-${version}"; @@ -39,15 +39,15 @@ let qt-oauth-lib = stdenv.mkDerivation rec { name = "qt-oauth-lib-${version}"; - version = "20180521.233208"; + version = "20190125.190943"; src = fetchzip { url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; - sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + sha256 = "0zmfgvdf6n79mgfvbda7lkdxxlzjmy86436gqi2r5x05vq04sfrj"; }; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase qtwebkit ]; + buildInputs = [ qtbase qtwebengine ]; }; poco-pc = writeText "poco.pc" '' @@ -100,7 +100,7 @@ let libtoggl qxtglobalshortcut qtbase - qtwebkit + qtwebengine qt-oauth-lib qtx11extras libX11 diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index aa741a5c94f..4fa1c833df5 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xkbmon-${version}"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "xkbmon"; repo = "xkbmon"; rev = version; - sha256 = "1x2xwak0yp0xkl63jzz3k1pf074mh9yxgppwwm96ms3zaslq44yp"; + sha256 = "03v8f6fijgwagjphyj8w7lgh5hlc8jk0j2n45n7fm0xwy82cxxx9"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index d67d9d5851c..876630c559a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.14.0"; + version = "0.16.1"; goPackagePath = "github.com/docker/machine"; @@ -11,16 +11,16 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0hd5sklmvkhhpfn318hq9w0f7x14165h1l2mdn9iv4447z1iibff"; + sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - ''; + mkdir -p \ + $bin/share/bash-completion/completions/ \ + $bin/share/zsh/site-functions/ - postFixup = '' - mv $bin/bin/cmd $bin/bin/docker-machine + cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ + cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 6ffe40d6a3d..c9edaae1e53 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.10.0"; + version = "1.11.0"; goPackagePath = "k8s.io/kops"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp"; + sha256 = "1z67jl66g79q6v5kjy9qxx2xp656ybv5hrc10h3wmzy0b0n30s4n"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 73a28325f52..1e16cf1afca 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.6.0"; in +let version = "0.9.1"; in buildGoPackage { name = "kubecfg-${version}"; @@ -9,7 +9,7 @@ buildGoPackage { owner = "ksonnet"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf"; + sha256 = "010k33arxa4spaq923iazsisxgsaj8c7w4z250y9yrch8xxd74bi"; }; goPackagePath = "github.com/ksonnet/kubecfg"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 3343141801e..368b3cd2ee6 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.11"; + stableVersion = "2.1.12"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1skcb47r0wvv7l7z487b2165pwvc397b23abfq24kw79806vknzn"; - serverSrcHash = "09j2nafxvgc6plk7s3qwv5qc0cc2bi41h4fhg8g7c85ixfx5yz8a"; + guiSrcHash = "19kk1nc8h6ljczhizkgszw6xma31p0fmh6vkygpmrfwb8975d1s6"; + serverSrcHash = "1rs3l33jf33y02xri0b7chy02cjzd8v7l20ccjw2in8mw08mpc99"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fbd326919f3..edcf154dc77 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = https://www.bitlbee.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wkennington pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 4b8670f23d4..d33761ba772 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -1,60 +1,44 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook -, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2 +{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg +, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else "ia32"; - - version = "4.0.4"; - - desktopItem = makeDesktopItem rec { - name = "Franz"; - exec = name; - icon = "franz"; - desktopName = name; - genericName = "Franz messenger"; - categories = "Network;"; - }; + version = "5.0.0-beta.19"; in stdenv.mkDerivation rec { name = "franz-${version}"; src = fetchurl { - url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz"; - sha256 = if bits == "x64" then - "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else - "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; + sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy"; }; # don't remove runtime deps dontPatchELF = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; buildInputs = (with xorg; [ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc ]; runtimeDependencies = [ udev.lib libnotify ]; - unpackPhase = '' - tar xzf $src - ''; + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' - mkdir -p $out/bin $out/opt/franz - cp -r * $out/opt/franz - ln -s $out/opt/franz/Franz $out/bin + mkdir -p $out/bin + cp -r opt $out + ln -s $out/opt/Franz/franz $out/bin # provide desktop item and icon - mkdir -p $out/share/applications $out/share/pixmaps - ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + cp -r usr/share $out + substituteInPlace $out/share/applications/franz.desktop \ + --replace Exec=\"/opt/Franz/franz\" Exec=franz ''; postFixup = '' - wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin + wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin ''; meta = with stdenv.lib; { @@ -62,7 +46,7 @@ in stdenv.mkDerivation rec { homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = ["x86_64-linux"]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 41e7db569c4..fdb3326803c 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper }: let - version = "3.5.0"; + version = "3.5.1"; arch = if stdenv.is64bit then "amd64" else "x86"; libDir = if stdenv.is64bit then "lib64" else "lib"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2" ]; sha256 = if stdenv.is64bit - then "0zk7rbi6mvs2nnsjhv4aizl5ydiyr46ng2i3lr8r78gyb88nxmcv" - else "0nahsmcnykgchgv50jb22fin74sab1zl8gy6m6s8mjk570qlvzzm"; + then "0ygb867ff2fvi9n9hgs4hldpg4y012w4i1d9cx4f5mpli1xim6da" + else "0g1cixsldpdbfzg2vain7h3hr5j3xjdngjw66r0aqnzbx743gjzj"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5642d254295..b992263e215 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -2,17 +2,17 @@ , xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }: let - version = "3.9.0"; + version = "4.0.1"; in stdenv.mkDerivation { name = "vk-messenger-${version}"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3"; + sha256 = "0mgppa9qnhix64zp40dc05yc9klsc7qiwcgw7pwq2wm7m3fz3nm8"; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9"; + sha256 = "0ra0y4dfx4gfa1r3lm6v42j7c9pf7a8vh12kxv3wkg3pvijwgdsm"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 84466f7cd3d..e2b56f3b8af 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "notmuch-bower-${version}"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0f8djiclq4rz9isbx18bpzymbvb2q0spvjp982b149hr1my6klaf"; + sha256 = "0jpaxlfxz7mj76z3cyj8sq053p0mkp46kaw05nimzwaq5yx923fv"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index f05ec7efa21..c9774f269da 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = - stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' install -d $out/share/doc/${pname}/scripts diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d0a690496e2..2d008492050 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ jgeerds wkennington ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 7f7b03f71d2..0cfcf6408ba 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -4,15 +4,13 @@ , gobject-introspection, glib-networking, hicolor-icon-theme }: -let +stdenv.mkDerivation rec { pname = "liferea"; - version = "1.12.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "1.12.6"; src = fetchurl { - url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}b.tar.bz2"; + sha256 = "sha256:03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7ece1375793..624c5472ddc 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { $out/share/applications/nextcloud.desktop wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} \ + --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 6512792dd2b..425a064fa96 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.freerdp.com/; license = licenses.asl20; - maintainers = with maintainers; [ wkennington peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index e4715cce8e1..9bfaad8a5bc 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "13.1.3026"; + version = "14.1.3399"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; - sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; + url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; + sha256 = "166ndijis2i3afz3l6nsnrdhs56v33w5cnjd0m7giqj0fbq43ws5"; }; unpackPhase = '' diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 5dae3c9f85c..a7887357cd3 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }: let - version = "1.43.27"; + version = "1.44.55"; in stdenv.mkDerivation rec { name = "mytetra-${version}"; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h"; + sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l"; }; nativeBuildInputs = [ qmake makeWrapper ]; @@ -15,11 +15,11 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; preBuild = '' - substituteInPlace mytetra.pro \ + substituteInPlace app/app.pro \ --replace /usr/local/bin $out/bin \ --replace /usr/share $out/share - substituteInPlace src/views/mainWindow/MainWindow.cpp \ + substituteInPlace app/src/views/mainWindow/MainWindow.cpp \ --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png" ''; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5fab9788a94..0a4e1dddcae 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -25,7 +25,7 @@ let "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8"; "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk"; "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; - "8.9+beta1" = "1yxv2klqal3mh6symi3gc6gv3xm684zlld2c0b6ijhjmp865cin8"; + "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; }."${version}"; coq-version = builtins.substring 0 3 version; ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix new file mode 100644 index 00000000000..a3834dc70b6 --- /dev/null +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, openjdk}: +stdenv.mkDerivation rec { + pname = "leo3"; + version = "1.2"; + + jar = fetchurl { + url = "https://github.com/leoprover/Leo-III/releases/download/v${version}/leo3.jar"; + sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; + }; + + phases=["installPhase" "fixupPhase"]; + + installPhase = '' + mkdir -p "$out"/{bin,lib/java/leo3} + cp "${jar}" "$out/lib/java/leo3/leo3.jar" + echo "#!${stdenv.shell}" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + chmod a+x "$out/bin/leo3" + ''; + + meta = { + inherit version; + description = "An automated theorem prover for classical higher-order logic with choice"; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://page.mi.fu-berlin.de/lex/leo3/"; + }; +} diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix new file mode 100644 index 00000000000..34449542abb --- /dev/null +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -0,0 +1,31 @@ +{stdenv, z3, cmake}: +stdenv.mkDerivation rec { + pname = "z3-tptp"; + version = z3.version; + + src = z3.src; + + sourceRoot = "source/examples/tptp"; + + nativeBuildInputs = [cmake]; + buildInputs = [z3]; + + preConfigure = '' + echo 'set(Z3_LIBRARIES "-lz3")' >> CMakeLists.new + cat CMakeLists.txt | grep -E 'add_executable|project|link_libraries' >> CMakeLists.new + mv CMakeLists.new CMakeLists.txt + ''; + + installPhase = '' + mkdir -p "$out/bin" + cp "z3_tptp5" "$out/bin/" + ln -s "z3_tptp5" "$out/bin/z3-tptp" + ''; + + meta = { + inherit version; + inherit (z3.meta) license homepage platforms; + description = ''TPTP wrapper for Z3 prover''; + maintainers = [stdenv.lib.maintainers.raskin]; + }; +} diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 2158021c754..065360a112d 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -5,10 +5,10 @@ with lib; l10ns = flip map [ { - version = "11.2.0"; + version = "11.3.0"; lang = "en"; language = "English"; - sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9"; + sha256 = "0fcfe208c1eac8448e7be3af0bdb84370b17bd9c5d066c013928c8ee95aed10e"; } { version = "11.2.0"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f5e586ec2ba..689cf8d8de9 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "09h8nbzsxm34rlfnvbsf4cs02igids806927xpxf7g563cdapcnl"; + sha256 = "1mbr7pnzn8x05wc288855vqaf86qk2f1py5zh8s63l048bn0fld6"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dfc2484b1a5..664ef62be54 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "4.1.1"; + version = "4.2.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "188k6vaafv6szzhslsfabnnn68ispsv54d98rcm3m0bmp8kg5p7f"; + sha256 = "07f9h3276bs7m22vwpxrxmlwnq7l5inr2l67nmpiaz1569yabwsg"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index b7334ebbe5e..dc458eba167 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "10s7v7mi438b8lh3rpd6da9lkwgaflpi6a0inkd8bl4b4ya38vc6"; + sha256 = "02av8k241rn7b68g4kl22s7jqmlq545caah1a5rvbgy41y7zzjvh"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix new file mode 100644 index 00000000000..d98b3979660 --- /dev/null +++ b/pkgs/applications/video/bino3d/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: + +stdenv.mkDerivation rec { + name = "bino-${version}"; + version = "1.6.7"; + + src = fetchurl { + url = "https://bino3d.org/releases/${name}.tar.xz"; + sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ ffmpeg glew libass openal qtbase ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Stereoscopic 3D and multi-display video player"; + homepage = https://bino3d.org/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 28c43debcab..f616ca42983 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -199,13 +199,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = dockerGen rec { - version = "18.09.0"; - rev = "4d60db472b2bde6931072ca6467f2667c2590dff"; # git commit - sha256 = "0py944f5k71c1cf6ci96vnqk43d5979w7r82cngaxk1g6za6k5yj"; - runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; - runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; - containerdRev = "468a545b9edcd5932818eb9de8e72413e616e86e"; - containerdSha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v"; + version = "18.09.1"; + rev = "4c52b901c6cb019f7552cd93055f9688c6538be4"; # git commit + sha256 = "0q2789afx07pkisgp9iqrbac5k7xca54w1an4mf5mw34xn8yc4xc"; + runcRev = "96ec2177ae841256168fcf76954f7177af9446eb"; + runcSha256 = "1qr9msx6vs37jr0rk3r8x2q51fsk50c78a3999kd0snjy9bxmfhd"; + containerdRev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; + containerdSha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index cbdecb32288..746c45beccf 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + # Required for USB redirection PolicyKit rules file + propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index e28a9cf75be..a0e46c108b7 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,31 +3,32 @@ }: stdenv.mkDerivation rec { - rev = "3734fba160166006521e513f5734eb76ac6aa48f"; - name = "i3lock-fancy-unstable-2017-12-14_rev${builtins.substring 0 7 rev}"; + rev = "7accfb2aa2f918d1a3ab975b860df1693d20a81a"; + name = "i3lock-fancy-unstable-2018-11-25_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "1bg4xds2hmbq8rp6azbdqvgp1aaq5y1bp05cfwqqm6y3sjw7ywzl"; + sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1"; }; patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" lock - sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" lock - sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock - sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock - sed -i -e "s| awk | ${gawk}/bin/awk |" lock - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" lock - sed -i -e 's|icon="$scriptpath/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock - sed -i -e 's|icon="$scriptpath/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' lock - sed -i -e "s|getopt |${getopt}/bin/getopt |" lock - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock - sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" lock + sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy + sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy + sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy + sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy + sed -i -e "s|awk -F|${gawk}/bin/awk -F|" i3lock-fancy + sed -i -e "s| awk | ${gawk}/bin/awk |" i3lock-fancy + sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lockdark.png"|icon="'$out'/share/i3lock-fancy/icons/lockdark.png"|' i3lock-fancy + sed -i -e 's|icon="/usr/share/i3lock-fancy/icons/lock.png"|icon="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy + sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy + sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy + sed -i -e "s|shot=(import -window root)|shot=(${scrot}/bin/scrot -z)|" i3lock-fancy + rm Makefile ''; installPhase = '' mkdir -p $out/bin $out/share/i3lock-fancy/icons - cp lock $out/bin/i3lock-fancy + cp i3lock-fancy $out/bin/i3lock-fancy cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 541c7b539bb..b9d16db5792 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } |