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

Commits on Mar 14, 2019

  1. pythonPackages.xlib: 0.17 -> 0.25, enable tests 

    https://github.com/python-xlib/python-xlib/releases/tag/0.25

(and the releases along the way)
    @dtzWill
    dtzWill authored and Robert Schütz committed Mar 14, 2019
    Copy the full SHA
    5a302b2 View commit details

  2. plover.stable: add setuptools_scm to nativeBuildInputs

    Robert Schütz committed Mar 14, 2019
    Copy the full SHA
    ec95b91 View commit details

  3. Merge pull request #57621 from dtzWill/update/pyxlib-0.25 

    pythonPackages.xlib: 0.17 -> 0.25, enable tests
    @dotlambda
    dotlambda authored Mar 14, 2019
    Copy the full SHA
    badca37 View commit details
Showing with 16 additions and 7 deletions.
  1. +1 −0 pkgs/applications/misc/plover/default.nix
  2. +15 −7 pkgs/development/python-modules/xlib/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/misc/plover/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";
};

nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ pytest mock ];
propagatedBuildInputs = [
six setuptools pyserial appdirs hidapi wxPython xlib wmctrl
22 changes: 15 additions & 7 deletions pkgs/development/python-modules/xlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,24 +3,32 @@
, fetchFromGitHub
, six
, setuptools_scm
, pkgs
, xorg
, python
, mock
, nose
, utillinux
}:

buildPythonPackage rec {
pname = "xlib";
version = "0.17";
version = "0.25";

src = fetchFromGitHub {
owner = "python-xlib";
repo = "python-xlib";
rev = "${version}";
sha256 = "1iiz2nq2hq9x6laavngvfngnmxbgnwh54wdbq6ncx4va7v98liyi";
rev = version;
sha256 = "1nncx7v9chmgh56afg6dklz3479s5zg3kq91mzh4mj512y0skyki";
};

# Tests require `pyutil' so disable them to avoid circular references.
doCheck = false;
checkPhase = ''
${python.interpreter} runtests.py
'';

propagatedBuildInputs = [ six setuptools_scm pkgs.xorg.libX11 ];
checkInputs = [ mock nose utillinux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ];
nativeBuildInputs = [ setuptools_scm ];
buildInputs = [ xorg.libX11 ];
propagatedBuildInputs = [ six ];

meta = with stdenv.lib; {
description = "Fully functional X client library for Python programs";