git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #53818 from gnidorah/updates

update most packages I maintain

commitb3eaad9a27534052196aad91ab7d1c56ee7bd66c authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 23 Jan 2019, 19:19 (8 years ago) parent6418e34f2b9162
11 files changed+85−111
pkgs/applications/audio/openmpt123/default.nix+16−10 pkgs/applications/misc/qdirstat/default.nix+7−13 pkgs/applications/networking/instant-messengers/franz/default.nix+16−32 pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+3−3 pkgs/applications/office/mytetra/default.nix+4−4 pkgs/development/libraries/kmsxx/default.nix+3−3 pkgs/games/openjk/default.nix+3−3 pkgs/games/openmw/tes3mp.nix+25−37 pkgs/games/quakespasm/vulkan.nix+2−2 pkgs/tools/system/ps_mem/default.nix+3−3 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/audio/openmpt123/default.nix+16−10
@@ -1,24 +1,30 @@
1−{ stdenv, fetchurl, SDL2, pkgconfig, flac, libsndfile }:
1+{ stdenv, fetchurl, zlib, pkgconfig, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
2+, usePulseAudio ? false, libpulseaudio }:
23
34let
4− version = "0.2.7025-beta20.1";
5+ version = "0.4.1";
56in stdenv.mkDerivation rec {
67 name = "openmpt123-${version}";
8+
79 src = fetchurl {
8− url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz";
9− sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
10+ url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
11+ sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4";
1012 };
13+
14+ enableParallelBuilding = true;
15+ doCheck = true;
16+
1117 nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ SDL2 flac libsndfile ];
13− makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ]
14− ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
15− installFlags = "PREFIX=\${out}";
18+ buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ]
19+ ++ stdenv.lib.optional usePulseAudio libpulseaudio;
20+
21+ configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ];
1622
1723 meta = with stdenv.lib; {
1824 description = "A cross-platform command-line based module file player";
1925 homepage = https://lib.openmpt.org/libopenmpt/;
2026 license = licenses.bsd3;
21− maintainers = [ stdenv.lib.maintainers.gnidorah ];
22− platforms = stdenv.lib.platforms.unix;
27+ maintainers = with maintainers; [ gnidorah ];
28+ platforms = platforms.linux;
2329 };
2430}
pkgs/applications/misc/qdirstat/default.nix+7−13
@@ -3,7 +3,7 @@
33, makeWrapper, perlPackages }:
44
55let
6− version = "1.4";
6+ version = "1.5";
77in stdenv.mkDerivation rec {
88 name = "qdirstat-${version}";
99
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 owner = "shundhammer";
1212 repo = "qdirstat";
1313 rev = "${version}";
14− sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh";
14+ sha256 = "1v879kd7zahalb2qazq61wzi364k5cy3lgy6c8wj6mclwxjws1vc";
1515 };
1616
1717 nativeBuildInputs = [ qmake makeWrapper ];
@@ -20,18 +20,9 @@ in stdenv.mkDerivation rec {
2020
2121 preBuild = ''
2222 substituteInPlace scripts/scripts.pro \
23− --replace /bin/true ${coreutils}/bin/true \
24− --replace /usr/bin $out/bin
25− substituteInPlace src/src.pro \
26− --replace /usr/bin $out/bin \
27− --replace /usr/share $out/share
28− for i in doc/doc.pro doc/stats/stats.pro
29− do
30− substituteInPlace $i \
31− --replace /usr/share $out/share
32− done
23+ --replace /bin/true ${coreutils}/bin/true
3324
34− for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp
25+ for i in src/SysUtil.cpp src/FileSizeStatsWindow.cpp
3526 do
3627 substituteInPlace $i \
3728 --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open
@@ -45,6 +36,9 @@ in stdenv.mkDerivation rec {
4536 substituteInPlace src/StdCleanup.cpp \
4637 --replace /bin/bash ${bash}/bin/bash
4738 '';
39+ postPatch = ''
40+ export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
41+ '';
4842
4943 postInstall = ''
5044 wrapProgram $out/bin/qdirstat-cache-writer \
pkgs/applications/networking/instant-messengers/franz/default.nix+16−32
@@ -1,60 +1,44 @@
1−{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
2−, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2
1+{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg
2+, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
33, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
44
55let
6− bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
7− else "ia32";
8−
9− version = "4.0.4";
10−
11− desktopItem = makeDesktopItem rec {
12− name = "Franz";
13− exec = name;
14− icon = "franz";
15− desktopName = name;
16− genericName = "Franz messenger";
17− categories = "Network;";
18− };
6+ version = "5.0.0-beta.19";
197in stdenv.mkDerivation rec {
208 name = "franz-${version}";
219 src = fetchurl {
22− url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz";
23− sha256 = if bits == "x64" then
24− "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else
25− "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy";
10+ url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
11+ sha256 = "1b9b8y19iqx8bnax7hbh9rkjfxk8a9gqb1akrcxwwfi46l816gyy";
2612 };
2713
2814 # don't remove runtime deps
2915 dontPatchELF = true;
3016
31− nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
17+ nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ];
3218 buildInputs = (with xorg; [
3319 libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
3420 libXrender libX11 libXtst libXScrnSaver
3521 ]) ++ [
36− gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
22+ gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
3723 gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
3824 ];
3925 runtimeDependencies = [ udev.lib libnotify ];
4026
41− unpackPhase = ''
42− tar xzf $src
43− '';
27+ unpackPhase = "dpkg-deb -x $src .";
4428
4529 installPhase = ''
46− mkdir -p $out/bin $out/opt/franz
47− cp -r * $out/opt/franz
48− ln -s $out/opt/franz/Franz $out/bin
30+ mkdir -p $out/bin
31+ cp -r opt $out
32+ ln -s $out/opt/Franz/franz $out/bin
4933
5034 # provide desktop item and icon
51− mkdir -p $out/share/applications $out/share/pixmaps
52− ln -s ${desktopItem}/share/applications/* $out/share/applications
53− ln -s $out/opt/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps
35+ cp -r usr/share $out
36+ substituteInPlace $out/share/applications/franz.desktop \
37+ --replace Exec=\"/opt/Franz/franz\" Exec=franz
5438 '';
5539
5640 postFixup = ''
57− wrapProgram $out/opt/franz/Franz --prefix PATH : ${xdg_utils}/bin
41+ wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin
5842 '';
5943
6044 meta = with stdenv.lib; {
@@ -62,7 +46,7 @@ in stdenv.mkDerivation rec {
6246 homepage = https://meetfranz.com;
6347 license = licenses.free;
6448 maintainers = [ maintainers.gnidorah ];
65− platforms = ["i686-linux" "x86_64-linux"];
49+ platforms = ["x86_64-linux"];
6650 hydraPlatforms = [];
6751 };
6852}
pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+3−3
@@ -2,17 +2,17 @@
22, xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }:
33
44let
5− version = "3.9.0";
5+ version = "4.0.1";
66in stdenv.mkDerivation {
77 name = "vk-messenger-${version}";
88 src = {
99 i686-linux = fetchurl {
1010 url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
11− sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3";
11+ sha256 = "0mgppa9qnhix64zp40dc05yc9klsc7qiwcgw7pwq2wm7m3fz3nm8";
1212 };
1313 x86_64-linux = fetchurl {
1414 url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
15− sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9";
15+ sha256 = "0ra0y4dfx4gfa1r3lm6v42j7c9pf7a8vh12kxv3wkg3pvijwgdsm";
1616 };
1717 }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
1818
pkgs/applications/office/mytetra/default.nix+4−4
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, qmake, qtsvg, makeWrapper, xdg_utils }:
22
33let
4− version = "1.43.27";
4+ version = "1.44.55";
55in stdenv.mkDerivation rec {
66 name = "mytetra-${version}";
77 src = fetchurl {
88 url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz";
9− sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h";
9+ sha256 = "13lmfvschm1xwr0ys2ykhs0bb83m2f39rk1jdd7zf8yxlqki4i6l";
1010 };
1111
1212 nativeBuildInputs = [ qmake makeWrapper ];
@@ -15,11 +15,11 @@ in stdenv.mkDerivation rec {
1515 hardeningDisable = [ "format" ];
1616
1717 preBuild = ''
18− substituteInPlace mytetra.pro \
18+ substituteInPlace app/app.pro \
1919 --replace /usr/local/bin $out/bin \
2020 --replace /usr/share $out/share
2121
22− substituteInPlace src/views/mainWindow/MainWindow.cpp \
22+ substituteInPlace app/src/views/mainWindow/MainWindow.cpp \
2323 --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
2424 '';
2525
pkgs/development/libraries/kmsxx/default.nix+3−3
@@ -2,15 +2,15 @@
22
33stdenv.mkDerivation rec {
44 pname = "kmsxx";
5− version = "2018-09-10";
5+ version = "2018-10-23";
66 name = pname + "-" + version;
77
88 src = fetchFromGitHub {
99 owner = "tomba";
1010 repo = "kmsxx";
1111 fetchSubmodules = true;
12− rev = "524176c33ee2b79f78d454fa621e0d32e7e72488";
13− sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8";
12+ rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5";
13+ sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf";
1414 };
1515
1616 enableParallelBuilding = true;
pkgs/games/openjk/default.nix+3−3
@@ -20,13 +20,13 @@ let
2020 categories = "Game;";
2121 };
2222in stdenv.mkDerivation rec {
23− name = "OpenJK-2017-08-11";
23+ name = "OpenJK-2018-09-17";
2424
2525 src = fetchFromGitHub {
2626 owner = "JACoders";
2727 repo = "OpenJK";
28− rev = "a0828f06e0181c62e110f2f78d30acb5036b4113";
29− sha256 = "1wbb643z2nyhyirzzy3rz03wjqglwmsgnj7w5cl8167f9f9j9w0m";
28+ rev = "cc4094c8fa989663eb8087b33d97bb2749295b9f";
29+ sha256 = "1fzijlf4izpm6n92cwv951c10nb18pg5zhc5xx7pw3i4sy8h9nyk";
3030 };
3131
3232 dontAddPrefix = true;
pkgs/games/openmw/tes3mp.nix+25−37
@@ -1,73 +1,59 @@
11{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
2−, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }:
2+, libXt, writeScriptBin, makeWrapper, ncurses, libGL, luajit }:
33
44let
5− mygui_ = mygui.override {
6− inherit stdenv;
7− };
8− terra_ = symlinkJoin {
9− name = "terra";
10− paths = [ terra.static terra.dev ];
11− };
5+ version = "0.7.0-alpha";
126 TES3MP = fetchFromGitHub {
137 owner = "TES3MP";
148 repo = "openmw-tes3mp";
15− rev = "f61664ff6d521e10db761a550c97c6edce8f0046";
16− sha256 = "12h01kafyzq0h1cgf1c8d4mlvlplg5lvcnsc5m5h602r763pzgbb";
9+ rev = version;
10+ sha256 = "012f50f9jd29qcdww2vk4habg6pmxvxl0q6rrjq8xchb0566712q";
1711 };
1812 CallFF = fetchFromGitHub {
1913 owner = "Koncord";
2014 repo = "CallFF";
21− rev = "4aa5a31b7543a8f784852a5a109202b2783e93d9";
22− sha256 = "0cf7r8hfh79bsg4p4k1iwhxapyakkvi0hcwwvzg1ln0fqm2yqp57";
15+ rev = "da94b59ffe95d45bf98b9264e3d1279c9f6ebb6b";
16+ sha256 = "10wgiqmknh0av968c6r74n5n2izxsx8qawfrab57kkmj9h0zp0pm";
2317 };
24− RakNet = fetchFromGitHub {
18+ CrabNet = fetchFromGitHub {
2519 owner = "TES3MP";
26− repo = "RakNet";
27− rev = "9ace90a385f60e0b919bd84964a53fb1d42438ba";
28− sha256 = "0mkf5wx23w20fw9cmbiyfs86gmf0r11pdpd8y7qd4k4wl9c7n45q";
20+ repo = "CrabNet";
21+ rev = "ab1306050fe0f5b0f9c4f56893a79e56a9459567";
22+ sha256 = "03q76pjv9mdi7w832b23q1mj4r2wb0hsnh4kpvwai607g04l0pp0";
2923 };
30− PluginExamples = fetchFromGitHub {
24+ CoreScripts = fetchFromGitHub {
3125 owner = "TES3MP";
32− repo = "PluginExamples";
33− rev = "213e72f315a8029eec71437e56de0eaeba5b3670";
34− sha256 = "1q0cvz1s0zyq982066wgplnylqbiszz0bmcv2prqv78vq9is1l6b";
26+ repo = "CoreScripts";
27+ rev = "1e9f69f98051b2639b18203f989ffbd0a4b427ea";
28+ sha256 = "03ysi7rh0k78kv4slvmkxpymxvdpr8b6hwr1lvjdgq7rq0ljy0lg";
3529 };
3630
3731 fakegit = writeScriptBin "git" ''
3832 #! ${stdenv.shell}
39− if [ "$*" = "rev-list --tags --max-count=1" ] ||
40− [ "$*" = "rev-parse HEAD" ]; then
41− echo "${TES3MP.rev}"
42− else
43− exit 1
44− fi
4533 '';
4634in stdenv.mkDerivation rec {
47− version = "0.6.0";
35+ inherit version;
4836 name = "tes3mp-${version}";
4937
5038 src = fetchFromGitHub {
5139 owner = "GrimKriegor";
5240 repo = "TES3MP-deploy";
53− rev = "ac2e862c3b96206d8e0678d422ece30f9f2d0f45";
54− sha256 = "0nysr6h7sa1j5ijyd52k6sw052vcdqdx4wjjmmy7p8wh1i0jkvv6";
41+ rev = "1dd78a3e2cf9f4fe85bf7ca9c393251968a9c325";
42+ sha256 = "1bp9c4kds9q0xhbn4sxb7n0f6rvb45gzx7ljdgc56wz4j5rfi3xn";
5543 };
5644
5745 dontUseCmakeConfigure = true;
5846
5947 nativeBuildInputs = [ cmake makeWrapper fakegit ];
60− buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt
61− ncurses libGL ];
48+ buildInputs = [ boost ffmpeg qtbase bullet mygui openscenegraph SDL2 unshield openal libXt
49+ ncurses libGL luajit ];
6250
6351 buildPhase = ''
6452 mkdir dependencies keepers
6553 cp --no-preserve=mode -r ${TES3MP} code
66− mkdir code/.git
6754 cp --no-preserve=mode -r ${CallFF} dependencies/callff
68− cp --no-preserve=mode -r ${RakNet} dependencies/raknet
69− cp --no-preserve=mode -r ${PluginExamples} keepers/PluginExamples
70− ln -s ${terra_} dependencies/terra
55+ cp --no-preserve=mode -r ${CrabNet} dependencies/raknet
56+ cp --no-preserve=mode -r ${CoreScripts} keepers/CoreScripts
7157
7258 substituteInPlace tes3mp-deploy.sh \
7359 --replace "-DBUILD_OPENCS=OFF" "-DBUILD_OPENCS=OFF -DCMAKE_INSTALL_PREFIX=$out"
@@ -86,6 +72,8 @@ in stdenv.mkDerivation rec {
8672 mv build/resources $prefix/build
8773 mv build/{settings-default.cfg,openmw.cfg,gamecontrollerdb.txt} $out/etc/openmw
8874 mv keepers $prefix
75+ mv build/tes3mp-credits.md $prefix/build
76+ mv -f $prefix/keepers/version $prefix/build/resources
8977
9078 for i in tes3mp.sh tes3mp-browser.sh tes3mp-server.sh
9179 do
@@ -100,8 +88,8 @@ in stdenv.mkDerivation rec {
10088 wrapProgram $out/bin/tes3mp-server \
10189 --run "mkdir -p ~/.config/openmw" \
10290 --run "cd ~/.config/openmw" \
103− --run "[ -d PluginExamples ] || cp --no-preserve=mode -r $prefix/keepers/PluginExamples ." \
104− --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/PluginExamples\" > tes3mp-server.cfg"
91+ --run "[ -d CoreScripts ] || cp --no-preserve=mode -r $prefix/keepers/CoreScripts ." \
92+ --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg"
10593 '';
10694
10795 meta = with stdenv.lib; {
pkgs/games/quakespasm/vulkan.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 name = "vkquake-${version}";
5− majorVersion = "1.00";
5+ majorVersion = "1.01";
66 version = "${majorVersion}.0";
77
88 src = fetchFromGitHub {
99 owner = "Novum";
1010 repo = "vkQuake";
1111 rev = version;
12− sha256 = "1h7ac5bh6h6cpvkx5bvp17lv5m24hmdykcdppkivblikpxhml70s";
12+ sha256 = "1iwin8j5kbyrknbkhjgpy8nmm7pxqzr0daa9gn7p38qhg2mh0a39";
1313 };
1414
1515 sourceRoot = "source/Quake";
pkgs/tools/system/ps_mem/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, pythonPackages, fetchFromGitHub }:
22
33let
4− version = "3.9";
4+ version = "3.12";
55 pname = "ps_mem";
66in pythonPackages.buildPythonApplication rec {
77 name = "${pname}-${version}";
@@ -9,8 +9,8 @@ in pythonPackages.buildPythonApplication rec {
99 src = fetchFromGitHub {
1010 owner = "pixelb";
1111 repo = "${pname}";
12− rev = "f0891def54f1edb78a70006603d2b025236b830f";
13− sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif";
12+ rev = "v${version}";
13+ sha256 = "0kcxlmfisbwf24p2k72njfyfp22fjr9p9zalg9b4w0yhnlzk24ph";
1414 };
1515
1616 meta = with stdenv.lib; {
pkgs/top-level/all-packages.nix+3−1
@@ -18731,7 +18731,9 @@ in
1873118731
1873218732 vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
1873318733
18734− openmpt123 = callPackage ../applications/audio/openmpt123 {};
18734+ openmpt123 = callPackage ../applications/audio/openmpt123 {
18735+ usePulseAudio = config.pulseaudio or false;
18736+ };
1873518737
1873618738 opusfile = callPackage ../applications/audio/opusfile { };
1873718739