Merge master into staging-next

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

···
       </listitem>
       <listitem>
         <para>
+          ZFS module will not allow hibernation by default, this is a
+          safety measure to prevent data loss cases like the ones
+          described at
+          <link xlink:href="https://github.com/openzfs/zfs/issues/260">OpenZFS/260</link>
+          and
+          <link xlink:href="https://github.com/openzfs/zfs/issues/12842">OpenZFS/12842</link>.
+          Use the <literal>boot.zfs.allowHibernation</literal> option to
+          configure this behaviour.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           The Redis module now disables RDB persistence when
           <literal>services.redis.servers.&lt;name&gt;.save = []</literal>
           instead of using the Redis default.

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

···
 
 - A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`.
 
+- ZFS module will not allow hibernation by default, this is a safety measure to prevent data loss cases like the ones described at [OpenZFS/260](https://github.com/openzfs/zfs/issues/260) and [OpenZFS/12842](https://github.com/openzfs/zfs/issues/12842). Use the `boot.zfs.allowHibernation` option to configure this behaviour.
+
 - The Redis module now disables RDB persistence when `services.redis.servers.<name>.save = []` instead of using the Redis default.
 
 - Neo4j was updated from version 3 to version 4. See this [migration guide](https://neo4j.com/docs/upgrade-migration-guide/current/) on how to migrate your Neo4j instance.

nixos/modules/security/acme/default.nix

···
     Type = "oneshot";
     User = user;
     Group = mkDefault "acme";
-    UMask = 0022;
-    StateDirectoryMode = 750;
+    UMask = "0022";
+    StateDirectoryMode = "750";
     ProtectSystem = "strict";
     ReadWritePaths = [
       "/var/lib/acme"
···
     serviceConfig = commonServiceConfig // {
       StateDirectory = "acme/.minica";
       BindPaths = "/var/lib/acme/.minica:/tmp/ca";
-      UMask = 0077;
+      UMask = "0077";
     };
 
     # Working directory will be /tmp
···
 
       serviceConfig = commonServiceConfig // {
         Group = data.group;
-        UMask = 0027;
+        UMask = "0027";
 
         StateDirectory = "acme/${cert}";
 

nixos/modules/services/logging/journalwatch.nix

···
         Type = "oneshot";
         # requires a relative directory name to create beneath /var/lib
         StateDirectory = user;
-        StateDirectoryMode = 0750;
+        StateDirectoryMode = "0750";
         ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail";
         # lowest CPU and IO priority, but both still in best-effort class to prevent starvation
         Nice=19;

nixos/modules/services/matrix/appservice-discord.nix

···
         PrivateTmp = true;
         WorkingDirectory = appDir;
         StateDirectory = baseNameOf dataDir;
-        UMask = 0027;
+        UMask = "0027";
         EnvironmentFile = cfg.environmentFile;
 
         ExecStart = ''

nixos/modules/services/matrix/mautrix-telegram.nix

···
         PrivateTmp = true;
         WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found
         StateDirectory = baseNameOf dataDir;
-        UMask = 0027;
+        UMask = "0027";
         EnvironmentFile = cfg.environmentFile;
 
         ExecStart = ''

nixos/modules/services/misc/geoipupdate.nix

···
         DynamicUser = true;
         ReadWritePaths = cfg.settings.DatabaseDirectory;
         RuntimeDirectory = "geoipupdate";
-        RuntimeDirectoryMode = 0700;
+        RuntimeDirectoryMode = "0700";
         CapabilityBoundingSet = "";
         PrivateDevices = true;
         PrivateMounts = true;

nixos/modules/services/misc/mx-puppet-discord.nix

···
         PrivateTmp = true;
         WorkingDirectory = pkgs.mx-puppet-discord;
         StateDirectory = baseNameOf dataDir;
-        UMask = 0027;
+        UMask = "0027";
 
         ExecStart = ''
           ${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \

nixos/modules/services/misc/rmfakecloud.nix

···
         SystemCallArchitectures = "native";
         WorkingDirectory = serviceDataDir;
         StateDirectory = baseNameOf serviceDataDir;
-        UMask = 0027;
+        UMask = "0027";
       };
     };
   };

nixos/modules/services/monitoring/parsedmarc.nix

···
             Group = "parsedmarc";
             DynamicUser = true;
             RuntimeDirectory = "parsedmarc";
-            RuntimeDirectoryMode = 0700;
+            RuntimeDirectoryMode = "0700";
             CapabilityBoundingSet = "";
             PrivateDevices = true;
             PrivateMounts = true;

nixos/modules/services/ttys/getty.nix

···
         enable = mkDefault config.boot.isContainer;
       };
 
-    environment.etc.issue =
+    environment.etc.issue = mkDefault
       { # Friendly greeting on the virtual consoles.
         source = pkgs.writeText "issue" ''
 

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

···
         User = user;
         WorkingDirectory = "${bookstack}";
         RuntimeDirectory = "bookstack/cache";
-        RuntimeDirectoryMode = 0700;
+        RuntimeDirectoryMode = "0700";
       };
       path = [ pkgs.replace-secret ];
       script =

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

···
           "public"
           "sockets"
         ];
-        RuntimeDirectoryMode = 0750;
+        RuntimeDirectoryMode = "0750";
         StateDirectory = map (p: "discourse/" + p) [
           "uploads"
           "backups"
           "tmp"
         ];
-        StateDirectoryMode = 0750;
+        StateDirectoryMode = "0750";
         LogsDirectory = "discourse";
         TimeoutSec = "infinity";
         Restart = "on-failure";

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

···
               Group = "keycloak";
               DynamicUser = true;
               RuntimeDirectory = "keycloak";
-              RuntimeDirectoryMode = 0700;
+              RuntimeDirectoryMode = "0700";
               AmbientCapabilities = "CAP_NET_BIND_SERVICE";
             };
             script = ''

nixos/modules/services/web-apps/snipe-it.nix

···
         User = user;
         WorkingDirectory = snipe-it;
         RuntimeDirectory = "snipe-it/cache";
-        RuntimeDirectoryMode = 0700;
+        RuntimeDirectoryMode = "0700";
       };
       path = [ pkgs.replace-secret ];
       script =

nixos/modules/tasks/filesystems/zfs.nix

···
           '';
       };
 
+      allowHibernation = mkOption {
+        type = types.bool;
+        default = false;
+        description = lib.mdDoc ''
+          Allow hibernation support, this may be a unsafe option depending on your
+          setup. Make sure to NOT use Swap on ZFS.
+        '';
+      };
+
       extraPools = mkOption {
         type = types.listOf types.str;
         default = [];
···
 
       boot = {
         kernelModules = [ "zfs" ];
+        # https://github.com/openzfs/zfs/issues/260
+        # https://github.com/openzfs/zfs/issues/12842
+        # https://github.com/NixOS/nixpkgs/issues/106093
+        kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ];
 
         extraModulePackages = [
           (if config.boot.zfs.enableUnstable then

pkgs/applications/audio/mmlgui/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "mmlgui";
-  version = "unstable-2022-09-15";
+  version = "unstable-2022-10-13";
 
   src = fetchFromGitHub {
     owner = "superctr";
     repo = "mmlgui";
-    rev = "163cc73a7c009d524b0d5aff94f9ed47fe19e3ce";
+    rev = "6b2687504644b481db403f032f463e38bbbb1dca";
     fetchSubmodules = true;
-    sha256 = "kKo3ge2wcDK2xU1YCfEwyqw84N+3jcbOEEsJHSpMpzY=";
+    sha256 = "OkYVjdvi8ls01DaIiDEPFXFCUh6g9AEeSlbDFfdPKeo=";
   };
 
   postPatch = ''

pkgs/applications/editors/vscode/extensions/default.nix

···
         mktplcRef = {
           name = "catppuccin-vsc";
           publisher = "catppuccin";
-          version = "2.1.0";
-          sha256 = "sha256-1pX9NQxW2Rm9p912Pn7QmLmXPI7EmiXTnCLWsIQNFhY=";
+          version = "2.2.1";
+          sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA=";
         };
         meta = with lib; {
           description = "Soothing pastel theme for VSCode";
···
         mktplcRef = {
           name = "direnv";
           publisher = "mkhl";
-          version = "0.6.1";
-          sha256 = "sha256-5/Tqpn/7byl+z2ATflgKV1+rhdqj+XMEZNbGwDmGwLQ=";
+          version = "0.7.0";
+          sha256 = "sha256-MLBPhDBU8vPVvbde3fdwhxKvQa8orUMKAAXoOfNrbh4=";
         };
         meta = with lib; {
           description = "direnv support for Visual Studio Code";

pkgs/applications/graphics/xfig/default.nix

···
 { lib
 , stdenv
 , fetchurl
-, xlibsWrapper
 , makeWrapper
 , imagemagick
 , libXpm
···
   nativeBuildInputs = [ imagemagick makeWrapper ];
 
   buildInputs = [
-    xlibsWrapper
     libXpm
     libXmu
     libXi

pkgs/applications/graphics/xmountains/default.nix

···
-{ lib, stdenv, fetchFromGitHub, xlibsWrapper, xorg }:
+{ lib, stdenv, fetchFromGitHub, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "xmountains";
···
     sha256 = "0dx4n2y736lv04sj41cp1dw8n5zkw5gyd946a6zsiv0k796s9ra9";
   };
 
-  buildInputs = [ xlibsWrapper xorg.xbitmaps ];
+  buildInputs = [ xorg.xbitmaps xorg.libX11 ];
   nativeBuildInputs = with xorg; [ imake gccmakedep ];
 
   installPhase = "install -Dm755 xmountains -t $out/bin";

pkgs/applications/misc/mediaelch/default.nix

···
 
 mkDerivation rec {
   pname = "mediaelch";
-  version = "2.8.16";
+  version = "2.8.18";
 
   src = fetchFromGitHub {
     owner = "Komet";
     repo = "MediaElch";
     rev = "v${version}";
-    sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI=";
+    sha256 = "sha256-9kwU9j8YNF/OmzrQaRAlBpW+t/tIpZJw5+pfEoTmCBA=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

···
     "version": "2.30.0"
   },
   "azurerm": {
-    "hash": "sha256-W86RutsTsOi7bH1kJleaf6K1a91caDJTcXxsBn9gkmk=",
+    "hash": "sha256-TOm7e3yLTsmWCIDHklUncCjI5vbd0u/HWH/koOL95u4=",
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/azurerm",
     "repo": "terraform-provider-azurerm",
-    "rev": "v3.29.0",
+    "rev": "v3.29.1",
     "vendorHash": null,
-    "version": "3.29.0"
+    "version": "3.29.1"
   },
   "azurestack": {
     "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=",
···
     "version": "1.12.8"
   },
   "nsxt": {
-    "hash": "sha256-oXcT1VmwC9a+U0vM5O9y2As2PbzPr95LrUB6KlFKcMc=",
+    "hash": "sha256-TOoRtCKdR1fBjk39dbMgBd7pDJGfjvkQAqfpJzWRwRg=",
     "owner": "vmware",
     "provider-source-address": "registry.terraform.io/vmware/nsxt",
     "repo": "terraform-provider-nsxt",
-    "rev": "v3.2.8",
+    "rev": "v3.2.9",
     "vendorHash": null,
-    "version": "3.2.8"
+    "version": "3.2.9"
   },
   "null": {
     "hash": "sha256-2YM3btZInUlIwp1VkasuugZZ8FervpRviUlx60vhVak=",
···
     "version": "4.96.0"
   },
   "okta": {
-    "hash": "sha256-yUWz6JiejI36QXSzGj36Pzu8/exK4U/DXCdbToSeCrE=",
+    "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=",
     "owner": "okta",
     "provider-source-address": "registry.terraform.io/okta/okta",
     "repo": "terraform-provider-okta",
-    "rev": "v3.37.0",
-    "vendorHash": "sha256-qAnMwxTvvds3pOarRTWWVQqOCJKd0wSH2LZoPl4n2uA=",
-    "version": "3.37.0"
+    "rev": "v3.38.0",
+    "vendorHash": "sha256-iGQ3JPJ78Qhj+izR8D4H5oWGq4fF5lXuNHQCmpr7zFE=",
+    "version": "3.38.0"
   },
   "oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
···
     "version": "1.7.10"
   },
   "signalfx": {
-    "hash": "sha256-ke/35QtsYNW+6HVjBrx6hQ+CO2zhZsVLlryWTgI1vRE=",
+    "hash": "sha256-alLC61bEaFiVtoH0Fczj7G0m70ie1RNvTBR+MgYZGkQ=",
     "owner": "splunk-terraform",
     "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
     "repo": "terraform-provider-signalfx",
-    "rev": "v6.17.0",
-    "vendorHash": "sha256-hxYQF1sZOS5x6sZtUJg13A6SPZG6Ql20vAs8VDQegqQ=",
-    "version": "6.17.0"
+    "rev": "v6.18.0",
+    "vendorHash": "sha256-ESUNfkllwkS1NcAD30tO90VQcHR5XhdIeyXXHmU/byc=",
+    "version": "6.18.0"
   },
   "skytap": {
     "hash": "sha256-EAimiuQJOt12baZSjDKI+c9UjJd8e26ouOAZIZezw/I=",

pkgs/applications/science/astronomy/gnuastro/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "gnuastro";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchurl {
     url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz";
-    sha256 = "sha256-bKfiLhQFERdMbwL9+UitCL8/dB/k6YKNjBzfKnCtWec=";
+    sha256 = "sha256-4bPNW0sSb/J34vSOit8BA9Z/wK0Hz5o9OqfgVSlDDjU=";
   };
 
   nativeBuildInputs = [ libtool ];

pkgs/applications/video/xine-ui/default.nix

···
 , readline
 , shared-mime-info
 , xine-lib
-, xlibsWrapper
 , xorg
 }:
 
···
     ncurses
     readline
     xine-lib
-    xlibsWrapper
   ] ++ (with xorg; [
     libXext
     libXft

pkgs/applications/virtualization/libnvidia-container/default.nix

···
 , libtirpc
 , makeWrapper
 , substituteAll
+, removeReferencesTo
 , go
 }:
 let
···
   NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
   NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
 
-  nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper ];
+  nativeBuildInputs = [ pkg-config go rpcsvc-proto makeWrapper removeReferencesTo ];
 
   buildInputs = [ libelf libcap libseccomp libtirpc ];
 
···
       libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
     in
     ''
+      remove-references-to -t "${go}" $out/lib/libnvidia-container-go.so.1.9.0
       wrapProgram $out/bin/nvidia-container-cli --prefix LD_LIBRARY_PATH : ${libraryPath}
     '';
+  disallowedReferences = [ go ];
 
   meta = with lib; {
     homepage = "https://github.com/NVIDIA/libnvidia-container";

pkgs/applications/window-managers/ion-3/default.nix

···
-{ lib, stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
+{ lib, stdenv, fetchurl, lua, gettext, groff, libICE, libSM, libX11, libXext }:
 
 stdenv.mkDerivation rec {
   pname = "ion";
···
     sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
   };
 
-  buildInputs = [ xlibsWrapper lua gettext groff ];
+  buildInputs = [ libICE libSM libX11 libXext lua gettext groff ];
 
   buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
 

pkgs/development/compilers/vyper/default.nix

···
     setuptools-scm
   ];
 
-  pythonRelaxDeps = [ "semantic-version" ];
+  pythonRelaxDeps = [ "asttokens" "semantic-version" ];
 
   propagatedBuildInputs = [
     asttokens

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

···
 
 buildPythonPackage rec {
   pname = "rtree";
-  version = "1.0.0";
+  version = "1.0.1";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "Rtree";
     inherit version;
-    sha256 = "sha256-0Eg0ghITRrCTuaQlGNQPkhrfRFkVt66jB+smdoyDloI=";
+    sha256 = "sha256-IiEhaZwwOmQGXYSb9wOLHsq8N7Zcf6NAvts47w6AVCk=";
   };
 
   postPatch = ''

pkgs/development/python-modules/async-upnp-client/default.nix

···
 
 buildPythonPackage rec {
   pname = "async-upnp-client";
-  version = "0.32.0";
+  version = "0.32.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "StevenLooman";
     repo = "async_upnp_client";
     rev = version;
-    sha256 = "sha256-pVeVn2Z+onRjG3bIeRl5dXoNPwAWtarV56PL/CQOQUA=";
+    sha256 = "sha256-T/8AZU95eHl/AIVkG9tYhN19B8PLvTWRTBRJjbvfI+8=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "awscrt";
-  version = "0.14.7";
+  version = "0.15.1";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-59bwgjT3zFYx4q8G5Bi5RMUSQCVIlupu7rtycgXNXtg=";
+    hash = "sha256-2VBdad9NL19eW2Djot2gkynyjSCUvG4f0KnEub6M0vg=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [

pkgs/development/python-modules/dlms-cosem/default.nix

···
+{ lib
+, asn1crypto
+, attrs
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, pyserial
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "dlms-cosem";
+  version = "21.3.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "pwitab";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-BrLanP+SIRRof15yzqwcDOxw92phbW7m9CfORz0xo7I=";
+  };
+
+  propagatedBuildInputs = [
+    asn1crypto
+    attrs
+    cryptography
+    pyserial
+    python-dateutil
+    typing-extensions
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "dlms_cosem"
+  ];
+
+  meta = with lib; {
+    description = "Python module to parse DLMS/COSEM";
+    homepage = "https://github.com/pwitab/dlms-cosem";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/dsmr-parser/default.nix

···
 { lib
 , buildPythonPackage
+, dlms-cosem
 , fetchFromGitHub
 , pyserial
 , pyserial-asyncio
···
 
 buildPythonPackage rec {
   pname = "dsmr-parser";
-  version = "0.33";
+  version = "0.34";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
···
     owner = "ndokter";
     repo = "dsmr_parser";
     rev = "v${version}";
-    sha256 = "sha256-Phx8Yqx6beTzkQv0fU8Pfs2btPgKVARdO+nMcne1S+w=";
+    sha256 = "sha256-GO+lSgTmFgi/ljt99mteoot+p5BJnGb6ZFky5I3I6Io=";
   };
 
   propagatedBuildInputs = [
+    dlms-cosem
     pyserial
     pyserial-asyncio
     pytz

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

···
 
 buildPythonPackage rec {
   pname = "fiona";
-  version = "1.8.21";
+  version = "1.8.22";
 
   src = fetchPypi {
     pname = "Fiona";
     inherit version;
-    sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w=";
+    sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM=";
   };
 
   CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

pkgs/development/python-modules/flake8-bugbear/default.nix

···
 
 buildPythonPackage rec {
   pname = "flake8-bugbear";
-  version = "22.10.25";
+  version = "22.10.27";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
···
     owner = "PyCQA";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+eE9MY1k9JN0l3g8/wWOfbhkoSZLYG+wPKvl63R1n3o=";
+    hash = "sha256-pzVzCEkndbesX3tzuuPqtpEmCd5/bSuQmJ2J2IPFRMk=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "glcontext";
-  version = "2.3.6";
+  version = "2.3.7";
 
   src = fetchFromGitHub {
     owner = "moderngl";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-fE1fyoKQz1jmTBcAz2CbkLjRfgN5QedpMOLMU8keIZs=";
+    sha256 = "sha256-U/oP9nx7iTK6EYbUl90UD7fTOo5oDlh9ULPNjRibsXE=";
   };
 
   disabled = !isPy3k;

pkgs/development/python-modules/google-cloud-container/default.nix

···
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.12.2";
+  version = "2.13.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GnA60NjGi33i9P5D8IItQjLKlLirJITyijrGQROQHvM=";
+    hash = "sha256-Rq4DuCbXX4DSIr01AFYo0O4+wQv4B5yzrrX9a2ecAFI=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "growattserver";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
   src = fetchFromGitHub {
     owner = "indykoning";
     repo = "PyPi_GrowattServer";
-    rev = version;
-    hash = "sha256-dS5Ng89aYzfegdFlyt1eo7vhva2ME77pQV2hkd/iNq8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-79/siHqwY3TNFIxodR24TJwsrKapG1GP4u4fIKxdFI4=";
   };
 
   propagatedBuildInputs = [

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

···
 , fetchFromGitHub
 , poetry-core
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "immutabledict";
-  version = "2.2.1";
+  version = "2.2.2";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "corenting";
     repo = "immutabledict";
     rev = "v${version}";
-    sha256 = "sha256-z04xxoCw0eBtkt++y/1yUsAPaLlAGUtWBdRBM74ul1c=";
+    hash = "sha256-YqUxkpFl2G/LFLtFWqocXbFvgVhqqiquoWNIIO9c/6o=";
   };
 
   nativeBuildInputs = [
···
     maintainers = with maintainers; [ hexa ];
   };
 }
-

pkgs/development/python-modules/influxdb-client/default.nix

···
 
 buildPythonPackage rec {
   pname = "influxdb-client";
-  version = "1.33.0";
+  version = "1.34.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "influxdata";
     repo = "influxdb-client-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RhUIdIwLYJwlpLtyrXO9GCvKY6OLDJl7Aop5acgTHN0=";
+    hash = "sha256-Bswlrfh9lBobZDA4Rt/02jMER5IrZ6b3ykpbklCFhUE=";
   };
 
   propagatedBuildInputs = [

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

···
 { lib
 , buildPythonPackage
-, fetchPypi
 , cmake
+, cvxopt
+, fetchPypi
 , future
 , numpy
+, pytestCheckHook
+, pythonOlder
 , qdldl
-, setuptools-scm
 , scipy
-# check inputs
-, pytestCheckHook
-, cvxopt
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
   pname = "osqp";
   version = "0.6.2.post5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61";
+    hash = "sha256-svoXquQqftSY7CYbM/Jiu0s2BefoRkBiFZ2froF/DWE=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-  nativeBuildInputs = [ cmake setuptools-scm ];
   dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    cmake
+    setuptools-scm
+  ];
 
   propagatedBuildInputs = [
     future
···
     scipy
   ];
 
-  pythonImportsCheck = [ "osqp" ];
-  checkInputs = [ pytestCheckHook cvxopt ];
+  checkInputs = [
+    cvxopt
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "osqp"
+  ];
+
   disabledTests = [
-    "mkl_"
+    # Test are failing due to scipy update (removal of scipy.random in 1.9.0)
+    # Is fixed upstream but requires a new release
+    "test_feasibility_problem"
+    "test_issue14"
+    "test_polish_random"
+    "test_polish_unconstrained"
+    "test_primal_and_dual_infeasible_problem"
+    "test_primal_infeasible_problem"
+    "test_solve"
+    "test_unconstrained_problem"
+    "test_update_A_allind"
+    "test_update_A"
+    "test_update_bounds"
+    "test_update_l"
+    "test_update_P_A_allind"
+    "test_update_P_A_indA"
+    "test_update_P_A_indP_indA"
+    "test_update_P_A_indP"
+    "test_update_P_allind"
+    "test_update_P"
+    "test_update_q"
+    "test_update_u"
+    "test_warm_start"
   ];
 
   meta = with lib; {

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

···
 
 buildPythonPackage rec {
   pname = "pyeight";
-  version = "0.3.1";
+  version = "0.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "mezz64";
     repo = "pyEight";
     rev = version;
-    sha256 = "sha256-vW64m8XQZ9XfgjlZph47JFyOsxWtCbIJZBZVwsTrjLs=";
+    sha256 = "sha256-JYmhEZQw11qPNV2jZhP+0VFb387kNom70R3C13PM7kc=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "4.0.0";
+  version = "4.0.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-+CzJmh/1UjENGcN5gnwsZN2fhaOLzVVZ2yRwFhhnt4Y=";
+    sha256 = "sha256-miMRGm5hInDFkf0x/zMhxrXz1fPauxQnMXpatgj8Jho=";
   };
 
   propagatedBuildInputs = [

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

···
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.39.1";
+  version = "0.39.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
···
     owner = "jstasiak";
     repo = "python-zeroconf";
     rev = "refs/tags/${version}";
-    hash = "sha256-fIp1RLf6qpo9s5fdgFt7yid6M/Sf3hmm8MZikjCiCu0=";
+    hash = "sha256-bzD8i97m6iHsHiGJHlyRuhtKBqQiAb6YEOglIIGn2no=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/misc/xspim/default.nix

···
-{ lib, stdenv, fetchsvn, imake, bison, flex, xlibsWrapper, libXaw, libXpm, ... }:
+{ lib, stdenv, fetchsvn, imake, bison, flex, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "xspim";
···
   };
 
   nativeBuildInputs = [ imake bison flex ];
-  buildInputs = [ xlibsWrapper libXaw libXpm ];
+  buildInputs = [
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXaw
+    xorg.libXext
+    xorg.libXmu
+    xorg.libXpm
+    xorg.libXt
+  ];
 
   preConfigure = ''
     cd xspim

pkgs/development/tools/misc/xxgdb/default.nix

···
-{ lib, stdenv, fetchurl, imake, xlibsWrapper, gccmakedep, libXaw }:
+{ lib
+, stdenv
+, fetchurl
+, imake
+, gccmakedep
+, libX11
+, libXaw
+, libXext
+, libXmu
+, libXt
+}:
 
 stdenv.mkDerivation rec {
   pname = "xxgdb";
···
   ];
 
   nativeBuildInputs = [ imake gccmakedep ];
-  buildInputs = [ xlibsWrapper libXaw ];
+  buildInputs = [ libX11 libXaw libXext libXmu libXt ];
 
   preConfigure = ''
     mkdir build

pkgs/development/tools/symfony-cli/default.nix

···
 
 buildGoModule rec {
   pname = "symfony-cli";
-  version = "5.4.16";
-  vendorSha256 = "sha256-A0Dq5QoKSFDpif8x27a1O8CGZ9s5PzOycvPfvEp4qn4=";
+  version = "5.4.17";
+  vendorSha256 = "sha256-hIi+WmLxCTFbu8E++CJkp4bOUrK81PkojRk60SljVik=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     rev = "v${version}";
-    sha256 = "sha256-dKt7hM04gDQtpGwDSppDmJqr2uEb77tke4YJYbXMCgU=";
+    sha256 = "sha256-cOO8U0/PnH19/oaK9wM/mPplC+VTIkF5+RXdjWJyxqc=";
   };
 
   postInstall = ''

pkgs/games/zoom/default.nix

···
 , fetchurl
 , perl
 , expat
-, xlibsWrapper
+, fontconfig
 , freetype
+, xorg
 }:
 
 # !!! assert freetype == xorg.freetype
···
     hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w=";
   };
 
-  buildInputs = [ perl expat xlibsWrapper freetype ];
+  buildInputs = [
+    perl
+    expat
+    fontconfig
+    freetype
+    xorg.libICE
+    xorg.libSM
+    xorg.libX11
+    xorg.libXext
+    xorg.libXrender
+  ];
 
   NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline";
 

pkgs/misc/screensavers/rss-glx/default.nix

···
 , fetchurl
 , autoconf
 , pkg-config
-, xlibsWrapper
+, libX11
 , libXext
 , libGLU
 , libGL
···
   };
 
   nativeBuildInputs = [ autoconf pkg-config ];
-  buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ];
+  buildInputs = [ libGLU libGL libX11 libXext imagemagick6 libtiff bzip2 ];
 
   patches = [
     ./cstddef.patch
   ];
 
   NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick";
-  NIX_LDFLAGS= "-rpath ${libXext}/lib";
 
   meta = {
     description = "Really Slick Screensavers Port to GLX";

pkgs/misc/screensavers/xtrlock-pam/default.nix

···
-{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }:
+{ lib, stdenv, fetchFromGitHub, python2, pkg-config, pam, xorg }:
 
 stdenv.mkDerivation {
   pname = "xtrlock-pam";
···
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ python2 xlibsWrapper pam ];
+  buildInputs = [ python2 pam xorg.libX11 ];
 
   configurePhase = ''
     substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h

pkgs/servers/jellyfin/default.nix

···
 in
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.8.5"; # ensure that jellyfin-web has matching version
+  version = "10.8.6"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    sha256 = "le6yNEK1k0U9ZnkqvBLCiLz0p3rK7jcet7xl/ym+L2g=";
+    sha256 = "nZt6/PdilKXK6Z/9NtoP3MnomduoRVkkJpbL70/MLTQ=";
   };
 
   patches = [

pkgs/servers/jellyfin/node-deps.nix

···
   args = {
     name = "jellyfin-web";
     packageName = "jellyfin-web";
-    version = "10.8.5";
-    src = ../../../../../../../../../nix/store/ab0b3ia5gcmwb7p5kz6dvw456qrdbz91-source;
+    version = "10.8.6";
+    src = ../../../../../../../nix/store/zk40h20vcx9jpz7kcc8fdcn5b9rbxs5p-source;
     dependencies = [
       sources."@ampproject/remapping-2.1.2"
       (sources."@apideck/better-ajv-errors-0.3.3" // {

pkgs/servers/jellyfin/web.nix

···
 
 stdenv.mkDerivation rec {
   pname = "jellyfin-web";
-  version = "10.8.5";
+  version = "10.8.6";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-web";
     rev = "v${version}";
-    sha256 = "KNIxqZSTO1330KFW8y+4nVFiCM1KEEwEM0Vdei26gVI=";
+    sha256 = "6g00UjQyPaiimHNJBout/omyerqe2hCGChNkmojELOA=";
   };
 
   nativeBuildInputs = [

pkgs/servers/nosql/immudb/default.nix

···
 }:
 
 let
-  webconsoleVersion = "1.0.17";
+  webconsoleVersion = "1.0.18";
   webconsoleDist = fetchzip {
     url = "https://github.com/codenotary/immudb-webconsole/releases/download/v${webconsoleVersion}/immudb-webconsole.tar.gz";
-    sha256 = "sha256-hFSvPwSRXyrSBYktTOwIRa1+aH+mX/scDYDokvZuW1s=";
+    sha256 = "sha256-4BhTK+gKO8HW1CelGa30THpfkqfqFthK+b7p9QWl4Pw=";
   };
 in
 buildGoModule rec {
   pname = "immudb";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-lcKjeqZeTQQMhVjnWNP3c+HanI/eenfUbpZJAo5FEkM=";
+    sha256 = "sha256-L8RvbMmq9DPJ2FvxlCE1KC8TRhmZA5CrzUPmr9JNy0Q=";
   };
 
   preBuild = ''
···
     go generate -tags webconsole ./webconsole
   '';
 
-  proxyVendor = true; # check if this is needed anymore when updating
-
-  vendorSha256 = "sha256-gMpkV0XqY6wh7s0lndIdCoYlvVBrMk7/lvyDVqnJ66c=";
+  vendorSha256 = "sha256-k2OwwGjuyfM3QIRz+/DgGD0xUYor4TDmfBmcQOkcA3A=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/tools/X11/xinput_calibrator/default.nix

···
-{ lib, stdenv, fetchFromGitHub, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, libXi, xorgproto, autoconf, automake, libtool, m4, pkg-config, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
···
   preConfigure = "./autogen.sh --with-gui=X11";
 
   nativeBuildInputs = [ pkg-config autoconf automake ];
-  buildInputs = [ xorgproto libXi libtool m4 xlibsWrapper ];
+  buildInputs = [ xorgproto libXi libtool m4 xorg.libX11 xorg.libXext ];
 
   meta = {
     homepage = "https://github.com/tias/xinput_calibrator";

pkgs/tools/X11/xwinwrap/default.nix

···
-{ lib, stdenv, fetchbzr, xlibsWrapper }:
+{ lib, stdenv, fetchbzr, xorg }:
 
 stdenv.mkDerivation rec {
   pname = "xwinwrap";
···
   };
 
   buildInputs = [
-    xlibsWrapper
+    xorg.libX11
+    xorg.libXext
+    xorg.libXrender
   ];
 
   buildPhase = if stdenv.hostPlatform.system == "x86_64-linux" then ''

pkgs/tools/graphics/scrot/default.nix

···
 , stdenv
 , fetchFromGitHub
 , imlib2
-, xlibsWrapper
 , autoreconfHook
 , autoconf-archive
+, libX11
+, libXext
 , libXfixes
 , libXcomposite
 , pkg-config
···
 
   buildInputs = [
     imlib2
-    xlibsWrapper
+    libX11
+    libXext
     libXfixes
     libXcomposite
     libbsd

pkgs/tools/misc/arch-install-scripts/default.nix

···
 
 resholve.mkDerivation rec {
   pname = "arch-install-scripts";
-  version = "26";
+  version = "27";
 
   src = fetchFromGitHub {
     owner = "archlinux";
     repo = "arch-install-scripts";
     rev = "v${version}";
-    hash = "sha256-TRo1ANKSt3njw4HdBMUymMJDpTkL/i5/hdSqxHZnuYw=";
+    hash = "sha256-owJImToG8GIk1TfkSKJyXCu9RTJ1qYlvQ6DTMSazaeQ=";
   };
 
   nativeBuildInputs = [ asciidoc gnum4 ];
···
 
       # packages resholve should resolve executables from
       inputs = [ coreutils gawk gnugrep pacman util-linux ];
+
+      execer = [ "cannot:${pacman}/bin/pacman-key" ];
 
       # TODO: no good way to resolve mount/umount in Nix builds for now
       # see https://github.com/abathur/resholve/issues/29

pkgs/tools/misc/diffoscope/default.nix

···
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "224";
+  version = "225";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "sha256-rbfXQJJjPZAtoYbrpJczR5Gft+SeGoo6xjZvgwI+l1g=";
+    sha256 = "sha256-nuQmvYpCSzw2kUj/UdcBpn6jabaVMYT47MDblzpb/o0=";
   };
 
   outputs = [ "out" "man" ];

pkgs/tools/misc/file/default.nix

···
     ++ lib.optional stdenv.hostPlatform.isWindows libgnurx;
 
   # https://bugs.astron.com/view.php?id=382
-  doCheck = !stdenv.hostPlatform.isMusl;
+  doCheck = !stdenv.buildPlatform.isMusl;
 
   makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file";
 

pkgs/tools/package-management/pacman/default.nix

···
 , fetchurl
 , asciidoc
 , binutils
-, bzip2
 , coreutils
 , curl
 , gnupg
···
 , openssl
 , perl
 , pkg-config
+, zlib
+
+# Compression tools in scripts/libmakepkg/util/compress.sh.in
+, gzip
+, bzip2
 , xz
-, zlib
+, zstd
+, lrzip
+, lzop
+, ncompress
+, lz4
+, lzip
 
 # Tells pacman where to find ALPM hooks provided by packages.
 # This path is very likely to be used in an Arch-like root.
···
   ];
 
   buildInputs = [
-    bzip2
     curl
     gpgme
     libarchive
     openssl
     perl
-    xz
     zlib
   ];
 
···
     })
   ];
 
-  postPatch = ''
+  postPatch = let compressionTools = [
+    gzip
+    bzip2
+    xz
+    zstd
+    lrzip
+    lzop
+    ncompress
+    lz4
+    lzip
+  ]; in ''
+    echo 'export PATH=${lib.makeBinPath compressionTools}:$PATH' >> scripts/libmakepkg/util/compress.sh.in
     substituteInPlace meson.build \
       --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \
       --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \
···
     wrapProgram $out/bin/makepkg \
       --prefix PATH : ${lib.makeBinPath [ binutils ]}
     wrapProgram $out/bin/pacman-key \
-      --prefix PATH : ${lib.makeBinPath [ gnupg ]}
+      --prefix PATH : ${lib.makeBinPath [ "${placeholder "out"}" gnupg ]}
   '';
 
   meta = with lib; {

pkgs/tools/security/sequoia/default.nix

···
 { stdenv
 , fetchFromGitLab
+, fetchpatch
 , lib
 , darwin
 , git
···
   };
 
   cargoSha256 = "sha256-Y7iiZVIT9Vbe4YmTfGTU8p3H3odQKms2FBnnWgvF7mI=";
+
+  patches = [
+    (fetchpatch
+      { url = "https://gitlab.com/sequoia-pgp/sequoia/-/commit/7916f90421ecb9a75e32f0284459bcc9a3fd02b0.patch";
+        sha256 = "sha256-KBBn6XaGzIT0iVzoCYsS0N+OkZzGuWmUmIF2hl49FEI=";
+      }
+    )
+  ];
 
   nativeBuildInputs = [
     pkg-config

pkgs/tools/text/vale/default.nix

···
 
 buildGoModule rec {
   pname = "vale";
-  version = "2.20.2";
+  version = "2.21.0";
 
   subPackages = [ "cmd/vale" ];
   outputs = [ "out" "data" ];
···
     owner = "errata-ai";
     repo = "vale";
     rev = "v${version}";
-    sha256 = "sha256-NQtpuFHHbZwrD9kwSppx7GvJ+Puj4awyN0mAbwlMH8Y=";
+    sha256 = "sha256-H+Hi9KS8gDAfXNqotHdkzWK1m8twOajC8kf/uLUEAv4=";
   };
 
   vendorSha256 = "sha256-ODzQkNOXEvSOhG6MoJbyxIwduFAW5FQb5hlOn3+io3A=";

pkgs/tools/typesetting/ted/default.nix

···
-{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xlibsWrapper, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
+{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }:
 
 stdenv.mkDerivation rec {
   pname = "ted";
···
   '';
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ zlib pcre xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
+  buildInputs = [ zlib pcre xorg.libX11 xorg.libICE xorg.libSM xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ];
 
   meta = with lib; {
     description = "An easy rich text processor";

pkgs/top-level/python-packages.nix

···
 
   dlinfo = callPackage ../development/python-modules/dlinfo { };
 
+  dlms-cosem = callPackage ../development/python-modules/dlms-cosem { };
+
   dlx = callPackage ../development/python-modules/dlx { };
 
   dmenu-python = callPackage ../development/python-modules/dmenu { };