Merge staging-next into staging

maintainers/maintainer-list.nix

···
     githubId = 15128988;
     name = "Maksim Dzabraev";
   };
+  e1mo = {
+    email = "[e-mail]";
+    matrix = "@e1mo:chaos.jetzt";
+    github = "e1mo";
+    githubId = 61651268;
+    name = "Moritz Fromm";
+    keys = [{
+      fingerprint = "67BE E563 43B6 420D 550E  DF2A 6D61 7FD0 A85B AADA";
+    }];
+  };
   eadwu = {
     email = "[e-mail]";
     github = "eadwu";

nixos/modules/services/misc/etebase-server.nix

···
       description = "An Etebase (EteSync 2.0) server";
       after = [ "network.target" "systemd-tmpfiles-setup.service" ];
       wantedBy = [ "multi-user.target" ];
+      path = [ pythonEnv ];
       serviceConfig = {
         User = cfg.user;
         Restart = "always";
         WorkingDirectory = cfg.dataDir;
       };
       environment = {
-        PYTHONPATH = "${pythonEnv}/${pkgs.python3.sitePackages}";
         ETEBASE_EASY_CONFIG_PATH = configIni;
       };
       preStart = ''
         # Auto-migrate on first run or if the package has changed
         versionFile="${cfg.dataDir}/src-version"
         if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then
-          ${pythonEnv}/bin/etebase-server migrate --no-input
-          ${pythonEnv}/bin/etebase-server collectstatic --no-input --clear
+          etebase-server migrate --no-input
+          etebase-server collectstatic --no-input --clear
           echo ${pkgs.etebase-server} > "$versionFile"
         fi
       '';
···
           else "-b 0.0.0.0 -p ${toString cfg.port}";
         in ''
           cd "${pythonEnv}/lib/etebase-server";
-          ${pythonEnv}/bin/daphne ${networking} \
+          daphne ${networking} \
             etebase_server.asgi:application
         '';
     };

nixos/modules/services/web-apps/dokuwiki.nix

···
     _1000101
     onny
     dandellion
+    e1mo
   ];
 }

nixos/tests/dokuwiki.nix

···
     maintainers = with maintainers; [
       _1000101
       onny
+      e1mo
     ];
   };
 

pkgs/applications/blockchains/electrs/default.nix

···
 in
 rustPlatform.buildRustPackage rec {
   pname = "electrs";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "romanz";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE=";
+    hash = "sha256-iudHdsSjoPal+ORMB3lU7ejGYv69q/8HcxScZS8D/u8=";
   };
 
-  cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ=";
+  cargoHash = "sha256-Ft1AluPfV6BIRGEddrrIGNRmaZIzUsA2DN2TcghCnSQ=";
 
   # needed for librocksdb-sys
   nativeBuildInputs = [ rustPlatform.bindgenHook ];

pkgs/applications/misc/remarkable/rmview/default.nix

···
 
 python3Packages.buildPythonApplication rec {
   pname = "rmview";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "bordaigorl";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-lUzmOayMHftvCukXSxXr6tBzrr2vaua1ey9gsuCKOBc=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-oCF37WQqNIXut2k+xr528twGxwPoH/sQ2leThagQJAU=";
   };
 
   nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];

pkgs/applications/networking/cluster/glooctl/default.nix

···
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.12.37";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-3dm60ySi/IdiAzZ+LWMLwxUJRv2HX0tQR5s+XMFqyGg=";
+    hash = "sha256-dCMseU7rHxfyLCr+RlmsSJM7TSg3x/lQoCZpUtuPboQ=";
   };
 
   subPackages = [ "projects/gloo/cli/cmd" ];
-  vendorSha256 = "sha256-b4Nl6uuZmcbxht4IRupyzQJL/o8nj4fIUuHvlHZWYTU=";
+  vendorSha256 = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/applications/networking/flexget/default.nix

···
 
 python3Packages.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.5.16";
+  version = "3.5.17";
   format = "pyproject";
 
   # Fetch from GitHub in order to use `requirements.in`
···
     owner = "flexget";
     repo = "flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9hcl7OZLi86hZHLotsN1QlPzQ1Ep5vJumAyZxSxxIE8=";
+    hash = "sha256-7r/3rB0TI/sRTi69+tx24dGjETBhX0KS1Arhg8aeoCk=";
   };
 
   postPatch = ''

pkgs/applications/window-managers/stalonetray/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "stalonetray";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "kolbusa";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-grxPqSYPLUstLIOKqzMActaSQ2ftYrjbalfR4HcPDRY=";
+    sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw=";
   };
 
   preConfigure =

pkgs/data/fonts/sarasa-gothic/default.nix

···
 { lib, fetchurl, libarchive }:
 
 let
-  version = "0.37.4";
+  version = "0.38.0";
 in fetchurl {
   name = "sarasa-gothic-${version}";
 
   # Use the 'ttc' files here for a smaller closure size.
   # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
   url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-  sha256 = "sha256-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs=";
+  sha256 = "sha256-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI=";
 
   recursiveHash = true;
   downloadToTemp = true;

pkgs/desktops/gnome/extensions/extensionOverrides.nix

···
 , gjs
 , gnome
 , gobject-introspection
+, gsound
 , hddtemp
+, libgda
 , liquidctl
 , lm_sensors
 , netcat-gnu
···
         substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"
       done
     '';
+  }))
+
+  (patchExtension "[e-mail]" (old: {
+    patches = [
+      (substituteAll {
+        src = ./extensionOverridesPatches/pano_at_elhan.io.patch;
+        inherit gsound libgda;
+      })
+    ];
   }))
 
   (patchExtension "[e-mail]" (old: {

pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch

···
+diff --git a/extension.js b/extension.js
+index 26561f2..01209e7 100644
+--- a/extension.js
++++ b/extension.js
+@@ -1,3 +1,5 @@
++imports.gi.GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0')
++imports.gi.GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0')
+ 
+ try {
+ 

pkgs/development/python-modules/ansible-lint/default.nix

···
 
 buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "6.10.1";
+  version = "6.10.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q=";
+    hash = "sha256-4ihEmsLxDRwW3zXEdpKCtSmsH+K1B2czP60chaYt9nE=";
   };
 
   postPatch = ''

pkgs/development/python-modules/aws-lambda-builders/default.nix

···
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.23.1";
+  version = "1.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "refs/tags/v${version}";
-    hash = "sha256-t/fdj0p3Z0J0C1v+TWx5jWNOjdAK2f0sPPkNM3SthXk=";
+    hash = "sha256-Qr1E6MNBAKyNr0XbCIP0yJUFRvBpLhTZzTG06tdg31I=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/cloudscraper/default.nix

···
 
 buildPythonPackage rec {
   pname = "cloudscraper";
-  version = "1.2.66";
+  version = "1.2.67";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XwzeI3dCcOigkt5o4PvWjheFTHZ/wtQEKpG9qeSBaHE=";
+    hash = "sha256-J3bHDzZhwCjln9MGrCsQSILJs8s/eYCGJR4A/C1yw6I=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/cvelib/default.nix

···
 , pytestCheckHook
 , pythonOlder
 , requests
+, testers
+, cve
 }:
 
 buildPythonPackage rec {
···
     "cvelib"
   ];
 
+  passthru.tests.version = testers.testVersion { package = cve; };
+
   meta = with lib; {
     description = "Library and a command line interface for the CVE Services API";
     homepage = "https://github.com/RedHatProductSecurity/cvelib";
     license = licenses.mit;
     maintainers = with maintainers; [ raboof ];
+    mainProgram = "cve";
   };
 }

pkgs/development/python-modules/django_treebeard/default.nix

···
 { lib
 , buildPythonPackage
+, django
 , fetchPypi
-, pytest
-, django
+, pytest-django
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "django-treebeard";
-  version = "4.5.1";
+  version = "4.6.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "80150017725239702054e5fa64dc66e383dc13ac262c8d47ee5a82cb005969da";
+    hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA=";
   };
 
-  buildInputs = [ pytest ];
-  propagatedBuildInputs = [ django ];
+  propagatedBuildInputs = [
+    django
+  ];
 
-  # tests fail  "AppRegistryNotReady("Apps aren't loaded yet.")"
-  doCheck = false;
+  checkInputs = [
+    pytest-django
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "treebeard"
+  ];
 
   meta = with lib; {
-    description = "Efficient tree implementations for Django 1.6+";
+    description = "Efficient tree implementations for Django";
     homepage = "https://tabo.pe/projects/django-treebeard/";
-    maintainers = with maintainers; [ desiderius ];
+    changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md";
     license = licenses.asl20;
+    maintainers = with maintainers; [ desiderius ];
   };
-
 }

pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix

···
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.8.0";
+  version = "3.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-TR41fn/e4185RW8zkd3SY1E/jNQZuUYJr1n+TwNPHT4=";
+    hash = "sha256-AH6Xq5jMIo1arGQazoPWgWnKefEavHnas6FIy+LFNP8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/sqlalchemy-continuum/default.nix

···
 { lib
-, fetchPypi
 , buildPythonPackage
+, fetchPypi
 , flask
 , flask-login
 , flask-sqlalchemy
 , flexmock
+, psycopg2
+, pymysql
 , pytestCheckHook
+, pythonOlder
 , sqlalchemy
-, sqlalchemy-utils
 , sqlalchemy-i18n
+, sqlalchemy-utils
 }:
 
 buildPythonPackage rec {
-  pname = "SQLAlchemy-Continuum";
-  version = "1.3.13";
+  pname = "sqlalchemy-continuum";
+  version = "1.3.14";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-JTqlHQmaVH2qKz7CFyCqpous3ecOpoFrxVlzasbc21I=";
+    pname = "SQLAlchemy-Continuum";
+    inherit version;
+    hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM=";
   };
 
   propagatedBuildInputs = [
···
     sqlalchemy-utils
   ];
 
-  # indicate tests that we don't have a database server at hand
-  DB = "sqlite";
+  passthru.optional-dependencies = {
+    flask = [
+      flask
+    ];
+    flask-login = [
+      flask-login
+    ];
+    flask-sqlalchemy = [
+      flask-sqlalchemy
+    ];
+    flexmock = [
+      flexmock
+    ];
+    i18n = [
+      sqlalchemy-i18n
+    ];
+  };
 
   checkInputs = [
+    psycopg2
+    pymysql
     pytestCheckHook
-    sqlalchemy-i18n
-    flask
-    flask-login
-    flask-sqlalchemy
-    flexmock
+  ] ++ passthru.optional-dependencies.flask
+  ++ passthru.optional-dependencies.flask-login
+  ++ passthru.optional-dependencies.flask-sqlalchemy
+  ++ passthru.optional-dependencies.flexmock
+  ++ passthru.optional-dependencies.i18n;
+
+  # indicate tests that we don't have a database server at hand
+  DB = "sqlite";
+
+  pythonImportsCheck = [
+    "sqlalchemy_continuum"
   ];
 
   meta = with lib; {
+    description = "Versioning and auditing extension for SQLAlchemy";
     homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
-    description = "Versioning and auditing extension for SQLAlchemy";
+    changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/games/anki/bin.nix

···
 let
   pname = "anki-bin";
   # Update hashes for both Linux and Darwin!
-  version = "2.1.54";
+  version = "2.1.55";
 
   sources = {
     linux = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
-      sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE=";
+      sha256 = "sha256-fi7efWBZZnqOEztVOhOsfspcTBDxqw2Rr/eAGMFYbAU=";
     };
 
     # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
     darwin-x86_64 = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
-      sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA=";
+      sha256 = "sha256-+Ceo03bMNnDQWgDmF1MIlrTQyHaJUKG8gF1/+ZEFCYw=";
     };
     darwin-aarch64 = fetchurl {
       url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
-      sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E=";
+      sha256 = "sha256-3ppE+APPUJ6H/ud67KNwfQJnFCa7g7Hdxx4oZD0ip6E=";
     };
   };
 

pkgs/os-specific/linux/nvidia-x11/default.nix

···
   kernel = callPackage # a hacky way of extracting parameters from callPackage
     ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
 
-  kernelModVersion = lib.versions.majorMinor kernel.modDirVersion;
-
   selectHighestVersion = a: b: if lib.versionOlder a.version b.version
     then b
     else a;
···
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "525.60.11";
-    sha256_64bit = "sha256-gW7mwuCBPMw9SnlY9x/EmjfGDv4dUdYUbBznJAOYPV0=";
-    openSha256 = "sha256-33ATZuYu+SOOxM6UKXp6J+f1+zbmHvaK4v13X3UZTTM=";
-    settingsSha256 = "sha256-gA1x6oEpnkr/OPP4eR1L5gC5srvEKtDrSpnv2QEaEpE=";
-    persistencedSha256 = "sha256-AFMy3agoJ6yVsGgUvTfOzHlz30iApBpAReckq9iS7AA=";
+    version = "525.78.01";
+    sha256_64bit = "sha256-Q9pC0r9pvDfqnHwPoC9S2w3MSDwnL1LtrK2JpctJWpM=";
+    openSha256 = "sha256-fxpyXVl735ZJ3NnK7jN95gPstu7YopYH/K7UK0iAC7k=";
+    settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw=";
+    persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA=";
   };
 
   latest = selectHighestVersion production (generic {

pkgs/tools/archivers/gbl/default.nix

···
   };
 
   cargoPatches = [
+    # update ring to fix building on Mac M1
+    # https://github.com/dac-gmbh/gbl/pull/64
+    (fetchpatch {
+      url = "https://github.com/raboof/gbl/commit/17e154d66932af59abe8677309792606b7f64c7d.patch";
+      sha256 = "sha256-5Itoi86Q+9FzSTtnggODKPwwYPp5BpIVgR2vYMLHBts=";
+    })
     # Upstream does not include Cargo.lock, even though this is recommended for applications.
-    # This patch adds it. https://github.com/dac-gmbh/gbl/pull/62
     (fetchpatch {
-      url = "https://github.com/raboof/gbl/commit/99078da334c6e1ffd8189c691bbc711281fae5cc.patch";
-      sha256 = "sha256-sAKkn4//8P87ZJ6NTHm2NUJH1sAFFwfrybv2QtQ3nnM=";
+      url = "https://github.com/raboof/gbl/commit/9423d36ee3168bca8db7a7cb65611dc7ddc2daf0.patch";
+      sha256 = "sha256-zwHXgUVkAYiQs/AT/pINnZoECoXzh+9astWMYENGTL8=";
     })
   ];
 
-  cargoSha256 = "sha256-RUZ6wswRtV8chq3+bY9LTRf6IYMbZ9/GPl2X5UcF7d8=";
+  cargoSha256 = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
···
       Utility to read, create and manipulate `.gbl` firmware update
       files targeting the Silicon Labs Gecko Bootloader.
     '';
-    homepage = "https://github.com/dac-gmbh/gbl";
+    homepage = "https://github.com/jonas-schievink/gbl";
     license = licenses.mit;
     maintainers = [ maintainers.raboof ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.isDarwin && stdenv.isAarch64;
   };
 }

pkgs/tools/misc/yt-dlp/default.nix

···
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2023.1.2";
+  version = "2023.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uNe7tcFZX3GIVaMfNNigJ2pwhvXT9ULAIaje2LJtNq4=";
+    sha256 = "sha256-Ong6NnUc7RY2j0CzuoZas5swaJ7YBW8e4jRqo4OaCw8=";
   };
 
   propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];

pkgs/tools/virtualization/uefi-run/default.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "uefi-run";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "Richard-W";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-fwzWdOinW/ECVI/65pPB1shxPdl2nZThAqlg8wlWg/g=";
+    sha256 = "sha256-OL21C3J4M7q1nNB6lL9xaU6ryZN45UDUqiKsbqQhYH8=";
   };
 
-  cargoSha256 = "sha256-c+wzMzTkG0FpfQ1rZ8e9dn0ez12vmoecrtNeFk90sdQ=";
+  cargoSha256 = "sha256-ieX8jQKv9Fht1p7JtTieZ5M+rXdn6/Oo/LgJ8NEBIuQ=";
 
   meta = with lib; {
     description = "Directly run UEFI applications in qemu";