Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0dd910d4702f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9634362175a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 10, 2020

  1. magic-wormhole: 0.11.2 -> 0.12.0

    @r-ryantm
    r-ryantm authored and Jon committed Apr 10, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: CED392DE0C483D00
    Learn about vigilant mode
    Copy the full SHA
    b963436 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/python-modules/magic-wormhole/default.nix
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/magic-wormhole/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,18 +23,18 @@

buildPythonPackage rec {
pname = "magic-wormhole";
version = "0.11.2";
version = "0.12.0";

src = fetchPypi {
inherit pname version;
sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf";
sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv";
};

buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];

postPatch = ''
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
'';

@@ -56,7 +56,7 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "Securely transfer data between computers";
homepage = https://github.com/warner/magic-wormhole;
homepage = "https://github.com/warner/magic-wormhole";
license = licenses.mit;
# Currently broken on Python 2.7. See
# https://github.com/NixOS/nixpkgs/issues/71826