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: 0c07921c906c
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: 5220486f44e4
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Sep 23, 2019

  1. build-support: Add p11_kit to appimage dependency set 

    This was in the upstream list but missing from nixpkgs' list.

(cherry picked from commit d1139e3)
    @bgamari @Mic92
    bgamari authored and Mic92 committed Sep 23, 2019
    Copy the full SHA
    6e5766e View commit details

  2. mopidy-iris: 3.39.0 -> 3.40.0 

    (cherry picked from commit 49e52b7)
    @Tomahna @Mic92
    Tomahna authored and Mic92 committed Sep 23, 2019
    Copy the full SHA
    9cf3bcf View commit details

  3. mopidy: add setuptools to propagatedBuildInputs 

    (cherry picked from commit 09dac43)
    @Tomahna @Mic92
    Tomahna authored and Mic92 committed Sep 23, 2019
    Copy the full SHA
    5220486 View commit details
Showing with 4 additions and 3 deletions.
  1. +1 −1 pkgs/applications/audio/mopidy/default.nix
  2. +2 −2 pkgs/applications/audio/mopidy/iris.nix
  3. +1 −0 pkgs/build-support/appimage/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/audio/mopidy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];

propagatedBuildInputs = with pythonPackages; [
gst-python pygobject3 pykka tornado_4 requests
gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;

# There are no tests
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mopidy/iris.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.39.0";
version = "3.40.0";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
};

propagatedBuildInputs = [
1 change: 1 addition & 0 deletions pkgs/build-support/appimage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -185,6 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
p11_kit

# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage