Unverified Commit 8b61c6a4 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #309258 from mjoerg/magic-wormhole-fix-build

parents e085ef2a 88254172

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -13404,6 +13404,12 @@ 
    matrix = "@mjm:beeper.com";

    name = "Matt Moriarity";

  };

  mjoerg = {

    name = "Martin Joerg";

    email = "martin.joerg@gmail.com";

    github = "mjoerg";

    githubId = 147256;

  };

  mjp = {

    email = "mike@mythik.co.uk";

    github = "MikePlayle";

pkgs/development/python-modules/iterable-io/default.nix

0 → 100644
+37 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,

  setuptools,

  pytestCheckHook,

}:



buildPythonPackage rec {

  pname = "iterable-io";

  version = "1.0.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "pR0Ps";

    repo = "iterable-io";

    rev = "refs/tags/v${version}";

    hash = "sha256-+PSINKS7/FeGHYvkOASA5m+1pBpKfURfylZ8CwKijgA=";

  };



  nativeBuildInputs = [ setuptools ];



  pythonImportsCheck = [ "iterableio" ];



  nativeCheckInputs = [ pytestCheckHook ];



  meta = {

    description = "Library to adapt iterables to a file-like interface";

    homepage = "https://github.com/pR0Ps/iterable-io";

    changelog = "https://github.com/pR0Ps/iterable-io/blob/v${version}/CHANGELOG.md";

    license = lib.licenses.lgpl3Only;

    maintainers = [ lib.maintainers.mjoerg ];

  };

}

pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix

+20 −19
Original line number Diff line number Diff line
@@ -3,27 +3,29 @@ 
, buildPythonPackage

, fetchPypi

, fetchpatch

, setuptools

, six

, attrs

, twisted

, pyopenssl

, service-identity

, autobahn

, treq

, mock

, pythonOlder

, pythonAtLeast

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "magic-wormhole-mailbox-server";

  version = "0.4.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.7";

  # python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/issues/41

  disabled = pythonOlder "3.7" || pythonAtLeast "3.12";



  src = fetchPypi {

    inherit pname version;

    sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb";

    hash = "sha256-GvEFkpCcqvUZwA5wbqyELF53+NQ1YhX+nGHHsiWKiPs=";

  };



  patches = [
@@ -35,6 +37,8 @@ buildPythonPackage rec { 
    })

  ];



  nativeBuildInputs = [ setuptools ];



  propagatedBuildInputs = [

    attrs

    six
@@ -43,27 +47,24 @@ buildPythonPackage rec { 
  ] ++ autobahn.optional-dependencies.twisted

  ++ twisted.optional-dependencies.tls;



  pythonImportsCheck = [ "wormhole_mailbox_server" ];



  nativeCheckInputs = [

    pytestCheckHook

    treq

    mock

    twisted

  ];



  # Fails in Darwin's sandbox

  postPatch = lib.optionalString stdenv.isDarwin ''

    echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py

    echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py

  '';



  checkPhase = ''

    trial -j$NIX_BUILD_CORES wormhole_mailbox_server

  '';

  disabledTestPaths = lib.optionals stdenv.isDarwin [

    # these tests fail in Darwin's sandbox

    "src/wormhole_mailbox_server/test/test_web.py"

  ];



  meta = with lib; {

  meta = {

    description = "Securely transfer data between computers";

    homepage = "https://github.com/warner/magic-wormhole-mailbox-server";

    homepage = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server";

    changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md";

    license = licenses.mit;

    maintainers = with maintainers; [ ];

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.mjoerg ];

  };

}

pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix

+16 −9
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, setuptools

, autobahn

, mock

, twisted

, pythonOlder

, pythonAtLeast

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "magic-wormhole-transit-relay";

  version = "0.2.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.7" || pythonAtLeast "3.12";



  src = fetchPypi {

    inherit pname version;

    sha256 = "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b";

    hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4=";

  };



  nativeBuildInputs = [ setuptools ];



  propagatedBuildInputs = [ autobahn twisted ];



  nativeCheckInputs = [ mock twisted ];

  pythonImportsCheck = [ "wormhole_transit_relay" ];



  checkPhase = ''

    trial -j$NIX_BUILD_CORES wormhole_transit_relay

  '';

  nativeCheckInputs = [ pytestCheckHook mock twisted ];



  meta = with lib; {

  meta = {

    description = "Transit Relay server for Magic-Wormhole";

    homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay";

    license = licenses.mit;

    maintainers = with maintainers; [ ];

    changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.mjoerg ];

  };

}

pkgs/development/python-modules/magic-wormhole/default.nix

+8 −4
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
, tqdm

, click

, humanize

, iterable-io

, txtorcon

, zipstream-ng



# optional-dependencies

, noiseprotocol
@@ -34,7 +36,7 @@ 
buildPythonPackage rec {

  pname = "magic-wormhole";

  version = "0.14.0";

  format = "pyproject";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;
@@ -56,7 +58,9 @@ buildPythonPackage rec { 
    tqdm

    click

    humanize

    iterable-io

    txtorcon

    zipstream-ng

  ]

  ++ autobahn.optional-dependencies.twisted

  ++ twisted.optional-dependencies.tls;
@@ -111,12 +115,12 @@ buildPythonPackage rec { 
    install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1

  '';



  meta = with lib; {

  meta = {

    changelog = "https://github.com/magic-wormhole/magic-wormhole/blob/${version}/NEWS.md";

    description = "Securely transfer data between computers";

    homepage = "https://github.com/magic-wormhole/magic-wormhole";

    license = licenses.mit;

    maintainers = with maintainers; [ asymmetric ];

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.mjoerg ];

    mainProgram = "wormhole";

  };

}