Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -3282,6 +3282,12 @@
     name = "Changsheng Wu";
     githubId = 2083950;
   };
+  conni2461 = {
+    email = "simon.hauser@outlook.com";
+    github = "Conni2461";
+    name = "Simon Hauser";
+    githubId = 15233006;
+  };
   connorbaker = {
     email = "connor.baker@tweag.io";
     matrix = "@connorbaker:matrix.org";

nixos/modules/services/security/usbguard.nix

@@ -150,6 +150,8 @@ in
           Generate device specific rules including the "via-port" attribute.
         '';
       };
+
+      dbus.enable = mkEnableOption (lib.mdDoc "USBGuard dbus daemon");
     };
   };
 
@@ -160,49 +162,90 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    systemd.services.usbguard = {
+    systemd.services = {
-      description = "USBGuard daemon";
+      usbguard = {
+        description = "USBGuard daemon";
 
-      wantedBy = [ "basic.target" ];
+        wantedBy = [ "basic.target" ];
-      wants = [ "systemd-udevd.service" ];
+        wants = [ "systemd-udevd.service" ];
 
-      # make sure an empty rule file exists
+        # make sure an empty rule file exists
-      preStart = ''[ -f "${ruleFile}" ] || touch ${ruleFile}'';
+        preStart = ''[ -f "${ruleFile}" ] || touch ${ruleFile}'';
 
-      serviceConfig = {
+        serviceConfig = {
-        Type = "simple";
+          Type = "simple";
-        ExecStart = "${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}";
+          ExecStart = "${cfg.package}/bin/usbguard-daemon -P -k -c ${daemonConfFile}";
-        Restart = "on-failure";
+          Restart = "on-failure";
 
-        StateDirectory = [
+          StateDirectory = [
-          "usbguard"
+            "usbguard"
-          "usbguard/IPCAccessControl.d"
+            "usbguard/IPCAccessControl.d"
-        ];
+          ];
 
-        AmbientCapabilities = "";
+          AmbientCapabilities = "";
-        CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER";
+          CapabilityBoundingSet = "CAP_CHOWN CAP_FOWNER";
-        DeviceAllow = "/dev/null rw";
+          DeviceAllow = "/dev/null rw";
-        DevicePolicy = "strict";
+          DevicePolicy = "strict";
-        IPAddressDeny = "any";
+          IPAddressDeny = "any";
-        LockPersonality = true;
+          LockPersonality = true;
-        MemoryDenyWriteExecute = true;
+          MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
+          NoNewPrivileges = true;
-        PrivateDevices = true;
+          PrivateDevices = true;
-        PrivateTmp = true;
+          PrivateTmp = true;
-        ProtectControlGroups = true;
+          ProtectControlGroups = true;
-        ProtectHome = true;
+          ProtectHome = true;
-        ProtectKernelModules = true;
+          ProtectKernelModules = true;
-        ProtectSystem = true;
+          ProtectSystem = true;
-        ReadOnlyPaths = "-/";
+          ReadOnlyPaths = "-/";
-        ReadWritePaths = "-/dev/shm -/tmp";
+          ReadWritePaths = "-/dev/shm -/tmp";
-        RestrictAddressFamilies = [ "AF_UNIX" "AF_NETLINK" ];
+          RestrictAddressFamilies = [ "AF_UNIX" "AF_NETLINK" ];
-        RestrictNamespaces = true;
+          RestrictNamespaces = true;
-        RestrictRealtime = true;
+          RestrictRealtime = true;
-        SystemCallArchitectures = "native";
+          SystemCallArchitectures = "native";
-        SystemCallFilter = "@system-service";
+          SystemCallFilter = "@system-service";
-        UMask = "0077";
+          UMask = "0077";
+        };
+      };
+
+      usbguard-dbus = mkIf cfg.dbus.enable {
+        description = "USBGuard D-Bus Service";
+
+        wantedBy = [ "multi-user.target" ];
+        requires = [ "usbguard.service" ];
+
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.usbguard1";
+          ExecStart = "${cfg.package}/bin/usbguard-dbus --system";
+          Restart = "on-failure";
+        };
+
+        aliases = [ "dbus-org.usbguard.service" ];
       };
     };
+
+    security.polkit.extraConfig =
+      let
+        groupCheck = (lib.concatStrings (map
+          (g: "subject.isInGroup(\"${g}\") || ")
+          cfg.IPCAllowedGroups))
+        + "false";
+      in
+      optionalString cfg.dbus.enable ''
+        polkit.addRule(function(action, subject) {
+            if ((action.id == "org.usbguard.Policy1.listRules" ||
+                 action.id == "org.usbguard.Policy1.appendRule" ||
+                 action.id == "org.usbguard.Policy1.removeRule" ||
+                 action.id == "org.usbguard.Devices1.applyDevicePolicy" ||
+                 action.id == "org.usbguard.Devices1.listDevices" ||
+                 action.id == "org.usbguard1.getParameter" ||
+                 action.id == "org.usbguard1.setParameter") &&
+                subject.active == true && subject.local == true &&
+                (${groupCheck})) {
+                    return polkit.Result.YES;
+            }
+        });
+      '';
   };
   imports = [
     (mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.")

nixos/modules/services/x11/desktop-managers/cde.nix

@@ -36,7 +36,7 @@ in {
         name = "cmsd";
         protocol = "udp";
         user = "root";
-        server = "${pkgs.cdesktopenv}/opt/dt/bin/rpc.cmsd";
+        server = "${pkgs.cdesktopenv}/bin/rpc.cmsd";
         extraConfig = ''
           type  = RPC UNLISTED
           rpc_number  = 100068
@@ -64,7 +64,7 @@ in {
     services.xserver.desktopManager.session = [
     { name = "CDE";
       start = ''
-        exec ${pkgs.cdesktopenv}/opt/dt/bin/Xsession
+        exec ${pkgs.cdesktopenv}/bin/Xsession
       '';
     }];
   };

pkgs/applications/editors/neovim/utils.nix

@@ -175,6 +175,8 @@ let
       withPython3 ? true
     , withNodeJs ? false
     , withRuby ? true
+    # perl is problematic https://github.com/NixOS/nixpkgs/issues/132368
+    , withPerl ? false
 
     # so that we can pass the full neovim config while ignoring it
     , ...
@@ -184,6 +186,7 @@ let
         python = false;
         python3 = withPython3;
         ruby = withRuby;
+        perl = withPerl;
       };
 
       genProviderCommand = prog: withProg:

pkgs/applications/editors/neovim/wrapper.nix

@@ -6,6 +6,7 @@
 , callPackage
 , neovimUtils
 , vimUtils
+, perl
 }:
 neovim:
 
@@ -19,6 +20,7 @@ let
     , withPython2 ? false
     , withPython3 ? true,  python3Env ? python3
     , withNodeJs ? false
+    , withPerl ? false
     , rubyEnv ? null
     , vimAlias ? false
     , viAlias ? false
@@ -32,7 +34,7 @@ let
     # entry to load in packpath
     , packpathDirs
     , ...
-  }@args:
+  }:
   let
 
     wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
@@ -50,8 +52,10 @@ let
           ]
           ;
 
-    providerLuaRc = neovimUtils.generateProviderRc args;
+    providerLuaRc = neovimUtils.generateProviderRc {
-    # providerLuaRc = "toto";
+      inherit withPython3 withNodeJs withPerl;
+      withRuby = rubyEnv != null;
+    };
 
     # If configure != {}, we can't generate the rplugin.vim file with e.g
     # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in
@@ -86,6 +90,9 @@ let
       + lib.optionalString withNodeJs ''
         ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node
       ''
+      + lib.optionalString withPerl ''
+        ln -s ${perl}/bin/perl $out/bin/nvim-perl
+      ''
       + lib.optionalString vimAlias ''
         ln -s $out/bin/nvim $out/bin/vim
       ''

pkgs/applications/misc/anytype/default.nix

@@ -2,13 +2,13 @@
 
 let
   pname = "anytype";
-  version = "0.31.0";
+  version = "0.32.3";
   name = "Anytype-${version}";
   nameExecutable = pname;
   src = fetchurl {
-    url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
+    url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage";
     name = "Anytype-${version}.AppImage";
-    sha256 = "sha256-s8al0R9G478A+PymQcdcdRpw6tpKkG+WIZsXZYEvf/o=";
+    sha256 = "sha256-usRGwQuYNETQu+a23UeW384tOFXLfsjO6Tc+57utCvk=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
 in
@@ -20,11 +20,11 @@ appimageTools.wrapType2 {
 
   extraInstallCommands = ''
     mv $out/bin/${name} $out/bin/${pname}
-    install -m 444 -D ${appimageContents}/anytype2.desktop -t $out/share/applications
+    install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/anytype2.desktop \
+    substituteInPlace $out/share/applications/anytype.desktop \
       --replace 'Exec=AppRun' 'Exec=${pname}'
-    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/anytype2.png \
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/anytype.png \
-      $out/share/icons/hicolor/512x512/apps/anytype2.png
+      $out/share/icons/hicolor/512x512/apps/anytype.png
   '';
 
   meta = with lib; {

pkgs/desktops/cdesktopenv/0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch

@@ -1,336 +0,0 @@
-From 67f62e5a8acd70d30f7067f1f44ac7b15c67011a Mon Sep 17 00:00:00 2001
-From: Peter Howkins <flibble@users.sf.net>
-Date: Mon, 2 Nov 2020 05:30:08 +0000
-Subject: [PATCH] all: remove deprecated sys_errlist[] and replace with ANSI C
- strerror()
-
----
- cde/config/imake/imake.c                            | 13 -------------
- cde/lib/tt/bin/dbck/spec.C                          |  8 --------
- cde/lib/tt/lib/tt_options.h                         | 12 ------------
- cde/programs/dtcm/dtcm/dnd.c                        |  4 ----
- cde/programs/dtcm/libDtCmP/util.c                   |  5 +----
- .../dthelp/parser.ccdf/volumegen/Volumegen.c        |  1 -
- cde/programs/dtimsstart/remote.c                    |  4 ----
- cde/programs/dtimsstart/start.c                     | 12 +++---------
- cde/programs/dtinfo/dtinfo/src/external-api/comm.c  |  5 +----
- .../dtksh/ksh93/src/lib/libast/string/fmterror.c    |  9 +--------
- .../dtksh/ksh93/src/lib/libast/string/strerror.c    |  8 +-------
- cde/programs/dtlogin/dm.h                           |  7 +------
- 12 files changed, 8 insertions(+), 80 deletions(-)
-
-diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c
-index 574af7c7..83834aa7 100644
---- a/cde/config/imake/imake.c
-+++ b/config/imake/imake.c
-@@ -242,19 +242,6 @@ extern int	errno;
- #include <stdarg.h>
- #include "imakemdep.h"
- 
--/*
-- * This define of strerror is copied from (and should be identical to)
-- * Xos.h, which we don't want to include here for bootstrapping reasons.
-- */
--#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4))
--# ifndef strerror
--extern char *sys_errlist[];
--extern int sys_nerr;
--#  define strerror(n) \
--    (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
--# endif
--#endif
--
- #define	TRUE		1
- #define	FALSE		0
- 
-diff --git a/cde/lib/tt/bin/dbck/spec.C b/cde/lib/tt/bin/dbck/spec.C
-index 18bba3fb..eaf2d6b7 100644
---- a/cde/lib/tt/bin/dbck/spec.C
-+++ b/lib/tt/bin/dbck/spec.C
-@@ -44,14 +44,6 @@
- #include "ttdbck.h"
- #include "tt_db_server_consts.h"
- 
--#if !defined(OPT_STRERROR)
--// No strerror(), fake it
--char *
--strerror(int e)
--{
--	return ((e<sys_nerr) ? sys_errlist[e] : "unknown");
--}
--#endif
- 
- Spec::
- Spec()     
-diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
-index e23bb9e5..de3a30e2 100644
---- a/cde/lib/tt/lib/tt_options.h
-+++ b/lib/tt/lib/tt_options.h
-@@ -107,10 +107,6 @@
-  * OPT_CPP_OPTIONS - string, options to pass to cpp. For example, on
-  *   some platforms -B is used so C++ comments are processed by cpp.
-  *
-- *
-- * OPT_STRERROR - set if strerror() is available, otherwise we assume
-- *   global symbol sys_errlist is defined in errno.h.
-- *
-  * OPT_SVR4_GETMNTENT - set to use new SVR4 flavor of getmntent.
-  *
-  * OPT_LOCKF_MNTTAB - set to hold a lockf lock on MNTTAB while doing
-@@ -242,7 +238,6 @@
- # undef  OPT_SYSINFO
- # define OPT_CPP_PATH		"/usr/ccs/lib/cpp"
- # define OPT_CPP_OPTIONS	""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_DEFINE_SIG_PF
-@@ -273,7 +268,6 @@
- # undef  OPT_SYSINFO
- # define OPT_CPP_PATH		"/usr/lib/cpp"
- # define OPT_CPP_OPTIONS	 "-B"
--# undef  OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_42
-@@ -302,7 +296,6 @@
- # define OPT_CATGETS
- # undef  OPT_GETDTABLESIZE
- # define OPT_SYSINFO
--# define OPT_STRERROR
- # define OPT_CPP_PATH		"/usr/ccs/lib/cpp"
- # define OPT_CPP_OPTIONS	"-B"
- # define OPT_SVR4_GETMNTENT
-@@ -389,7 +382,6 @@
- #  define OPT_CPP_PATH		"/opt/langtools/lbin/cpp"
- # endif
- # define OPT_CPP_OPTIONS	""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_HFS
-@@ -415,7 +407,6 @@
- # undef  OPT_SYSINFO
- # define OPT_CPP_PATH		"/usr/bin/cpp"
- # define OPT_CPP_OPTIONS	 ""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	"ext2fs"
-@@ -446,7 +437,6 @@
- # undef  OPT_SYSINFO
- # define OPT_CPP_PATH		"/usr/libexec/cpp"
- # define OPT_CPP_OPTIONS	""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
-@@ -479,7 +469,6 @@
- #  define OPT_CPP_PATH		"/usr/libexec/cpp"
- # endif
- # define OPT_CPP_OPTIONS	""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
-@@ -509,7 +498,6 @@
- # undef  OPT_SYSINFO
- # define OPT_CPP_PATH		"/usr/bin/cpp"
- # define OPT_CPP_OPTIONS	""
--# define OPT_STRERROR
- # undef  OPT_SVR4_GETMNTENT
- # undef  OPT_LOCKF_MNTENT
- # define OPT_LOCAL_MOUNT_TYPE	MNTTYPE_UFS
-diff --git a/cde/programs/dtcm/dtcm/dnd.c b/cde/programs/dtcm/dtcm/dnd.c
-index abc58c12..f37f19a6 100644
---- a/cde/programs/dtcm/dtcm/dnd.c
-+++ b/programs/dtcm/dtcm/dnd.c
-@@ -72,10 +72,6 @@
- 
- static Bool lookForButton(Display *, XEvent *, XPointer);
- 
--#if !defined(__linux__) && !defined(CSRG_BASED)
--extern char	*sys_errlist[];
--#endif
--
- extern int	drag_load_proc(char*, Calendar *);
- static char	dnd_filename[20];
- 
-diff --git a/cde/programs/dtcm/libDtCmP/util.c b/cde/programs/dtcm/libDtCmP/util.c
-index d33b8ba1..6de4739d 100644
---- a/cde/programs/dtcm/libDtCmP/util.c
-+++ b/programs/dtcm/libDtCmP/util.c
-@@ -306,10 +306,7 @@ syserr(char *msg, int a1, int a2, int a3)
- #if 0
- 	/* print the error, if any */
- 	if (saveerr != 0) {
--		if (saveerr < 0 || saveerr > sys_nerr) 
--			(void) fprintf(stderr, ":Unknown error %d", saveerr);
--		else 
--			(void) fprintf(stderr, ":%s", sys_errlist[saveerr]);
-+			(void) fprintf(stderr, ":%s", strerror(saveerr));
- 	}
- #endif
- 
-diff --git a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c b/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
-index d9a42943..08de4809 100644
---- a/cde/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
-+++ b/programs/dthelp/parser.ccdf/volumegen/Volumegen.c
-@@ -56,7 +56,6 @@
- typedef int Boolean;
- 
- /* extern int errno; */
--/* extern char *sys_errlist[]; */
- /* extern int sys_nerr; */
- 
- static void GenTopicList (
-diff --git a/cde/programs/dtimsstart/remote.c b/cde/programs/dtimsstart/remote.c
-index 68773673..71d32977 100644
---- a/cde/programs/dtimsstart/remote.c
-+++ b/programs/dtimsstart/remote.c
-@@ -37,10 +37,6 @@
- #include	<X11/Xproto.h>		/* for X_ChangeHosts */
- #include	<X11/Xatom.h>		/* for XA_STRING */
- 
--#if !defined(__linux__) && !defined(CSRG_BASED)
--extern char	*sys_errlist[];
--#endif
--
- static char	*conf_msg_id = STR_CONFDATA;
- 
- #define	CONF_MSG_ID_LEN		strlen(conf_msg_id)
-diff --git a/cde/programs/dtimsstart/start.c b/cde/programs/dtimsstart/start.c
-index 78fc2a38..1dafa189 100644
---- a/cde/programs/dtimsstart/start.c
-+++ b/programs/dtimsstart/start.c
-@@ -27,14 +27,10 @@
- #include	<sys/wait.h>
- #include	<setjmp.h>
- #include	<unistd.h>
-+#include    <errno.h>
- 
- #if (defined(__linux__) || defined(CSRG_BASED)) && !defined(_NFILE)
- #define _NFILE FOPEN_MAX
--#endif
--
--#if !defined(__linux__) && !defined(CSRG_BASED)
--extern char	*sys_errlist[];
--extern int	sys_nerr;
- #endif
- 
-     /* local functions */
-@@ -599,8 +595,7 @@ static int	invoke_ims(UserSelection *sel)
- 
-     pid = fork();
-     if (pid == (pid_t) -1) {
--	put_xims_log("fork failed [%s]",
--		(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
-+	put_xims_log("fork failed [%s]", strerror(errno), 0, 0);
- #ifdef	DEBUG
- 	perror("fork");
- #endif
-@@ -617,8 +612,7 @@ static int	invoke_ims(UserSelection *sel)
- #endif
- 	execl(SH_PATH, "sh", "-c", renv->cmdbuf, NULL);
- 
--	put_xims_log("%s: exec failed [%s]", SH_PATH,
--		(errno <= sys_nerr) ? sys_errlist[errno] : NULL, 0, 0);
-+	put_xims_log("%s: exec failed [%s]", SH_PATH, strerror(errno) , 0, 0);
- 	/* perror(SH_PATH); */
- 	sleep(1);
- 	_exit(1);
-diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
-index d61ccb7a..6aa2fc91 100644
---- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
-+++ b/programs/dtinfo/dtinfo/src/external-api/comm.c
-@@ -53,9 +53,6 @@
- #include <sys/select.h>
- #endif
- 
--extern char *sys_errlist[];
--
--
- static OliasEvent *current_event;
- static int reply_status;
- #define NO_REPLY 0
-@@ -332,7 +329,7 @@ wait_for_reply (Widget toplevel)
- 	      XtAppWarningMsg (XtWidgetToApplicationContext (toplevel),
- 			       "communicationsError", "select",
- 			       "Olias API", "Select failed: %s",
--			       &sys_errlist[errno], &num_params);
-+			       strerror(errno), &num_params);
- 	      continue;
- 	    }
- 	  continue;
-diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
-index 313b67bc..8dd87ab8 100644
---- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
-+++ b/programs/dtksh/ksh93/src/lib/libast/string/fmterror.c
-@@ -92,14 +92,7 @@
- #endif
- #include <ast.h>
- 
--extern __MANGLE__ int	sys_nerr;
--extern __MANGLE__ char*	sys_errlist[];
--
- char*
- fmterror __PARAM__((int err), (err)) __OTORP__(int err;){
--	static char	msg[28];
--
--	if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
--	sfsprintf(msg, sizeof(msg), "Error %d", err);
--	return(msg);
-+    return strerror(err);
- }
-diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
-index 7686a54d..a6aa7ce8 100644
---- a/cde/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
-+++ b/programs/dtksh/ksh93/src/lib/libast/string/strerror.c
-@@ -108,18 +108,12 @@ NoN(strerror)
- 
- #include <ast.h>
- 
--extern __MANGLE__ int	sys_nerr;
--extern __MANGLE__ char*	sys_errlist[];
- 
- char*
- strerror __PARAM__((int err), (err)) __OTORP__(int err;)
- #line 25
- {
--	static char	msg[28];
--
--	if (err > 0 && err <= sys_nerr) return(sys_errlist[err]);
--	sfsprintf(msg, sizeof(msg), "Error %d", err);
--	return(msg);
-+	return strerror(err);
- }
- 
- #endif
-diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
-index 3e0f2499..e67edc3c 100644
---- a/cde/programs/dtlogin/dm.h
-+++ b/programs/dtlogin/dm.h
-@@ -68,8 +68,7 @@
- # include       <pwd.h>                 /* for passwd structure            */
- # include	<stdio.h>
- # include	<stdlib.h>		/* for exit(), malloc(), abort()   */
--# include	<string.h>		/* for string functions, bcopy(),
--					   sys_errlist			   */
-+# include	<string.h>		/* for string functions, bcopy()   */
- # include	<sys/param.h>		/* for NGROUPS			   */
- # include	<sys/types.h>   	/* for fd_set			   */
- # include	<netinet/in.h>		/* for Internet socket stuff	   */
-@@ -475,10 +474,6 @@ struct verify_info {
-  *
-  ***************************************************************************/
- 
--#if !defined(__linux__) && !defined(CSRG_BASED)
--extern char	*sys_errlist[];		/* system error msgs		   */
--extern int	sys_nerr;		/* system error msgs		   */
--#endif
- extern XrmDatabase  XresourceDB; 
- 
- 
--- 
-2.28.0
-

pkgs/desktops/cdesktopenv/2.3.2.patch

@@ -1,106 +0,0 @@
-From 8db8a2290683acf94f02e855af668a864d6001c2 Mon Sep 17 00:00:00 2001
-Subject: [PATCH 1/2] installCDE: don't hardcode path to whoami
----
- cde/admin/IntegTools/dbTools/installCDE.src | 11 ++---------
- cde/admin/IntegTools/dbTools/mkProd         |  9 +--------
- 2 files changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
-index a00fefd1..233b4a96 100755
---- a/cde/admin/IntegTools/dbTools/installCDE.src
-+++ b/admin/IntegTools/dbTools/installCDE.src
-@@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
- 
- Log()
- {
--  /bin/echo "$1" | tee -a $LOGFILE
-+  echo "$1" | tee -a $LOGFILE
- }
- 
- MakeTarball()
-@@ -537,14 +537,7 @@ XCOMM
-     PLATFORM_SCRIPT_DIR=hp
-   fi
- 
--  if [ "$PLATFORM" = "aix" ];
--  then
--    USER=$(/bin/whoami)
--  else
--    USER=$(/usr/bin/whoami)
--  fi
--
--  if [ "$USER" != "root" ];
-+  if [ $(whoami) != "root" ];
-   then
-     echo ""
-     echo "You should be root to run this script.  Continuing anyway."
-diff --git a/cde/admin/IntegTools/dbTools/mkProd b/cde/admin/IntegTools/dbTools/mkProd
-index 44591fab..413a77e8 100755
---- a/cde/admin/IntegTools/dbTools/mkProd
-+++ b/admin/IntegTools/dbTools/mkProd
-@@ -96,13 +96,6 @@ else                                                # Build system = HP
-         PLATFORM=hp-ux
- fi
- 
--if [ $PLATFORM = "aix" ];
--then
--        USER=`/bin/whoami`
--else
--        USER=`/usr/bin/whoami`
--fi
--
- awkit() {
- 	awk  '
- 	BEGIN {
-@@ -504,7 +497,7 @@ doit()
- 		}
- 		# set permissions for non-links
- 		if [ "${TYPE%link}" = "$TYPE" ]; then
--			if [ "$USER" = "root" ]; then
-+			if [ $(whoami) = "root" ]; then
- 				chgrp $GROUP $DEST || 
- 					echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2
- 				chown $OWNER $DEST || 
--- 
-2.25.0
-
-
-From 9221c55a5f811986eaf0e01301827c294ac2e29b Mon Sep 17 00:00:00 2001
-Subject: [PATCH 2/2] tt_type_comp: use CppCmd definition
----
- cde/lib/tt/bin/tt_type_comp/Imakefile | 4 +++-
- cde/lib/tt/lib/tt_options.h           | 5 +++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile
-index 92179208..62434929 100644
---- a/cde/lib/tt/bin/tt_type_comp/Imakefile
-+++ b/lib/tt/bin/tt_type_comp/Imakefile
-@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
- 
- #include "../../tooltalk.tmpl"
- 
--DEFINES = 
-+CPP_PROGRAM = CppCmd
-+CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
-+DEFINES = $(CPP_DEFINES)
- INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
- 
- DEPLIBS         = ../../slib/libstt.a TtClientDepLibs
-diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
-index 4315daa8..e23bb9e5 100644
---- a/cde/lib/tt/lib/tt_options.h
-+++ b/lib/tt/lib/tt_options.h
-@@ -529,4 +529,9 @@
- 
- #endif
- 
-+#ifdef CPP_PROGRAM
-+# undef OPT_CPP_PATH
-+# define OPT_CPP_PATH CPP_PROGRAM
-+#endif
-+
- #endif				/* _TT_OPTIONS_H */
--- 
-2.25.0
-

pkgs/desktops/cdesktopenv/default.nix

@@ -1,106 +1,67 @@
 { lib, stdenv, fetchurl
-, fetchpatch
+, libX11, bison, ksh, perl
-, xorgproto, libX11, bison, ksh, perl, gnum4
 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
-, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
+, libjpeg, libXmu, libXdmcp, libXScrnSaver, bdftopcf
-, ncompress, mkfontdir, tcl-8_5, libXaw, libxcrypt, gcc, glibcLocales
+, ncompress, mkfontdir, tcl, libXaw, libxcrypt, glibcLocales
-, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
+, autoPatchelfHook, makeWrapper, xset, xrdb
+, autoreconfHook, opensp, flex, libXpm
 , rpcsvc-proto }:
 
-let
+stdenv.mkDerivation rec {
-  x11ProjectRoot = symlinkJoin {
-    name = "x11ProjectRoot";
-    paths = [
-      bdftopcf mkfontdir
-      xset # fonts
-      xrdb # session load
-    ];
-  };
-in stdenv.mkDerivation rec {
-  version = "2.3.2";
   pname = "cde";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
-    sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
+    hash = "sha256-caslezz2kbljwApv5igDPH345PK2YqQUTi1YZgvM1Dw=";
   };
 
-  # remove with next release
+  postPatch = ''
-  patches = [
+    for f in $(find . -type f ! -path doc/common); do
-    ./2.3.2.patch
+      sed -i \
-    ./0001-all-remove-deprecated-sys_errlist-and-replace-with-A.patch
+        -e "s|/usr/dt|$out|g" \
+        -e "s|/etc/dt|$out/etc|g" \
+        -e "s|\$(DESTDIR)/var|$out/var|g" \
+        "$f"
+    done
 
-    (fetchpatch {
+    for f in $(find . -type f -name "Makefile.am"); do
-      name = "binutils-2.36.patch";
+      sed -i \
-      url = "https://github.com/cdesktopenv/cde/commit/0b7849e210a99a413ddeb52a0eb5aef9a08504a0.patch";
+        -e "/chown /d" \
-      sha256 = "0wlhs617hws3rwln9v74y1nw27n3pp7jkpnxlala7k5y64506ipj";
+        -e "/chgrp /d" \
-      stripLen = 1;
+        -e "s/chmod 4755/chmod 755/g" \
-    })
+        "$f"
-  ];
+    done
+
+    substituteInPlace configure.ac \
+      --replace "-I/usr/include/tirpc" "-I${libtirpc.dev}/include/tirpc"
+
+    patchShebangs autogen.sh config.rpath contrib programs
+  '';
 
   buildInputs = [
     libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps
-    libjpeg libXmu libXdmcp libXScrnSaver tcl-8_5 libXaw ksh libxcrypt
+    libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh libxcrypt
+    libXpm
   ];
   nativeBuildInputs = [
-    bison ncompress autoPatchelfHook makeWrapper fakeroot
+    bison ncompress autoPatchelfHook makeWrapper
+    autoreconfHook bdftopcf mkfontdir xset xrdb opensp perl flex
     rpcsvc-proto
   ];
-  # build fails otherwise
-  enableParallelBuilding = false;
 
-  # Workaround build failure on -fno-common toolchains:
+  enableParallelBuilding = true;
-  #   ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of
-  #     `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  makeFlags = [
-    "World"
-    "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"
-    "IMAKECPP=cpp"
-    "LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive"
-    # Workaround for dtdocbook issue with tcl 8.6.13.
-    # TODO: this might be possible to remove when updating CDE
-    "TCLLIB=-ltcl8.5"
-  ];
 
   preConfigure = ''
-    # binutils 2.37 fix
+    export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-    fixupList=(
-      "config/cf/Imake.tmpl"
-      "config/util/crayar.sh"
-      "config/util/crayar.sh"
-      "programs/dtwm/Makefile.tmpl"
-    )
-    for toFix in "''${fixupList[@]}"; do
-      substituteInPlace "$toFix" --replace "clq" "cq"
-    done
   '';
 
-  preBuild = ''
+  configureFlags = [
-    while IFS= read -r -d ''$'\0' i; do
+    "--with-tcl=${tcl}/lib"
-      substituteInPlace "$i" --replace /usr/dt $out/opt/dt
+  ];
-    done < <(find "." -type f -exec grep -Iq /usr/dt {} \; -and -print0)
 
-    cat >> config/cf/site.def << EOF
+  preInstall = ''
-#define MakeFlagsToShellFlags(makeflags,shellcmd) set -e
+    mkdir -p $out/opt/dt/bin
-#define KornShell ${ksh}/bin/ksh
-#define PerlCmd ${perl}/bin/perl
-#define M4Cmd ${gnum4}/bin/m4
-#define X11ProjectRoot ${x11ProjectRoot}
-#define CppCmd ${gcc}/bin/cpp
-TIRPCINC = -I${libtirpc.dev}/include/tirpc
-EOF
-
-    patchShebangs .
-    unset AR
-  '';
-
-  installPhase = ''
-    fakeroot admin/IntegTools/dbTools/installCDE -s . -DontRunScripts
-
-    mkdir -p $out/bin
-    mv $out/opt/dt/bin/dtmail $out/bin
   '';
 
   meta = with lib; {
@@ -108,6 +69,6 @@ EOF
     homepage = "https://sourceforge.net/projects/cdesktopenv/";
     license = licenses.lgpl2;
     maintainers = [ ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = platforms.linux;
   };
 }

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

@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , async-timeout
+, chacha20poly1305-reuseable
 , mock
 , noiseprotocol
 , protobuf
@@ -13,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "13.9.0";
+  version = "15.1.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -22,11 +23,12 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RjLzOl8Cb6Vrq+75SvBntAmmiK70i3o2rED7Smnpiws=";
+    hash = "sha256-pdG/yfrGWMu85WXA7CXrmK2FXc+x3e/RNPXCWIEn8n8=";
   };
 
   propagatedBuildInputs = [
     async-timeout
+    chacha20poly1305-reuseable
     noiseprotocol
     protobuf
     zeroconf

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

@@ -1,39 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, ifaddr
-, pythonOlder
-}:
-
-buildPythonPackage rec {
-  pname = "aiosenseme";
-  version = "0.6.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "bdraco";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg=";
-  };
-
-  propagatedBuildInputs = [
-    ifaddr
-  ];
-
-  pythonImportsCheck = [
-    "aiosenseme"
-  ];
-
-  # Module has no tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Module to interact with SenseME fans and lights by Big Ass Fans";
-    homepage = "https://github.com/bdraco/aiosenseme";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ fab ];
-  };
-}

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

@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
 , attrs
 , argon2-cffi
 , base58
@@ -21,7 +20,7 @@
 , msgpack
 , passlib
 , py-ecc
-, py-eth-sig-utils
+# , py-eth-sig-utils
 , py-multihash
 , py-ubjson
 , pynacl
@@ -49,22 +48,14 @@
 
 buildPythonPackage rec {
   pname = "autobahn";
-  version = "22.7.1";
+  version = "23.6.2";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
-
-  patches = [
-    (fetchpatch {
-      # https://github.com/crossbario/autobahn-python/pull/1604
-      url = "https://github.com/crossbario/autobahn-python/commit/ffe679fae4ebcdde964d4ee88cb82a9c65c40529.patch";
-      hash = "sha256-QNnQkxMZJsFbiYUp4Os+dWo7jdCa96+kyb/2HxSMU8k=";
-    })
-  ];
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-i0Yuouaq1rTcDtRfuAC2y/6wMl5/5pg5B/Ei8r5KH+k=";
+    hash = "sha256-7JQhxSohAzZNHvBGgDbmAZ7oT3FyHoazb+Ga1pZsEYE=";
   };
 
   postPatch = ''
@@ -110,7 +101,7 @@ buildPythonPackage rec {
     serialization = [ cbor2 flatbuffers msgpack ujson py-ubjson ];
     twisted = [ attrs args.twisted zope_interface ];
     ui = [ pygobject3 ];
-    xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc py-eth-sig-utils py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ];
+    xbr = [ base58 cbor2 click ecdsa eth-abi jinja2 hkdf mnemonic py-ecc /* py-eth-sig-utils */ py-multihash rlp spake2 twisted /* web3 xbr */ yapf /* zlmdb */ ];
   };
 
   meta = with lib; {

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

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flit-core
+}:
+
+buildPythonPackage rec {
+  pname = "bottombar";
+  version = "1.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "evalf";
+    repo = "bottombar";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/3m34HcYmmEf92H3938dYV1Q6k44KaCb9TDx9nDNPnM=";
+  };
+
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  # The package only has some "interactive" tests where a user must check for
+  # the correct output and hit enter after every check
+  doCheck = false;
+  pythonImportsCheck = [
+    "bottombar"
+  ];
+
+  meta = with lib; {
+    description = "Context manager that prints a status line at the bottom of a terminal window";
+    homepage = "https://github.com/evalf/bottombar";
+    changelog = "https://github.com/evalf/bottombar/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ conni2461 ];
+  };
+}

pkgs/development/python-modules/hass-nabucasa/default.nix

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.67.1";
+  version = "0.69.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "nabucasa";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-/cu7+fMbe9kyWGGBGBwjsiA6PXoUJZ7IFzpEcnVSLn0=";
+    hash = "sha256-7FO/z5AseP80y74e4ivLXlwB9t5jJf2bCaNp6HfqZ1c=";
   };
 
   postPatch = ''

pkgs/development/python-modules/lru-dict/default.nix

@@ -2,19 +2,22 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
+, pythonOlder
 }:
 
 let
   pname = "lru-dict";
-  version = "1.1.8";
+  version = "1.2.0";
 in
 buildPythonPackage {
   inherit pname version;
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU=";
+    hash = "sha256-E8VngvGdaN302NsBcAQRkoWWFlFMcGsSbQ3y7HKhG9c=";
   };
 
   nativeCheckInputs = [
@@ -28,6 +31,7 @@ buildPythonPackage {
   meta = with lib; {
     description = "Fast and memory efficient LRU cache for Python";
     homepage = "https://github.com/amitdev/lru-dict";
+    changelog = "https://github.com/amitdev/lru-dict/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

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

@@ -5,14 +5,16 @@
 , numpy
 , treelog
 , stringly
+, flit-core
+, bottombar
 , pytestCheckHook
 , pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "7.2";
+  version = "7.3";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
@@ -20,13 +22,18 @@ buildPythonPackage rec {
     owner = "evalf";
     repo = "nutils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KCvUBE3qbX6v1HahBj4/jjM8ujvFGtWNuH1D+bTHrQ0=";
+    hash = "sha256-3VtQFnR8vihxoIyRkbE1a1Rs8Np3/79PWNKReTBZDg8=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   propagatedBuildInputs = [
     numpy
     treelog
     stringly
+    bottombar
   ];
 
   nativeCheckInputs = [
@@ -44,9 +51,9 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Numerical Utilities for Finite Element Analysis";
+    changelog = "https://github.com/evalf/nutils/releases/tag/v${version}";
     homepage = "https://www.nutils.org/";
     license = licenses.mit;
-    broken = stdenv.hostPlatform.isAarch64;
     maintainers = with maintainers; [ Scriptkiddi ];
   };
 }

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

@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, gsl
+, swig
+, numpy
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pygsl";
+  version = "2.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-F3m85Bs8sONw0Rv0EAOFK6R1DFHfW4dxuzQmXo4PHfM=";
+  };
+
+  nativeBuildInputs = [
+    gsl.dev
+    swig
+  ];
+  buildInputs = [
+    gsl
+  ];
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  preCheck = ''
+    cd tests
+  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python interface for GNU Scientific Library";
+    homepage = "https://github.com/pygsl/pygsl";
+    changelog = "https://github.com/pygsl/pygsl/blob/v${version}/ChangeLog";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ amesgen ];
+  };
+}

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

@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.1.3";
+  version = "3.3.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pymodbus-dev";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8=";
+    hash = "sha256-EGJyb0AVLKN7FEoeWF4rVqmJBNbXHent9P+cxc13rQs=";
   };
 
   # Twisted asynchronous version is not supported due to a missing dependency

pkgs/development/python-modules/python-matter-server/default.nix

@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "python-matter-server";
-  version = "3.5.2";
+  version = "3.6.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.10";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "python-matter-server";
     rev = "refs/tags/${version}";
-    hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA=";
+    hash = "sha256-xtxbZS8CPCkgyFX08THn7hGurFj8dQV+KIZ6VvTY7hA=";
   };
 
   nativeBuildInputs = [

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

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , aiohttp
+, alexapy
 , async-timeout
 , buildPythonPackage
 , click
@@ -14,27 +15,34 @@
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
+, pythonRelaxDepsHook
 }:
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "0.23.6";
+  version = "0.29.2";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "humbertogontijo";
     repo = "python-roborock";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5WgCVdmEhFrKYT7Uflnjv6OIISk//VH2aoxVwlWuPTk=";
+    hash = "sha256-Jxo3y7hQeedLYLrofnSivWGgmuRfnFeFnxkmwjoQ2Tc=";
   };
 
+  pythonRelaxDeps = [
+    "pycryptodome"
+  ];
+
   nativeBuildInputs = [
     poetry-core
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = [
+    alexapy
     aiohttp
     async-timeout
     click

pkgs/development/python-modules/zha-quirks/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.100";
+  version = "0.0.101";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     rev = "refs/tags/${version}";
-    hash = "sha256-EWGsnUnr83YuhEdGJ3YtlYm9VT+aTuUjfganhOeqt7o=";
+    hash = "sha256-YZGsDSrxPpxluxyRkOPyvJLQ9YADuZ8NYcznIGZ0BYg=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/zigpy-xbee/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy-xbee";
-  version = "0.18.0";
+  version = "0.18.1";
   # https://github.com/Martiusweb/asynctest/issues/152
   # broken by upstream python bug with asynctest and
   # is used exclusively by home-assistant with python 3.8
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy-xbee";
     rev = "refs/tags/${version}";
-    hash = "sha256-zSaT9WdA4tR8tJAShSzqL+f/nTLQJbeIZnbSBe1EOks=";
+    hash = "sha256-vR+oLshiIYmMdAvir+TGBqVkTGXKAVnUWnQPR3YwuUk=";
   };
 
   buildInputs = [

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

@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.55.0";
+  version = "0.56.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     rev = "refs/tags/${version}";
-    hash = "sha256-fc98V6KJ7zROgNktHZlWj9/BQRbCIWYT5Px09mFrwHQ=";
+    hash = "sha256-xOvRsnTv/5GhGRVM9M6zjkEWI5dq9rGVcoi5G+0LpDE=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/continuous-integration/drone/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
-  version = "2.17.0";
+  version = "2.18.0";
 
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
     rev = "v${version}";
-    sha256 = "sha256-b+kttHGH6KVsq9MR0bni7Gh1ZCIPkFzCvhoBdiC5Mk8=";
+    sha256 = "sha256-fN86wdKe3KWRkVxRK/4L4Gcf8auelAi2e+erANLCCmA=";
   };
 
-  vendorHash = "sha256-I4GQ/KRM8vFOaMrGdSWll5PAk8ivFXdje7GTGYRPECw=";
+  vendorHash = "sha256-3Gjo5i3tLXZNUNdp+CKX5hPxVupH5juUIKzndN2AaBU=";
 
   tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ];
 

pkgs/os-specific/linux/ax99100/default.nix

@@ -28,6 +28,7 @@ stdenv.mkDerivation {
     ./kernel-6.1-set_termios-const-ktermios.patch
   ] ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [
     ./kernel-6.2-fix-pointer-type.patch
+    ./kernel-6.4-fix-define-semaphore.patch
   ];
 
   patchFlags = [ "-p0" ];

pkgs/os-specific/linux/ax99100/kernel-6.4-fix-define-semaphore.patch

@@ -0,0 +1,14 @@
+--- ax99100_sp.c
++++ ax99100_sp.c
+@@ -2670,8 +2670,10 @@ static void serial99100_dma_tx_tasklet (unsigned long param)
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+ static DECLARE_MUTEX(serial99100_sem);
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
+ static DEFINE_SEMAPHORE(serial99100_sem);
++#else
++static DEFINE_SEMAPHORE(serial99100_sem, 1);
+ #endif
+ 
+ static struct uart_driver starex_serial_driver = {

pkgs/servers/home-assistant/default.nix

@@ -287,7 +287,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2023.6.3";
+  hassVersion = "2023.7.0";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -303,7 +303,7 @@ in python.pkgs.buildPythonApplication rec {
   # Primary source is the pypi sdist, because it contains translations
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc=";
+    hash = "sha256-2bo/TJPc2CBH+y6z7Hl4I7TeacDH61L+jMIRWzOAgz0=";
   };
 
   # Secondary source is git for tests
@@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY=";
+    hash = "sha256-ZOqehiotdPLA+ZjtTmonsvpDEEke13nbwt+0E/hGD6E=";
   };
 
   nativeBuildInputs = with python.pkgs; [

pkgs/servers/home-assistant/frontend.nix

@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20230608.0";
+  version = "20230705.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-bTOjenzcj8d5N192v3L7W7XZ0CRDcO8GbVUnxcMitQU=";
+    hash = "sha256-kkrCEgc+cckjDESG2WoHd93Qdb5RwIF2FrNxnBB8jFI=";
   };
 
   # there is nothing to strip in this package

pkgs/servers/home-assistant/intents.nix

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2023.6.5";
+  version = "2023.6.28";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = "intents";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZfPOxTFPQNdZ3Tq8p410RHlLGej+FOqhafD+91MRbRo=";
+    hash = "sha256-K441nrwoQ7zzle4iC679oGxU6iZn/yTJOElvDblHB7U=";
   };
 
   sourceRoot = "source/package";

pkgs/servers/home-assistant/parse-requirements.py

@@ -43,7 +43,7 @@ PKG_PREFERENCES = {
     "ha-av": "av",
     "HAP-python": "hap-python",
     "tensorflow": "tensorflow",
-    "youtube_dl": "youtube-dl-light",
+    "yt-dlp": "yt-dlp",
 }
 
 # Some dependencies are loaded dynamically at runtime, and are not
@@ -263,13 +263,13 @@ def main() -> None:
             available, extras, missing = deps
             f.write(f'    "{component}" = ps: with ps; [')
             if available:
-                f.write("\n      " + "\n      ".join(available))
+                f.write("\n      " + "\n      ".join(sorted(available)))
             f.write("\n    ]")
             if extras:
-                f.write("\n    ++ " + "\n    ++ ".join(extras))
+                f.write("\n    ++ " + "\n    ++ ".join(sorted(extras)))
             f.write(";")
             if len(missing) > 0:
-                f.write(f" # missing inputs: {' '.join(missing)}")
+                f.write(f" # missing inputs: {' '.join(sorted(missing))}")
             f.write("\n")
         f.write("  };\n")
         f.write("  # components listed in tests/components for which all dependencies are packaged\n")

pkgs/tools/misc/tremor-rs/default.nix

@@ -63,6 +63,13 @@ rustPlatform.buildRustPackage rec {
   PROTOC = "${protobuf}/bin/protoc";
   PROTOC_INCLUDE = "${protobuf}/include";
 
+  env = lib.optionalAttrs (stdenv.system == "x86_64-darwin") {
+    RUSTFLAGS = "-C target-feature=+avx,+avx2,+sse4.2";
+  };
+
+  # tests failed on x86_64-darwin with SIGILL: illegal instruction
+  doCheck = !(stdenv.system == "x86_64-darwin");
+
   checkFlags = [
     # all try to make a network access
     "--skip=connectors::tests::http::server::https_server_test"
@@ -77,7 +84,6 @@ rustPlatform.buildRustPackage rec {
   cargoBuildFlags = [ "-p tremor-cli" ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin && stdenv.isx86_64;
     description = ''
       Early stage event processing system for unstructured data with rich
       support for structural pattern matching, filtering and transformation

pkgs/tools/security/lil-pwny/default.nix

@@ -0,0 +1,32 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "lil-pwny";
+  version = "2.0.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "PaperMtn";
+    repo = "lil-pwny";
+    rev = "refs/tags/${version}";
+    hash = "sha256-EE6+PQTmvAv5EvxI9QR/dQcPby13BBk66KSc7XDNAZA=";
+  };
+
+  # Project has no test
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "lil_pwny"
+  ];
+
+  meta = with lib; {
+    description = "Offline auditing of Active Directory passwords";
+    homepage = "https://github.com/PaperMtn/lil-pwny";
+    changelog = "https://github.com/PaperMtn/lil-pwny/blob/${version}/CHANGELOG.md";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2860,6 +2860,8 @@ with pkgs;
 
   lifecycled = callPackage ../tools/misc/lifecycled { };
 
+  lil-pwny = callPackage ../tools/security/lil-pwny { };
+
   lilo = callPackage ../tools/misc/lilo { };
 
   logseq = callPackage ../applications/misc/logseq { };
@@ -14088,8 +14090,8 @@ with pkgs;
 
   tre = callPackage ../development/libraries/tre { };
 
-  tremor-rs = callPackage ../tools/misc/tremor-rs {
+  tremor-rs = darwin.apple_sdk_11_0.callPackage ../tools/misc/tremor-rs {
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin.apple_sdk_11_0.frameworks) Security;
   };
 
   tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };

pkgs/top-level/python-aliases.nix

@@ -36,6 +36,7 @@ mapAliases ({
   abodepy = jaraco-abode; # added 2023-02-01
   acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
   aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
+  aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
   ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
   ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
   ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16

pkgs/top-level/python-packages.nix

@@ -332,8 +332,6 @@ self: super: with self; {
 
   aiosql = callPackage ../development/python-modules/aiosql { };
 
-  aiosenseme = callPackage ../development/python-modules/aiosenseme { };
-
   aiosenz = callPackage ../development/python-modules/aiosenz { };
 
   aioserial = callPackage ../development/python-modules/aioserial { };
@@ -1467,6 +1465,8 @@ self: super: with self; {
 
   boschshcpy = callPackage ../development/python-modules/boschshcpy { };
 
+  bottombar = callPackage ../development/python-modules/bottombar { };
+
   boost-histogram = callPackage ../development/python-modules/boost-histogram {
     inherit (pkgs) boost;
   };
@@ -8819,6 +8819,10 @@ self: super: with self; {
 
   pygrok = callPackage ../development/python-modules/pygrok { };
 
+  pygsl = callPackage ../development/python-modules/pygsl {
+    inherit (pkgs) gsl swig;
+  };
+
   pygtfs = callPackage ../development/python-modules/pygtfs { };
 
   pygtail = callPackage ../development/python-modules/pygtail { };