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

Commits on Apr 27, 2018

  1. python35, python36: fix reading large files on darwin

    @veprbl
    veprbl committed Apr 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    tilpner Till Höppner
    GPG key ID: 6A13327225BE51F6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b8917dc View commit details

Commits on May 1, 2018

  1. Merge pull request #39627 from veprbl/pr/python_issue24658 

    python35, python36: fix reading large files on darwin
    @matthewbauer
    matthewbauer authored May 1, 2018
    Copy the full SHA
    ca4fe58 View commit details
Showing with 12 additions and 0 deletions.
  1. +6 −0 pkgs/development/interpreters/python/cpython/3.5/default.nix
  2. +6 −0 pkgs/development/interpreters/python/cpython/3.6/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/interpreters/python/cpython/3.5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -67,6 +67,12 @@ in stdenv.mkDerivation {
patches = [
./no-ldconfig.patch
./ld_library_path.patch
] ++ optionals stdenv.isDarwin [
# Fix for https://bugs.python.org/issue24658
(fetchpatch {
url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
];
6 changes: 6 additions & 0 deletions pkgs/development/interpreters/python/cpython/3.6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,6 +69,12 @@ in stdenv.mkDerivation {

patches = [
./no-ldconfig.patch
] ++ optionals stdenv.isDarwin [
# Fix for https://bugs.python.org/issue24658
(fetchpatch {
url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
];