From 521dad6d26990b4164d3f279384845e6fb03f688 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Feb 2024 06:23:47 +0000 Subject: [PATCH 01/22] swayrbar: 0.3.7 -> 0.3.8 --- pkgs/tools/wayland/swayrbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index f8f085f1632b..db0095a973c3 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-41zlVT060Fu90N4oiZ6lWSZdJJSZjyk3GEA/u+bVNCI="; + sha256 = "sha256-pCXkgIesHqXI/m8ecytlq+U62lIrf7bOv95Hi/nyf/g="; }; - cargoHash = "sha256-/MUolnEdYlBTfmUB/j9vHaVpU63upeMoScjHl38cGjo="; + cargoHash = "sha256-RSdNYr6l9ayn9anczeGGh2rkKt6COqj+H71d14Gb8r0="; # don't build swayr buildAndTestSubdir = pname; From cca22fb9cebb583251da910f6ca65f53f6911e06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Feb 2024 17:06:37 +0000 Subject: [PATCH 02/22] minio: 2024-02-24T17-11-14Z -> 2024-02-26T09-33-48Z --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 2936aa6a8736..3fb9ecc28f38 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,13 +21,13 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-02-24T17-11-14Z"; + version = "2024-02-26T09-33-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-LD32cNKvW0mfYeXHNOqgiWXAiHjWJrorRqbQkosjaNE="; + hash = "sha256-V5Pmp36YA0u1Z2SBNdJZAHQuA3PgVKHmIJlDElhS24s="; }; vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M="; From b8abf67c26a7723d41fcb738340c6f6a2814fc5a Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 1 Mar 2024 15:13:20 +0100 Subject: [PATCH 03/22] sequoia-sq: 0.32.0 -> 0.34.0 --- pkgs/tools/security/sequoia-sq/default.nix | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/tools/security/sequoia-sq/default.nix index 699a8ee63632..2214b346f87b 100644 --- a/pkgs/tools/security/sequoia-sq/default.nix +++ b/pkgs/tools/security/sequoia-sq/default.nix @@ -6,26 +6,30 @@ , nix-update-script , rustPlatform , pkg-config +, capnproto +, installShellFiles , openssl , sqlite }: rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-2a6LIW5ohSi7fbMwk/wmNJ0AOz5JIXiXJI7EoVKv1Sk="; + hash = "sha256-voFektWZnkmIQzI7s5nKzVVWQtEhzk2GKtxX926RtxU="; }; - cargoHash = "sha256-beA0viJVDjfANsPegkc/x2syVp8uGKTMnrPcM7jcvG4="; + cargoHash = "sha256-3ncBpRi0v6g6wwPkSASDwt0d8cOOAUv9BwZaYvnif1U="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook + capnproto + installShellFiles ]; buildInputs = [ @@ -41,14 +45,19 @@ rustPlatform.buildRustPackage rec { "--skip=macros::time_it" ]; - # Install manual pages, see https://gitlab.com/sequoia-pgp/sequoia-sq#building - postInstall = '' - mkdir -p $out/share/man - SQ_MAN=$out/share/man/man1 cargo run - ''; + env.ASSET_OUT_DIR = "/tmp/"; doCheck = true; + postInstall = '' + installManPage /tmp/man-pages/*.* + installShellCompletion \ + --cmd sq \ + --bash /tmp/shell-completions/sq.bash \ + --fish /tmp/shell-completions/sq.fish \ + --zsh /tmp/shell-completions/_sq + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { From 98aea3b2945486cd115ea6f759d6f08b79227aa8 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 1 Mar 2024 15:15:39 +0100 Subject: [PATCH 04/22] sequoia-sq: move to pkgs/by-name/ directory --- .../default.nix => by-name/se/sequoia-sq/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/sequoia-sq/default.nix => by-name/se/sequoia-sq/package.nix} (100%) diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/by-name/se/sequoia-sq/package.nix similarity index 100% rename from pkgs/tools/security/sequoia-sq/default.nix rename to pkgs/by-name/se/sequoia-sq/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 667e4a9c1a88..2a95011039e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13040,8 +13040,6 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-sq = callPackage ../tools/security/sequoia-sq { }; - sequoia-sqv = callPackage ../tools/security/sequoia-sqv { }; sequoia-sqop = callPackage ../tools/security/sequoia-sqop { }; From 4ff48a0179ead2b09c31b4514eeb218ce450734b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Mar 2024 15:06:14 -0500 Subject: [PATCH 05/22] squid: 6.6 -> 6.7 Diff: https://github.com/squid-cache/squid/compare/SQUID_6_6...SQUID_6_7 --- pkgs/servers/squid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5968c7e1e340..d564f77f7a7c 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vb1/n0iYFTFh6hIomYrLVRv4QIMrnluQ/I7NKUJCAxg="; + hash = "sha256-4U2qTq5Bkl0a4/COZEOaaqowEb3O1oZii43ml9WrhCg="; }; nativeBuildInputs = [ pkg-config ]; From 8a6251839a8a4f913ae1d9a17a56170980c32ac8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 21:17:28 -0300 Subject: [PATCH 06/22] duden: migrate to python-modules Because it is a "dual package": a Python app and lib. --- .../misc => development/python-modules}/duden/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) rename pkgs/{applications/misc => development/python-modules}/duden/default.nix (100%) diff --git a/pkgs/applications/misc/duden/default.nix b/pkgs/development/python-modules/duden/default.nix similarity index 100% rename from pkgs/applications/misc/duden/default.nix rename to pkgs/development/python-modules/duden/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4af9c196390..0fe2f15909df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41713,7 +41713,7 @@ with pkgs; udict = callPackage ../applications/misc/udict { }; - duden = callPackage ../applications/misc/duden { }; + duden = python3Packages.toPythonApplication python3Packages.duden; zf = callPackage ../tools/misc/zf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2fceb9e64e6..3df2e45be2cc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3500,6 +3500,8 @@ self: super: with self; { duct-py = callPackage ../development/python-modules/duct-py { }; + duden = callPackage ../development/python-modules/duden { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { }; From b590908c9e7a7ad4149d85607438acd9061e3387 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 20:54:43 -0300 Subject: [PATCH 07/22] duden: refactor - get rid of rec by using recursive let - do not use python3.pkgs (oh that splicing dark magic) - get rid of nested with - set meta.mainProgram - adopted by AndersonTorres --- .../python-modules/duden/default.nix | 84 +++++++++++-------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix index 0d310e8c23dc..a28ae2e1291a 100644 --- a/pkgs/development/python-modules/duden/default.nix +++ b/pkgs/development/python-modules/duden/default.nix @@ -1,40 +1,56 @@ { lib -, python3 +, beautifulsoup4 +, buildPythonPackage +, crayons , fetchFromGitHub +, poetry-core +, pyxdg +, pyyaml +, requests +, setuptools }: -python3.pkgs.buildPythonPackage rec { - pname = "duden"; - version = "0.18.0"; - format = "pyproject"; +let + finalAttrs = { + pname = "duden"; + version = "0.18.0"; + pyproject = true; - src = fetchFromGitHub { - owner = "radomirbosak"; - repo = "duden"; - rev = version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = finalAttrs.version; + hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + crayons + pyxdg + pyyaml + requests + setuptools + ]; + + pythonImportsCheck = [ "duden" ]; + + meta = { + homepage = "https://github.com/radomirbosak/duden"; + changelog = "https://github.com/radomirbosak/duden/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "CLI for https://duden.de dictionary written in Python"; + longDescription = '' + duden is a CLI-based program and python module, which can provide + various information about given german word. The provided data are + parsed from german dictionary duden.de. + ''; + license = with lib.licenses; [ mit ]; + mainProgram = "duden"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - crayons - pyxdg - pyyaml - requests - setuptools - ]; - - pythonImportsCheck = [ "duden" ]; - - meta = with lib; { - description = "CLI for http://duden.de dictionary written in Python"; - homepage = "https://github.com/radomirbosak/duden"; - changelog = "https://github.com/radomirbosak/duden/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} +in +buildPythonPackage finalAttrs From 36da5a3900fb792105b5b532c124661b23432134 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 28 Feb 2024 21:33:13 -0300 Subject: [PATCH 08/22] duden: 0.18.0 -> 0.19.1 Co-authored-by: linuxissuper Co-authored-by: R. RyanTM --- pkgs/development/python-modules/duden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix index a28ae2e1291a..6381da7271ee 100644 --- a/pkgs/development/python-modules/duden/default.nix +++ b/pkgs/development/python-modules/duden/default.nix @@ -13,14 +13,14 @@ let finalAttrs = { pname = "duden"; - version = "0.18.0"; + version = "0.19.1"; pyproject = true; src = fetchFromGitHub { owner = "radomirbosak"; repo = "duden"; rev = finalAttrs.version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; + hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ let ''; license = with lib.licenses; [ mit ]; mainProgram = "duden"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres linuxissuper ]; }; }; in From 16d5b925a863984018cf0d622b074d78614a6973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 20:33:42 +0000 Subject: [PATCH 09/22] lammps-mpi: 2Aug2023_update2 -> 2Aug2023_update3 --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index a6dc8592ae3c..db27bb188cf5 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update2"; + version = "2Aug2023_update3"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-E918Jv6RAfXmHxyHZos2F7S8HFWzU6KjxDwXYNAYFMY="; + hash = "sha256-jx0hkiYxQlnE2sa4WTvluEgphF//sNbK91VGAQJMwjw="; }; preConfigure = '' cd cmake From 8a2ad95413206da58345a744b8cd3ccc868cfa6f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Mar 2024 22:46:14 +0200 Subject: [PATCH 10/22] python311Packages.verlib2: init at 0.2.0 --- .../python-modules/verlib2/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/verlib2/default.nix diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix new file mode 100644 index 000000000000..41c1d95eff25 --- /dev/null +++ b/pkgs/development/python-modules/verlib2/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +}: + +buildPythonPackage rec { + pname = "verlib2"; + version = "0.2.0"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-CrlAh8CU4nFjlI36gXyY1itr3QEibM5RiPjMPNaDRbk="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + pythonImportsCheck = [ "verlib2" ]; + + meta = with lib; { + description = "A standalone variant of packaging.version, without anything else"; + homepage = "https://pypi.org/project/verlib2/"; + license = licenses.bsd2; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 424e7a726bf1..60b6decb5230 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16144,6 +16144,8 @@ self: super: with self; { verboselogs = callPackage ../development/python-modules/verboselogs { }; + verlib2 = callPackage ../development/python-modules/verlib2 { }; + versioneer = callPackage ../development/python-modules/versioneer { }; versionfinder = callPackage ../development/python-modules/versionfinder { }; From 7a1b97825badd102a583b4ef11c86451177859ac Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Mar 2024 23:06:51 +0200 Subject: [PATCH 11/22] python311Packages.pueblo: init at 0.0.8 --- .../python-modules/pueblo/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pueblo/default.nix diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix new file mode 100644 index 000000000000..52a5a4435275 --- /dev/null +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +, platformdirs +}: + +buildPythonPackage rec { + pname = "pueblo"; + version = "0.0.8"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-iM8Ea2ym7ZM0wInkCZ76yUjvOPRF5MVbT4WhpWz70UU="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + propagatedBuildInputs = [ + # contextlib-chdir + # importlib-metadata + platformdirs + ]; + + pythonImportsCheck = [ "pueblo" ]; + + meta = with lib; { + description = "Pueblo - a Python toolbox library"; + homepage = "https://pypi.org/project/pueblo/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60b6decb5230..7bc514fc7e58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1310,6 +1310,8 @@ self: super: with self; { paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pueblo = callPackage ../development/python-modules/pueblo { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; From 848f5533fa638d7097ead7a9af5f5537f3721528 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Mar 2024 22:27:09 +0200 Subject: [PATCH 12/22] python311Packages.crate: 0.34.0 -> 0.35.2 Changelog: https://github.com/crate/crate-python/blob/0.35.2/CHANGES.txt Closes #291423. --- .../python-modules/crate/default.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index fe60eceb93c8..a7e03d3ecad4 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,9 +1,12 @@ { lib , fetchPypi , buildPythonPackage +, fetchpatch , dask , urllib3 , geojson +, verlib2 +, pueblo , pandas , pythonOlder , sqlalchemy @@ -13,20 +16,35 @@ buildPythonPackage rec { pname = "crate"; - version = "0.34.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEWrfCd2MQCcIM6dLkVYc/cWT5wcT/pvYaY2V3wfuto="; + hash = "sha256-4hGACtsK71hvcn8L9ggID7zR+umtTwvskBxSHBpLyME="; }; + patches = [ + # Fix a pandas issue https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979 + (fetchpatch { + url = "https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979.patch"; + hash = "sha256-20g8T0t5gPMbK6kRJ2bzc4BNbB1Dg4hvngXNUPvxi5I="; + name = "python-crate-fix-pandas-error.patch"; + # Patch doesn't apply due to other changes to these files + excludes = [ + "setup.py" + "docs/by-example/sqlalchemy/dataframe.rst" + ]; + }) + ]; propagatedBuildInputs = [ urllib3 sqlalchemy geojson + verlib2 + pueblo ]; nativeCheckInputs = [ From 036a5ca059048e3c0f573358b071cad3ef86be37 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 2 Mar 2024 23:24:08 +0200 Subject: [PATCH 13/22] sequoia-sq: fix darwin test failure --- pkgs/by-name/se/sequoia-sq/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 2214b346f87b..54e19ba073fa 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , lib , darwin , nettle @@ -22,6 +23,14 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-voFektWZnkmIQzI7s5nKzVVWQtEhzk2GKtxX926RtxU="; }; + patches = [ + # Fixes test failing on Darwin, see: + # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/211 + (fetchpatch { + url = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/commit/21221a935e0d058ed269ae6c8f45c5fa7ea0d598.patch"; + hash = "sha256-ZjTl3EumeFwMJUl+qMpX+P2maYz4Ow/Tn9KwYbHDbes="; + }) + ]; cargoHash = "sha256-3ncBpRi0v6g6wwPkSASDwt0d8cOOAUv9BwZaYvnif1U="; From d9d3c32fb66d5e0764c3cf3eded1f744e609d7a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 22:50:50 +0000 Subject: [PATCH 14/22] vhdl-ls: 0.77.0 -> 0.78.0 --- pkgs/development/tools/language-servers/vhdl-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 1ca6f8930709..82eb50937376 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.77.0"; + version = "0.78.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-IAe4m/GC6ubCcZZESC6fToWVQT73XrhjJOiGCGzNxnQ="; + hash = "sha256-R1ACYsN2GxpWkUd8kocbv3tnBOiu7PzjtSG8hWbCYfE="; }; - cargoHash = "sha256-p7BL8WuQiB1KihwAl5aeO6Fa9INYRTQgoQPHcSMnaiQ="; + cargoHash = "sha256-xt9v0QvHgej+YTIKGWfsEmLNy9RZp/mahPjKz3QWPrk="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ From babbddc88ab2407b4a2fab18c11f7e0fad91f6d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 23:20:14 +0000 Subject: [PATCH 15/22] cargo-cyclonedx: 0.4.1 -> 0.5.0 --- pkgs/development/tools/rust/cargo-cyclonedx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index acfd450f209a..c4290a6e9cfa 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-JrusJsMjaWAsWAssU+q87BCH2ouLfthIw47ypwBkR9o="; + hash = "sha256-791FZR9dmwVjORrkpm8el+2VMEEKJG+yKKqq+R1I9U4="; }; - cargoHash = "sha256-QzEojbwBF7s3C+LlFWle0+8DVtyEljuqAcMAyRJqFcs="; + cargoHash = "sha256-Cbi1cnUy6HKkgBXVjK0xItx2pzuYVob/Qz4o8eT6Fws="; nativeBuildInputs = [ pkg-config From e878ba5ff7dfbdd56096bbc8bc05199c4f4fccdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Mar 2024 02:07:14 +0000 Subject: [PATCH 16/22] python311Packages.langchain-core: 0.1.27 -> 0.1.28 --- pkgs/development/python-modules/langchain-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index ccd74777f32d..4ec235187b2d 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.27"; + version = "0.1.28"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-aYQUIjUlwLwTDYWmFOFJOQXViKty/gya07U3sdxiBn8="; + hash = "sha256-BOdhpRMgC25bWBhhOCGUV5nAe8U0kIfXaS5QgjEHydY="; }; pythonRelaxDeps = [ From 2b7d1a052453b53962ab88bc30f611533c8926d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Mar 2024 07:28:11 +0000 Subject: [PATCH 17/22] minio-client: 2024-02-16T11-05-48Z -> 2024-02-24T01-33-20Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index f05814f00f0f..b2f7367ab26a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-02-16T11-05-48Z"; + version = "2024-02-24T01-33-20Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-Kqv48krXiDi/8QtCEpn0uGvuLS2P6BYAtSnY5sNrCQ0="; + sha256 = "sha256-WWQwrrsYyJ96rVORSmxqid2bhYvkOREpP03uQ/Bbj9Q="; }; - vendorHash = "sha256-wxFhj+oqj5WV/UkPZlmeJHF2WC4oLlZOql1qgSFs+zU="; + vendorHash = "sha256-yteWhm9GxNIiYhuCxrlLqP2OzZ1iv1UmpEj8GH8LIWY="; subPackages = [ "." ]; From e3f64c6d9fd006b812add806d9bef6297c5ced42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Mar 2024 09:32:55 +0000 Subject: [PATCH 18/22] sgt-puzzles: 20240103.7a93ae5 -> 20240302.80aac31 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 7361d2281113..bd56416c5918 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240103.7a93ae5"; + version = "20240302.80aac31"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-1pTruSF+Kl1wqTFIaYYHrvbD9p+k+1PGa5PpV4jvgEk="; + hash = "sha256-0+bmGq4wM+0/ldQz8ieKdkuG0HHazctQr9ul/qLT0gg="; }; sgt-puzzles-menu = fetchurl { From 286977c08ddf540b4c6bebd8cd96fe30070bcb46 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 20 Feb 2024 18:48:46 +0000 Subject: [PATCH 19/22] cartridges: 2.7.2 -> 2.7.3 --- pkgs/applications/misc/cartridges/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index ff06da875d61..97e35455c217 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation (finalAttrs: { requests ]; + # TODO: remove this when #286814 hits master + mesonFlags = [ "-Dtiff_compression=jpeg" ]; + buildInputs = [ libadwaita (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) From 7305821c58b9d7dbd493e7fb847a0480ffa5cb08 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 31 Jan 2024 22:22:02 +0100 Subject: [PATCH 20/22] tests/minio: fix broken minio test Since last update minio pre allocates 2GiB of memory, so the test VM needs more than that to not run out of memory. We also remove the time based tests as it makes the test non deterministic --- nixos/tests/minio.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index ece4864f771c..67eb0cd88440 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -43,17 +43,17 @@ import ./make-test-python.nix ({ pkgs, ... }: # Minio requires at least 1GiB of free disk space to run. virtualisation.diskSize = 4 * 1024; + + # Minio pre allocates 2GiB or memory, reserve some more + virtualisation.memorySize = 4096; }; }; testScript = '' - import time start_all() # simulate manually editing root credentials file machine.wait_for_unit("multi-user.target") - machine.copy_from_host("${credsPartial}", "${rootCredentialsFile}") - time.sleep(3) machine.copy_from_host("${credsFull}", "${rootCredentialsFile}") machine.wait_for_unit("minio.service") From b34af2d675b8ae33f2fa783e5786e79bd7f11902 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 2 Mar 2024 18:41:27 +0100 Subject: [PATCH 21/22] presenterm: 0.6.1 -> 0.7.0 Diff: https://github.com/mfontanini/presenterm/compare/refs/tags/v0.6.1...v0.7.0 Changelog: https://github.com/mfontanini/presenterm/releases/tag/v0.7.0 --- pkgs/by-name/pr/presenterm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 8745736119ba..e14510559cbe 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,20 +9,20 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; rev = "refs/tags/v${version}"; - hash = "sha256-+XESFDseRScWYOry58JLknGv+xhewTKx38lrzQu2mQ4="; + hash = "sha256-I5L+Wygj9ApQu/5fm55okwNbyxOiF++7BDl765MLnjY="; }; buildInputs = [ libsixel ]; - cargoHash = "sha256-xZLGm+tGAmmo/OzDMrgQK0uH7GMG6fTkpPsXwLe94VM="; + cargoHash = "sha256-w1uXCH8Ybf78EPTIKrhPlPHAnNBp1iiBpFJHY98IPWY="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib From 5cb92fd712e859518cd17f2e230a013ded5dabb7 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Sun, 3 Mar 2024 12:59:41 +0100 Subject: [PATCH 22/22] blahaj: enable mt by default and add static (#270608) --- pkgs/tools/misc/blahaj/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index c0e591515cdf..a37d37bf4184 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , crystal , fetchFromGitHub + # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ +, multithreading ? true +, static ? stdenv.hostPlatform.isStatic }: crystal.buildCrystalPackage rec { @@ -14,6 +18,8 @@ crystal.buildCrystalPackage rec { hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik="; }; + buildTargets = [ "${if static then "static" else "build"}${if multithreading then "_mt" else ""}" ]; + meta = with lib; { description = "Gay sharks at your local terminal - lolcat-like CLI tool"; homepage = "https://blahaj.queer.software";