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 ]; 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"; 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; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 74c3f0e729d..c3484a3312c 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"; }) 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 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 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; } 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 = [ 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 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; 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 { diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index f7cddb19c47..4536024c511 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)]; 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 ]; 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 ]; }; } 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; { 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 { };