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

Commits on Oct 2, 2019

  1. pythonPackages.poetry: fix python2 build

    Jonathan Ringer committed Oct 2, 2019
    Copy the full SHA
    d222547 View commit details

  2. Merge pull request #70225 from jonringer/fix-poetry 

    pythonPackages.poetry: fix python2 build
    @mmahut
    mmahut authored Oct 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c18e6fb View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/poetry/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/poetry/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
, pkginfo
, html5lib
, shellingham
, subprocess32
, tomlkit
, typing
, pathlib2
@@ -63,7 +64,7 @@ in buildPythonPackage rec {
shellingham
tomlkit
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
++ lib.optionals isPy27 [ virtualenv functools32 ];
++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];

postInstall = ''
mkdir -p "$out/share/bash-completion/completions"