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: 373d7277936a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56ac23a19c2e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Aug 3, 2018

  1. blueman: use python3Packages

    Robert Schütz committed Aug 3, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    0fd688a View commit details

Commits on Aug 5, 2018

  1. bluez: use python3

    @rnhmjoj
    rnhmjoj authored and Robert Schütz committed Aug 5, 2018
    Copy the full SHA
    413d7f4 View commit details

  2. Merge pull request #44398 from dotlambda/blueman-python3 

    bluez: use python3
    @infinisil
    infinisil authored Aug 5, 2018
    Copy the full SHA
    56ac23a View commit details
Showing with 5 additions and 4 deletions.
  1. +3 −3 pkgs/os-specific/linux/bluez/default.nix
  2. +2 −1 pkgs/tools/bluetooth/blueman/default.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/bluez/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, udev, libical,
python3, readline, udev, libical,
systemd, enableWiimote ? false, enableMidi ? false }:

stdenv.mkDerivation rec {
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
};

pythonPath = with pythonPackages; [
pythonPath = with python3.pkgs; [
dbus-python pygobject2 pygobject3 recursivePthLoader
];

buildInputs = [
dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
dbus glib alsaLib python3 python3.pkgs.wrapPython
readline udev libical
];

3 changes: 2 additions & 1 deletion pkgs/tools/bluetooth/blueman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3
{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
, withPulseAudio ? true, libpulseaudio }:

let
pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];

in stdenv.mkDerivation rec {