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

Commits on Nov 11, 2018

  1. python27: add patch to fix CVE-2018-1000802

    @fpletz @FRidh
    fpletz authored and FRidh committed Nov 11, 2018
    Copy the full SHA
    ae3e9b5 View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/interpreters/python/cpython/2.7/default.nix
6 changes: 6 additions & 0 deletions pkgs/development/interpreters/python/cpython/2.7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -74,6 +74,12 @@ let
url = "file://${./type_getattro.patch}";
sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
})

(fetchpatch {
name = "CVE-2018-1000802.patch";
url = "https://github.com/python/cpython/pull/8985.patch";
sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [