From e5597afc62a93af60afadc1c87404f2276f97e78 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 12:49:48 +0100 Subject: [PATCH 1/5] python311Packages.ufolib2: rename from ufoLib2 --- pkgs/data/fonts/cantarell-fonts/default.nix | 2 +- pkgs/development/python-modules/babelfont/default.nix | 4 ++-- pkgs/development/python-modules/glyphslib/default.nix | 5 ++--- pkgs/development/python-modules/statmake/default.nix | 4 ++-- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- .../python-modules/{ufoLib2 => ufolib2}/default.nix | 5 +++-- pkgs/tools/misc/nanoemoji/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) rename pkgs/development/python-modules/{ufoLib2 => ufolib2}/default.nix (93%) diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 49b4e6354ca4..e1c18695db1e 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 4cd3e809a890..575c74a17be9 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -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 diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 65cbc5b3b205..054f5db667f1 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , fonttools , openstep-plist -, ufoLib2 +, ufolib2 , pytestCheckHook , unicodedata2 , setuptools-scm @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools openstep-plist - ufoLib2 + ufolib2 unicodedata2 ufonormalizer xmldiff @@ -59,4 +59,3 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.BarinovMaxim ]; }; } - diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index b9d0a4425c41..6ddd9830bedc 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pythonOlder , ufo2ft -, ufoLib2 +, ufolib2 }: buildPythonPackage rec { @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ufo2ft - ufoLib2 + ufolib2 ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 98087eaae75d..f0d517732805 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -13,7 +13,7 @@ , defcon , fonttools , skia-pathops -, ufoLib2 +, ufolib2 # tests , pytestCheckHook @@ -40,7 +40,7 @@ buildPythonPackage rec { compreffor booleanoperations cffsubr - ufoLib2 + ufolib2 skia-pathops ] ++ fonttools.optional-dependencies.lxml diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix similarity index 93% rename from pkgs/development/python-modules/ufoLib2/default.nix rename to pkgs/development/python-modules/ufolib2/default.nix index c2fef2e4656a..5712b150569e 100644 --- a/pkgs/development/python-modules/ufoLib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "ufoLib2"; + pname = "ufolib2"; version = "0.16.0"; format = "pyproject"; src = fetchPypi { - inherit pname version; + pname = "ufoLib2"; + inherit version; hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; }; diff --git a/pkgs/tools/misc/nanoemoji/default.nix b/pkgs/tools/misc/nanoemoji/default.nix index 401783bcc4a1..a4fb6768d0bb 100644 --- a/pkgs/tools/misc/nanoemoji/default.nix +++ b/pkgs/tools/misc/nanoemoji/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { toml tomlkit ufo2ft - ufoLib2 + ufolib2 zopfli ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 55637f24f480..d4c334ee395d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -463,6 +463,7 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + ufoLib2 = ufolib2; # added 2024-01-07 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 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 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6036bfd2fd3d..b28ab7bcc7e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15493,7 +15493,7 @@ self: super: with self; { ufo2ft = callPackage ../development/python-modules/ufo2ft { }; - ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; + ufolib2 = callPackage ../development/python-modules/ufolib2 { }; ufolint = callPackage ../development/python-modules/ufolint { }; From fc680ef5ecfe7ea6e9e26f9dfb8c1c3142500fcb Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 7 Jan 2024 17:28:19 +0300 Subject: [PATCH 2/5] memtest86plus: 6.20 -> 7.00 Diff: https://github.com/memtest86plus/memtest86plus/compare/v6.20...v7.00 --- pkgs/tools/misc/memtest86+/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 53f9efac5fc4..297ef5dff041 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.20"; + version = "7.00"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-JzQJrAnPsa3GKNdy1PidOAZk7IQvRBi/YtmK2O9rWfM="; + hash = "sha256-DVYiE9yi20IR2AZs8bya1h9vK4si7nKdg9Nqef4WTrw="; }; # Binaries are booted directly by BIOS/UEFI or bootloader From 427046dd872e1687d7e93c7a805170928cfd824b Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Mon, 8 Jan 2024 09:04:37 +1300 Subject: [PATCH 3/5] heroic: 2.11.0 -> 2.12.0 --- pkgs/games/heroic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index 239d78f973c8..583853b64cca 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-N+9wNlDARE1zdXW/vka6whFNu5CF240zCJ00EDT1cM0="; + hash = "sha256-1+TqIExvZHE3X38Fh43CasmTyjIr2WcEw07ZJEFrcBw="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-P7Mm9TMNjr2glLQppjJZRMeN9sYKyZWzRaerZIcY3Y8="; + hash = "sha256-27r6lZiD1Ptk0WIYdwNLSZy6iMnmaZjKXBUjr+5+1lQ="; }; nativeBuildInputs = [ From bb460aff88872cc93306538b9df891577d3c38e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 06:33:19 +0000 Subject: [PATCH 4/5] vdrPlugins.markad: 3.4.2 -> 3.4.3 --- pkgs/applications/video/vdr/markad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 335767204c43..3acec28d803a 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -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}"; }; From 2300905b7c2dc9935e41e7aa4f1df2aa0547868b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 06:43:40 +0000 Subject: [PATCH 5/5] vdrPlugins.softhddevice: 2.0.7 -> 2.0.9 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1f0cee44df32..3e738e40d486 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -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}"; };