Unverified Commit 61f6e256 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

python3Packages.qtile{,-extras}: 0.34.1 -> 0.35.0 (#501995)

parents f1a41763 6d3f2f36

pkgs/development/python-modules/qtile-extras/default.nix

+6 −16
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  anyio,

  gobject-introspection,

  gtk3,
@@ -22,9 +21,9 @@ 
  xorg-server,

  nixosTests,

}:

buildPythonPackage rec {

buildPythonPackage (finalAttrs: {

  pname = "qtile-extras";

  version = "0.34.1";

  version = "0.35.0";

  # nixpkgs-update: no auto update

  # should be updated alongside with `qtile`

  pyproject = true;
@@ -32,19 +31,10 @@ buildPythonPackage rec { 
  src = fetchFromGitHub {

    owner = "elParaguayo";

    repo = "qtile-extras";

    tag = "v${version}";

    hash = "sha256-CtmTZmUQlqkDPd++n3fPbRB4z1NA4ZxnmIR84IjsURw=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-xZ1pxe1EUnnjqz+46R4R9DWKi7M2j1pgvY4uy1dBak8=";

  };



  patches = [

    # Remove unpack of widget.eval call in tests

    # https://github.com/elParaguayo/qtile-extras/pull/460

    (fetchpatch {

      url = "https://github.com/elParaguayo/qtile-extras/commit/359964520a9dcd2c7e12680bfc53e359d74c489b.patch?full_index=1";

      hash = "sha256-nKt39bTaBbvEC5jWU6XH0pigTs4hpSmMIwFe/A9YdJA=";

    })

  ];



  build-system = [ setuptools-scm ];



  dependencies = [ gtk3 ];
@@ -107,8 +97,8 @@ buildPythonPackage rec { 
  meta = {

    description = "Extra modules and widgets for the Qtile tiling window manager";

    homepage = "https://github.com/elParaguayo/qtile-extras";

    changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.tag}/CHANGELOG";

    changelog = "https://github.com/elParaguayo/qtile-extras/blob/${finalAttrs.src.tag}/CHANGELOG";

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ arjan-s ];

  };

}
 
})

pkgs/development/python-modules/qtile/default.nix

+2 −19
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  cairocffi,

  dbus-fast,

  aiohttp,
@@ -38,7 +37,7 @@ 


buildPythonPackage (finalAttrs: {

  pname = "qtile";

  version = "0.34.1";

  version = "0.35.0";

  # nixpkgs-update: no auto update

  # should be updated alongside with `qtile-extras`
@@ -48,25 +47,9 @@ buildPythonPackage (finalAttrs: { 
    owner = "qtile";

    repo = "qtile";

    tag = "v${finalAttrs.version}";

    hash = "sha256-PPyI+IGvHBQusVmU3D26VjYjLaa9+94KUqNwbQSzeaI=";

    hash = "sha256-5XHzlS/Knw/VmVtnM7wToJ/F12GAa2lwdWuXBJHXnZM=";

  };



  patches = [

    # The patch below makes upstream's build script search for wayland-scanner

    # simply in $PATH, and not via `pkg-config`. This allows us to put

    # wayland-scanner in nativeBuildInputs and keep using `strictDeps`. See:

    #

    # https://github.com/qtile/qtile/pull/5726

    #

    # Upstream has merged the PR directly - without creating a merge commit, so

    # using a range is required.

    (fetchpatch {

      name = "qtile-PR5726-wayland-scanner-pkg-config.patch";

      url = "https://github.com/qtile/qtile/compare/f0243abee5e6b94ef92b24e99d09037a4f40272b..553845bd17f38a6d1dee763a23c1b015df894794.patch";

      hash = "sha256-hRArLC4nQMAbT//QhQeAUL1o7OCV0zvrlJztDavI0K0=";

    })

  ];



  build-system = [

    setuptools

    setuptools-scm