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

Commits on Aug 2, 2018

  1. python34: 3.4.8 -> 3.4.9

    @FRidh
    FRidh committed Aug 2, 2018
    Copy the full SHA
    3bd5580 View commit details

  2. python35: 3.5.5 -> 3.5.6

    @FRidh
    FRidh committed Aug 2, 2018
    Copy the full SHA
    3a61a94 View commit details

  3. Merge pull request #44357 from FRidh/pythonmajor 

    Python interpreter updates
    @FRidh
    FRidh authored Aug 2, 2018
    Copy the full SHA
    89a89dd 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 = "8";
minorVersion = "9";
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 = "1sn3i9z9m56inlfrqs250qv8snl8w211wpig2pfjlyrcj3x75919";
sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr";
};

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 = "5";
minorVersion = "6";
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 = "02ahsijk3a42sdzfp2il49shx0v4birhy7kkj0dikmh20hxjqg86";
sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m";
};

NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";