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

Commits on Mar 23, 2019

  1. python34: 3.4.9 -> 3.4.10

    @FRidh
    FRidh committed Mar 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7dc8a0a View commit details

  2. python35: 3.5.6 -> 3.5.7

    @FRidh
    FRidh committed Mar 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    60acee5 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/interpreters/python/cpython/3.4/default.nix
  2. +2 −2 pkgs/development/interpreters/python/cpython/3.5/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/3.4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ with stdenv.lib;

let
majorVersion = "3.4";
minorVersion = "9";
minorVersion = "10";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr";
sha256 = "0kjv34ynrw9mxddv5jjvrcm2s5xg1aiv1cbiqscy2y8nx5pqysnl";
};

NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/3.5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ with stdenv.lib;

let
majorVersion = "3.5";
minorVersion = "6";
minorVersion = "7";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {

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

NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";