From 69822178635ebe1541003fa23607fa417e09b48b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 26 Nov 2024 13:32:27 +0100 Subject: [PATCH 01/26] netbox: 4.1.3 -> 4.1.7 (cherry picked from commit 623d6fbbca58104cf5167ce9433812296e86f207) --- pkgs/by-name/ne/netbox_4_1/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix index be5b53042793..2fd7eebaa1c7 100644 --- a/pkgs/by-name/ne/netbox_4_1/package.nix +++ b/pkgs/by-name/ne/netbox_4_1/package.nix @@ -15,7 +15,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.1.3"; + version = "4.1.7"; format = "other"; @@ -23,14 +23,17 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = "netbox"; rev = "refs/tags/v${version}"; - hash = "sha256-SRzkmRkniVDu6vYGa9Kd9exob/LHpGBPd+lRA/pbCFo="; + hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0="; }; patches = [ ./custom-static-root.patch + + # Rebase of PR 17620 "Upgrade to Django 5.1" + # https://github.com/netbox-community/netbox/pull/17620 (fetchpatch { - url = "https://github.com/netbox-community/netbox/pull/17620.patch"; - hash = "sha256-zN2zke4qlNJUbxI8mSV+zGmEv0Qtd0zSCbCXWyE1L2k="; + url = "https://github.com/netbox-community/netbox/commit/cda9e0525dc850ddd82bf46762a64607bf97df83.patch"; + hash = "sha256-iJiz5f926Np1k4c9DpfPe0HefJy1CH6c0wjwBIt1vWQ="; }) ]; From ba040e289d1c00ea6440b00f30c25add16c42cc8 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Fri, 27 Dec 2024 23:12:56 +0100 Subject: [PATCH 02/26] python3Packages.loguru: 0.7.2 -> 0.7.3 & cleanups (cherry picked from commit 01ea54baa838c9cef64f62c4f4b896391adbbb7d) --- .../python-modules/loguru/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index d3776308759c..5fa1a0251bc5 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -3,37 +3,42 @@ stdenv, buildPythonPackage, colorama, + exceptiongroup, fetchFromGitHub, + flit-core, freezegun, + pytest-mypy-plugins, + pytest-xdist, pytestCheckHook, pythonOlder, - pytest-xdist, }: buildPythonPackage rec { pname = "loguru"; - version = "0.7.2"; - format = "setuptools"; + version = "0.7.3"; + + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Delgan"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-1xcPAOOhjFmWSxmPj6NICRur3ITOuQRNNKPJlfp89Jw="; + tag = version; + hash = "sha256-tccEzzs9TtFAZM9s43cskF9llc81Ng28LqedjLiE1m4="; }; + build-system = [ flit-core ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist # massive speedup, not tested by upstream colorama freezegun - ]; + pytest-mypy-plugins + ] ++ lib.optional (pythonOlder "3.10") exceptiongroup; - disabledTestPaths = [ - "tests/test_type_hinting.py" # avoid dependency on mypy - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_multiprocessing.py" ]; disabledTests = [ @@ -52,12 +57,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "loguru" ]; - meta = with lib; { + meta = { description = "Python logging made (stupidly) simple"; homepage = "https://github.com/Delgan/loguru"; changelog = "https://github.com/delgan/loguru/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jakewaksbaum rmcgibbo ]; From 43e9cbd5814ebf188116789dde7946af82a35018 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jan 2025 14:22:41 +0000 Subject: [PATCH 03/26] ecapture: 0.9.1 -> 0.9.2 (cherry picked from commit 211e54889a60754cf224a2b2af9d7f9371d9f032) --- pkgs/by-name/ec/ecapture/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix index 3922bab9b40f..091c65abdaf4 100644 --- a/pkgs/by-name/ec/ecapture/package.nix +++ b/pkgs/by-name/ec/ecapture/package.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "ecapture"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "gojue"; repo = "ecapture"; tag = "v${version}"; - hash = "sha256-ucauZ1nvsiNxeqMcMHbUaKidAGF/XW7hi04W+Bv6I6Q="; + hash = "sha256-UPWREeyB2YLYU3B4Rxr5oPoOfksL/lnllWyaFxhAe/0="; fetchSubmodules = true; }; @@ -106,7 +106,7 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-A+0ASVHMzNcuLsP9F55hvGjflLg68p0ckj6kPbjdg4E="; + vendorHash = "sha256-8ilfqPt5Phuj5Uaf90+Ir/DFN27oW5Fd+Wsp34/EU9M="; passthru.updateScript = nix-update-script { }; From 0fc0fa4ed39b7147d01bda83eb043596a2050302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 18:39:27 +0000 Subject: [PATCH 04/26] simplex-chat-desktop: 6.2.1 -> 6.2.3 (cherry picked from commit f69b3fc343fa6e540e1e0383e2c387b0c05e59df) --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index c1767f1388fd..347f2428a0a8 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -7,11 +7,11 @@ let pname = "simplex-chat-desktop"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-JEe4dmbb/T2A4+t1ycvgJofes2CkEphytFMnWJgpZ7s="; + hash = "sha256-yS3KnR9JLUEwtV8e2J5l4WW+XNHWg7PDOKtlfT/zfUE="; }; appimageContents = appimageTools.extract { From 8999abb71e792afb1d8567a209505f13e91aa7ce Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jan 2025 08:48:22 +0100 Subject: [PATCH 05/26] nixos/zfs-replication: use expanded arguments for clarity (cherry picked from commit 83af87a20653e11be4cc0d39c9c3fce38c36c039) --- nixos/modules/services/backup/zfs-replication.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index ed635a35617b..063ddf6a79d7 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -80,9 +80,9 @@ in let args = lib.map lib.escapeShellArg ( [ - "-l" + "--user" cfg.username - "-i" + "--identity-file" cfg.identityFilePath cfg.host cfg.remoteFilesystem From 95a171af367ba1f6743f91f867f5e78df3c1a29e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 2 Jan 2025 08:48:37 +0100 Subject: [PATCH 06/26] nixos/zfs-replication: add --verbose to command line arguments (cherry picked from commit 28f43d4628fc7f1d039efde754fce409a7788994) --- nixos/modules/services/backup/zfs-replication.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix index 063ddf6a79d7..3828db386f66 100644 --- a/nixos/modules/services/backup/zfs-replication.nix +++ b/nixos/modules/services/backup/zfs-replication.nix @@ -80,6 +80,7 @@ in let args = lib.map lib.escapeShellArg ( [ + "--verbose" "--user" cfg.username "--identity-file" From b69613fcb6f97bdb9db0612f61925d4deb06f325 Mon Sep 17 00:00:00 2001 From: Jonas Fierlings Date: Wed, 1 Jan 2025 23:00:38 +0100 Subject: [PATCH 07/26] python312Packages.blockdiag: fix missing runtime dependency The `blockdiag.imagedraw` module has a runtime dependency on [`pkg_resources`], which is part of the `setuptools` package. [`pkg_resources`]: https://github.com/blockdiag/blockdiag/blob/3.0.0/src/blockdiag/imagedraw/__init__.py#L16 (cherry picked from commit 8c30dd41a7f580b2eac5fecfc872daed3c233dd3) --- pkgs/development/python-modules/blockdiag/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 5859e00c6cd8..149d30c1dda6 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -58,6 +58,7 @@ buildPythonPackage rec { funcparserlib pillow reportlab + setuptools webcolors ]; From 6864dc1daa1661c91fa72d31c7490abf2a01162a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 5 Apr 2024 00:59:43 +0200 Subject: [PATCH 08/26] mesen: init at 2.0.0-unstable-2024-12-25 (cherry picked from commit 87c9626b22879ee03f7300f64249ef251ab73d56) --- pkgs/by-name/me/mesen/deps.json | 272 ++++++++++++++++++ ...dont-use-alternative-restore-sources.patch | 16 ++ .../by-name/me/mesen/dont-zip-libraries.patch | 74 +++++ pkgs/by-name/me/mesen/package.nix | 82 ++++++ 4 files changed, 444 insertions(+) create mode 100644 pkgs/by-name/me/mesen/deps.json create mode 100644 pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch create mode 100644 pkgs/by-name/me/mesen/dont-zip-libraries.patch create mode 100644 pkgs/by-name/me/mesen/package.nix diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json new file mode 100644 index 000000000000..8b2284636873 --- /dev/null +++ b/pkgs/by-name/me/mesen/deps.json @@ -0,0 +1,272 @@ +[ + { + "pname": "Avalonia", + "version": "11.2.0", + "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.2.0", + "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.2.0", + "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" + }, + { + "pname": "Avalonia.Controls.ProportionalStackPanel", + "version": "11.2.0", + "hash": "sha256-Y8tX7dBzSl69NOSNdpNGzGetc6wQtKnFy/KRnV0SKhQ=" + }, + { + "pname": "Avalonia.Controls.Recycling", + "version": "11.2.0", + "hash": "sha256-ylsPhtILO0pk+5uPZKB5L1o7X8JTiOe48czPPLYLyVs=" + }, + { + "pname": "Avalonia.Controls.Recycling.Model", + "version": "11.2.0", + "hash": "sha256-zAleY6ryWIexJAzz4BpT/Xd3iDgNL624YW5sIBJ0Sv8=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.2.0", + "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.2.0", + "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.2.0", + "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo=" + }, + { + "pname": "Avalonia.MarkupExtension", + "version": "11.2.0", + "hash": "sha256-BUEMX+YThWmxh9X50bGsFtclLFVSIITMlAf0iq2vApk=" + }, + { + "pname": "Avalonia.Native", + "version": "11.2.0", + "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI=" + }, + { + "pname": "Avalonia.ReactiveUI", + "version": "11.2.0", + "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.0", + "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.2.0", + "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.2.0", + "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.2.0", + "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.2.0", + "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU=" + }, + { + "pname": "Avalonia.X11", + "version": "11.2.0", + "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.0.0", + "hash": "sha256-G+PXrc2sr2pdy+JCr3t/Ge6nTDtuoWf1Eypu5HufAxw=" + }, + { + "pname": "Dock.Avalonia", + "version": "11.2.0", + "hash": "sha256-Q8YUsH+hfnL9VDMPTJSAms7xb+hr42p7scWqu2c2eD4=" + }, + { + "pname": "Dock.Model", + "version": "11.2.0", + "hash": "sha256-+PSgjxvHIJBQRn8naGgSfYyArImVLwy6ftm9FoQc+lA=" + }, + { + "pname": "Dock.Model.Mvvm", + "version": "11.2.0", + "hash": "sha256-iO67eWHoxsB51Wx5KIK4dwVkU9qwrja7pYsQWTs/8sA=" + }, + { + "pname": "Dock.Settings", + "version": "11.2.0", + "hash": "sha256-esCRl7Trdv2bu2ayLw5kXVtCskXLar1asykkfWnqhug=" + }, + { + "pname": "DotNet.Bundle", + "version": "0.9.13", + "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys=" + }, + { + "pname": "DynamicData", + "version": "8.3.27", + "hash": "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac=" + }, + { + "pname": "DynamicData", + "version": "8.4.1", + "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4=" + }, + { + "pname": "ELFSharp", + "version": "2.17.3", + "hash": "sha256-8OaAkLxpa5rIhxbmDSnKLeY06jS7nV66LjBjXxHnOb0=" + }, + { + "pname": "Fody", + "version": "6.8.0", + "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.2", + "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.2", + "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3-preview.2.2", + "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.2", + "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "ReactiveUI", + "version": "19.5.41", + "hash": "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk=" + }, + { + "pname": "ReactiveUI", + "version": "20.1.1", + "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE=" + }, + { + "pname": "ReactiveUI.Fody", + "version": "19.5.41", + "hash": "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.8", + "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.8", + "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.8", + "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.8", + "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + }, + { + "pname": "Splat", + "version": "14.8.12", + "hash": "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU=" + }, + { + "pname": "Splat", + "version": "15.1.1", + "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" + }, + { + "pname": "System.ComponentModel.Annotations", + "version": "5.0.0", + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + }, + { + "pname": "System.Reactive", + "version": "6.0.1", + "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "8.0.0", + "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.0", + "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + } +] diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch new file mode 100644 index 000000000000..1c194a4a3084 --- /dev/null +++ b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch @@ -0,0 +1,16 @@ +diff --git a/UI/UI.csproj b/UI/UI.csproj +index 2a0eb78..74751bc 100644 +--- a/UI/UI.csproj ++++ b/UI/UI.csproj +@@ -90,11 +90,6 @@ + + + +- +- +- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json +- +- + + + diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch new file mode 100644 index 000000000000..6aeed6c3e757 --- /dev/null +++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch @@ -0,0 +1,74 @@ +diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs +index 56c1ff1..ed5fe8a 100644 +--- a/UI/Config/ConfigManager.cs ++++ b/UI/Config/ConfigManager.cs +@@ -51,7 +51,6 @@ namespace Mesen.Config + } else { + homeFolder = DefaultDocumentsFolder; + } +- Program.ExtractNativeDependencies(homeFolder); + _homeFolder = homeFolder; + Config.Save(); + } +diff --git a/UI/Program.cs b/UI/Program.cs +index dfc4ba3..632cef2 100644 +--- a/UI/Program.cs ++++ b/UI/Program.cs +@@ -54,8 +54,6 @@ namespace Mesen + Environment.CurrentDirectory = ConfigManager.HomeFolder; + + if(!File.Exists(ConfigManager.GetConfigFile())) { +- //Could not find configuration file, show wizard +- ExtractNativeDependencies(ConfigManager.HomeFolder); + App.ShowConfigWindow = true; + BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose); + if(File.Exists(ConfigManager.GetConfigFile())) { +@@ -68,9 +66,6 @@ namespace Mesen + //Start loading config file in a separate thread + Task.Run(() => ConfigManager.LoadConfig()); + +- //Extract core dll & other native dependencies +- ExtractNativeDependencies(ConfigManager.HomeFolder); +- + if(CommandLineHelper.IsTestRunner(args)) { + return TestRunner.Run(args); + } +@@ -147,7 +142,7 @@ namespace Mesen + libraryName = libraryName + ".dylib"; + } + } +- return NativeLibrary.Load(Path.Combine(ConfigManager.HomeFolder, libraryName)); ++ return NativeLibrary.Load(Path.Combine(AppContext.BaseDirectory, libraryName)); + } + return IntPtr.Zero; + } +diff --git a/UI/UI.csproj b/UI/UI.csproj +index 053d495..2a0eb78 100644 +--- a/UI/UI.csproj ++++ b/UI/UI.csproj +@@ -634,7 +634,6 @@ + + + +- + + + +@@ -644,16 +643,5 @@ + + + +- +- +- +- +- +- +- +- +- +- +- + + + diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix new file mode 100644 index 000000000000..43957a1c7004 --- /dev/null +++ b/pkgs/by-name/me/mesen/package.nix @@ -0,0 +1,82 @@ +{ + lib, + clangStdenv, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + wrapGAppsHook3, + gtk3, + SDL2, +}: + +buildDotnetModule rec { + pname = "mesen"; + version = "2.0.0-unstable-2024-12-25"; + + src = fetchFromGitHub { + owner = "SourMesen"; + repo = "Mesen2"; + rev = "6820db37933002089a04d356d8469481e915a359"; + hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE="; + }; + + patches = [ + # the nightly avalonia repository url is still queried, which errors out + # even if we don't actually need any nightly versions + ./dont-use-alternative-restore-sources.patch + # upstream has a weird library loading mechanism, which we override with a more sane alternative + ./dont-zip-libraries.patch + ]; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + projectFile = [ "UI/UI.csproj" ]; + + dotnetFlags = [ + "-p:RuntimeIdentifier=${dotnetCorePackages.systemToDotnetRid clangStdenv.hostPlatform.system}" + ]; + + executables = [ "Mesen" ]; + + nugetDeps = ./deps.json; + + nativeBuildInputs = [ wrapGAppsHook3 ]; + + runtimeDeps = [ gtk3 ]; + + postInstall = '' + ln -s ${passthru.core}/lib/MesenCore.* $out/lib/mesen + ''; + + # according to upstream, compiling with clang creates a faster binary + passthru.core = clangStdenv.mkDerivation { + pname = "mesen-core"; + inherit version src; + + enableParallelBuilding = true; + + strictDeps = true; + + nativeBuildInputs = [ SDL2 ]; + + buildInputs = [ SDL2 ]; + + makeFlags = [ "core" ]; + + installPhase = '' + runHook preInstall + install -Dm755 InteropDLL/obj.*/MesenCore.* -t $out/lib + runHook postInstall + ''; + }; + + meta = { + badPlatforms = [ "aarch64-linux" ]; # not sure what the issue is + description = "Multi-system emulator that supports NES, SNES, Game Boy (Color) and PC Engine games"; + homepage = "https://www.mesen.ca"; + license = lib.licenses.gpl3Plus; + mainProgram = "Mesen"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} From f0a75c8509dc020495d95e0ffaa5a1b8d9001bb6 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 26 Dec 2024 17:14:24 +0100 Subject: [PATCH 09/26] torzu: init at unstable 12.15.24 (cherry picked from commit a476cb19a61342cb52a971f108d070cbf53fd59f) --- pkgs/by-name/to/torzu/fix-debugger.patch | 53 ++++ pkgs/by-name/to/torzu/fix-udp-client.patch | 30 +++ pkgs/by-name/to/torzu/fix-udp-protocol.patch | 13 + pkgs/by-name/to/torzu/package.nix | 244 +++++++++++++++++++ 4 files changed, 340 insertions(+) create mode 100644 pkgs/by-name/to/torzu/fix-debugger.patch create mode 100644 pkgs/by-name/to/torzu/fix-udp-client.patch create mode 100644 pkgs/by-name/to/torzu/fix-udp-protocol.patch create mode 100644 pkgs/by-name/to/torzu/package.nix diff --git a/pkgs/by-name/to/torzu/fix-debugger.patch b/pkgs/by-name/to/torzu/fix-debugger.patch new file mode 100644 index 000000000000..87d4e0cc118f --- /dev/null +++ b/pkgs/by-name/to/torzu/fix-debugger.patch @@ -0,0 +1,53 @@ +diff --git a/src/core/debugger/debugger.cpp b/src/core/debugger/debugger.cpp +index e86aae8460..a4dca23770 100644 +--- a/src/core/debugger/debugger.cpp ++++ b/src/core/debugger/debugger.cpp +@@ -5,7 +5,13 @@ + #include + #include + +-#include ++// Use basic asio functionality only ++#define BOOST_ASIO_STANDALONE ++#include ++#include ++#include ++#include ++ + #include + + #include "common/logging/log.h" +@@ -21,17 +27,22 @@ + + template + static void AsyncReceiveInto(Readable& r, Buffer& buffer, Callback&& c) { +- static_assert(std::is_trivial_v); +- auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; +- r.async_read_some( +- boost_buffer, [&, c](const boost::system::error_code& error, size_t bytes_read) { +- if (!error.failed()) { +- const u8* buffer_start = reinterpret_cast(&buffer); +- std::span received_data{buffer_start, buffer_start + bytes_read}; +- c(received_data); +- AsyncReceiveInto(r, buffer, c); +- } +- }); ++ try { ++ static_assert(std::is_trivial_v); ++ auto boost_buffer{boost::asio::buffer(&buffer, sizeof(Buffer))}; ++ r.async_read_some( ++ boost_buffer, ++ [&, c](const boost::system::error_code& error, size_t bytes_read) { ++ if (!error) { ++ const u8* buffer_start = reinterpret_cast(&buffer); ++ std::span received_data{buffer_start, buffer_start + bytes_read}; ++ c(received_data); ++ AsyncReceiveInto(r, buffer, c); ++ } ++ }); ++ } catch (const std::exception& e) { ++ LOG_ERROR(Debug_GDBStub, "AsyncReceiveInto error: {}", e.what()); ++ } + } + + template diff --git a/pkgs/by-name/to/torzu/fix-udp-client.patch b/pkgs/by-name/to/torzu/fix-udp-client.patch new file mode 100644 index 000000000000..103b1001ee2a --- /dev/null +++ b/pkgs/by-name/to/torzu/fix-udp-client.patch @@ -0,0 +1,30 @@ +diff --git a/src/input_common/drivers/udp_client.cpp b/src/input_common/drivers/udp_client.cpp +index 60821b31a6..8f9c047218 100644 +--- a/src/input_common/drivers/udp_client.cpp ++++ b/src/input_common/drivers/udp_client.cpp +@@ -2,7 +2,15 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + + #include +-#include ++// Include only needed asio components ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include + + #include "common/logging/log.h" +@@ -113,7 +121,7 @@ private: + } + + SocketCallback callback; +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + boost::asio::basic_waitable_timer timer; + udp::socket socket; + diff --git a/pkgs/by-name/to/torzu/fix-udp-protocol.patch b/pkgs/by-name/to/torzu/fix-udp-protocol.patch new file mode 100644 index 000000000000..65c4862825fc --- /dev/null +++ b/pkgs/by-name/to/torzu/fix-udp-protocol.patch @@ -0,0 +1,13 @@ +diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h +index db08fc62c5..ea223ea937 100644 +--- a/src/input_common/helpers/udp_protocol.h ++++ b/src/input_common/helpers/udp_protocol.h +@@ -69,7 +69,7 @@ Message CreateMessage(const u32 magic, const T data, const u32 sender_id) { + }; + Message message{header, data}; + crc.process_bytes(&message, sizeof(Message)); +- message.header.crc = crc.checksum(); ++ message.header.crc = static_cast(crc.checksum()); + return message; + } + diff --git a/pkgs/by-name/to/torzu/package.nix b/pkgs/by-name/to/torzu/package.nix new file mode 100644 index 000000000000..06cd23badc4e --- /dev/null +++ b/pkgs/by-name/to/torzu/package.nix @@ -0,0 +1,244 @@ +{ + lib, + stdenv, + SDL2, + autoconf, + boost, + catch2_3, + cmake, + fetchFromGitHub, + cpp-jwt, + cubeb, + discord-rpc, + enet, + fetchgit, + fetchurl, + ffmpeg-headless, + fmt, + glslang, + libopus, + libusb1, + libva, + lz4, + python3, + unzip, + nix-update-script, + nlohmann_json, + nv-codec-headers-12, + pkg-config, + qt6, + vulkan-headers, + vulkan-loader, + yasm, + simpleini, + zlib, + vulkan-memory-allocator, + zstd, +}: + +let + inherit (qt6) + qtbase + qtmultimedia + qtwayland + wrapQtAppsHook + qttools + qtwebengine + ; + + compat-list = stdenv.mkDerivation { + pname = "yuzu-compatibility-list"; + version = "unstable-2024-02-26"; + + src = fetchFromGitHub { + owner = "flathub"; + repo = "org.yuzu_emu.yuzu"; + rev = "9c2032a3c7e64772a8112b77ed8b660242172068"; + hash = "sha256-ITh/W4vfC9w9t+TJnPeTZwWifnhTNKX54JSSdpgaoBk="; + }; + + buildCommand = '' + cp $src/compatibility_list.json $out + ''; + }; + + nx_tzdb = stdenv.mkDerivation rec { + pname = "nx_tzdb"; + version = "221202"; + + src = fetchurl { + url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip"; + hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; + }; + + nativeBuildInputs = [ unzip ]; + + buildCommand = '' + unzip $src -d $out + ''; + + }; + +in + +stdenv.mkDerivation (finalAttrs: { + pname = "torzu"; + version = "unstable-2024-12-15"; + + src = fetchgit { + url = "https://notabug.org/litucks/torzu"; + rev = "02cfee3f184e6fdcc3b483ef399fb5d2bb1e8ec7"; + hash = "sha256-hAWMFzTNJGFcrXov5LKMdW9YWhsu7wueATmiuS7EVkI="; + fetchSubmodules = true; + }; + + patches = [ + # Remove coroutines from debugger to fix boost::asio compatibility issues + ./fix-debugger.patch + # Add explicit cast for CRC checksum value + ./fix-udp-protocol.patch + # Use specific boost::asio includes and update to modern io_context + ./fix-udp-client.patch + ]; + + nativeBuildInputs = [ + cmake + glslang + pkg-config + python3 + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + # vulkan-headers must come first, so the older propagated versions + # don't get picked up by accident + vulkan-headers + + boost + catch2_3 + cpp-jwt + cubeb + discord-rpc + # intentionally omitted: dynarmic - prefer vendored version for compatibility + enet + + # ffmpeg deps (also includes vendored) + # we do not use internal ffmpeg because cuda errors + autoconf + yasm + libva # for accelerated video decode on non-nvidia + nv-codec-headers-12 # for accelerated video decode on nvidia + ffmpeg-headless + # end ffmpeg deps + + fmt + # intentionally omitted: gamemode - loaded dynamically at runtime + # intentionally omitted: httplib - upstream requires an older version than what we have + libopus + libusb1 + # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger + lz4 + nlohmann_json + qtbase + qtmultimedia + qtwayland + qtwebengine + # intentionally omitted: renderdoc - heavy, developer only + SDL2 + # intentionally omitted: stb - header only libraries, vendor uses git snapshot + vulkan-memory-allocator + # intentionally omitted: xbyak - prefer vendored version for compatibility + zlib + zstd + ]; + + # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` + # making the build fail, as that path does not exist + dontFixCmake = true; + + cmakeFlags = [ + # actually has a noticeable performance impact + (lib.cmakeBool "YUZU_ENABLE_LTO" true) + (lib.cmakeBool "YUZU_TESTS" false) + + (lib.cmakeBool "ENABLE_QT6" true) + (lib.cmakeBool "ENABLE_QT_TRANSLATION" true) + + # use system libraries + # NB: "external" here means "from the externals/ directory in the source", + # so "off" means "use system" + (lib.cmakeBool "YUZU_USE_EXTERNAL_SDL2" false) + (lib.cmakeBool "YUZU_USE_EXTERNAL_VULKAN_HEADERS" true) + "-DVulkan_INCLUDE_DIRS=${vulkan-headers}/include" + + # # don't use system ffmpeg, suyu uses internal APIs + # (lib.cmakeBool "YUZU_USE_BUNDLED_FFMPEG" true) + + # don't check for missing submodules + (lib.cmakeBool "YUZU_CHECK_SUBMODULES" false) + + # enable some optional features + (lib.cmakeBool "YUZU_USE_QT_WEB_ENGINE" true) + (lib.cmakeBool "YUZU_USE_QT_MULTIMEDIA" true) + (lib.cmakeBool "USE_DISCORD_PRESENCE" true) + + # We dont want to bother upstream with potentially outdated compat reports + (lib.cmakeBool "YUZU_ENABLE_COMPATIBILITY_REPORTING" false) + (lib.cmakeBool "ENABLE_COMPATIBILITY_LIST_DOWNLOAD" false) # We provide this deterministically + ]; + + env = { + # Does some handrolled SIMD + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; + }; + + qtWrapperArgs = [ + # Fixes vulkan detection. + # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate + "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + ]; + + # Setting this through cmakeFlags does not work. + # https://github.com/NixOS/nixpkgs/issues/114044 + preConfigure = lib.concatStringsSep "\n" [ + '' + cmakeFlagsArray+=( + "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}" + "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}" + ) + '' + # provide pre-downloaded tz data + '' + mkdir -p build/externals/nx_tzdb + ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb + '' + ]; + + postConfigure = '' + ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json + ''; + + postInstall = " + install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules + "; + + meta = { + description = "Fork of yuzu, an open-source Nintendo Switch emulator"; + homepage = "https://notabug.org/litucks/torzu"; + mainProgram = "yuzu"; + platforms = lib.platforms.linux; + badPlatforms = [ + # Several conversion errors, probably caused by the update to GCC 14 + "aarch64-linux" + ]; + maintainers = with lib.maintainers; [ liberodark ]; + license = with lib.licenses; [ + gpl3Plus + # Icons + asl20 + mit + cc0 + ]; + }; +}) From 50f3b5c294599636bbe128f07caf82275ccaf203 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Jan 2025 17:08:20 +0300 Subject: [PATCH 10/26] linux_testing: 6.13-rc4 -> 6.13-rc5 (cherry picked from commit 6ff39470d983d4861165dc3734c13f6aa9243fbe) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3b5c5feea1b5..5dd1a3fba12b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.13-rc4", - "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39" + "version": "6.13-rc5", + "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr" }, "6.1": { "version": "6.1.122", From 157596f3139da9a5c7c1b6cb8d6849d82010c80b Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Jan 2025 17:08:25 +0300 Subject: [PATCH 11/26] linux_6_12: 6.12.7 -> 6.12.8 (cherry picked from commit 1ba73a81a6c20bf998ae685561e4534f03b85743) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5dd1a3fba12b..e8ed63ee0dd5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.7", - "hash": "sha256:1kx0kmc8xlx5kpvfplawk05wjqpdnsj2hcmv8flnc2qfi9jgp1gp" + "version": "6.12.8", + "hash": "sha256:0y992b484rkkaqdkz5mw2is1l0izxhm3cl7fi5f72jx0bh3dm492" } } From c9002bb329f3626a13614eaa6172b20082ff3362 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Jan 2025 17:08:31 +0300 Subject: [PATCH 12/26] linux_6_6: 6.6.68 -> 6.6.69 (cherry picked from commit 71435ccf3eeeeb2e1a4dd0f8149df574d28d18c5) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e8ed63ee0dd5..d0f555c52973 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7" }, "6.6": { - "version": "6.6.68", - "hash": "sha256:1qj0b2n4ck9qrgpqcgmhkl2jc4rh4000rqqs2vnwwlpkwc8g8gr8" + "version": "6.6.69", + "hash": "sha256:0d2gilgh8myavzfdjnx7az4dbwvkk7irvsz6rla9bnbmgdb0aqww" }, "6.11": { "version": "6.11.11", From 999446c61d91be71159d3a61b541453196fcb563 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Jan 2025 17:08:38 +0300 Subject: [PATCH 13/26] linux_6_1: 6.1.122 -> 6.1.123 (cherry picked from commit d798810f57742f2dfafaa3966cc7abfb9d6036b9) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index d0f555c52973..11bec459af64 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:02rasg3dyzq0cfqj74rn98xm2amhw3djd4dd0nvf5syha91l81rr" }, "6.1": { - "version": "6.1.122", - "hash": "sha256:0l3frvlzpl23f9j1vjm2y29d1ppv0ynq40h695i7w2qhh2rw14p8" + "version": "6.1.123", + "hash": "sha256:1g5k9q113nyid3a347abb36v2xfv5vf74ic88af7kf04kzbsr9rk" }, "5.15": { "version": "5.15.175", From b5c5c12f75157ee8c1cf8b80f3ba983e62e1bd27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jan 2025 18:40:26 +0000 Subject: [PATCH 14/26] notmuch-mailmover: 0.5.0 -> 0.6.0 (cherry picked from commit 98fe668bb66b62077edf1b068edee92b5bfe6b84) --- pkgs/by-name/no/notmuch-mailmover/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix index 3380ea217a22..73e5ea5e6632 100644 --- a/pkgs/by-name/no/notmuch-mailmover/package.nix +++ b/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - hash = "sha256-ionqR60mI/oHnqVqtdIeIU1HeCbXfLGIHqaHDYEZONk="; + hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10="; }; - cargoHash = "sha256-tUhdfmYAdDlDMez03+ObX9PEU0CML12c5D8N95xiErI="; + cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI="; nativeBuildInputs = [ installShellFiles From 17a78c4129eb1e93904ae11e4634943e9bc387eb Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 15:28:56 +0100 Subject: [PATCH 15/26] mplayer: 1.5-unstable-2024-07-03 -> 1.5-unstable-2024-12-21 (cherry picked from commit b24078ce1d0a8cef251bfe1d23f92f1ba9aa0372) --- pkgs/applications/video/mplayer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f84c8e5c18ef..bf94c7c1d9f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -120,12 +120,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.5-unstable-2024-07-03"; + version = "1.5-unstable-2024-12-21"; src = fetchsvn { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "38637"; - hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE="; + rev = "38668"; + hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY="; }; prePatch = '' @@ -276,7 +276,8 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = [ ]; + # Picking it up: no idea about the origin of some choices (but seems fine) + maintainers = [ maintainers.raskin ]; platforms = [ "i686-linux" "x86_64-linux" From 9727fb62be512da99f3e718a9f2f4237dfe20a42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Jan 2025 20:01:58 +0000 Subject: [PATCH 16/26] flyctl: 0.3.53 -> 0.3.56 (cherry picked from commit 2756e29d887d9358ce2ad4a92dbf0af8a4d7a8fc) --- pkgs/by-name/fl/flyctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index d8ce4a9f323b..51fbf03d9172 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.53"; + version = "0.3.56"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-B6Qku84vUy2KtAWQ3mpbOd1G14xAw0FFuB02fDvFE84="; + hash = "sha256-l413128FjVflVKHAYJspK63UP8IomNimIeJi3xyYmxw="; }; - vendorHash = "sha256-B7COrPKxTBDdFehBcNKt47I1ZslBHjWc+ibPiCpIocU="; + vendorHash = "sha256-/YP9qx6OS2OcPSF1BgEZ4l+nSwg+T5rKOHjdDHlNy+k="; subPackages = [ "." ]; From 8bc90746bd3806acc7952d846bf838db1eaf08f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 12:22:19 +0000 Subject: [PATCH 17/26] bloat: 0-unstable-2024-10-28 -> 0-unstable-2024-12-27 (cherry picked from commit a00976b3883b7e8627a10d45e3c1f8969ec3b148) --- pkgs/by-name/bl/bloat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bl/bloat/package.nix b/pkgs/by-name/bl/bloat/package.nix index bfb5b1f13395..e2efe3f83307 100644 --- a/pkgs/by-name/bl/bloat/package.nix +++ b/pkgs/by-name/bl/bloat/package.nix @@ -7,12 +7,12 @@ buildGoModule { pname = "bloat"; - version = "0-unstable-2024-10-28"; + version = "0-unstable-2024-12-27"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "68d7acc2f7266c47001445229ff235546c8c71b4"; - hash = "sha256-VLyL1tnb3/qsDFp8s84XTj1Ohl/ajD+tn7V8iBp3ppY="; + rev = "d171b6c2d50500cdfd2f3308bf82a5f79e22cd8b"; + hash = "sha256-a9nL6NvZLQZLOuoqdDbZTH9dVtQ6guKopkAHughINcg="; }; vendorHash = null; From d681ac0c812afbccdd5a74e8e0c38763ff8747ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 07:47:01 +0000 Subject: [PATCH 18/26] git-delete-merged-branches: 7.4.1 -> 7.4.2 (cherry picked from commit 3b7f0c3b4d322ed3832efa78e4d6b82613ccea6f) --- pkgs/by-name/gi/git-delete-merged-branches/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-delete-merged-branches/package.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix index 0287e5ed5903..945cdb11f85c 100644 --- a/pkgs/by-name/gi/git-delete-merged-branches/package.nix +++ b/pkgs/by-name/gi/git-delete-merged-branches/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "7.4.1"; + version = "7.4.2"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; - rev = "refs/tags/${version}"; - sha256 = "sha256-1CUwac2TPU5s1uLS1zPvtXZEGCWYwm1y935jqbI173Q="; + tag = version; + sha256 = "sha256-l+R4gINZJ8bJdhcK+U9jOuIoAm2/bd5P+w9AbwPZMrk="; }; propagatedBuildInputs = with python3Packages; [ From 27d3b1b1578dab5c31ba1c34abab926987a1a494 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 1 Jan 2025 12:26:06 +0800 Subject: [PATCH 19/26] nixos/kmonad: create determinate symlinks (cherry picked from commit 9695e75dde3197dd10e3a4d9883e2daaeb6ee2f7) The 25.05 release note is manually removed. --- nixos/modules/services/hardware/kmonad.nix | 11 +++++++++++ nixos/tests/kmonad.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix index 687224fae2e9..363a8e702874 100644 --- a/nixos/modules/services/hardware/kmonad.nix +++ b/nixos/modules/services/hardware/kmonad.nix @@ -195,6 +195,17 @@ in config = lib.mkIf cfg.enable { hardware.uinput.enable = true; + services.udev.extraRules = + let + mkRule = name: '' + ACTION=="add", KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="${name}", ATTRS{id/product}=="5679", ATTRS{id/vendor}=="1235", SYMLINK+="input/by-id/${name}" + ''; + in + lib.foldlAttrs ( + rules: _: keyboard: + rules + "\n" + mkRule (mkName keyboard.name) + ) "" cfg.keyboards; + systemd = { paths = lib.mapAttrs' (_: mkPath) cfg.keyboards; services = lib.mapAttrs' (_: mkService) cfg.keyboards; diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix index e0150cb99f18..9b0d47e578e4 100644 --- a/nixos/tests/kmonad.nix +++ b/nixos/tests/kmonad.nix @@ -43,5 +43,7 @@ with subtest("kmonad is running"): machine.succeed(f"systemctl status {service_name}") + with subtest("kmonad symlink is created"): + machine.wait_for_file(f"/dev/input/by-id/{service_name}", timeout=5) ''; } From e03e65af67bfcec8bcd337b96ffd87d660a3a935 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 27 Dec 2024 20:35:18 +0100 Subject: [PATCH 20/26] koreader: 2024.04 -> 2024.11 (cherry picked from commit 5abe8bcffb796e3a58f7b3634f3f490bbd19fd3a) --- pkgs/by-name/ko/koreader/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index 2f7d78fc473a..4a32fa621b73 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -11,13 +11,14 @@ luajit, sdcv, SDL2, + nix-update-script, }: let luajit_lua52 = luajit.override { enable52Compat = true; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2024.04"; + version = "2024.11"; src = { @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { }; x86_64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + hash = "sha256-ibehFrOcJqhM+CMAcHDn3Xwy6CueB8kdnoYMMDe/2Js="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -80,6 +81,10 @@ stdenv.mkDerivation rec { } ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { homepage = "https://github.com/koreader/koreader"; changelog = "https://github.com/koreader/koreader/releases/tag/v${version}"; @@ -95,6 +100,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ contrun neonfuz + liberodark ]; }; } From 12497d2a584540b3c2f78b798387f06798664d54 Mon Sep 17 00:00:00 2001 From: liberodark Date: Thu, 2 Jan 2025 18:07:59 +0100 Subject: [PATCH 21/26] koreader: fix hash (#370115) (cherry picked from commit df553a0b34b5e9851565d1d76a6bb47d0328c0ae) --- pkgs/by-name/ko/koreader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index 4a32fa621b73..5f79e5e72a19 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { { aarch64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + hash = "sha256-uy+4+pNyz10xrGM0QF9q0y6UpQK1B9PGNqrcK6nENQY="; }; armv7l-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; - hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + hash = "sha256-lTc12qmoe0kGUhrStlGfDRw+cNJnX7F09/jKKc/1U9g="; }; x86_64-linux = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { owner = "koreader"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; + sha256 = "sha256-EI8UOQuwhJqcAp8QnLYhI0K+uV/7ZqxdHNk8mPkDWA0="; }; sourceRoot = "."; From 0d10119c1db89c2af59c02c987188bf4a25c3879 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Thu, 19 Dec 2024 16:48:06 +0000 Subject: [PATCH 22/26] kubernetes: kubelet.extraConfig should be `attrsOf json.type` (cherry picked from commit 66ddf84c33620c69bbb6be6b86252c7b4ce0460d) --- nixos/modules/services/cluster/kubernetes/kubelet.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index f481f70b84c3..daf6771656b1 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -205,9 +205,14 @@ in }; extraConfig = mkOption { - description = "Kubernetes kubelet extra configuration file entries."; + description = '' + Kubernetes kubelet extra configuration file entries. + + See also [Set Kubelet Parameters Via A Configuration File](https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/) + and [Kubelet Configuration](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/). + ''; default = { }; - type = attrsOf attrs; + type = attrsOf ((pkgs.formats.json { }).type); }; featureGates = mkOption { From f0bd9a727a76d1b2b7be44dfb9a01842cfb7520d Mon Sep 17 00:00:00 2001 From: Nathan Regner Date: Fri, 29 Nov 2024 14:15:30 -0700 Subject: [PATCH 23/26] buildGraalvm: fix build on x86_64-darwin (cherry picked from commit 83b526817ad2a8a834a46e290110617fe3391bf0) --- .../community-edition/buildGraalvm.nix | 68 ++++++++++++------- .../graalvm/community-edition/default.nix | 3 - 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index 8af494866e1b..ea4c6d1b282d 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -2,10 +2,11 @@ lib, stdenv, alsa-lib, + apple-sdk_11, autoPatchelfHook, cairo, cups, - darwin, + darwinMinVersionHook, fontconfig, glib, glibc, @@ -30,10 +31,12 @@ let "lib" "stdenv" "alsa-lib" + "apple-sdk_11" "autoPatchelfHook" "cairo" "cups" "darwin" + "darwinMinVersionHook" "fontconfig" "glib" "glibc" @@ -122,34 +125,51 @@ let propagatedBuildInputs = [ setJavaClassPath zlib - ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation; - - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib # libasound.so wanted by lib/libjsound.so - fontconfig - (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib # libasound.so wanted by lib/libjsound.so + fontconfig + (lib.getLib stdenv.cc.cc) # libstdc++.so.6 + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXrender + xorg.libXtst + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + (darwinMinVersionHook "11.0") + ]); + postInstall = let cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs); - preservedNixVariables = [ - "-ELOCALE_ARCHIVE" - "-ENIX_BINTOOLS" - "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" - "-ENIX_BUILD_CORES" - "-ENIX_BUILD_TOP" - "-ENIX_CC" - "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" - "-ENIX_CFLAGS_COMPILE" - "-ENIX_HARDENING_ENABLE" - "-ENIX_LDFLAGS" - ]; + preservedNixVariables = + [ + "-ENIX_BINTOOLS" + "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_BUILD_CORES" + "-ENIX_BUILD_TOP" + "-ENIX_CC" + "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}" + "-ENIX_CFLAGS_COMPILE" + "-ENIX_HARDENING_ENABLE" + "-ENIX_LDFLAGS" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-ELOCALE_ARCHIVE" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-EDEVELOPER_DIR" + "-EDEVELOPER_DIR_FOR_BUILD" + "-EDEVELOPER_DIR_FOR_TARGET" + "-EMACOSX_DEPLOYMENT_TARGET" + "-EMACOSX_DEPLOYMENT_TARGET_FOR_BUILD" + "-EMACOSX_DEPLOYMENT_TARGET_FOR_TARGET" + "-ENIX_APPLE_SDK_VERSION" + ]; preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables); in '' diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 7f534d748459..c4fc958fa8fa 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -4,9 +4,6 @@ }: lib.makeScope pkgs.newScope (self: { - stdenv = - if pkgs.stdenv.hostPlatform.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; - buildGraalvm = self.callPackage ./buildGraalvm.nix; buildGraalvmProduct = self.callPackage ./buildGraalvmProduct.nix; From 32ee3ce1dcca33f7be4bbf0268cc48e6001195f1 Mon Sep 17 00:00:00 2001 From: Nathan Regner Date: Fri, 29 Nov 2024 16:22:55 -0700 Subject: [PATCH 24/26] buildGraalvmNativeImage: fix build on darwin-x86_64 (cherry picked from commit 551230b7a99d557f45a76158c4abbcc307db7ad5) --- .../build-support/build-graalvm-native-image/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix index e1e4df52f02a..45680a42e9ed 100644 --- a/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/pkgs/build-support/build-graalvm-native-image/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, + apple-sdk_11, + darwinMinVersionHook, glibcLocales, # The GraalVM derivation to use graalvmDrv, @@ -33,6 +35,8 @@ let extraArgs = builtins.removeAttrs args [ "lib" "stdenv" + "apple-sdk_11" + "darwinMinVersionHook" "glibcLocales" "jar" "dontUnpack" @@ -56,6 +60,11 @@ stdenv.mkDerivation ( removeReferencesTo ]; + buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ + apple-sdk_11 + (darwinMinVersionHook "11.0") + ]; + nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ]; buildPhase = From cca8a5caa28fb35b31ba33277677c6d86fc23940 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 2 Jan 2025 06:11:49 +0800 Subject: [PATCH 25/26] nixos/kmonad: remove unnecessary cli flag --input input has already been set in the config file. (cherry picked from commit ed3f112a0e6bafe629f602fd7b1e313ed1a57ad6) --- nixos/modules/services/hardware/kmonad.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix index 363a8e702874..bce5869862a0 100644 --- a/nixos/modules/services/hardware/kmonad.nix +++ b/nixos/modules/services/hardware/kmonad.nix @@ -122,8 +122,6 @@ let cmd = [ (lib.getExe cfg.package) - "--input" - ''device-file "${keyboard.device}"'' ] ++ cfg.extraArgs ++ [ "${mkCfg keyboard}" ]; From dd88d7868c362349ddcc0dc8b67e0d06023142e7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 2 Jan 2025 06:42:32 +0800 Subject: [PATCH 26/26] nixos/kmonad: avoid running an unnecessary bash (cherry picked from commit c3588cf2c5fb41bb1759fd0b46820384625c8120) --- nixos/modules/services/hardware/kmonad.nix | 14 +++++--------- nixos/tests/kmonad.nix | 3 +++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix index bce5869862a0..fa9b8fbb610f 100644 --- a/nixos/modules/services/hardware/kmonad.nix +++ b/nixos/modules/services/hardware/kmonad.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + utils, ... }: @@ -118,17 +119,8 @@ let # Build a systemd service that starts KMonad: mkService = keyboard: - let - cmd = - [ - (lib.getExe cfg.package) - ] - ++ cfg.extraArgs - ++ [ "${mkCfg keyboard}" ]; - in lib.nameValuePair (mkName keyboard.name) { description = "KMonad for ${keyboard.device}"; - script = lib.escapeShellArgs cmd; unitConfig = { # Control rate limiting. # Stop the restart logic if we restart more than @@ -137,6 +129,10 @@ let StartLimitBurst = 5; }; serviceConfig = { + ExecStart = '' + ${lib.getExe cfg.package} ${mkCfg keyboard} \ + ${utils.escapeSystemdExecArgs cfg.extraArgs} + ''; Restart = "always"; # Restart at increasing intervals from 2s to 1m RestartSec = 2; diff --git a/nixos/tests/kmonad.nix b/nixos/tests/kmonad.nix index 9b0d47e578e4..0c880a99787e 100644 --- a/nixos/tests/kmonad.nix +++ b/nixos/tests/kmonad.nix @@ -11,6 +11,9 @@ machine = { services.kmonad = { enable = true; + extraArgs = [ + "--log-level=debug" + ]; keyboards = { defaultKbd = { device = "/dev/input/by-id/vm-default-kbd";