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: 33000fe7cabd
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: 76aafbf4bf49
Choose a head ref
  • 5 commits
  • 5 files changed
  • 4 contributors

Commits on Dec 27, 2018

  1. nixos/journaldriver: import module in top-level module list 

    Imports the `journaldriver` module into the top-level NixOS module
list to make it usable without extra work.

This went unnoticed in #42134 (mostly because my setup imports modules
explicitly from pinned versions).

Fixes #50390

(cherry picked from commit d5ea097)
    @tazjin @Mic92
    tazjin authored and Mic92 committed Dec 27, 2018
    Copy the full SHA
    5c48901 View commit details

  2. nauty: 26r10 -> 26r11 (#52960) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nauty/versions

(cherry picked from commit 98092f7)
    @timokau
    timokau authored Dec 27, 2018
    Copy the full SHA
    d4e1d3d View commit details

  3. python36: fix darwin build 

    Remove issue24658 patch because is already fixed and backported to
Python 3.6 python/cpython@a5ebc20

(cherry picked from commit 31680c5)
    @marsam @FRidh
    marsam authored and FRidh committed Dec 27, 2018
    Copy the full SHA
    838f18e View commit details

  4. python37: fix darwin build 

    Remove issue24658 patch because is already fixed and backported to
Python 3.7 python/cpython@178d1c0

(cherry picked from commit 1764870)
    @marsam @FRidh
    marsam authored and FRidh committed Dec 27, 2018
    Copy the full SHA
    32326f5 View commit details

  5. python.pkgs.pytest_xdist: pytest-forked is needed during runtime, fix… 

    …es #45060

(cherry picked from commit 364c59d)
    @FRidh
    FRidh committed Dec 27, 2018
    Copy the full SHA
    76aafbf View commit details
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -293,6 +293,7 @@
./services/logging/graylog.nix
./services/logging/heartbeat.nix
./services/logging/journalbeat.nix
./services/logging/journaldriver.nix
./services/logging/journalwatch.nix
./services/logging/klogd.nix
./services/logging/logcheck.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/math/nauty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "nauty-${version}";
version = "26r10";
version = "26r11";
src = fetchurl {
url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6";
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
};
buildInputs = [];
installPhase = ''
10 changes: 2 additions & 8 deletions pkgs/development/interpreters/python/cpython/3.6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -69,12 +69,6 @@ in stdenv.mkDerivation {

patches = [
./no-ldconfig.patch
] ++ optionals stdenv.isDarwin [
# Fix for https://bugs.python.org/issue24658
(fetchpatch {
url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals hasDistutilsCxxPatch [
@@ -83,8 +77,8 @@ in stdenv.mkDerivation {
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(fetchpatch {
url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
})
];

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
@@ -74,8 +74,8 @@ in stdenv.mkDerivation {
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
(fetchpatch {
url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch";
sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii";
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
})
];

8 changes: 4 additions & 4 deletions pkgs/development/python-modules/pytest-xdist/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked }:
{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest, setuptools_scm, pytest-forked, six }:

buildPythonPackage rec {
pname = "pytest-xdist";
@@ -9,9 +9,9 @@ buildPythonPackage rec {
sha256 = "28e25e79698b2662b648319d3971c0f9ae0e6500f88258ccb9b153c31110ba9b";
};

nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ pytest pytest-forked ];
propagatedBuildInputs = [ execnet ];
nativeBuildInputs = [ setuptools_scm pytest ];
checkInputs = [ pytest ];
propagatedBuildInputs = [ execnet pytest-forked six ];

checkPhase = ''
# Excluded tests access file system