Merge branch 'master' into staging-next

K900 bcdfbb56 a86f7216

+24 -23
+2 -2
pkgs/applications/video/vdr/markad/default.nix
··· 19 19 }: 20 20 stdenv.mkDerivation rec { 21 21 pname = "vdr-markad"; 22 - version = "3.4.2"; 22 + version = "3.4.3"; 23 23 24 24 src = fetchFromGitHub { 25 25 repo = "vdr-plugin-markad"; 26 26 owner = "kfb77"; 27 - sha256 = "sha256-C7s/92xmG6bffRqr3ndecmi/RbVlboRsYZLLThLYEzQ="; 27 + sha256 = "sha256-1+NpfZaXUaNSRbN07FrjDNqbOotmvrAwf4uLKhnKGkQ="; 28 28 rev = "V${version}"; 29 29 }; 30 30
+2 -2
pkgs/applications/video/vdr/softhddevice/default.nix
··· 14 14 }: 15 15 stdenv.mkDerivation rec { 16 16 pname = "vdr-softhddevice"; 17 - version = "2.0.7"; 17 + version = "2.0.9"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "ua0lnj"; 21 21 repo = "vdr-plugin-softhddevice"; 22 - sha256 = "sha256-AzWYgR0IdB4922HxH7K83heRIEi31fz20Z2W7E9ljXw="; 22 + sha256 = "sha256-FyjKMCKPZVtQhb7wBx4Xr6I/kb2QMH/TEE21bw5gcwc="; 23 23 rev = "v${version}"; 24 24 }; 25 25
+1 -1
pkgs/data/fonts/cantarell-fonts/default.nix
··· 27 27 python3.pkgs.statmake 28 28 python3.pkgs.ufo2ft 29 29 python3.pkgs.setuptools 30 - python3.pkgs.ufoLib2 30 + python3.pkgs.ufolib2 31 31 gettext 32 32 appstream-glib 33 33 ];
+2 -2
pkgs/development/python-modules/babelfont/default.nix
··· 10 10 , orjson 11 11 , poetry-core 12 12 , pytestCheckHook 13 - , ufoLib2 13 + , ufolib2 14 14 }: 15 15 16 16 buildPythonPackage rec { ··· 34 34 glyphslib 35 35 openstep-plist 36 36 orjson 37 - ufoLib2 37 + ufolib2 38 38 ]; 39 39 nativeBuildInputs = [ 40 40 poetry-core
+2 -3
pkgs/development/python-modules/glyphslib/default.nix
··· 3 3 , fetchFromGitHub 4 4 , fonttools 5 5 , openstep-plist 6 - , ufoLib2 6 + , ufolib2 7 7 , pytestCheckHook 8 8 , unicodedata2 9 9 , setuptools-scm ··· 32 32 propagatedBuildInputs = [ 33 33 fonttools 34 34 openstep-plist 35 - ufoLib2 35 + ufolib2 36 36 unicodedata2 37 37 ufonormalizer 38 38 xmldiff ··· 57 57 maintainers = [ lib.maintainers.BarinovMaxim ]; 58 58 }; 59 59 } 60 -
+2 -2
pkgs/development/python-modules/statmake/default.nix
··· 11 11 , pytestCheckHook 12 12 , pythonOlder 13 13 , ufo2ft 14 - , ufoLib2 14 + , ufolib2 15 15 }: 16 16 17 17 buildPythonPackage rec { ··· 47 47 nativeCheckInputs = [ 48 48 pytestCheckHook 49 49 ufo2ft 50 - ufoLib2 50 + ufolib2 51 51 ]; 52 52 53 53 pythonImportsCheck = [
+2 -2
pkgs/development/python-modules/ufo2ft/default.nix
··· 13 13 , defcon 14 14 , fonttools 15 15 , skia-pathops 16 - , ufoLib2 16 + , ufolib2 17 17 18 18 # tests 19 19 , pytestCheckHook ··· 40 40 compreffor 41 41 booleanoperations 42 42 cffsubr 43 - ufoLib2 43 + ufolib2 44 44 skia-pathops 45 45 ] 46 46 ++ fonttools.optional-dependencies.lxml
+3 -2
pkgs/development/python-modules/ufoLib2/default.nix pkgs/development/python-modules/ufolib2/default.nix
··· 14 14 }: 15 15 16 16 buildPythonPackage rec { 17 - pname = "ufoLib2"; 17 + pname = "ufolib2"; 18 18 version = "0.16.0"; 19 19 format = "pyproject"; 20 20 21 21 src = fetchPypi { 22 - inherit pname version; 22 + pname = "ufoLib2"; 23 + inherit version; 23 24 hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; 24 25 }; 25 26
+3 -3
pkgs/games/heroic/default.nix
··· 17 17 let appName = "heroic"; 18 18 in stdenv.mkDerivation rec { 19 19 pname = "heroic-unwrapped"; 20 - version = "2.11.0"; 20 + version = "2.12.0"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "Heroic-Games-Launcher"; 24 24 repo = "HeroicGamesLauncher"; 25 25 rev = "v${version}"; 26 - hash = "sha256-N+9wNlDARE1zdXW/vka6whFNu5CF240zCJ00EDT1cM0="; 26 + hash = "sha256-1+TqIExvZHE3X38Fh43CasmTyjIr2WcEw07ZJEFrcBw="; 27 27 }; 28 28 29 29 offlineCache = fetchYarnDeps { 30 30 yarnLock = "${src}/yarn.lock"; 31 - hash = "sha256-P7Mm9TMNjr2glLQppjJZRMeN9sYKyZWzRaerZIcY3Y8="; 31 + hash = "sha256-27r6lZiD1Ptk0WIYdwNLSZy6iMnmaZjKXBUjr+5+1lQ="; 32 32 }; 33 33 34 34 nativeBuildInputs = [
+2 -2
pkgs/tools/misc/memtest86+/default.nix
··· 2 2 3 3 stdenv.mkDerivation (finalAttrs: { 4 4 pname = "memtest86+"; 5 - version = "6.20"; 5 + version = "7.00"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "memtest86plus"; 9 9 repo = "memtest86plus"; 10 10 rev = "v${finalAttrs.version}"; 11 - hash = "sha256-JzQJrAnPsa3GKNdy1PidOAZk7IQvRBi/YtmK2O9rWfM="; 11 + hash = "sha256-DVYiE9yi20IR2AZs8bya1h9vK4si7nKdg9Nqef4WTrw="; 12 12 }; 13 13 14 14 # Binaries are booted directly by BIOS/UEFI or bootloader
+1 -1
pkgs/tools/misc/nanoemoji/default.nix
··· 43 43 toml 44 44 tomlkit 45 45 ufo2ft 46 - ufoLib2 46 + ufolib2 47 47 zopfli 48 48 ]; 49 49
+1
pkgs/top-level/python-aliases.nix
··· 481 481 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 482 482 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 483 483 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 484 + ufoLib2 = ufolib2; # added 2024-01-07 484 485 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 485 486 unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 486 487 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
+1 -1
pkgs/top-level/python-packages.nix
··· 15523 15523 15524 15524 ufo2ft = callPackage ../development/python-modules/ufo2ft { }; 15525 15525 15526 - ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; 15526 + ufolib2 = callPackage ../development/python-modules/ufolib2 { }; 15527 15527 15528 15528 ufolint = callPackage ../development/python-modules/ufolint { }; 15529 15529