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

Commits on Nov 4, 2018

  1. python.pkgs.click: rebase fix-paths.patch

    Robert Schütz committed Nov 4, 2018
    Copy the full SHA
    c5edd09 View commit details
Showing with 11 additions and 9 deletions.
  1. +11 −9 pkgs/development/python-modules/click/fix-paths.patch
20 changes: 11 additions & 9 deletions pkgs/development/python-modules/click/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
--- a/click/_unicodefun.py 2018-06-11 15:08:59.369358278 +0200
+++ b/click/_unicodefun.py 2018-06-11 15:09:09.342325998 +0200
@@ -60,7 +60,7 @@
extra = ''
diff --git a/click/_unicodefun.py b/click/_unicodefun.py
index 620edff..85a3c98 100644
--- a/click/_unicodefun.py
+++ b/click/_unicodefun.py
@@ -63,7 +63,7 @@ def _verify_python3_env():
if os.name == 'posix':
import subprocess
- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0]
good_locales = set()
has_c_utf8 = False
try:
- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE,
+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()[0]
except OSError:
rv = b''