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: 27c0b18970b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 23fa449d65b8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 7, 2020

  1. python3Packages.asyncssh: fix build 

    The test changed from `yield from` to `await`, which broke our patch.
Fix our patch.

Closes #79380
    @andrew-d
    andrew-d committed Feb 7, 2020
    Copy the full SHA
    5a0f000 View commit details

  2. Merge pull request #79422 from andrew-d/andrew/asyncssh 

    python3Packages.asyncssh: fix build
    @worldofpeace
    worldofpeace authored Feb 7, 2020
    Copy the full SHA
    23fa449 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
8 changes: 4 additions & 4 deletions pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index db9cc88..234004b 100644
index d94379f..4ee46a9 100644
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -957,8 +957,8 @@ class _TestSFTP(_CheckSFTP):
@@ -955,8 +955,8 @@ class _TestSFTP(_CheckSFTP):

try:
self._create_file('file')
- yield from sftp.chmod('file', 0o4321)
- await sftp.chmod('file', 0o4321)
- self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o4321)
+ yield from sftp.chmod('file', 0o1234)
+ await sftp.chmod('file', 0o1234)
+ self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o1234)
finally:
remove('file')