Merge pull request #53818 from gnidorah/updates

update most packages I maintain

11 files changed, 85 insertions, 111 deletions

diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 5d13aa7daf42..af8597022922 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/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index ab9029512a20..abf4bb054621 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/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 4b8670f23d43..d33761ba772e 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/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index 5642d254295e..b992263e215b 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/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index 5dae3c9f85c0..a7887357cd30 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/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index d270e2f0678d..d3733ea5f720 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "kmsxx";
-  version = "2018-09-10";
+  version = "2018-10-23";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "tomba";
     repo = "kmsxx";
     fetchSubmodules = true;
-    rev = "524176c33ee2b79f78d454fa621e0d32e7e72488";
-    sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8";
+    rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5";
+    sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index fd662fe9743e..a03599b50895 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -20,13 +20,13 @@ let
     categories = "Game;";
   };
 in stdenv.mkDerivation rec {
-  name = "OpenJK-2017-08-11";
+  name = "OpenJK-2018-09-17";
 
   src = fetchFromGitHub {
     owner = "JACoders";
     repo = "OpenJK";
-    rev = "a0828f06e0181c62e110f2f78d30acb5036b4113";
-    sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m";
+    rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f";
+    sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk";
   };
 
   dontAddPrefix = true;
diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix
index aba92ac087e8..a3ad0e637e5a 100644
--- a/pkgs/games/openmw/tes3mp.nix
+++ b/pkgs/games/openmw/tes3mp.nix
@@ -1,73 +1,59 @@
 { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
-, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }:
+, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }:
 
 let
-  mygui_ = mygui.override {
-    inherit stdenv;
-  };
-  terra_ = symlinkJoin {
-    name = "terra";
-    paths = [ terra.static terra.dev ];
-  };
+  version = "0.7.0-alpha";
   TES3MP = fetchFromGitHub {
     owner = "TES3MP";
     repo = "openmw-tes3mp";
-    rev = "f61664ff6d521e10db761a550c97c6edce8f0046";
-    sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb";
+    rev = version;
+    sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q";
   };
   CallFF = fetchFromGitHub {
     owner = "Koncord";
     repo = "CallFF";
-    rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9";
-    sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57";
+    rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b";
+    sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm";
   };
-  RakNet = fetchFromGitHub {
+  CrabNet = fetchFromGitHub {
     owner = "TES3MP";
-    repo = "RakNet";
-    rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba";
-    sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q";
+    repo = "CrabNet";
+    rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567";
+    sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0";
   };
-  PluginExamples = fetchFromGitHub {
+  CoreScripts = fetchFromGitHub {
     owner = "TES3MP";
-    repo = "PluginExamples";
-    rev = "213e72f315a8029eec71437e56de0eaeba5b3670";
-    sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b";
+    repo = "CoreScripts";
+    rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea";
+    sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg";
   };
 
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell}
-    if [ "$*" = "rev-list --tags --max-count=1" ] ||
-       [ "$*" = "rev-parse HEAD" ]; then
-      echo "${TES3MP.rev}"
-    else
-      exit 1
-    fi
   '';
 in stdenv.mkDerivation rec {
-  version = "0.6.0";
+  inherit version;
   name = "tes3mp-${version}";
 
   src = fetchFromGitHub {
     owner = "GrimKriegor";
     repo = "TES3MP-deploy";
-    rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45";
-    sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6";
+    rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325";
+    sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn";
   };
 
   dontUseCmakeConfigure = true;
 
   nativeBuildInputs = [ cmake makeWrapper fakegit ];
-  buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt
-    ncurses libGL ];
+  buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt
+    ncurses libGL luajit ];
 
   buildPhase = ''
     mkdir dependencies keepers
     cp --no-preserve=mode -r ${TES3MP} code
-    mkdir code/.git
     cp --no-preserve=mode -r ${CallFF} dependencies/callff
-    cp --no-preserve=mode -r ${RakNet} dependencies/raknet
-    cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples
-    ln -s ${terra_} dependencies/terra
+    cp --no-preserve=mode -r ${CrabNet} dependencies/raknet
+    cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts
 
     substituteInPlace tes3mp-deploy.sh \
       --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out"
@@ -86,6 +72,8 @@ in stdenv.mkDerivation rec {
     mv build/resources $prefix/build
     mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw
     mv keepers $prefix
+    mv build/tes3mp-credits.md $prefix/build
+    mv -f $prefix/keepers/version $prefix/build/resources
 
     for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh
     do
@@ -100,8 +88,8 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/tes3mp-server \
       --run "mkdir -p ~/.config/openmw" \
       --run "cd ~/.config/openmw" \
-      --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \
-      --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg"
+      --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \
+      --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 6f69c6469503..4cd073869dc8 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "vkquake-${version}";
-  majorVersion = "1.00";
+  majorVersion = "1.01";
   version = "${majorVersion}.0";
 
   src = fetchFromGitHub {
     owner = "Novum";
     repo = "vkQuake";
     rev = version;
-    sha256 = "1h7ac5bh6h6cpvkx5bvp17lv5m24hmdykcdppkivblikpxhml70s";
+    sha256 = "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39";
   };
 
   sourceRoot = "source/Quake";
diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
index bbac78f4864b..3e7bb301a6b9 100644
--- a/pkgs/tools/system/ps_mem/default.nix
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pythonPackages, fetchFromGitHub }:
 
 let
-  version = "3.9";
+  version = "3.12";
   pname = "ps_mem";
 in pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
@@ -9,8 +9,8 @@ in pythonPackages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "pixelb";
     repo = "${pname}";
-    rev = "f0891def54f1edb78a70006603d2b025236b830f";
-    sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif";
+    rev = "v${version}";
+    sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 474778afa5d5..aba19f6287c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18731,7 +18731,9 @@ in
 
   vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
 
-  openmpt123 = callPackage ../applications/audio/openmpt123 {};
+  openmpt123 = callPackage ../applications/audio/openmpt123 {
+    usePulseAudio = config.pulseaudio or false;
+  };
 
   opusfile = callPackage ../applications/audio/opusfile { };