From 3a42fb90176dc7a6efb8e462ad5f8be9fbced733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 5 Oct 2023 13:28:39 +0200 Subject: [PATCH 01/31] zd1211: only copy firmware files according to readme, update license --- pkgs/os-specific/linux/firmware/zd1211/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 6b86277ebc6e..eb6276d36ac9 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall mkdir -p $out/lib/firmware/zd1211 - cp * $out/lib/firmware/zd1211 + cp zd1211* $out/lib/firmware/zd1211 runHook postInstall ''; @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = "https://sourceforge.net/projects/zd1211/"; - license = "GPL"; + license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; } From 1473ac2228d1f1541f3508aa0121dc1598122fe0 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 22 Dec 2023 22:07:00 +0100 Subject: [PATCH 02/31] Revert "pinentry: drop gtk2" This reverts commit edb8b7994c383d3754cbb03b2bdb6016026e19cc. --- pkgs/tools/security/pinentry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index dca48f4e2108..baa78521f345 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpg-error, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , withLibsecret ? true, libsecret -, enabledFlavors ? [ "curses" "tty" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: From 8930c7968f28d7a5ca55e37560f9c1a2dc1fad81 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Mon, 8 Jan 2024 10:02:38 +0530 Subject: [PATCH 03/31] chkservice: remove project has been deleted upstream. --- pkgs/tools/admin/chkservice/default.nix | 56 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 pkgs/tools/admin/chkservice/default.nix diff --git a/pkgs/tools/admin/chkservice/default.nix b/pkgs/tools/admin/chkservice/default.nix deleted file mode 100644 index 9e2965a0db2a..000000000000 --- a/pkgs/tools/admin/chkservice/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, ninja -, pkg-config -, systemd -, ncurses -}: - -stdenv.mkDerivation rec { - pname = "chkservice"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "linuxenko"; - repo = "chkservice"; - rev = version; - hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU="; - }; - - patches = [ - # Pull fix pending upstream inclusion for gcc-11 support: - # https://github.com/linuxenko/chkservice/pull/38 - (fetchpatch { - name = "gcc-11.patch"; - url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch"; - hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM="; - }) - ]; - - # Tools needed during build time - nativeBuildInputs = [ - cmake - # Makes the build faster, adds less than half a megabyte to the build - # dependencies - ninja - pkg-config - ]; - - buildInputs = [ - systemd - ncurses - ]; - - hardeningDisable = [ "format" ]; - - meta = { - description = "chkservice is a tool for managing systemd units in terminal."; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ infinisil ]; - license = lib.licenses.gpl3Plus; - homepage = "https://github.com/linuxenko/chkservice"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 780c0112520c..586c57d90ed6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -146,6 +146,7 @@ mapAliases ({ chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2a0095f6243..a1d2f389c45e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -225,8 +225,6 @@ with pkgs; } ''); - chkservice = callPackage ../tools/admin/chkservice { }; - # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. addDriverRunpath = callPackage ../build-support/add-driver-runpath { }; From 2202d5c90955c302d45587cbd68e7a5eb24c0c50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 05:36:25 +0000 Subject: [PATCH 04/31] primesieve: 11.1 -> 11.2 --- pkgs/applications/science/math/primesieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix index 24f583a3346b..20da1d342831 100644 --- a/pkgs/applications/science/math/primesieve/default.nix +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "11.1"; + version = "11.2"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-b6X3zhoJsO3UiWfeW4zbKsaoofIWArJi5usof3efQ0k="; + hash = "sha256-HtVuUS4dmTC7KosyBhqZ0QRstvon9WMxYf9Ocs1XIrs="; }; nativeBuildInputs = [ cmake ]; From 3e3dcedae8ddbddd88a2aff70edf27b222437252 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 09:20:02 +0000 Subject: [PATCH 05/31] python311Packages.openai: 1.6.1 -> 1.7.1 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 2bab76a391d1..30071aa591ae 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.6.1"; + version = "1.7.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-w5jj2XWTAbiu64NerLvDyGe9PybeE/WHkukoWT97SJE="; + hash = "sha256-NXZ+7gDA3gMGSrmgceHxcR45LrXdazXbYuhcoUsNXew="; }; nativeBuildInputs = [ From 83bf19239f7969c461219130c65ab50ce4fa4604 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 17:36:20 +0000 Subject: [PATCH 06/31] python311Packages.bokeh: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/bokeh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index a697a15c54b9..91760ed463a7 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.3.2"; + version = "3.3.3"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-rhgPhvd2Ul9+uBZzofJ+DrVoh9czdxZixRLsDYKkM/U="; + hash = "sha256-bs5vACY/LSBDok6vnbdab4YO/Ioflt9mMYb+PrJpLdM="; }; src_test = fetchFromGitHub { From 9a9c192d743b691f0d7a98736aa1d6a5a1fa7e8d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Dec 2023 21:33:48 +0900 Subject: [PATCH 07/31] ansible: 2.15.5 -> 2.16.2 Diff: https://github.com/ansible/ansible/compare/v2.15.5...v2.16.2 Changelog: https://github.com/ansible/ansible/blob/v2.16.2/changelogs/CHANGELOG-v2.16.rst --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 12002f4933c4..dec3ad21bdeb 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.5"; + version = "2.16.2"; src = fetchPypi { inherit pname version; - hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; + hash = "sha256-5KtVnn5SWxxvmQhPyoc7sBR3XV7L6EW3wHuOnWycBIs="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02730ae63352..af30b8c5b60c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18259,8 +18259,15 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_15; - ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible = ansible_2_16; + ansible_2_16 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.15.5"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; + }; + })); ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { version = "2.14.13"; src = oldAttrs.src.override { From 5ea284d4f402aea4e9a1cbc6fb735d7bb98c8d4d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Dec 2023 21:38:01 +0900 Subject: [PATCH 08/31] ansible_2_13: remove --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ac9881862f3..399ef302fe6d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 + ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af30b8c5b60c..175c25638e68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18275,13 +18275,6 @@ with pkgs; hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o="; }; })); - ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.13.10"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-1LQKSq+GDe9sLJ6K1SAfhoPj59fY4hRjxtWepPixLfc="; - }; - })); ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { }; From 722d7cdbb42712097b7f186c7f1a62935985f6b0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 14 Jan 2024 09:42:56 +0900 Subject: [PATCH 09/31] python311Packages.pytest-ansible: 4.1.1 -> 24.1.1 Diff: https://github.com/ansible/pytest-ansible/compare/refs/tags/v4.1.1...v24.1.1 Changelog: https://github.com/ansible-community/pytest-ansible/releases/tag/v24.1.1 --- .../python-modules/pytest-ansible/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 1a83d0ed064f..705c578f3bd5 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,29 +1,30 @@ { lib , stdenv +, ansible-compat , ansible-core , buildPythonPackage , coreutils , fetchFromGitHub +, packaging , pytest , pytestCheckHook , pythonOlder , setuptools , setuptools-scm -, wheel }: buildPythonPackage rec { pname = "pytest-ansible"; - version = "4.1.1"; - format = "pyproject"; + version = "24.1.1"; + pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ="; + hash = "sha256-UPQx+CGJgaK4XVNngtzzncSueQN9LWh1gMmH5nGtPNk="; }; postPatch = '' @@ -34,7 +35,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; buildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ansible-core + ansible-compat + packaging ]; nativeCheckInputs = [ @@ -77,6 +79,9 @@ buildPythonPackage rec { # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" + ] ++ lib.optionals (lib.versionAtLeast ansible-core.version "2.16") [ + # Test fail in the NixOS environment + "tests/test_adhoc.py" ]; pythonImportsCheck = [ From 84ac7df0a4ece1880769facba66f1a31d525ddae Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 14 Jan 2024 17:30:41 +0000 Subject: [PATCH 10/31] pinentry-bemenu: add 'meta.mainProgram' --- pkgs/tools/security/pinentry-bemenu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/tools/security/pinentry-bemenu/default.nix index ed43ee382597..36fff7d34d5c 100644 --- a/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/pkgs/tools/security/pinentry-bemenu/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jc ]; platforms = with platforms; linux; + mainProgram = "pinentry-bemenu"; }; } From 1a76b6cc783c01157372e31fbb768a767e5f7580 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 14 Jan 2024 17:30:49 +0000 Subject: [PATCH 11/31] pinentry-rofi: add 'meta.mainProgram' --- pkgs/tools/security/pinentry-rofi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/tools/security/pinentry-rofi/default.nix index a7f92818b8b7..e0fffff7cedf 100644 --- a/pkgs/tools/security/pinentry-rofi/default.nix +++ b/pkgs/tools/security/pinentry-rofi/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ seqizz ]; + mainProgram = "pinentry-rofi"; }; } From ec836290b03ac2eef0e083720a6186894c89ffeb Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 14 Jan 2024 17:31:00 +0000 Subject: [PATCH 12/31] pinentry_mac: add 'meta.mainProgram' --- pkgs/tools/security/pinentry/mac.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index d824a816dc90..4620aedecc75 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = lib.platforms.darwin; + mainProgram = passthru.binaryPath; }; } From 5c44c87c8d269ad970a1b8ea8c09e17ec28ddb0d Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 14 Jan 2024 12:45:07 -0500 Subject: [PATCH 13/31] python3Packages.wandb: fix build --- .../python-modules/wandb/default.nix | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index c0720c4757a5..654d63981a65 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -18,12 +18,14 @@ , google-cloud-compute , google-cloud-storage , hypothesis +, imageio , jsonref , jsonschema , keras , kubernetes , matplotlib , mlflow +, moviepy , nbclient , nbformat , pandas @@ -45,6 +47,7 @@ , sentry-sdk , setproctitle , setuptools +, soundfile , substituteAll , torch , tqdm @@ -107,12 +110,14 @@ buildPythonPackage rec { google-cloud-compute google-cloud-storage hypothesis + imageio jsonref jsonschema keras kubernetes matplotlib mlflow + moviepy nbclient nbformat pandas @@ -124,6 +129,7 @@ buildPythonPackage rec { pytestCheckHook responses scikit-learn + soundfile torch tqdm ]; @@ -150,8 +156,6 @@ buildPythonPackage rec { "tests/pytest_tests/unit_tests_old/test_file_upload.py" "tests/pytest_tests/unit_tests_old/test_footer.py" "tests/pytest_tests/unit_tests_old/test_internal_api.py" - "tests/pytest_tests/unit_tests_old/test_keras.py" - "tests/pytest_tests/unit_tests_old/test_logging.py" "tests/pytest_tests/unit_tests_old/test_metric_internal.py" "tests/pytest_tests/unit_tests_old/test_public_api.py" "tests/pytest_tests/unit_tests_old/test_runtime.py" @@ -160,7 +164,6 @@ buildPythonPackage rec { "tests/pytest_tests/unit_tests_old/test_tb_watcher.py" "tests/pytest_tests/unit_tests_old/test_time_resolution.py" "tests/pytest_tests/unit_tests_old/test_wandb_agent.py" - "tests/pytest_tests/unit_tests_old/test_wandb_artifacts.py" "tests/pytest_tests/unit_tests_old/test_wandb_integration.py" "tests/pytest_tests/unit_tests_old/test_wandb_run.py" "tests/pytest_tests/unit_tests_old/test_wandb.py" @@ -181,6 +184,9 @@ buildPythonPackage rec { # Requires docker access "tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py" + "tests/pytest_tests/system_tests/test_artifacts/test_misc.py" + "tests/pytest_tests/system_tests/test_artifacts/test_misc2.py" + "tests/pytest_tests/system_tests/test_artifacts/test_object_references.py" "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py" "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py" "tests/pytest_tests/system_tests/test_core/test_cli_full.py" @@ -198,7 +204,6 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_core/test_public_api.py" "tests/pytest_tests/system_tests/test_core/test_redir_full.py" "tests/pytest_tests/system_tests/test_core/test_report_api.py" - "tests/pytest_tests/system_tests/test_core/test_runtime.py" "tests/pytest_tests/system_tests/test_core/test_save_policies.py" "tests/pytest_tests/system_tests/test_core/test_sender.py" "tests/pytest_tests/system_tests/test_core/test_start_method.py" @@ -216,15 +221,8 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_core/test_wandb_verify.py" "tests/pytest_tests/system_tests/test_core/test_wandb.py" "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py" - "tests/pytest_tests/system_tests/test_nexus/test_nexus.py" - "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" - "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" "tests/pytest_tests/system_tests/test_launch/test_github_reference.py" + "tests/pytest_tests/system_tests/test_launch/test_job_status_tracker.py" "tests/pytest_tests/system_tests/test_launch/test_job.py" "tests/pytest_tests/system_tests/test_launch/test_launch_add.py" "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py" @@ -234,8 +232,18 @@ buildPythonPackage rec { "tests/pytest_tests/system_tests/test_launch/test_launch_sagemaker.py" "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py" "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py" + "tests/pytest_tests/system_tests/test_launch/test_launch_vertex.py" "tests/pytest_tests/system_tests/test_launch/test_launch.py" "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py" + "tests/pytest_tests/system_tests/test_nexus/test_nexus.py" + "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" + "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" + "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" + "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" + "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" + "tests/pytest_tests/system_tests/test_system_metrics/test_system_monitor.py" # Tries to access /homeless-shelter "tests/pytest_tests/unit_tests/test_tables.py" @@ -248,12 +256,16 @@ buildPythonPackage rec { "tests/pytest_tests/unit_tests/test_launch/test_runner/test_vertex.py" # Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests_old/tests_launch/test_kaniko_build.py" "tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py" # Requires kfp which is not packaged as of 2023-04-25. "tests/pytest_tests/system_tests/test_core/test_kfp.py" + # Requires kubernetes_asyncio which is not packaged as of 2024-01-14. + "tests/pytest_tests/unit_tests/test_launch/test_builder/test_kaniko.py" + "tests/pytest_tests/unit_tests/test_launch/test_runner/test_kubernetes.py" + "tests/pytest_tests/unit_tests/test_launch/test_runner/test_safe_watch.py" + # Requires metaflow which is not packaged as of 2023-04-25. "tests/pytest_tests/unit_tests/test_metaflow.py" @@ -266,6 +278,9 @@ buildPythonPackage rec { # See https://github.com/wandb/wandb/issues/5423 "tests/pytest_tests/unit_tests/test_docker.py" "tests/pytest_tests/unit_tests/test_library_public.py" + + # See https://github.com/wandb/wandb/issues/6836 + "tests/pytest_tests/unit_tests_old/test_logging.py" ] ++ lib.optionals stdenv.isLinux [ # Same as above "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py" From 7d2c5bf495a113fac493cad733f5bf89e1915b35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 18:29:55 +0000 Subject: [PATCH 14/31] python311Packages.logging-journald: 0.6.5 -> 0.6.7 --- pkgs/development/python-modules/logging-journald/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logging-journald/default.nix b/pkgs/development/python-modules/logging-journald/default.nix index 92cb8475c9d6..812de51498d1 100644 --- a/pkgs/development/python-modules/logging-journald/default.nix +++ b/pkgs/development/python-modules/logging-journald/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "logging-journald"; - version = "0.6.5"; + version = "0.6.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EyKXc/Qr9mRFngDqbCPNVs/0eD9OCbQq0FbymA6kpLQ="; + hash = "sha256-RQ9opkAOZfhYuqOXJ2Mtnig8soL+lCveYH2YdXL1AGM="; }; nativeBuildInputs = [ From 6605c0dad80d6399176706cde1893179e058320e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 20 Jul 2023 00:50:48 +0200 Subject: [PATCH 15/31] openxray: 1144-december-2021-rc1 -> 1747-january-2023-rc3 --- pkgs/games/openxray/default.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index aef6c0c2e92a..05240dfb6b92 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , glew , freeimage @@ -15,18 +16,30 @@ , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openxray"; - version = "1144-december-2021-rc1"; + version = "1747-january-2023-rc3"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; - rev = version; + rev = finalAttrs.version; fetchSubmodules = true; - sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v"; + hash = "sha256-ip9CruOWk5T/dBDMcn9aOHbYaaZ+7VJw9U5GayiE7AE="; }; + patches = [ + # Fix OpenGL shader lookup & linking + # Remove when in a tag + (fetchpatch { + name = "0001-openxray-Fix-resource-linking-again.patch"; + url = "https://github.com/OpenXRay/xray-16/commit/88d2302b490ff62344c5ab4f8ba77260402cf4f4.patch"; + hash = "sha256-JvOwnqTThYB41ndpGrW1jVUp7rcysCTHNCEyq1fTlrY="; + }) + ]; + + strictDeps = true; + nativeBuildInputs = [ cmake makeWrapper @@ -56,13 +69,13 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - mainProgram = "xray-16"; + mainProgram = "xr_3da"; description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = "https://github.com/OpenXRay/xray-16/"; license = licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt"; }; maintainers = with maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; -} +}) From 1fb2556e994c3e549deea0330a2f72373d190a05 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 25 Aug 2023 15:51:01 +0200 Subject: [PATCH 16/31] openxray: 1747-january-2023-rc3 -> 2088-august-2023-rc1 --- pkgs/games/openxray/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 05240dfb6b92..fde0e2eedf9c 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , glew , freeimage @@ -18,26 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "openxray"; - version = "1747-january-2023-rc3"; + version = "2088-august-2023-rc1"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-ip9CruOWk5T/dBDMcn9aOHbYaaZ+7VJw9U5GayiE7AE="; + hash = "sha256-f9EheVp05BAjjk3FIJjHVfm0piYiMYZJ9U156g2vhac="; }; - patches = [ - # Fix OpenGL shader lookup & linking - # Remove when in a tag - (fetchpatch { - name = "0001-openxray-Fix-resource-linking-again.patch"; - url = "https://github.com/OpenXRay/xray-16/commit/88d2302b490ff62344c5ab4f8ba77260402cf4f4.patch"; - hash = "sha256-JvOwnqTThYB41ndpGrW1jVUp7rcysCTHNCEyq1fTlrY="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ From 60c8b2e2339e25add195e0cdcc4989f5208726bf Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 25 Aug 2023 18:58:21 +0200 Subject: [PATCH 17/31] openxray: Enable on Darwin --- pkgs/games/openxray/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index fde0e2eedf9c..8751de6835fb 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -51,10 +51,18 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebInfo"; dontStrip = true; + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ + # Needed because of dlopen module loading code + "--prefix LD_LIBRARY_PATH : $out/lib" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Because we work around https://github.com/OpenXRay/xray-16/issues/1224 by using GCC, + # we need a followup workaround for Darwin locale stuff when using GCC: + # runtime error: locale::facet::_S_create_c_locale name not valid + "--run 'export LC_ALL=C'" + ]; + postInstall = '' - # needed because of SDL_LoadObject library loading code - wrapProgram $out/bin/xr_3da \ - --prefix LD_LIBRARY_PATH : $out/lib + wrapProgram $out/bin/xr_3da ${toString finalAttrs.makeWrapperArgs} ''; meta = with lib; { @@ -65,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt"; }; maintainers = with maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dadc9464cea4..e14edb5f543f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38074,7 +38074,11 @@ with pkgs; openxcom = callPackage ../games/openxcom { SDL = SDL_compat; }; - openxray = callPackage ../games/openxray { }; + openxray = callPackage ../games/openxray { + # Builds with Clang, but hits an assertion failure unless GCC is used + # https://github.com/OpenXRay/xray-16/issues/1224 + stdenv = gccStdenv; + }; orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; From f853628ae5569d40879d77880026935347930a4b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 3 Nov 2023 18:39:23 +0100 Subject: [PATCH 18/31] openxray: 2088-august-2023-rc1 -> 2188-november-2023-rc1, add passthru.updateScript --- pkgs/games/openxray/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 8751de6835fb..1dbb1a7bf6f4 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , cmake , glew , freeimage @@ -17,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "openxray"; - version = "2088-august-2023-rc1"; + version = "2188-november-2023-rc1"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-f9EheVp05BAjjk3FIJjHVfm0piYiMYZJ9U156g2vhac="; + hash = "sha256-rRxw/uThACmT2qI8NUwJU+WbJ3BWUss6CH13R5aaHco="; }; strictDeps = true; @@ -65,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/xr_3da ${toString finalAttrs.makeWrapperArgs} ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { mainProgram = "xr_3da"; description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; From 47c638264b9e7564853cf1998128b3b2eb63013b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 4 Nov 2023 15:19:17 +0100 Subject: [PATCH 19/31] openxray: Simplify wrapping --- pkgs/games/openxray/default.nix | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 1dbb1a7bf6f4..c7f4e0197a8e 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -52,20 +52,17 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebInfo"; dontStrip = true; - makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ - # Needed because of dlopen module loading code - "--prefix LD_LIBRARY_PATH : $out/lib" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Because we work around https://github.com/OpenXRay/xray-16/issues/1224 by using GCC, - # we need a followup workaround for Darwin locale stuff when using GCC: - # runtime error: locale::facet::_S_create_c_locale name not valid - "--run 'export LC_ALL=C'" - ]; - - postInstall = '' - wrapProgram $out/bin/xr_3da ${toString finalAttrs.makeWrapperArgs} + # Because we work around https://github.com/OpenXRay/xray-16/issues/1224 by using GCC, + # we need a followup workaround for Darwin locale stuff when using GCC: + # runtime error: locale::facet::_S_create_c_locale name not valid + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/bin/xr_3da \ + --run 'export LC_ALL=C' ''; + # dlopens its own libraries, relies on rpath not having its prefix stripped + dontPatchELF = true; + passthru.updateScript = gitUpdater { }; meta = with lib; { From 362aba4b17a3e4ae04c50af4a2ae98a11d81bae6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 14 Jan 2024 20:36:41 +0100 Subject: [PATCH 20/31] openxray: Drop freeimage Doesn't seem to be required anymore --- pkgs/games/openxray/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index c7f4e0197a8e..961df955ca9a 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -4,7 +4,6 @@ , gitUpdater , cmake , glew -, freeimage , liblockfile , openal , libtheora @@ -37,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glew - freeimage liblockfile openal libtheora From 40cd3bcc06d8a9118c26ab905a7d52d672283942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 14 Jan 2024 17:28:02 -0300 Subject: [PATCH 21/31] lxqt.obconf-qt: 0.16.3 -> 0.16.4 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 4ebd052a5ef4..d44077db4fcf 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.16.3"; + version = "0.16.4"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-ExBcP+j1uf9Y8f6YfZsqyD6YTx1PriS3w8I6qdqQGeE="; + hash = "sha256-uF90v56BthEts/Jy+a6kH2b1QFHCtft4ZLxyi/K/Vnc="; }; nativeBuildInputs = [ From 3e924be8a85a134df4fa5169adfb871f54473865 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 14 Jan 2024 20:29:34 +0000 Subject: [PATCH 22/31] tmuxp: 1.29.0 -> 1.34.0 Fixes: ,---- | error: builder for '/nix/store/n9ram8wgn9niqm78wraxh4l21c4rfl2q-tmuxp-1.29.0.drv' failed with exit code 1; | last 10 log lines: | > Creating a wheel... | > * Getting build dependencies for wheel... | > * Building wheel... | > Successfully built tmuxp-1.29.0-py3-none-any.whl | > Finished creating a wheel... | > Finished executing pypaBuildPhase | > Running phase: pythonRuntimeDepsCheckHook | > Executing pythonRuntimeDepsCheck | > Checking runtime dependencies for tmuxp-1.29.0-py3-none-any.whl | > - libtmux<0.24.0,>=0.23.0 not satisfied by version 0.25.0 | For full logs, run 'nix log /nix/store/n9ram8wgn9niqm78wraxh4l21c4rfl2q-tmuxp-1.29.0.drv'. `---- Signed-off-by: Otavio Salvador --- pkgs/tools/misc/tmuxp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 8babec312268..a32a0f0b14ce 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.29.0"; + version = "1.34.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MiXG4MVzomyc4LjovPsvhmPngtJv85s6Ypo/Cm2Whho="; + hash = "sha256-G93YtgXo4li+tLWKgJFaxx4Ax4sK4F+vK6M3WTXIeiU="; }; nativeBuildInputs = [ From cac10ee05182c5298764a4e623da0a1be8f92f55 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 14 Jan 2024 17:40:20 -0300 Subject: [PATCH 23/31] tmuxp: add myself as co-maintainer Signed-off-by: Otavio Salvador --- pkgs/tools/misc/tmuxp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index a32a0f0b14ce..1d1eaa53e7bb 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://tmuxp.git-pull.com/"; changelog = "https://github.com/tmux-python/tmuxp/raw/v${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg otavio ]; mainProgram = "tmuxp"; }; } From 06cbb08c1fc1c84dd7c54f92afb725df3b18fa54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 22:46:33 +0100 Subject: [PATCH 24/31] python311Packages.ics: refactor --- .../python-modules/ics/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index 7b732d589fc0..f6e86242c612 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -1,17 +1,20 @@ { lib +, arrow +, attrs , buildPythonPackage , fetchFromGitHub -, pythonOlder -, tatsu -, arrow -, pytestCheckHook , pytest-flakes +, pytestCheckHook +, pythonOlder +, setuptools +, tatsu }: buildPythonPackage rec { pname = "ics"; version = "0.7.2"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -21,7 +24,12 @@ buildPythonPackage rec { hash = "sha256-hdtnET7YfSb85+TGwpwzoxOfxPT7VSj9eKSiV6AXUS8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + attrs arrow tatsu ]; @@ -45,7 +53,9 @@ buildPythonPackage rec { "test_many_lines" ]; - pythonImportsCheck = [ "ics" ]; + pythonImportsCheck = [ + "ics" + ]; meta = with lib; { description = "Pythonic and easy iCalendar library (RFC 5545)"; @@ -53,7 +63,7 @@ buildPythonPackage rec { Ics.py is a pythonic and easy iCalendar library. Its goals are to read and write ics data in a developer friendly way. ''; - homepage = "http://icspy.readthedocs.org/en/stable/"; + homepage = "http://icspy.readthedocs.org/"; changelog = "https://github.com/ics-py/ics-py/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; From c35f2b069fc59711f2900794c9584b68b2178db6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 23:25:06 +0100 Subject: [PATCH 25/31] calcure: refactor --- pkgs/applications/misc/calcure/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/applications/misc/calcure/default.nix index f9a2fc9d8a38..dcd2c62d2185 100644 --- a/pkgs/applications/misc/calcure/default.nix +++ b/pkgs/applications/misc/calcure/default.nix @@ -6,33 +6,34 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; version = "3.0.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel + nativeBuildInputs = with python3.pkgs; [ + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ - jdatetime holidays icalendar - ics - attrs + jdatetime + taskw ]; - pythonImportsCheck = [ "calcure" ]; + pythonImportsCheck = [ + "calcure" + ]; meta = with lib; { description = "Modern TUI calendar and task manager with minimal and customizable UI"; homepage = "https://github.com/anufrievroman/calcure"; + changelog = "https://github.com/anufrievroman/calcure/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; }; From 05a21a1870bdf0b2f6ced6ecd3b7f088e345c77a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 00:24:07 +0100 Subject: [PATCH 26/31] python311Packages.python-crontab: disable failing test --- pkgs/development/python-modules/python-crontab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index a1fb349c9ee9..0cbb5666bb05 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "test_07_non_posix_shell" # doctest that assumes /tmp is writeable, awkward to patch "test_03_usage" - # AssertionError: 4 != 0 + # Test is assuming $CURRENT_YEAR is not a leap year "test_19_frequency_at_month" ]; From af146f47b310b695053dd850b5dd7cf638272ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 15 Jan 2024 00:24:35 +0100 Subject: [PATCH 27/31] osu-lazer-bin: 2023.113.0 -> 2023.114.0 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index b155f7420f48..c47792dd7cdf 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.113.0"; + version = "2024.114.0"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-7/gPvjp45yzKADEYFuZCkxUaJNlsoWUgOcgb93GYE+k="; + hash = "sha256-T4xzggcz4T0kzLiQyGJfGo8lkAubG+miP2iMU9kxr5c="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-u7255jnXkC/sTSaxeABsSrE4RgxG34A4fd70eD5Qmb0="; + hash = "sha256-1if+H4OAJt7BcgFyLoGe8dIgvkEQ5xT+wCIj03WVDLY="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-pVTIcveB3ELvsoap0y8jI+DbXiqbp1D00YuqF1q2lHY="; + hash = "sha256-TM+x+T3EL28Era5eRRmhnunF8aoJ2r6oTTvjND08p9I="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From 7ff48c20eeba8944b8c2f8ce614501144ba82f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Mon, 15 Jan 2024 00:28:04 +0100 Subject: [PATCH 28/31] osu-lazer: 2024.113.0 -> 2023.114.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 471ec4818d12..1bd769b472b9 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.113.0"; + version = "2024.114.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-pyaHqaNt2E/6uYys8CxOBp2Bst8yfSicdvePbhXwcNc="; + hash = "sha256-6cvfKpBhJHCJ9XJ36YbgVRtRXIH9UL2lNW44LXj4mWM="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 45cc5015d4eb..82807ca692cc 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -137,7 +137,7 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.113.0"; sha256 = "0q1kyi86yzqkhmjzk1q4kbl7zlz958i1gbcz3f7jfnk1ivrnszbc"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.114.0"; sha256 = "1xyfc9j5qiy0skhy8xxxdyss6jpd0bcrbbigq2z3mx750mi77rif"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1228.0"; sha256 = "09qjfavp71nlzyl6fqgpjfpsilii2fbsjyjggdbq9hf9i49hwz7s"; }) From 9350f6fa5a2cb2b2918c90c131d2efd4691064cd Mon Sep 17 00:00:00 2001 From: Jerry Starke <42114389+JerrySM64@users.noreply.github.com> Date: Mon, 15 Jan 2024 03:51:13 +0100 Subject: [PATCH 29/31] linuxKernel.kernels.linux_zen: 6.7-zen2 -> 6.7-zen3 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9d7b12b08e45..54aa1df85b4a 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,8 +5,8 @@ let # ./update-zen.py zen zenVariant = { version = "6.7"; #zen - suffix = "zen2"; #zen - sha256 = "1f50s9zjxrhq656h88b89hdccxp68xczw2w3nd0nx8p7ipxa7agn"; #zen + suffix = "zen3"; #zen + sha256 = "0iflyip1a70i7bhll5bpls513g3q1hwsi1irm42rmjsysh4fb188"; #zen isLqx = false; }; # ./update-zen.py lqx From 9b8cffeb6bb5a990381a204dfbd45b98671d981a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 15 Jan 2024 03:23:29 -0500 Subject: [PATCH 30/31] python311Packages.agate: 1.7.1 -> 1.9.1 (#280993) This also fixes a test failure. --- pkgs/development/python-modules/agate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 80daa780685b..9c464014bb61 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "agate"; - version = "1.7.1"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "wireservice"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7Ew9bgeheymCL8xXSW5li0LdFvGYb/7gPxmC4w6tHvM="; + hash = "sha256-I7jvZA/m06kUuUcfglySaroDbJ5wbgiF2lb84EFPmpw="; }; propagatedBuildInputs = [ From d6e9e26d2351c4aa26adcd7ec96d2cbe9c7aaf0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jan 2024 00:07:56 +0000 Subject: [PATCH 31/31] ocamlPackages.js_of_ocaml: 5.5.2 -> 5.6.0 --- pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 78dfa8b12e75..5af30cc25506 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -5,12 +5,12 @@ buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "5.5.2"; + version = "5.6.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - hash = "sha256-l+aFEhFP8dl0Nnhff7m7mMUhgRrMXP8ysQS8XEoprDM="; + hash = "sha256-hDXwJjOhfvbIoaMXGmU3/bIGwAxPt9TKVCUN9tr2wj8="; }; nativeBuildInputs = [ menhir ];