Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 039983bd7a49
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c8dedaddd64f
Choose a head ref
  • 11 commits
  • 9 files changed
  • 6 contributors

Commits on Jun 11, 2019

  1. perlPackages.ImageExifTool: 11.48 -> 11.50

    @bdesham
    bdesham committed Jun 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    842693b View commit details

Commits on Jun 12, 2019

  1. bazel: 0.24.0 -> 0.26.0

    @groodt @Profpatsch
    groodt authored and Profpatsch committed Jun 12, 2019
    Copy the full SHA
    dd2a0f6 View commit details

  2. bazel: move the python test to py_binary 

    `py_test` tries to download unnecessary dependencies at runtime. We
can just as well run it to check the assertion.

Upstream issue: bazelbuild/bazel#8575
    @Profpatsch
    Profpatsch committed Jun 12, 2019
    Copy the full SHA
    44f97b5 View commit details

  3. bazel.tests: prebuild the bazel self-extraction to speed up test 

    Factor out the common parts of tests & cache the bazel
self-extraction (ugh) to a common store path.
    @Profpatsch
    Profpatsch committed Jun 12, 2019
    Copy the full SHA
    629c050 View commit details

  4. bazel: run the tests on all supported platforms

    @Profpatsch
    Profpatsch committed Jun 12, 2019
    Copy the full SHA
    5d238e4 View commit details

  5. xe: platforms.linux -> platforms.all 

    xe is such a trivial package, it should build on every platform that
supports a CC compiler.
    @Profpatsch
    Profpatsch committed Jun 12, 2019
    Copy the full SHA
    7bae5c6 View commit details

  6. Merge pull request #62336 from groodt/bazel-0.26.0 

    bazel: 0.24.0 -> 0.26.0
    @Profpatsch
    Profpatsch authored Jun 12, 2019
    Copy the full SHA
    cc62736 View commit details

  7. exiftool: 11.48 -> 11.50 (#62987) 

    exiftool: 11.48 -> 11.50
    @dywedir
    dywedir authored Jun 12, 2019
    Copy the full SHA
    e37d6ef View commit details

  8. pulseaudio-dlna: Fix build by downgrading zeroconf

    @adisbladis
    adisbladis committed Jun 12, 2019
    Copy the full SHA
    acbfb00 View commit details

  9. firefox-devedition-bin: 68.0b8 -> 68.0b9

    @adisbladis
    adisbladis committed Jun 12, 2019
    Copy the full SHA
    56fbfd5 View commit details

  10. firefox-beta-bin: 68.0b8 -> 68.0b9

    @adisbladis
    adisbladis committed Jun 12, 2019
    Copy the full SHA
    c8dedad View commit details
12 changes: 8 additions & 4 deletions pkgs/applications/audio/pulseaudio-dlna/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, faacSupport ? false, faac ? null
, flacSupport ? true, flac ? null
, soxSupport ? true, sox ? null
, vorbisSupport ? true, vorbisTools ? null
, vorbisSupport ? true, vorbisTools ? null
}:

assert mp3Support -> lame != null;
@@ -14,7 +14,10 @@ assert flacSupport -> flac != null;
assert soxSupport -> sox != null;
assert vorbisSupport -> vorbisTools != null;

pythonPackages.buildPythonApplication rec {
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };

in pythonPackages.buildPythonApplication rec {
pname = "pulseaudio-dlna";
version = "2017-11-01";

@@ -24,13 +27,14 @@ pythonPackages.buildPythonApplication rec {
rev = "4472928dd23f274193f14289f59daec411023ab0";
sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
};

# pulseaudio-dlna has no tests
doCheck = false;

propagatedBuildInputs = with pythonPackages; [
dbus-python docopt requests setproctitle protobuf psutil futures
chardet notify2 netifaces pyroute2 pygobject2 lxml zeroconf ]
chardet notify2 netifaces pyroute2 pygobject2 lxml ]
++ [ zeroconf ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional opusSupport opusTools
++ stdenv.lib.optional faacSupport faac
31 changes: 31 additions & 0 deletions pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, ifaddr
, typing
, isPy27
, pythonOlder
, netifaces
, six
, enum-compat
}:

buildPythonPackage rec {
pname = "zeroconf";
version = "0.19.1";

src = fetchPypi {
inherit pname version;
sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
};

propagatedBuildInputs = [ netifaces six enum-compat ifaddr ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];

meta = with stdenv.lib; {
description = "A pure python implementation of multicast DNS service discovery";
homepage = https://github.com/jstasiak/python-zeroconf;
license = licenses.lgpl21;
maintainers = [ ];
};
}
Loading