From 1b6ca98b5f86236c21a22f4b79ab0583fddcc99a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 13 Jan 2026 09:12:01 +0000 Subject: [PATCH 1/2] magic-wormhole: modernize --- .../python-modules/magic-wormhole/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 74594ae40a5f..da24e28f97ed 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -40,7 +40,7 @@ gitUpdater, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "magic-wormhole"; version = "0.21.1"; pyproject = true; @@ -48,7 +48,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; - tag = version; + tag = finalAttrs.version; hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc="; }; @@ -103,7 +103,7 @@ buildPythonPackage rec { pytestCheckHook pytest-twisted ] - ++ optional-dependencies.dilation + ++ finalAttrs.finalPackage.optional-dependencies.dilation ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; @@ -112,7 +112,7 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 # https://github.com/magic-wormhole/magic-wormhole/issues/619 - installShellCompletion --cmd ${meta.mainProgram} \ + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ --bash wormhole_complete.bash \ --fish wormhole_complete.fish \ --zsh wormhole_complete.zsh @@ -122,11 +122,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { }; meta = { - changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md"; + changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${finalAttrs.src.rev}/NEWS.md"; description = "Securely transfer data between computers"; homepage = "https://magic-wormhole.readthedocs.io/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; mainProgram = "wormhole"; }; -} +}) From c4df0fd7af1964f4e9d93d232fcbb7596b71aa88 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Tue, 13 Jan 2026 09:12:01 +0000 Subject: [PATCH 2/2] magic-wormhole: 0.21.1 -> 0.22.0 https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.22.0/NEWS.md https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.21.1...refs/tags/0.22.0 --- pkgs/development/python-modules/magic-wormhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index da24e28f97ed..b50e649d644c 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -42,14 +42,14 @@ buildPythonPackage (finalAttrs: { pname = "magic-wormhole"; - version = "0.21.1"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; tag = finalAttrs.version; - hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc="; + hash = "sha256-22UFwBcpuutFDRPFJAS9MBwoTdIx2xW0DSpR44DJ1lU="; }; postPatch =