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

Commits on Jun 6, 2019

  1. nixos/zoneminder: font files cannot be found

    @peterhoeg
    peterhoeg committed Jun 6, 2019
    Copy the full SHA
    5278760 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2019

  1. rtv: 1.26.0 -> 1.27.0

    @dtzWill
    dtzWill committed Jun 7, 2019
    Copy the full SHA
    2fcdf4a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2019

  1. jellyfin: 10.3.3 -> 10.3.4

    @minijackson
    minijackson committed Jun 8, 2019
    Copy the full SHA
    5a8a901 View commit details
    Browse the repository at this point in the history

  2. pulseaudio: Fix detection of ALSA UCM 

    This one was a bit tricky to find because it only causes a runtime
error, and pulseaudio has shims for most ALSA UCM methods except one.
(I guess nobody ever really tests pulseaudio in combination with
UCM-less ALSA?)

ALSA 1.1.8 had ${alsa-dev}/include/alsa/ in the pkg-config file, which
was considered wrong and fixed in 1.1.9.

However, pulseaudio was relying on being able to include ALSA headers
like <asoundlib.h> and <use-case.h> rather than <alsa/asoundlib.h> and
<alsa/use-case.h>. (For asoundlib.h it only causes a warning, because
the ALSA guys created a shim for that header.)

These two patches change pulseaudio to use the correct include
directives.
    @aristidb
    aristidb committed Jun 8, 2019
    Copy the full SHA
    dacc02f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #62857 from minijackson/jellyfin-10.3.4 

    jellyfin: 10.3.3 -> 10.3.4
    @etu
    etu committed Jun 8, 2019
    Copy the full SHA
    ebee0a3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #62809 from dtzWill/update/rtv-1.27.0 

    rtv: 1.26.0 -> 1.27.0
    @srhb
    srhb committed Jun 8, 2019
    Copy the full SHA
    e3bacc0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #62758 from peterhoeg/f/zm 

    nixos/zoneminder: font files cannot be found
    @srhb
    srhb committed Jun 8, 2019
    Copy the full SHA
    635e3b1 View commit details
    Browse the repository at this point in the history