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

Commits on Nov 4, 2018

  1. python34: remove 

    Python 3.4 will receive it's final patch release in March 2019 and there won't
be any releases anymore after that, so also not during NixOS 2019.03.

Python 3.4 is not used anymore in Nixpkgs. In any case, migrating code from
3.4 to 3.4+ is trivial.
    @FRidh @globin
    FRidh authored and globin committed Nov 4, 2018
    2
    Copy the full SHA
    b1bdce0 View commit details

  2. canto-{curses,daemon}: use python3 instead of python34

    @FRidh @globin
    FRidh authored and globin committed Nov 4, 2018
    Copy the full SHA
    795f4b3 View commit details

  3. retroarch: use python3 instead of python34

    @FRidh @globin
    FRidh authored and globin committed Nov 4, 2018
    Copy the full SHA
    3059cf7 View commit details

  4. haskellPackages.cpython: set to null 

    because these are bindings for cpython 3.4 which we no longer distribute.
    @FRidh @globin
    FRidh authored and globin committed Nov 4, 2018
    Copy the full SHA
    6a0b1b1 View commit details
9 changes: 4 additions & 5 deletions doc/languages-frameworks/python.section.md
View file
Original file line number Diff line number Diff line change
@@ -483,8 +483,8 @@ and in this case the `python35` interpreter is automatically used.

### Interpreters

Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python35` and `python36`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
@@ -507,7 +507,7 @@ Each interpreter has the following attributes:
- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
- `executable`. Name of the interpreter executable, e.g. `python3.4`.
- `executable`. Name of the interpreter executable, e.g. `python3.7`.
- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.

### Building packages and applications
@@ -529,7 +529,6 @@ attribute set is created for each available Python interpreter. The available
sets are

* `pkgs.python27Packages`
* `pkgs.python34Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
* `pkgs.python37Packages`
@@ -837,7 +836,7 @@ community to help save time. No tool is preferred at the moment.

### Deterministic builds

Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
The Python interpreters are now built deterministically.
Minor modifications had to be made to the interpreters in order to generate
deterministic bytecode. This has security implications and is relevant for
those using Python in a `nix-shell`.
6 changes: 3 additions & 3 deletions pkgs/applications/networking/feedreaders/canto-curses/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
{ stdenv, fetchFromGitHub, python3Packages, readline, ncurses, canto-daemon }:

python34Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
version = "0.9.9";
name = "canto-curses-${version}";
pname = "canto-curses";

src = fetchFromGitHub {
owner = "themoken";
9 changes: 4 additions & 5 deletions pkgs/applications/networking/feedreaders/canto-daemon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ stdenv, fetchFromGitHub, python34Packages, }:
{ stdenv, fetchFromGitHub, python3Packages, }:

python34Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
version = "0.9.7";
name = "canto-daemon-${version}";
namePrefix = "";
pname = "canto-daemon";

src = fetchFromGitHub {
owner = "themoken";
@@ -12,7 +11,7 @@ python34Packages.buildPythonApplication rec {
sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n";
};

propagatedBuildInputs = with python34Packages; [ feedparser ];
propagatedBuildInputs = with python3Packages; [ feedparser ];

meta = {
description = "Daemon for the canto Atom/RSS feed reader";
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -893,6 +893,9 @@ self: super: {
# https://github.com/aisamanra/config-ini/issues/12
config-ini = dontCheck super.config-ini;

# We've remove cpython 3.4 from nixpkgs
cpython = null;

# doctest >=0.9 && <0.12
genvalidity-property = doJailbreak super.genvalidity-property;
path = dontCheck super.path;
214 changes: 0 additions & 214 deletions pkgs/development/interpreters/python/cpython/3.4/default.nix
View file

This file was deleted.

51 changes: 0 additions & 51 deletions pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
View file

This file was deleted.

Loading