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

Commits on May 27, 2018

  1. python: 2.7.14 -> 2.7.15 (bugfix + security) 

    Fixes CVE-2018-1000030, /cc #38993.

The ncurses patch no longer applied, and it appears the problems have
been resolved upstream https://bugs.python.org/issue25720
python/cpython@6ba0b583d67

(cherry picked from commit 59beaf7)
    @vcunat @FRidh
    vcunat authored and FRidh committed May 27, 2018
    7
    Copy the full SHA
    30ff9ca View commit details
Showing with 2 additions and 120 deletions.
  1. +2 −4 pkgs/development/interpreters/python/cpython/2.7/default.nix
  2. +0 −116 pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch
6 changes: 2 additions & 4 deletions pkgs/development/interpreters/python/cpython/2.7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ with stdenv.lib;

let
majorVersion = "2.7";
minorVersion = "14";
minorVersion = "15";
minorVersionSuffix = "";
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -40,7 +40,7 @@ let

src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi";
sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92";
};

hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@@ -58,8 +58,6 @@ let
# if DETERMINISTIC_BUILD env var is set
./deterministic-build.patch

./properly-detect-curses.patch

] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
116 changes: 0 additions & 116 deletions pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch
View file

This file was deleted.