Commit bcdfbb56 authored by K900's avatar K900
Browse files

Merge branch 'master' into staging-next

parents a86f7216 ca6499e8

pkgs/applications/video/vdr/markad/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
}:

stdenv.mkDerivation rec {

  pname = "vdr-markad";

  version = "3.4.2";

  version = "3.4.3";



  src = fetchFromGitHub {

    repo = "vdr-plugin-markad";

    owner = "kfb77";

    sha256 = "sha256-C7s/92xmG6bffRqr3ndecmi/RbVlboRsYZLLThLYEzQ=";

    sha256 = "sha256-1+NpfZaXUaNSRbN07FrjDNqbOotmvrAwf4uLKhnKGkQ=";

    rev = "V${version}";

  };

pkgs/applications/video/vdr/softhddevice/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
}:

stdenv.mkDerivation rec {

  pname = "vdr-softhddevice";

  version = "2.0.7";

  version = "2.0.9";



  src = fetchFromGitHub {

    owner = "ua0lnj";

    repo = "vdr-plugin-softhddevice";

    sha256 = "sha256-AzWYgR0IdB4922HxH7K83heRIEi31fz20Z2W7E9ljXw=";

    sha256 = "sha256-FyjKMCKPZVtQhb7wBx4Xr6I/kb2QMH/TEE21bw5gcwc=";

    rev = "v${version}";

  };

pkgs/data/fonts/cantarell-fonts/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 
    python3.pkgs.statmake

    python3.pkgs.ufo2ft

    python3.pkgs.setuptools

    python3.pkgs.ufoLib2

    python3.pkgs.ufolib2

    gettext

    appstream-glib

  ];

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
, orjson

, poetry-core

, pytestCheckHook

, ufoLib2

, ufolib2

}:



buildPythonPackage rec {
@@ -34,7 +34,7 @@ buildPythonPackage rec { 
    glyphslib

    openstep-plist

    orjson

    ufoLib2

    ufolib2

  ];

  nativeBuildInputs = [

    poetry-core

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

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchFromGitHub

, fonttools

, openstep-plist

, ufoLib2

, ufolib2

, pytestCheckHook

, unicodedata2

, setuptools-scm
@@ -32,7 +32,7 @@ buildPythonPackage rec { 
  propagatedBuildInputs = [

    fonttools

    openstep-plist

    ufoLib2

    ufolib2

    unicodedata2

    ufonormalizer

    xmldiff
@@ -57,4 +57,3 @@ buildPythonPackage rec { 
    maintainers = [ lib.maintainers.BarinovMaxim ];

  };

}