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: 3c9ff308e7c3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef6a1b7f460e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 27, 2019

  1. python2Packages.nevow: fix build

    @xeji
    xeji committed Mar 27, 2019
    Copy the full SHA
    128e6c5 View commit details

  2. tahoe-lafs: fix build

    @xeji
    xeji committed Mar 27, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ea5f098 View commit details

Commits on Mar 28, 2019

  1. Merge pull request #58429 from xeji/p/nevow 

    python2Packages.nevow, tahoe-lafs: fix build
    @dotlambda
    dotlambda authored Mar 28, 2019
    Copy the full SHA
    ef6a1b7 View commit details
Showing with 3 additions and 1 deletion.
  1. +2 −0 pkgs/development/python-modules/nevow/default.nix
  2. +1 −1 pkgs/tools/networking/p2p/tahoe-lafs/default.nix
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/nevow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ buildPythonPackage rec {

propagatedBuildInputs = [ twisted ];

checkInputs = [ twisted ];

checkPhase = ''
trial formless nevow
'';
2 changes: 1 addition & 1 deletion pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication rec {
service-identity pyyaml magic-wormhole treq
];

checkInputs = with pythonPackages; [ hypothesis ];
checkInputs = with pythonPackages; [ hypothesis twisted ];

# Install the documentation.
postInstall = ''