From b2a979a4b468139f3cf102d9d83dc5bed91620d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 23 May 2025 22:28:52 -0400 Subject: [PATCH 01/21] python313Packages.stomp-py: init at 8.2.0 --- .../python-modules/stomp-py/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/stomp-py/default.nix diff --git a/pkgs/development/python-modules/stomp-py/default.nix b/pkgs/development/python-modules/stomp-py/default.nix new file mode 100644 index 000000000000..27c5a1639933 --- /dev/null +++ b/pkgs/development/python-modules/stomp-py/default.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + docopt, + websocket-client, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "stomp-py"; + version = "8.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jasonrbriggs"; + repo = "stomp.py"; + tag = "v${version}"; + hash = "sha256-UkNmE0+G9d3k1OhkNl98Jy5sP6MAywynzBmBtK9mZ90="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + docopt + websocket-client + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + doCheck = false; # needs external services setup + + pythonImportsCheck = [ "stomp" ]; + + meta = { + description = "Client library for accessing messaging servers (such as ActiveMQ or RabbitMQ) using the STOMP protocol"; + homepage = "https://github.com/jasonrbriggs/stomp.py"; + changelog = "https://github.com/jasonrbriggs/stomp.py/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 764bab2093a5..b9e2c49d1ee5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16784,6 +16784,8 @@ self: super: with self; { stm32loader = callPackage ../development/python-modules/stm32loader { }; + stomp-py = callPackage ../development/python-modules/stomp-py { }; + stone = callPackage ../development/python-modules/stone { }; stookalert = callPackage ../development/python-modules/stookalert { }; From 962db8079611bf6c3282197436b37af3ddbb4718 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Sun, 1 Jun 2025 15:52:47 +0200 Subject: [PATCH 02/21] nixosTests.ngingx-http3: fix race condition make the client wait for its network to come up before starting test without the wait, the client might try to access the network before its own network stack is up, as evidenced in https://hydra.nixos.org/build/299048133/nixlog/9/tail --- nixos/tests/nginx-http3.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix index 1d6cd56294be..1c0326d0f0f6 100644 --- a/nixos/tests/nginx-http3.nix +++ b/nixos/tests/nginx-http3.nix @@ -90,6 +90,7 @@ builtins.listToAttrs ( server.wait_for_unit("nginx") server.wait_for_open_port(443) + client.wait_for_unit("network-online.target") # Check http connections client.succeed("curl --verbose --http3-only https://acme.test | grep 'Hello World!'") From 8a975887b274f3c16aa9d3505dc2f24f06220b6c Mon Sep 17 00:00:00 2001 From: Benedikt Fein Date: Wed, 4 Jun 2025 19:55:33 +0200 Subject: [PATCH 03/21] maintainers: add b-fein --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5314a22833d1..1d93ed698c53 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2645,6 +2645,11 @@ githubId = 9315; name = "Zhong Jianxin"; }; + b-fein = { + github = "b-fein"; + githubId = 64250573; + name = "Benedikt Fein"; + }; b-m-f = { email = "maximilian@sodawa.com"; github = "b-m-f"; From edf597637797d5af079dde91ae8c0a917d0dea97 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 23 May 2025 22:29:23 -0400 Subject: [PATCH 04/21] python312Packages.oic: init at 1.7.0 --- .../python-modules/oic/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/oic/default.nix diff --git a/pkgs/development/python-modules/oic/default.nix b/pkgs/development/python-modules/oic/default.nix new file mode 100644 index 000000000000..3d222a196417 --- /dev/null +++ b/pkgs/development/python-modules/oic/default.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + requests, + pycryptodomex, + pydantic-settings, + pyjwkest, + mako, + cryptography, + defusedxml, + + # tests + pytestCheckHook, + freezegun, + responses, + testfixtures, +}: + +buildPythonPackage rec { + pname = "oic"; + version = "1.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "CZ-NIC"; + repo = "pyoidc"; + tag = version; + hash = "sha256-7qEK1HWLEGCKu+gDAfbyT1a+sM9fVOfjtkqZ33GWv6U="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + pycryptodomex + pydantic-settings + pyjwkest + mako + cryptography + defusedxml + ]; + + nativeCheckInputs = [ + pytestCheckHook + freezegun + responses + testfixtures + ]; + + pythonImportsCheck = [ "oic" ]; + + meta = { + description = "OpenID Connect implementation in Python"; + homepage = "https://github.com/CZ-NIC/pyoidc"; + changelog = "https://github.com/CZ-NIC/pyoidc/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9e2c49d1ee5..87345aebe3ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10278,6 +10278,8 @@ self: super: with self; { ohme = callPackage ../development/python-modules/ohme { }; + oic = callPackage ../development/python-modules/oic { }; + okonomiyaki = callPackage ../development/python-modules/okonomiyaki { }; okta = callPackage ../development/python-modules/okta { }; From f05a1313c81dd01c14af9504a19cd51778b811db Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 23 May 2025 22:36:32 -0400 Subject: [PATCH 05/21] python313Python.gfal2-python: 1.12.2 -> 1.13.0, unbroken --- pkgs/development/python-modules/gfal2-python/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gfal2-python/default.nix b/pkgs/development/python-modules/gfal2-python/default.nix index 52cb5ad1b227..03cd735683ca 100644 --- a/pkgs/development/python-modules/gfal2-python/default.nix +++ b/pkgs/development/python-modules/gfal2-python/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "gfal2-python"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "cern-fts"; repo = "gfal2-python"; rev = "v${version}"; - hash = "sha256-Xk+gLTrqfWb0kGB6QhnM62zAHVFb8rRAqCIBxn0V824="; + hash = "sha256-TF8EwT1UEtB9lhfq8Jkn9rrSkSxMSLzuAywfB23K1kE="; }; nativeBuildInputs = [ cmake @@ -44,8 +44,5 @@ buildPythonPackage rec { homepage = "https://github.com/cern-fts/gfal2-python"; license = licenses.asl20; maintainers = with maintainers; [ ShamrockLee ]; - # It currently fails to build against Python 3.12 or later, - # complaining CMake faililng to find Python include path, library path and site package path. - broken = pythonAtLeast "3.12"; }; } From acab3b9488254a7cefda9f501731eacd248bdcba Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 23 May 2025 22:29:53 -0400 Subject: [PATCH 06/21] python312Packages.rucio: init at 32.8.6 --- .../python-modules/rucio/default.nix | 114 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 116 insertions(+) create mode 100644 pkgs/development/python-modules/rucio/default.nix diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix new file mode 100644 index 000000000000..15ffb3309b94 --- /dev/null +++ b/pkgs/development/python-modules/rucio/default.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + alembic, + argcomplete, + boto3, + dogpile-cache, + flask, + geoip2, + gfal2-python, + google-auth, + jsonschema, + oic, + paramiko, + prometheus-client, + pymemcache, + python-dateutil, + python-magic, + redis, + requests, + sqlalchemy, + statsd, + stomp-py, + tabulate, + urllib3, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rucio"; + version = "32.8.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rucio"; + repo = "rucio"; + tag = version; + hash = "sha256-VQQ4gy9occism1WDrlcHnB7b7D5/G68wKct2PhD59FA="; + }; + + pythonRelaxDeps = [ + "alembic" + "argcomplete" + "boto3" + "dogpile.cache" + "flask" + "geoip2" + "google-auth" + "jsonschema" + "oic" + "paramiko" + "prometheus_client" + "python-dateutil" + "redis" + "requests" + "sqlalchemy" + "stomp.py" + "urllib3" + ]; + + build-system = [ + setuptools + ]; + + dependencies = [ + alembic + argcomplete + boto3 + dogpile-cache + flask + geoip2 + gfal2-python # needed for rucio download + google-auth + jsonschema + oic + paramiko + prometheus-client + pymemcache + python-dateutil + python-magic + redis + requests + sqlalchemy + statsd + stomp-py + tabulate + urllib3 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + doCheck = false; # needs a rucio.cfg + + pythonImportsCheck = [ "rucio" ]; + + meta = { + description = "Tool for Scientific Data Management"; + homepage = "http://rucio.cern.ch/"; + changelog = "https://github.com/rucio/rucio/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87345aebe3ff..3ffd9c838c36 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15431,6 +15431,8 @@ self: super: with self; { rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + rucio = callPackage ../development/python-modules/rucio { }; + ruff = callPackage ../development/python-modules/ruff { inherit (pkgs) ruff; }; ruff-api = callPackage ../development/python-modules/ruff-api { }; From ff8ec41663b6e65609698e79f7575630a1435ae4 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 4 Jun 2025 15:17:24 -0400 Subject: [PATCH 07/21] rucio: init at 32.8.6 --- pkgs/by-name/ru/rucio/package.nix | 5 +++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/by-name/ru/rucio/package.nix diff --git a/pkgs/by-name/ru/rucio/package.nix b/pkgs/by-name/ru/rucio/package.nix new file mode 100644 index 000000000000..c50e22324b5c --- /dev/null +++ b/pkgs/by-name/ru/rucio/package.nix @@ -0,0 +1,5 @@ +{ python3Packages }: + +with python3Packages; + +toPythonApplication rucio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 330e39efac2c..1915af7a1110 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4378,6 +4378,12 @@ with pkgs; pythonPackages = python3Packages; }; + rucio = callPackage ../by-name/ru/rucio/package.nix { + # Pinned to python 3.12 while python313Packages.future does not evaluate and + # until https://github.com/CZ-NIC/pyoidc/issues/649 is resolved + python3Packages = python312Packages; + }; + rubocop = rubyPackages.rubocop; ruby-lsp = rubyPackages.ruby-lsp; From 55d29209dca10cf15159725838c648e235bd0ceb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 09:36:23 +0000 Subject: [PATCH 08/21] python3Packages.osprofiler: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/osprofiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index b0c6e012133d..fc9a160cdb2a 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "osprofiler"; - version = "4.2.0"; + version = "4.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E="; + hash = "sha256-d6jaKyO7X5BIBUvVzMRdCshFdMqKiO8SC4+sbohk4kw="; }; build-system = [ setuptools ]; From 25e90088b9d2580156a9ab1f06ecf7b793326100 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 7 Jun 2025 11:25:46 +0800 Subject: [PATCH 09/21] soulseekqt: drop --- .../networking/p2p/soulseekqt/default.nix | 68 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/soulseekqt/default.nix diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix deleted file mode 100644 index 2a7a3bb37e6a..000000000000 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - stdenv, - lib, - fetchzip, - mkDerivation, - appimageTools, - autoPatchelfHook, - desktop-file-utils, - imagemagick, - qtmultimedia, -}: - -mkDerivation rec { - pname = "soulseekqt"; - version = "2018-1-30"; - - src = fetchzip { - url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"; - sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg"; - }; - - appextracted = appimageTools.extractType2 { - inherit pname version; - src = "${src}/SoulseekQt-2018-1-30-64bit.AppImage"; - }; - - dontBuild = true; - dontConfigure = true; - - nativeBuildInputs = [ - imagemagick - autoPatchelfHook - desktop-file-utils - ]; - buildInputs = [ - qtmultimedia - stdenv.cc.cc - ]; - - installPhase = '' - binary="$(realpath ${appextracted}/AppRun)" - install -Dm755 $binary -t $out/bin - - # fixup and install desktop file - desktop-file-install --dir $out/share/applications \ - --set-key Exec --set-value SoulseekQt \ - --set-key Terminal --set-value false \ - --set-key Comment --set-value "${meta.description}" \ - --set-key Categories --set-value Network ${appextracted}/default.desktop - mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop - #TODO: write generic code to read icon path from $binary.desktop - icon="$(realpath ${appextracted}/.DirIcon)" - for size in 16 32 48 64 72 96 128 192 256 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$(basename $icon) - done - ''; - - meta = with lib; { - description = "Official Qt SoulSeek client"; - homepage = "https://www.slsknet.org"; - mainProgram = "SoulseekQt"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 096df1a9a019..5fc03e702b89 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1768,6 +1768,7 @@ mapAliases { snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04; snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21 soldat-unstable = opensoldat; # Added 2022-07-02 + soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07 soundOfSorting = sound-of-sorting; # Added 2023-07-07 SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 SPAdes = spades; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 339dc8a399fe..3c7cf42c5f0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13997,8 +13997,6 @@ with pkgs; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; - soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; - spek = callPackage ../applications/audio/spek { autoreconfHook = buildPackages.autoreconfHook269; }; From b3346866261b6501257c5c53a99d0c51c915923d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Jun 2025 21:59:03 +0300 Subject: [PATCH 10/21] gentium: use finalAttrs --- pkgs/by-name/ge/gentium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix index 1a1260657dfd..2288d2510b9f 100644 --- a/pkgs/by-name/ge/gentium/package.nix +++ b/pkgs/by-name/ge/gentium/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gentium"; version = "6.200"; src = fetchzip { - url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${finalAttrs.version}.zip"; hash = "sha256-gpVOtmF4Kp3y1Rm00c4o3WQEskO7mY1Z5SVaYHI0hzg="; }; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version} - cp -r documentation $out/share/doc/${pname}-${version} + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} + cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} runHook postInstall ''; @@ -49,4 +49,4 @@ stdenvNoCC.mkDerivation rec { license = licenses.ofl; platforms = platforms.all; }; -} +}) From 718db763e8f66ec9033b8aba4b212f43b0f0ab7f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Jun 2025 21:59:43 +0300 Subject: [PATCH 11/21] gentium: no with lib; in meta --- pkgs/by-name/ge/gentium/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix index 2288d2510b9f..4bb7d543e222 100644 --- a/pkgs/by-name/ge/gentium/package.nix +++ b/pkgs/by-name/ge/gentium/package.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://software.sil.org/gentium/"; description = "High-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' @@ -42,11 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { font family, along with documentation. ''; downloadPage = "https://software.sil.org/gentium/download/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ raskin rycee ]; - license = licenses.ofl; - platforms = platforms.all; + license = lib.licenses.ofl; + platforms = lib.platforms.all; }; }) From 496731bdbe110fe6b79eb68f335cf01c934bb320 Mon Sep 17 00:00:00 2001 From: Benedikt Fein Date: Wed, 4 Jun 2025 19:56:45 +0200 Subject: [PATCH 12/21] gentium-book: init at 7.000 --- pkgs/by-name/ge/gentium-book/package.nix | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ge/gentium-book/package.nix diff --git a/pkgs/by-name/ge/gentium-book/package.nix b/pkgs/by-name/ge/gentium-book/package.nix new file mode 100644 index 000000000000..30080ccce838 --- /dev/null +++ b/pkgs/by-name/ge/gentium-book/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gentium-book"; + version = "7.000"; + + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumBook-${finalAttrs.version}.zip"; + hash = "sha256-A/QZX8OYrifaxChC08SNOaspdnSr8PxOtYgFAwUc5WY="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} + cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} + + runHook postInstall + ''; + + meta = { + homepage = "https://software.sil.org/gentium/"; + description = "High-quality typeface family for Latin, Cyrillic, and Greek"; + longDescription = '' + Gentium is a typeface family designed to enable the diverse ethnic groups + around the world who use the Latin, Cyrillic and Greek scripts to produce + readable, high-quality publications. It supports a wide range of Latin and + Cyrillic-based alphabets. + + The design is intended to be highly readable, reasonably compact, and + visually attractive. The additional ‘extended’ Latin letters are designed + to naturally harmonize with the traditional 26 ones. Diacritics are + treated with careful thought and attention to their use. Gentium also + supports both polytonic and monotonic Greek. + + This package contains the regular and italic styles for the Gentium Book + font family, along with documentation. + ''; + downloadPage = "https://software.sil.org/gentium/download/"; + maintainers = with lib.maintainers; [ + b-fein + raskin + rycee + ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + }; +}) From c93299fd4476ee36795f111759455633e611f374 Mon Sep 17 00:00:00 2001 From: Benedikt Fein Date: Wed, 4 Jun 2025 21:24:36 +0200 Subject: [PATCH 13/21] gentium-plus: rename from gentium Upstream has named this font 'GentiumPlus' all the time, and stopped releasing new versions of this font, but began to release a font named simply 'Gentium' straight at version 7.000. --- nixos/tests/fontconfig-default-fonts.nix | 2 +- pkgs/by-name/ge/{gentium => gentium-plus}/package.nix | 2 +- pkgs/by-name/ho/hottext/package.nix | 4 ++-- pkgs/by-name/si/sile/package.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/by-name/ge/{gentium => gentium-plus}/package.nix (98%) diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index 674192e7bba2..e3af3aa39f99 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -15,7 +15,7 @@ cantarell-fonts twitter-color-emoji source-code-pro - gentium + gentium-plus ]; fonts.fontconfig.defaultFonts = { serif = [ "Gentium Plus" ]; diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium-plus/package.nix similarity index 98% rename from pkgs/by-name/ge/gentium/package.nix rename to pkgs/by-name/ge/gentium-plus/package.nix index 4bb7d543e222..cd043d91e477 100644 --- a/pkgs/by-name/ge/gentium/package.nix +++ b/pkgs/by-name/ge/gentium-plus/package.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { - pname = "gentium"; + pname = "gentium-plus"; version = "6.200"; src = fetchzip { diff --git a/pkgs/by-name/ho/hottext/package.nix b/pkgs/by-name/ho/hottext/package.nix index 91e38a608a31..7bdcaa578201 100644 --- a/pkgs/by-name/ho/hottext/package.nix +++ b/pkgs/by-name/ho/hottext/package.nix @@ -2,7 +2,7 @@ lib, buildNimPackage, fetchFromSourcehut, - gentium, + gentium-plus, makeDesktopItem, }: @@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: { lockFile = ./lock.json; - HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; + HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf"; desktopItem = makeDesktopItem { categories = [ "Utility" ]; diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix index 5c1e5d620656..6ea63089511b 100644 --- a/pkgs/by-name/si/sile/package.nix +++ b/pkgs/by-name/si/sile/package.nix @@ -20,7 +20,7 @@ libiconv, # FONTCONFIG_FILE makeFontsConf, - gentium, + gentium-plus, # passthru.tests runCommand, @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ - gentium + gentium-plus ]; }; strictDeps = true; From 386fcf3077aaedf40633b6de4b817898ba9253ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 22:04:14 +0000 Subject: [PATCH 14/21] phpPackages.grumphp: 2.12.0 -> 2.13.0 --- pkgs/development/php-packages/grumphp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 7a1f2fde88c4..b005fb272f82 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-uA+s3ZOZIlgO2yD5jsjJUKPy3u66K/8kazDL3TUVyF8="; + hash = "sha256-tPMmvauFQooXYQvS5BCZN/pJzywXeiOqqmnwy64jBaA="; }; - vendorHash = "sha256-F+9/Avu+36pN0U9meUJppo4YqyCKEblQx2rCJ7uD8PU="; + vendorHash = "sha256-TRK/xDrVvjJOWOh8JwKvffEV3kyR2VpveKbFn6rjGkI="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 8aad240124d02c68097efa2f31afe6e28c422253 Mon Sep 17 00:00:00 2001 From: Benedikt Fein Date: Wed, 4 Jun 2025 19:48:02 +0200 Subject: [PATCH 15/21] gentium: init at 7.000 --- pkgs/by-name/ge/gentium/package.nix | 53 +++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ge/gentium/package.nix diff --git a/pkgs/by-name/ge/gentium/package.nix b/pkgs/by-name/ge/gentium/package.nix new file mode 100644 index 000000000000..86af847e9793 --- /dev/null +++ b/pkgs/by-name/ge/gentium/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gentium"; + version = "7.000"; + + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/Gentium-${finalAttrs.version}.zip"; + hash = "sha256-RBBecFdi/yyFfBk1CcQebOuAdKNUczpwOP52zVtbc2o="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} + cp -r documentation $out/share/doc/${finalAttrs.pname}-${finalAttrs.version} + + runHook postInstall + ''; + + meta = { + homepage = "https://software.sil.org/gentium/"; + description = "High-quality typeface family for Latin, Cyrillic, and Greek"; + longDescription = '' + Gentium is a typeface family designed to enable the diverse ethnic groups + around the world who use the Latin, Cyrillic and Greek scripts to produce + readable, high-quality publications. It supports a wide range of Latin and + Cyrillic-based alphabets. + + The design is intended to be highly readable, reasonably compact, and + visually attractive. The additional ‘extended’ Latin letters are designed + to naturally harmonize with the traditional 26 ones. Diacritics are + treated with careful thought and attention to their use. Gentium also + supports both polytonic and monotonic Greek. + + This package contains the regular and italic styles for the Gentium font + family, along with documentation. + ''; + downloadPage = "https://software.sil.org/gentium/download/"; + maintainers = with lib.maintainers; [ + b-fein + raskin + rycee + ]; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + }; +}) From 9dd340e3083d45895097969f1f314ca361a9800b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Jun 2025 22:28:21 +0300 Subject: [PATCH 16/21] nixosTests.fontconfig-default-fonts: use Gentium font As GentiumPlus will probably never be updated further by upstream. --- nixos/tests/fontconfig-default-fonts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index e3af3aa39f99..4a46b3e17172 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -15,10 +15,10 @@ cantarell-fonts twitter-color-emoji source-code-pro - gentium-plus + gentium ]; fonts.fontconfig.defaultFonts = { - serif = [ "Gentium Plus" ]; + serif = [ "Gentium" ]; sansSerif = [ "Cantarell" ]; monospace = [ "Source Code Pro" ]; emoji = [ "Twitter Color Emoji" ]; @@ -26,7 +26,7 @@ }; testScript = '' - machine.succeed("fc-match serif | grep '\"Gentium Plus\"'") + machine.succeed("fc-match serif | grep '\"Gentium\"'") machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'") machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'") machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'") From 3e3af30ad26310e1b5c8769082de4122e17d302f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 22:56:44 +0000 Subject: [PATCH 17/21] nom: 2.8.1 -> 2.8.2 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 58fd59144f78..4ee8739d1800 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; tag = "v${version}"; - hash = "sha256-PqoTpy+Pz5OS+7pzzdxNKeqIZRipOvHKMs9o67XzdqY="; + hash = "sha256-SkmY3eFEAC4EJtFpe6FwRmECIZJa/Oyb1yov75ySSH0="; }; vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw="; From 13a7364eda3851a9bb104d09e0fce422a7a4eca9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 00:33:29 +0000 Subject: [PATCH 18/21] mini-calc: 3.4.2 -> 4.0.0 --- pkgs/by-name/mi/mini-calc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 44973a67f9d7..5218c3420063 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -9,17 +9,17 @@ }: rustPlatform.buildRustPackage rec { pname = "mini-calc"; - version = "3.4.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "vanilla-extracts"; repo = "calc"; rev = version; - hash = "sha256-iLKW0ibsHZyAMYvux+CrOeJZCVMPE1HtWi0VBg96hr0="; + hash = "sha256-601BmecY+jbiD39buN68MeJKd5wguH0hahHquHadsL4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-DMfk0F2HSFGoGM1+JCeDlPMOYBjRumc8KXzt0xsSbh0="; + cargoHash = "sha256-9Ug6lyDvacj47FnLzJo4fwpXeMYxgSlMB7+2fIv5oxo="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' From e91a6f4594d13abb104f3b3e8c92c9d51f310559 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 12 Mar 2025 18:27:54 +0100 Subject: [PATCH 19/21] nixosTests.keepassxc: enable dconf Keepass tries to commit data to the service ca.desrt.dconf, which leads to many warnings in the test log if dconf is not enabled. --- nixos/tests/keepassxc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 1cdbdb445c3d..ae5ff332750f 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,6 +17,7 @@ ]; services.xserver.enable = true; + programs.dconf.enable = true; # for better OCR environment.etc."icewm/prefoverride".text = '' From af9ffbb640bc2d815e36d3a1cab63766d96f356e Mon Sep 17 00:00:00 2001 From: Paul Mulders Date: Sun, 8 Jun 2025 05:17:55 +0200 Subject: [PATCH 20/21] blender: fix hip support (#410748) --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index bd3a2e09f4f7..7cf4b1a96a6d 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -134,8 +134,8 @@ stdenv'.mkDerivation (finalAttrs: { '${lib.getLib brotli}/lib/libbrotlidec.dylib' '') + (lib.optionalString hipSupport '' - substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' - substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' + substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"' + substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; From 85794319e727ea666e0302ad177ca5448238c1d1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Jun 2025 01:31:17 +0300 Subject: [PATCH 21/21] gentium: mention rename confusion in release notes --- doc/release-notes/rl-2511.section.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f739ba9cd1f5..0b1b4a844d6c 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -16,6 +16,7 @@ - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader - `base16-builder` node package has been removed due to lack of upstream maintenance. +- `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier. ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}