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: 69ed29f5f411
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 0d9055a2ac29
Choose a head ref
  • 4 commits
  • 6 files changed
  • 4 contributors

Commits on Dec 26, 2019

  1. root: wrap python executables 

    In normal use of ROOT the PYTHONPATH is intended to be set when user
sources the thisroot.{,s}sh. We do that in the setupHook. This covers
the case when thisroot.sh was not sourced.

(cherry picked from commit 0b28198)

cc #76541
    @veprbl
    veprbl committed Dec 26, 2019
    Copy the full SHA
    c5d5561 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2019

  1. flashplayer: 32.0.0.293 -> 32.0.0.303

    @taku0 @rissson
    taku0 authored and rissson committed Dec 28, 2019
    Copy the full SHA
    a528355 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76622 from rissson/release-19.09 

    flashplayer: 32.0.0.293 -> 32.0.0.303
    @7c6f434c
    7c6f434c committed Dec 28, 2019
    Copy the full SHA
    2f6a9e4 View commit details
    Browse the repository at this point in the history

  3. nixos/tinydns: order service after network.target 

    In cases where you boot up really quickly (like in the VM test on a
non-busy host), tinydns might want to bind before the loopback interface
is fully up. Order tinydns after network.target to fix that.

(cherry picked from commit cbd9e9e)
    @flokli @rycee
    flokli authored and rycee committed Dec 28, 2019
    Copy the full SHA
    0d9055a View commit details
    Browse the repository at this point in the history