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: 298db02d7338
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2db400d8c844
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2db400d View commit details
Showing with 61 additions and 0 deletions.
  1. +60 −0 pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
  2. +1 −0 pkgs/tools/admin/certbot/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
From 411b8a413baf39e9b967949b17a992e81a11abfe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 29 Oct 2019 14:08:07 +0100
Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain
versions

```
File "setup.py", line 63, in <module>
if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
File
"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
line 40, in __init__
self.parse(vstring)
File
"/nix/store/zdh16dcvjw99ybam59zd2ijb6bx138j0-python3-3.7.5/lib/python3.7/distutils/version.py",
line 137, in parse
raise ValueError("invalid version number '%s'" % vstring)
ValueError: invalid version number '41.4.0.post20191022'
```
---
setup.py | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index 1f4838c90..831528d77 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@ import os
import re
import sys

-from distutils.version import StrictVersion
from setuptools import find_packages, setup, __version__ as setuptools_version
from setuptools.command.test import test as TestCommand

@@ -56,20 +55,8 @@ install_requires = [

# Add pywin32 on Windows platforms to handle low-level system calls.
# This dependency needs to be added using environment markers to avoid its installation on Linux.
-# However environment markers are supported only with setuptools >= 36.2.
-# So this dependency is not added for old Linux distributions with old setuptools,
-# in order to allow these systems to build certbot from sources.
pywin32_req = 'pywin32>=224'
-if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
- install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
-elif 'bdist_wheel' in sys.argv[1:]:
- raise RuntimeError('Error, you are trying to build certbot wheels using an old version '
- 'of setuptools. Version 36.2+ of setuptools is required.')
-elif os.name == 'nt':
- # This branch exists to improve this package's behavior on Windows. Without
- # it, if the sdist is installed on Windows with an old version of
- # setuptools, pywin32 will not be specified as a dependency.
- install_requires.append(pywin32_req)
+install_requires.append(pywin32_req + " ; sys_platform == 'win32'")

dev_extras = [
'astroid==1.6.5',
--
2.23.0

1 change: 1 addition & 0 deletions pkgs/tools/admin/certbot/default.nix
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ python37Packages.buildPythonApplication rec {

patches = [
./0001-pebble_artifacts-hardcode-pebble-location.patch
./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch
];

propagatedBuildInputs = with python37Packages; [