From a9255964224afc416cbfcff584403b06553cfefc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:20:21 +0900 Subject: [PATCH 1/3] python312Packages.sipyco: 1.4 -> 1.8 Diff: https://github.com/m-labs/sipyco/compare/refs/tags/v1.4...v1.8 Changelog: https://github.com/m-labs/sipyco/releases/tag/v1.8 --- pkgs/development/python-modules/sipyco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index 438072e9b072..eb21ad5dfe89 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sipyco"; - version = "1.4"; + version = "1.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "m-labs"; repo = "sipyco"; rev = "refs/tags/v${version}"; - hash = "sha256-sEYWtp11piUIa8YyuTOdFIIJ2GfcrUb+HEzPVKr4hW8="; + hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w="; }; propagatedBuildInputs = [ numpy ]; From 98252b90ddf7a4463aa3ba071c6cbd8fe9d46443 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 11:46:56 +0900 Subject: [PATCH 2/3] python312Packages.sipyco: switch to pypa builder --- pkgs/development/python-modules/sipyco/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index eb21ad5dfe89..757dc02c3660 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, pytestCheckHook, numpy, }: @@ -10,9 +10,7 @@ buildPythonPackage rec { pname = "sipyco"; version = "1.8"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "m-labs"; @@ -21,7 +19,9 @@ buildPythonPackage rec { hash = "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w="; }; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; From 5edbe2f6da2f6fef64eb1d93f1de056eb8ae5e3a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 12:51:33 +0900 Subject: [PATCH 3/3] python312Packages.sipyco: fix darwin tests --- pkgs/development/python-modules/sipyco/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sipyco/default.nix b/pkgs/development/python-modules/sipyco/default.nix index 757dc02c3660..277aa4961f3d 100644 --- a/pkgs/development/python-modules/sipyco/default.nix +++ b/pkgs/development/python-modules/sipyco/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sipyco" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Simple Python Communications - used by the ARTIQ experimental control package"; mainProgram = "sipyco_rpctool";