Merge master into staging-next

maintainers/maintainer-list.nix

@@ -11706,6 +11706,13 @@
       fingerprint = "EE59 5E29 BB5B F2B3 5ED2  3F1C D276 FF74 6700 7335";
     }];
   };
+  uniquepointer = {
+    email = "uniquepointer@mailbox.org";
+    matrix = "@uniquepointer:matrix.org";
+    github = "uniquepointer";
+    githubId = 71751817;
+    name = "uniquepointer";
+  };
   unode = {
     email = "alves.rjc@gmail.com";
     matrix = "@renato_alves:matrix.org";

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

@@ -1,5 +1,5 @@
 <section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-release-21.11">
-  <title>Release 21.11 (“?”, 2021.11/??)</title>
+  <title>Release 21.11 (“Porcupine”, 2021.11/??)</title>
   <para>
     In addition to numerous new and upgraded packages, this release has
     the following highlights:

nixos/doc/manual/release-notes/rl-2111.section.md

@@ -1,4 +1,4 @@
-# Release 21.11 (“?”, 2021.11/??) {#sec-release-21.11}
+# Release 21.11 (“Porcupine”, 2021.11/??) {#sec-release-21.11}
 
 In addition to numerous new and upgraded packages, this release has the following highlights:
 

pkgs/applications/editors/your-editor/default.nix

@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "your-editor";
+  version = "1203";
+
+  src = fetchFromGitHub {
+    owner = "kammerdienerb";
+    repo = "yed";
+    rev = "608418f2037dc4ef5647e69fcef45302c50f138c";
+    sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    patchShebangs install.sh
+    ./install.sh -p $out
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Your-editor (yed) is a small and simple terminal editor core that is meant to be extended through a powerful plugin architecture";
+    homepage = "https://your-editor.org/";
+    license = with licenses; [ mit ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ uniquepointer ];
+    mainProgram = "yed";
+  };
+}

pkgs/applications/networking/instant-messengers/element/element-desktop-package.json

@@ -2,7 +2,7 @@
   "name": "element-desktop",
   "productName": "Element",
   "main": "lib/electron-main.js",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {

pkgs/applications/networking/instant-messengers/element/pin.json

@@ -1,6 +1,6 @@
 {
-  "version": "1.9.2",
+  "version": "1.9.3",
-  "desktopSrcHash": "F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=",
+  "desktopSrcHash": "Pb9iiCYtmuD6DzdvgY8c6pCFdVAxIIUZTWLCa7y5RMI=",
   "desktopYarnHash": "0iwbszhaxaxggymixljzjb2gqrsij67fwakxhd3yj9g1zds49ghh",
-  "webHash": "1d9kdj65yk86hx087x1p0qkm0cffaqkwgwzl74g11g264szz8ja2"
+  "webHash": "06lpb8i7fyimm06y6h3ngh19bx416if9lvs2ah2112vx28hs14zp"
 }

pkgs/development/tools/analysis/checkov/default.nix

@@ -46,7 +46,7 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.505";
+  version = "2.0.509";
 
   disabled = python3.pythonOlder "3.7";
 
@@ -54,7 +54,7 @@ buildPythonApplication rec {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    sha256 = "sha256-5udTx+aAC72R8wfn+lrWsZXgAyj/eN5nn/ly1JIkmCU=";
+    sha256 = "sha256-dds01scC93d/WdQTTL/JvXvfbiFAF3nEESL/zdFpOYA=";
   };
 
   nativeBuildInputs = with py.pkgs; [

pkgs/servers/hqplayerd/default.nix

@@ -8,21 +8,47 @@
 , gcc11
 , gnome
 , gssdp
-, gupnp
 , lib
 , libgmpris
 , llvmPackages_10
 , rpmextract
 , wavpack
-}:
 
+, gupnp
+, gupnp-av
+, meson
+, ninja
+}:
+let
+  # hqplayerd relies on some package versions available for the fc34 release,
+  # which has out-of-date pkgs compared to nixpkgs. The following drvs
+  # can/should be removed when the fc35 hqplayer rpm is made available.
+  gupnp_1_2 = gupnp.overrideAttrs (old: rec {
+    pname = "gupnp";
+    version = "1.2.7";
+    src = fetchurl {
+      url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+      sha256 = "sha256-hEEnbxr9AXbm9ZUCajpQfu0YCav6BAJrrT8hYis1I+w=";
+    };
+  });
+
+  gupnp-av_0_12 = gupnp-av.overrideAttrs (old: rec {
+    pname = "gupnp-av";
+    version = "0.12.11";
+    src = fetchurl {
+      url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+      sha256 = "sha256-aJ3PFJKriZHa6ikTZaMlSKd9GiKU2FszYitVzKnOb9w=";
+    };
+    nativeBuildInputs = lib.subtractLists [ meson ninja ] old.nativeBuildInputs;
+  });
+in
 stdenv.mkDerivation rec {
   pname = "hqplayerd";
-  version = "4.26.0-67";
+  version = "4.26.2-69";
 
   src = fetchurl {
     url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm";
-    sha256 = "sha256-Wbtt1yO/CE2cewOE5RynwEm+fCdOV1cxzR/XiCwj0NU=";
+    sha256 = "sha256-zxUVtOi4fN3EuCbzH/SEse24Qz7/0jozzDX1yW8bhCU=";
   };
 
   unpackPhase = ''
@@ -38,7 +64,8 @@ stdenv.mkDerivation rec {
     gcc11.cc.lib
     gnome.rygel
     gssdp
-    gupnp
+    gupnp_1_2
+    gupnp-av_0_12
     libgmpris
     llvmPackages_10.openmp
     wavpack

pkgs/tools/backup/zbackup/default.nix

@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch
+, cmake, protobufc
+, libunwind, lzo, openssl, protobuf, zlib
+}:
+
 stdenv.mkDerivation rec {
   pname = "zbackup";
   version = "1.4.4";
@@ -10,6 +14,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";
   };
 
+  patches = [
+    # compare with https://github.com/zbackup/zbackup/pull/158;
+    # but that doesn't apply cleanly to this version
+    ./protobuf-api-change.patch
+  ];
+
   buildInputs = [ zlib openssl protobuf lzo libunwind ];
   nativeBuildInputs = [ cmake protobufc ];
 

pkgs/tools/backup/zbackup/protobuf-api-change.patch

@@ -0,0 +1,11 @@
+--- a/backup_restorer.cc
++++ b/backup_restorer.cc
+@@ -48,7 +48,7 @@
+   // TODO: this disables size checks for each separate message. Figure a better
+   // way to do this while keeping them enabled. It seems we need to create an
+   // instance of CodedInputStream for each message, but it might be expensive
+-  cis.SetTotalBytesLimit( backupData.size(), -1 );
++  cis.SetTotalBytesLimit( backupData.size() );
+ 
+   // Used when emitting chunks
+   string chunk;

pkgs/top-level/all-packages.nix

@@ -29220,6 +29220,8 @@ with pkgs;
 
   yoshimi = callPackage ../applications/audio/yoshimi { };
 
+  your-editor = callPackage ../applications/editors/your-editor { };
+
   youtube-dl = with python3Packages; toPythonApplication youtube-dl;
 
   youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light;