Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 22 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix b/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix
index b1c6fab9f8a8..b3dfed8c6cac 100644
--- a/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pydsdl/default.nix
@@ -1,15 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
 
  buildPythonPackage rec {
   pname = "pydsdl";
-  version = "1.12.1";
-  disabled = pythonOlder "3.5"; # only python>=3.5 is supported
+  version = "1.18.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = "UAVCAN";
+    owner = "OpenCyphal";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-5AwwqduIvLSZk6WcI59frwRKwjniQXfNWWVsy6V6I1E=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-sn7KoJmJbr7Y+N9PAXyhJnts/hW+Gi06nrHj5VIDZMU=";
   };
 
   # allow for writable directory for darwin
@@ -17,7 +23,7 @@
     export HOME=$TMPDIR
   '';
 
-  # repo doesn't contain tests
+  # Module doesn't contain tests
   doCheck = false;
 
   pythonImportsCheck = [
@@ -25,12 +31,17 @@
   ];
 
   meta = with lib; {
-    description = "A UAVCAN DSDL compiler frontend implemented in Python";
+    description = "Library to process Cyphal DSDL";
     longDescription = ''
-      It supports all DSDL features defined in the UAVCAN specification.
+      PyDSDL is a Cyphal DSDL compiler front-end implemented in Python. It accepts
+      a DSDL namespace at the input and produces a well-annotated abstract syntax
+      tree (AST) at the output, evaluating all constant expressions in the process.
+      All DSDL features defined in the Cyphal Specification are supported. The
+      library should, in theory, work on any platform and with any Python
+      implementation.
     '';
-    homepage = "https://uavcan.org";
-    maintainers = with maintainers; [ wucke13 ];
+    homepage = "https://pydsdl.readthedocs.io/";
     license = licenses.mit;
+    maintainers = with maintainers; [ wucke13 ];
   };
 }