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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e913308b11bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 017f0e8043da
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 25, 2019

  1. avahi: add -compat option

    @peterhoeg
    peterhoeg committed Feb 25, 2019
    Copy the full SHA
    6e802e3 View commit details

  2. mumble: use the new avahi-compat derivation

    @peterhoeg
    peterhoeg committed Feb 25, 2019
    Copy the full SHA
    812da4b View commit details

  3. shairplay: 2016-01-01 -> 2018-08-24

    @peterhoeg
    peterhoeg committed Feb 25, 2019
    Copy the full SHA
    d8c3d56 View commit details

Commits on Mar 18, 2019

  1. Merge pull request #56334 from peterhoeg/u/shairplay 

    shairplay: 2016-01-01 -> 2018-08-24 and add avahi-compat convenience derivation
    @peterhoeg
    peterhoeg authored Mar 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    017f0e8 View commit details
Showing with 13 additions and 13 deletions.
  1. +1 −1 pkgs/development/libraries/avahi/default.nix
  2. +5 −5 pkgs/servers/shairplay/default.nix
  3. +7 −7 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/avahi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
assert qt4Support -> qt4 != null;

stdenv.mkDerivation rec {
name = "avahi-${version}";
name = "avahi${stdenv.lib.optionalString withLibdnssdCompat "-compat"}-${version}";
version = "0.7";

src = fetchurl {
10 changes: 5 additions & 5 deletions pkgs/servers/shairplay/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, avahi, libao }:

stdenv.mkDerivation rec {
name = "shairplay-${version}";
version = "2016-01-01";
name = "shairplay-unstable-${version}";
version = "2018-08-24";

src = fetchFromGitHub {
owner = "juhovh";
repo = "shairplay";
rev = "ce80e005908f41d0e6fde1c4a21e9cb8ee54007b";
sha256 = "10b4bmqgf4rf1wszvj066mc42p90968vqrmyqyrdal4k6f8by1r6";
rev = "096b61ad14c90169f438e690d096e3fcf87e504e";
sha256 = "02xkd9al79pbqh8rhzz5w99vv43jg5vqkqg7kxsw8c8sz9di9wsa";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Apple airplay and raop protocol server";
description = "Apple AirPlay and RAOP protocol server";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
14 changes: 7 additions & 7 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -870,6 +870,10 @@ in

avahi = callPackage ../development/libraries/avahi (config.avahi or {});

avahi-compat = callPackage ../development/libraries/avahi ((config.avahi or {}) // {
withLibdnssdCompat = true;
});

avro-c = callPackage ../development/libraries/avro-c { };

avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; };
@@ -14149,7 +14153,7 @@ in

sambaFull = samba4Full;

shairplay = callPackage ../servers/shairplay { };
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };

shairport-sync = callPackage ../servers/shairport-sync { };

@@ -18503,19 +18507,15 @@ in
multimon-ng = callPackage ../applications/radio/multimon-ng { };

inherit (callPackages ../applications/networking/mumble {
avahi = avahi.override {
withLibdnssdCompat = true;
};
avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;
iceSupport = config.murmur.iceSupport or true;
}) mumble mumble_git murmur;

inherit (callPackages ../applications/networking/mumble {
avahi = avahi.override {
withLibdnssdCompat = true;
};
avahi = avahi-compat;
jackSupport = config.mumble.jackSupport or false;
speechdSupport = config.mumble.speechdSupport or false;
pulseSupport = config.pulseaudio or false;