Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c840631fe20d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52571d750de0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 26, 2018

  1. python37: 3.7.1 -> 3.7.2 

    (cherry picked from commit 552d8a7)
    @FRidh
    FRidh committed Dec 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0312ef1 View commit details

  2. python36: 3.6.7 -> 3.6.8 

    (cherry picked from commit 741e00f)
    @FRidh
    FRidh committed Dec 26, 2018
    Copy the full SHA
    52571d7 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/interpreters/python/cpython/3.6/default.nix
  2. +2 −2 pkgs/development/interpreters/python/cpython/3.7/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/3.6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ with stdenv.lib;

let
majorVersion = "3.6";
minorVersion = "7";
minorVersion = "8";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -51,7 +51,7 @@ in stdenv.mkDerivation {

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

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

let
majorVersion = "3.7";
minorVersion = "1";
minorVersion = "2";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {

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

NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";