Unverified Commit a326fdc4 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

magic-wormhole: 0.18.0 -> 0.19.2 (#415033)

parents 6a1d52ea fed6847c

pkgs/by-name/ta/tahoe-lafs/package.nix

+27 −1
Original line number Diff line number Diff line 
{

  lib,

  python3Packages,

  python3,

  fetchFromGitHub,

  texinfo,

  versionCheckHook,

}:



let

  python = python3.override {

    self = python;

    packageOverrides = self: super: {

      # tahoe-lafs is incompatible with magic-wormhole >= 0.19.0

      # TODO: unpin, when https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4180 is fixed

      magic-wormhole = super.magic-wormhole.overridePythonAttrs (oldAttrs: rec {

        version = "0.18.0";



        src = fetchFromGitHub {

          owner = "magic-wormhole";

          repo = "magic-wormhole";

          tag = version;

          hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";

        };



        nativeCheckInputs = lib.filter (

          input: (input.pname or null) != "pytest-twisted"

        ) oldAttrs.nativeCheckInputs;



        pytestFlagsArray = null;

      });

    };

  };

  python3Packages = python.pkgs;

in

python3Packages.buildPythonApplication rec {

  pname = "tahoe-lafs";

  version = "1.20.0";

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

+11 −3
Original line number Diff line number Diff line
@@ -34,18 +34,21 @@ 
  magic-wormhole-transit-relay,

  magic-wormhole-mailbox-server,

  pytestCheckHook,

  pytest-twisted,



  gitUpdater,

}:



buildPythonPackage rec {

  pname = "magic-wormhole";

  version = "0.18.0";

  version = "0.19.2";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "magic-wormhole";

    repo = "magic-wormhole";

    tag = version;

    hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";

    hash = "sha256-5Tipcood5RktXY05p20hQpWhSMMnZm67I4iybjV8TcA=";

  };



  postPatch =
@@ -98,10 +101,13 @@ buildPythonPackage rec { 
      magic-wormhole-mailbox-server

      magic-wormhole-transit-relay

      pytestCheckHook

      pytest-twisted

    ]

    ++ optional-dependencies.dilation

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ];



  pytestFlagsArray = [ "src/wormhole/test" ];



  __darwinAllowLocalNetworking = true;



  postInstall = ''
@@ -112,10 +118,12 @@ buildPythonPackage rec { 
      --zsh wormhole_complete.zsh

  '';



  passthru.updateScript = gitUpdater { };



  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";

    homepage = "https://magic-wormhole.readthedocs.io/";

    license = lib.licenses.mit;

    maintainers = [ lib.maintainers.mjoerg ];

    mainProgram = "wormhole";