From ee01b57e35e510d83b6492072448ad986885d77f Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Sun, 25 Apr 2021 20:28:20 +0530 Subject: [PATCH 01/16] tremor-rs: 0.11.0 -> 0.11.1 --- pkgs/tools/misc/tremor-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index ca3f3058755..73640de76bf 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "19g0ijkclrza6s0qcbwwh3lhlkisy00ffcl0c0d7dfqwrcisgz57"; + sha256 = "0aw6m5gklpgv1frrviv1v1ky898dwbcc1crd65d3gldcmnhvg6ap"; }; - cargoSha256 = "1xv205czb2z6qpqi6vslyrx2n21510qqa11i2hwya3jdcc9lkrsd"; + cargoSha256 = "1lks3xgnzcccv3hiqgxjpfm4v4g97an8yzfnb2kakw7jkfli6kvi"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From 5b0b678a31100332903324f434e1d4f053a5f404 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 25 Apr 2021 19:09:36 +0100 Subject: [PATCH 02/16] qemu: patches: use correct CVE numbers for CVE-2021-20221 & CVE-2021-20181 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d01af5dddb8..a10b8bd4b28 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -90,12 +90,12 @@ stdenv.mkDerivation rec { sha256 = "0sj0kr0g6jalygr5mb9i17fgr491jzaxvk3dvala0268940s01x9"; }) (fetchpatch { - name = "CVE-2020-20221.patch"; + name = "CVE-2021-20221.patch"; url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/arm_gic-fix-interrupt-ID-in-GICD_SGIR-CVE-2021-20221.patch"; sha256 = "1iyvcw87hzlc57fg5l87vddqmch8iw2yghk0s125hk5shn1bygjq"; }) (fetchpatch { - name = "CVE-2020-20181.patch"; + name = "CVE-2021-20181.patch"; url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/9pfs-Fully-restart-unreclaim-loop-CVE-2021-20181.patch"; sha256 = "149ifiazj6rn4d4mv2c7lcayq744fijsv5abxlb8bhbkj99wd64f"; }) From 17f00cd216e5fc949ac0f1df3dba836c7bef431a Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Mon, 26 Apr 2021 01:06:52 +0200 Subject: [PATCH 03/16] nxdomain: 1.0.1 -> 1.0.2 --- pkgs/tools/networking/nxdomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix index 073ac48b8d3..4e7a708125a 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "nxdomain"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn"; + sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb"; }; propagatedBuildInputs = [ dnspython ]; @@ -23,7 +23,7 @@ buildPythonApplication rec { homepage = "https://github.com/zopieux/nxdomain"; description = "A domain (ad) block list creator"; platforms = platforms.all; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ zopieux ]; }; } From 2a954135a64c70feead578a2b7fd098b6535e99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Apr 2021 14:02:22 +0200 Subject: [PATCH 04/16] lazygit: 0.27.3 -> 0.28.1 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index cd0fb4a3330..7038b7c1eb0 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.27.3"; + version = "0.28.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-giHAeD7hhda9YV+NQuZ6w0eow79egGhUCIX0dPvhrWk="; + sha256 = "sha256-tan8ksSyMIeDL7oRAWd3Qtz/sKbhAAfY7IknfwjyvgQ="; }; vendorSha256 = null; From b664b77ebaeec7b6be24372e73338189a869a01e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 26 Apr 2021 14:24:25 +0200 Subject: [PATCH 05/16] wlsunset: 0.1.0 -> 0.2.0 --- pkgs/tools/wayland/wlsunset/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index 931f394d689..3572f63f57e 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland +{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc , wayland-protocols }: stdenv.mkDerivation rec { pname = "wlsunset"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "12snizvf49y40cirhr2brgyldhsykv4k2gnln2sdrajqzhrc98v6"; + sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { From 55b38314deb4038ec65b178191248a610fdd9a31 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 14 Apr 2021 11:05:44 +0200 Subject: [PATCH 06/16] gnome3.file-roller: 3.38.0 -> 3.38.1 Fixes CVE-2020-36314. Changelog: https://gitlab.gnome.org/GNOME/file-roller/-/blob/12d6c77fb736d70bee4c8f6f5ea7c60adde8473c/NEWS --- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 81680fb5df8..02801cd5a78 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj"; + sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l"; }; LANG = "en_US.UTF-8"; # postinstall.py From a19b0aa223d4a0d873f355dfca8026ca89fc1ff8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 26 Apr 2021 18:01:34 +0000 Subject: [PATCH 07/16] element: 1.7.25 -> 1.7.26 https://github.com/vector-im/element-web/blob/v1.7.26/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.26/CHANGELOG.md --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../instant-messengers/element/element-desktop.nix | 5 +++-- .../networking/instant-messengers/element/element-web.nix | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index aa240b48e88..e1f070eaa9a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.25", + "version": "1.7.26", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 75252bb74b4..2a7e01e5291 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.25"; + version = "1.7.26"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-q8hVmTLt/GdLc6NSldLggogObQcPFp+lAeS3wmO0qPo="; + sha256 = "1iflsvzn36mywpzags55kjmyq71c3i7f1hgcdcp2ijmnrjk8fy3n"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; @@ -73,6 +73,7 @@ in mkYarnPackage rec { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-desktop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 624ba46b8e8..9f077c83377 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.25"; + version = "1.7.26"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-T4lsGVSUHkw4R7tSeTKPifbhwaTf/YF2vVAakFSrt9k="; + sha256 = "17y6wq6w1yk7r1rfply549kpilfraizahf67p00ra7cws66iqkwg"; }; installPhase = '' @@ -32,6 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; From b0c26d2c4038d2768b9b0191ddeed16377419f7b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 19:04:29 +0200 Subject: [PATCH 08/16] pkgs/stdenv/make-derivation: move hostSuffix before the version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the hostSuffix to the end of the derivation's name is problematic since some stuff, including user facing programs like nix-env rely on the behavior of parseDrvName instead of pname and version. builtins.parseDrvName currently thinks that the cross compilation target added via hostSuffix is part of the version. This has the practical consequence for example that nix-env would think a cross compiled derivation would be an updated version of a native derivation of the same package and version — breaking user's profiles. We can easily prevent this by moving the hostSuffix in between pname and version. In case name is passed to mkDerivation this is of course not possible and we are forced to fall back to the old behavior. This change could serve as a replacement for the migitation we introduced with the -static appendix to pname in order to avoid confusion between nix and nixStatic as outlined in the comment added with this commit. --- pkgs/stdenv/generic/make-derivation.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index de1b1abd615..730c90c227c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -200,9 +200,7 @@ in rec { // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let - staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; - name' = attrs.name or - "${attrs.pname}${staticMarker}-${attrs.version}"; + # Indicate the host platform of the derivation if cross compiling. # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the @@ -210,7 +208,16 @@ in rec { hostSuffix = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) "-${stdenv.hostPlatform.config}"; - in name' + hostSuffix; + # Disambiguate statically built packages. This was originally + # introduce as a means to prevent nix-env to get confused between + # nix and nixStatic. This should be also achieved by moving the + # hostSuffix before the version, so we could contemplate removing + # it again. + staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; + in + if attrs ? name + then attrs.name + hostSuffix + else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"; }) // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; From 78f77869b95d94255d4b347f02a7c7dcbad98a52 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Mon, 26 Apr 2021 15:23:42 -0400 Subject: [PATCH 09/16] Revert "minecraft-launcher: 2.2.1441 -> 2.2.741" This reverts commit dabfce650aa297748a5737d663b5ccf9be41495c, since it downgraded minecraft-launcher to an older version. --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index d98a7dd25e2..3d0b53035ed 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.741"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { From 00528521094d05b52005f5a9e23d71efcd13f72a Mon Sep 17 00:00:00 2001 From: Evsyukov Denis <114635+juev@users.noreply.github.com> Date: Mon, 26 Apr 2021 23:50:06 +0300 Subject: [PATCH 10/16] python2-packages.nix: fix typo (#120784) disablede to disabled --- pkgs/top-level/python2-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 474d3c2f951..74a15bb7ac7 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -638,7 +638,7 @@ with self; with super; { yt = callPackage ../development/python-modules/yt { }; - zeek = disablede super.zeek; + zeek = disabled super.zeek; zbase32 = callPackage ../development/python-modules/zbase32 { }; From 7cf6cbe49a4f9efa0607437447d256bbd206b0c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 23:07:45 +0200 Subject: [PATCH 11/16] python3Packages.hatasmota: 0.2.9 -> 0.2.10 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 961137ed9ab..9506dbb96de 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-+4jlzemF5f4Qz4QHDaErsmVHq1Pjn/vsvoq/oCbW/hI="; + sha256 = "sha256-f831DKQJII1/MeF1buFihi65y3l7Vp7reVEcyzbAw3o="; }; propagatedBuildInputs = [ From d3490a072439f8c012e1ea9fafb46108702bf921 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 23:20:06 +0200 Subject: [PATCH 12/16] python3Packages.hstspreload: 2021.3.29 -> 2021.4.26 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 55aafc62042..90cb27be843 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.3.29"; + version = "2021.4.26"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-F5EXwCoXYmFkV0VWT5leIWZU2xH1t6T0LuxodAANS8E="; + sha256 = "sha256-bjyOsZIsYE3xF2/imp+4HPOZzh5wIehAru/uqfijleE="; }; # tests require network connection From 8f19637a39b50804103016ac1716c20969bba974 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 Jul 2020 15:54:32 +0200 Subject: [PATCH 13/16] haskellPackages.pandoc-sidenote: remove broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3bf834c16da..ab237362dab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8782,7 +8782,6 @@ broken-packages: - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - - pandoc-sidenote - pandoc-unlit - pandoc-utils - PandocAgda From 1cf7f3cf6b3f36b723835589390cd628cf32dd46 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 20:30:24 +0000 Subject: [PATCH 14/16] drumstick: 1.1.3 -> 2.1.1 --- pkgs/development/libraries/drumstick/default.nix | 13 ++++++++----- .../libraries/drumstick/drumstick-fluidsynth.patch | 9 --------- .../libraries/drumstick/drumstick-plugins.patch | 4 +++- 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 21572e52e23..e101da35224 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,19 +1,18 @@ { lib, stdenv, fetchurl -, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook +, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { pname = "drumstick"; - version = "1.1.3"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; + sha256 = "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp"; }; patches = [ - ./drumstick-fluidsynth.patch ./drumstick-plugins.patch ]; @@ -24,13 +23,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ - cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook + cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; + cmakeFlags = [ + "-DUSE_DBUS=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; diff --git a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch deleted file mode 100644 index b8cdf63fb64..00000000000 --- a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch +++ /dev/null @@ -1,9 +0,0 @@ -It works with fluidsynth 2. - -Backported from r400: https://sourceforge.net/p/drumstick/code/400/ - ---- a/library/rt-backends/CMakeLists.txt -+++ b/library/rt-backends/CMakeLists.txt -@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND) -- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11) -+ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1) diff --git a/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/pkgs/development/libraries/drumstick/drumstick-plugins.patch index cbb0a0e3489..59711120a8e 100644 --- a/pkgs/development/libraries/drumstick/drumstick-plugins.patch +++ b/pkgs/development/libraries/drumstick/drumstick-plugins.patch @@ -1,12 +1,14 @@ Make it look for its plugin in its own installation directory. +Without this vmpk fails to start with "Unable to initialize all MIDI drivers". + --- a/library/rt/backendmanager.cpp +++ b/library/rt/backendmanager.cpp @@ -159,6 +159,7 @@ namespace rt { foreach(const QString& path, QCoreApplication::libraryPaths()) { d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result ); } -+ d->appendDir( "@out@/lib/drumstick", result ); ++ d->appendDir( "@out@/lib/" + QSTR_DRUMSTICK, result ); return result; } From 90620b1c2b2f7de8a597954dd02e6a9444383308 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 20:30:50 +0000 Subject: [PATCH 15/16] kmetronome: 1.0.1 -> 1.2.0 --- pkgs/applications/audio/kmetronome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 02353fcf4f5..51c853809fd 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kmetronome"; - version = "1.0.1"; + version = "1.2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; + sha256 = "1ln0nm24w6bj7wc8cay08j5azzznigd39cbbw3h4skg6fxd8p0s7"; }; nativeBuildInputs = [ cmake pkg-config qttools ]; From de1a5679d725d469c4e184ac77cc48697ff0f609 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 21:18:44 +0000 Subject: [PATCH 16/16] vmpk: 0.7.2 -> 0.8.2 --- pkgs/applications/audio/vmpk/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index dfae5d40e11..45142568f98 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,16 +5,21 @@ mkDerivation rec { pname = "vmpk"; - version = "0.7.2"; + version = "0.8.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ="; + sha256 = "1kv256j13adk4ib7r464gsl4vjhih820bq37ddhqfyfd07wh53a2"; }; nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; - buildInputs = [ qtx11extras drumstick ]; + buildInputs = [ drumstick qtx11extras ]; + + postInstall = '' + # vmpk drumstickLocales looks here: + ln -s ${drumstick}/share/drumstick $out/share/ + ''; meta = with lib; { description = "Virtual MIDI Piano Keyboard";