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
base: 5c79b4b5122f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7b8eb4948baf
Choose a head ref
  • 13 commits
  • 9 files changed
  • 10 contributors

Commits on Jan 13, 2019

  1. Allow the definition of extra options on commandline 

    I stumbled upon an issue with the Alertmanager that required
an additional comand line option. See https://groups.google.com/forum/#!msg/prometheus-users/-5wd-P13xCI/lGLBHHgnBgAJ

(cherry picked from commit 69e4e49)

Without this, Nixos machines on 18.09 that have no private IP addresses cannot start Alertmanager.
#46068
#45302
    @azazel75 @tomfitzhenry
    azazel75 authored and tomfitzhenry committed Jan 13, 2019
    Copy the full SHA
    ef7c9c4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #53877 from tomfitzhenry/cherry-pick-alertmanager-… 

    …extra-flags

Alertmanager: Allow the definition of extra options on commandline
    @samueldr
    samueldr committed Jan 13, 2019
    Copy the full SHA
    0352694 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2019

  1. nixos/containers: explicitly set link up on host for extraVeths 

    (cherry picked from commit 8a8bf88)
    @elseym @fpletz
    elseym authored and fpletz committed Jan 14, 2019
    Copy the full SHA
    e02b9d7 View commit details
    Browse the repository at this point in the history

  2. dub: Fix package build

    @ThomasMader
    ThomasMader committed Jan 14, 2019
    Copy the full SHA
    4b08662 View commit details
    Browse the repository at this point in the history

  3. nzbget service: fix preStart script and add more options to module 

    (cherry picked from commit 44e1aab)
    @elseym @fpletz
    elseym authored and fpletz committed Jan 14, 2019
    Copy the full SHA
    7436c65 View commit details
    Browse the repository at this point in the history

  4. sonarr service: add more options to module 

    (cherry picked from commit 31ad79f)
    @elseym @fpletz
    elseym authored and fpletz committed Jan 14, 2019
    Copy the full SHA
    0b471f7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'staging-18.09' into release-18.09 

    Mainly CVE fixes for systemd and openssh
    @vcunat
    vcunat committed Jan 14, 2019
    Copy the full SHA
    97e0d53 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. jetbrains-editors: 2018.2 -> 2018.3

    @lovek323 @Mic92
    lovek323 authored and Mic92 committed Jan 15, 2019
    Copy the full SHA
    ec4829a View commit details
    Browse the repository at this point in the history

  2. jetbrains: 2018.3 -> 2018.3.1

    @tadfisher @Mic92
    tadfisher authored and Mic92 committed Jan 15, 2019
    Copy the full SHA
    7bfb238 View commit details
    Browse the repository at this point in the history

  3. jetbrains: 2018.3.1 -> 2018.3.2

    @tadfisher @Mic92
    tadfisher authored and Mic92 committed Jan 15, 2019
    Copy the full SHA
    d6eccb3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #53940 from ThomasMader/fixDub 

    [18.09] dub: Fix package build
    @veprbl
    veprbl committed Jan 15, 2019
    Copy the full SHA
    5b0d714 View commit details
    Browse the repository at this point in the history

  5. youtube-dl: 2019.01.10 -> 2019.01.16 

    See #54010

(cherry picked from commit 977fd31)
    @leo60228
    leo60228 authored and Robert Schütz committed Jan 15, 2019
    Copy the full SHA
    28b3fa6 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. libjpeg-turbo: fix CVE-2018-20330 (#53950) 

    (cherry picked from commit b0757da)
    @orivej
    orivej committed Jan 16, 2019
    Copy the full SHA
    7b8eb49 View commit details
    Browse the repository at this point in the history