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: 63f250ed6cb2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 5c52b25283a6
Choose a head ref
  • 5 commits
  • 6 files changed
  • 3 contributors

Commits on Apr 9, 2019

  1. Merge #59003: pidgin: fix gst plugin path for audio/video 

    Fixes #32015.

(cherry picked from commit 2e35154)
    @vcunat
    vcunat committed Apr 9, 2019
    Copy the full SHA
    dc13a05 View commit details
    Browse the repository at this point in the history

  2. nixos/roundcube: only configure postgres config if localhost is used … 

    …as database

When using a different database, the evaluation fails as
`config.services.postgresql.package` is only set if `services.postgresql` is enabled.

Also, the systemd service shouldn't have a relation to postgres if a
remote database is used.

(cherry picked from commit 6b6348e)
    @Ma27 @globin
    Ma27 authored and globin committed Apr 9, 2019
    Copy the full SHA
    8111202 View commit details
    Browse the repository at this point in the history

  3. roundcube: don't resolve symlinks in update.sh 

    A side-effect of this is that the derivation required a rewrite in order
to apply the patch properly.

(cherry picked from commit 324e6db)
    @Ma27 @globin
    Ma27 authored and globin committed Apr 9, 2019
    Copy the full SHA
    8a21566 View commit details
    Browse the repository at this point in the history

  4. runc: 1.0.0-rc6 -> 1.0.0-rc7 

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 28a2dd8)
    @vdemeester @xeji
    vdemeester authored and xeji committed Apr 9, 2019
    Copy the full SHA
    2349349 View commit details
    Browse the repository at this point in the history

  5. containerd: 1.2.2 -> 1.2.6 

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 6adf0f3)
and resolved conflict
    @vdemeester @xeji
    vdemeester authored and xeji committed Apr 9, 2019
    Copy the full SHA
    5c52b25 View commit details
    Browse the repository at this point in the history