Skip to content
This repository has been 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
base: 33000fe7cabd
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
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
    Browse the repository at this point in the history

  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 committed Dec 27, 2018
    Copy the full SHA
    d4e1d3d View commit details
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history

  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
    Browse the repository at this point in the history