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

Commits on Nov 1, 2019

  1. python3Packages.pysnmp: Fix the build 

    The build did most likely break due to 501314c.
    @primeos
    primeos committed Nov 1, 2019
    Copy the full SHA
    d917e00 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/pysnmp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@ buildPythonPackage rec {
sha256 = "1acbfvpbr45i137s00mbhh21p71ywjfw3r8z0ybcmjjqz7rbwg8c";
};

patches = [ ./setup.py-Fix-the-setuptools-version-check.patch ];

# NameError: name 'mibBuilder' is not defined
doCheck = false;

27 changes: 27 additions & 0 deletions pkgs/development/python-modules/pysnmp/setup.py-Fix-the-setuptools-version-check.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 5f843f7c8554e2feab7f57d8718231408196fd80 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Nov 2019 18:47:14 +0100
Subject: [PATCH] setup.py: Fix the setuptools version check

This broke the Nix build after setuptools.__version__ changed from
"41.2.0" to "41.4.0.post20191022".
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0d987d5c..4f625d7c 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ try:

setup, Command = setuptools.setup, setuptools.Command

- observed_version = [int(x) for x in setuptools.__version__.split('.')]
+ observed_version = [int(x) for x in setuptools.__version__.split('.')[0:3]]
required_version = [36, 2, 0]

# NOTE(etingof): require fresh setuptools to build proper wheels
--
2.23.0