Skip to content

Commit 8a4d651

Browse files
dezgegdezgeg
committedNov 29, 2016
Merge remote-tracking branch 'upstream/staging' into master
·
branch-off-24.1117.03-beta
2 parents 56366b5 + 2587611 commit 8a4d651

File tree

102 files changed

+417
-361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+417
-361
lines changed
 

Diff for: ‎nixos/tests/blivet.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
1+
import ./make-test.nix ({ pkgs, ... }: with pkgs.python2Packages; rec {
22
name = "blivet";
33
meta = with pkgs.stdenv.lib.maintainers; {
44
maintainers = [ aszlig ];

Diff for: ‎pkgs/applications/audio/a2jmidid/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
2-
, pythonPackages}:
2+
, python2Packages}:
33

44
let
5-
inherit (pythonPackages) python dbus-python;
5+
inherit (python2Packages) python dbus-python;
66
in stdenv.mkDerivation rec {
77
name = "a2jmidid-${version}";
88
version = "8";

0 commit comments

Comments
 (0)
Please sign in to comment.