diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 2d396c8523f3..edbb3a921eea 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -161,6 +161,8 @@
- The `haka` package and module has been removed because the package was broken and unmaintained for 9 years.
+- The `gsignond` package, plugins and module have been removed because they were unmaintained for 6 years.
+
- `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package
and `withGstreamer`/`withVlc` override options have been removed due to this.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 284b2b2e177e..08d80e631b64 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7013,6 +7013,12 @@
githubId = 8146662;
name = "Eric Lesiuta";
};
+ elfenermarcell = {
+ email = "elfenermarcell@gmail.com";
+ github = "elfenermarcell";
+ githubId = 183738665;
+ name = "Marcell Tóth";
+ };
eliandoran = {
email = "contact@eliandoran.me";
name = "Elian Doran";
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 068e23aa3347..48f8ded73c64 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -343,14 +343,23 @@ in
];
# Don't add `nvidia-uvm` to `kernelModules`, because we want
- # `nvidia-uvm` be loaded only after `udev` rules for `nvidia` kernel
- # module are applied.
+ # `nvidia-uvm` be loaded only after the GPU device is available, i.e. after `udev` rules
+ # for `nvidia` kernel module are applied.
+ # This matters on Azure GPU instances: https://github.com/NixOS/nixpkgs/pull/267335
#
# Instead, we use `softdep` to lazily load `nvidia-uvm` kernel module
# after `nvidia` kernel module is loaded and `udev` rules are applied.
extraModprobeConfig = ''
softdep nvidia post: nvidia-uvm
'';
+
+ # Exception is the open-source kernel module failing to load nvidia-uvm using softdep
+ # for unknown reasons.
+ # It affects CUDA: https://github.com/NixOS/nixpkgs/issues/334180
+ # Previously nvidia-uvm was explicitly loaded only when xserver was enabled:
+ # https://github.com/NixOS/nixpkgs/pull/334340/commits/4548c392862115359e50860bcf658cfa8715bde9
+ # We are now loading the module eagerly for all users of the open driver (including headless).
+ kernelModules = lib.optionals useOpenModules [ "nvidia_uvm" ];
};
systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia [
"L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"
@@ -639,16 +648,11 @@ in
boot = {
extraModulePackages = if useOpenModules then [ nvidia_x11.open ] else [ nvidia_x11.bin ];
# nvidia-uvm is required by CUDA applications.
- kernelModules =
- lib.optionals config.services.xserver.enable [
- "nvidia"
- "nvidia_modeset"
- "nvidia_drm"
- ]
- # With the open driver, nvidia-uvm does not automatically load as
- # a softdep of the nvidia module, so we explicitly load it for now.
- # See https://github.com/NixOS/nixpkgs/issues/334180
- ++ lib.optionals (config.services.xserver.enable && useOpenModules) [ "nvidia_uvm" ];
+ kernelModules = lib.optionals config.services.xserver.enable [
+ "nvidia"
+ "nvidia_modeset"
+ "nvidia_drm"
+ ];
# If requested enable modesetting via kernel parameters.
kernelParams =
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1f1317ddcdfe..8ecdc692ef5d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -554,7 +554,6 @@
./services/desktops/gnome/rygel.nix
./services/desktops/gnome/sushi.nix
./services/desktops/gnome/tinysparql.nix
- ./services/desktops/gsignond.nix
./services/desktops/gvfs.nix
./services/desktops/malcontent.nix
./services/desktops/neard.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0e8711fd489a..94cf7428e09d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -299,6 +299,9 @@ in
See https://www.isc.org/blogs/isc-dhcp-eol/ for details.
Please switch to a different implementation like kea or dnsmasq.
'')
+ (mkRemovedOptionModule [ "services" "gsignond" ] ''
+ The corresponding package was unmaintained, abandoned upstream, used outdated library and thus removed from nixpkgs.
+ '')
(mkRemovedOptionModule [ "services" "haka" ] ''
The corresponding package was broken and removed from nixpkgs.
'')
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
deleted file mode 100644
index 96a54889babf..000000000000
--- a/nixos/modules/services/desktops/gsignond.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# Accounts-SSO gSignOn daemon
-{
- config,
- lib,
- pkgs,
- ...
-}:
-let
- package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; };
-in
-{
-
- meta.maintainers = [ ];
-
- ###### interface
-
- options = {
-
- services.gsignond = {
-
- enable = lib.mkOption {
- type = lib.types.bool;
- default = false;
- description = ''
- Whether to enable gSignOn daemon, a DBus service
- which performs user authentication on behalf of its clients.
- '';
- };
-
- plugins = lib.mkOption {
- type = lib.types.listOf lib.types.package;
- default = [ ];
- description = ''
- What plugins to use with the gSignOn daemon.
- '';
- };
- };
- };
-
- ###### implementation
- config = lib.mkIf config.services.gsignond.enable {
- environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf";
- services.dbus.packages = [ package ];
- };
-
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8c38bdb081f5..2f650f36bb0e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -966,7 +966,7 @@ in
nzbhydra2 = handleTest ./nzbhydra2.nix { };
ocis = handleTest ./ocis.nix { };
oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { };
- obs-studio = handleTest ./obs-studio.nix { };
+ obs-studio = runTest ./obs-studio.nix;
oh-my-zsh = handleTest ./oh-my-zsh.nix { };
ollama = runTest ./ollama.nix;
ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;
@@ -1092,21 +1092,25 @@ in
pretalx = runTest ./web-apps/pretalx.nix;
prefect = runTest ./prefect.nix;
pretix = runTest ./web-apps/pretix.nix;
- printing-socket = handleTest ./printing.nix {
- socket = true;
- listenTcp = true;
+ printing-socket = runTest {
+ imports = [ ./printing.nix ];
+ _module.args.socket = true;
+ _module.args.listenTcp = true;
};
- printing-service = handleTest ./printing.nix {
- socket = false;
- listenTcp = true;
+ printing-service = runTest {
+ imports = [ ./printing.nix ];
+ _module.args.socket = false;
+ _module.args.listenTcp = true;
};
- printing-socket-notcp = handleTest ./printing.nix {
- socket = true;
- listenTcp = false;
+ printing-socket-notcp = runTest {
+ imports = [ ./printing.nix ];
+ _module.args.socket = true;
+ _module.args.listenTcp = false;
};
- printing-service-notcp = handleTest ./printing.nix {
- socket = false;
- listenTcp = false;
+ printing-service-notcp = runTest {
+ imports = [ ./printing.nix ];
+ _module.args.socket = false;
+ _module.args.listenTcp = false;
};
private-gpt = handleTest ./private-gpt.nix { };
privatebin = runTest ./privatebin.nix;
@@ -1459,7 +1463,7 @@ in
wpa_supplicant = import ./wpa_supplicant.nix { inherit pkgs runTest; };
wordpress = runTest ./wordpress.nix;
wrappers = handleTest ./wrappers.nix { };
- writefreely = handleTest ./web-apps/writefreely.nix { };
+ writefreely = import ./web-apps/writefreely.nix { inherit pkgs runTest; };
wstunnel = runTest ./wstunnel.nix;
xandikos = runTest ./xandikos.nix;
xautolock = runTest ./xautolock.nix;
diff --git a/nixos/tests/installed-tests/geocode-glib.nix b/nixos/tests/installed-tests/geocode-glib.nix
index 76a32ee2849a..3fc5dc313a24 100644
--- a/nixos/tests/installed-tests/geocode-glib.nix
+++ b/nixos/tests/installed-tests/geocode-glib.nix
@@ -11,5 +11,5 @@ makeInstalledTest {
];
};
- tested = pkgs.geocode-glib;
+ tested = pkgs.geocode-glib_2;
}
diff --git a/nixos/tests/obs-studio.nix b/nixos/tests/obs-studio.nix
index a1b5bacf0428..7290119a12d7 100644
--- a/nixos/tests/obs-studio.nix
+++ b/nixos/tests/obs-studio.nix
@@ -1,40 +1,38 @@
-import ./make-test-python.nix (
- { ... }:
+{ ... }:
- {
- name = "obs-studio";
+{
+ name = "obs-studio";
- nodes.machine =
- { pkgs, ... }:
- {
- imports = [
- ./common/x11.nix
- ./common/user-account.nix
+ nodes.machine =
+ { pkgs, ... }:
+ {
+ imports = [
+ ./common/x11.nix
+ ./common/user-account.nix
+ ];
+
+ programs.obs-studio = {
+ enable = true;
+ plugins = with pkgs.obs-studio-plugins; [
+ wlrobs
+ obs-vkcapture
];
-
- programs.obs-studio = {
- enable = true;
- plugins = with pkgs.obs-studio-plugins; [
- wlrobs
- obs-vkcapture
- ];
- enableVirtualCamera = true;
- };
+ enableVirtualCamera = true;
};
+ };
- testScript = ''
- machine.wait_for_x()
- machine.succeed("obs --version")
+ testScript = ''
+ machine.wait_for_x()
+ machine.succeed("obs --version")
- # virtual camera tests
- machine.succeed("lsmod | grep v4l2loopback")
- machine.succeed("ls /dev/video1")
- machine.succeed("obs --startvirtualcam >&2 &")
- machine.wait_for_window("OBS")
- machine.sleep(5)
+ # virtual camera tests
+ machine.succeed("lsmod | grep v4l2loopback")
+ machine.succeed("ls /dev/video1")
+ machine.succeed("obs --startvirtualcam >&2 &")
+ machine.wait_for_window("OBS")
+ machine.sleep(5)
- # test plugins
- machine.succeed("which obs-vkcapture")
- '';
- }
-)
+ # test plugins
+ machine.succeed("which obs-vkcapture")
+ '';
+}
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 5fee5c6a4989..890bc207a326 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -1,141 +1,138 @@
# Test printing via CUPS.
+{
+ pkgs,
+ socket ? true, # whether to use socket activation
+ listenTcp ? true, # whether to open port 631 on client
+ ...
+}:
-import ./make-test-python.nix (
- {
- pkgs,
- socket ? true, # whether to use socket activation
- listenTcp ? true, # whether to open port 631 on client
- ...
- }:
+let
+ inherit (pkgs) lib;
+in
- let
- inherit (pkgs) lib;
- in
+{
+ name = "printing";
+ meta = with lib.maintainers; {
+ maintainers = [
+ domenkozar
+ matthewbauer
+ ];
+ };
- {
- name = "printing";
- meta = with lib.maintainers; {
- maintainers = [
- domenkozar
- matthewbauer
+ nodes.server =
+ { ... }:
+ {
+ services.printing = {
+ enable = true;
+ stateless = true;
+ startWhenNeeded = socket;
+ listenAddresses = [ "*:631" ];
+ defaultShared = true;
+ openFirewall = true;
+ extraConf = ''
+
+ Order allow,deny
+ Allow from all
+
+ '';
+ };
+ # Add a HP Deskjet printer connected via USB to the server.
+ hardware.printers.ensurePrinters = [
+ {
+ name = "DeskjetLocal";
+ deviceUri = "usb://foobar/printers/foobar";
+ model = "drv:///sample.drv/deskjet.ppd";
+ }
];
};
- nodes.server =
- { ... }:
- {
- services.printing = {
- enable = true;
- stateless = true;
- startWhenNeeded = socket;
- listenAddresses = [ "*:631" ];
- defaultShared = true;
- openFirewall = true;
- extraConf = ''
-
- Order allow,deny
- Allow from all
-
- '';
- };
- # Add a HP Deskjet printer connected via USB to the server.
- hardware.printers.ensurePrinters = [
- {
- name = "DeskjetLocal";
- deviceUri = "usb://foobar/printers/foobar";
- model = "drv:///sample.drv/deskjet.ppd";
- }
- ];
- };
+ nodes.client =
+ { lib, ... }:
+ {
+ services.printing.enable = true;
+ services.printing.startWhenNeeded = socket;
+ services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ];
+ # Add printer to the client as well, via IPP.
+ hardware.printers.ensurePrinters = [
+ {
+ name = "DeskjetRemote";
+ deviceUri = "ipp://server/printers/DeskjetLocal";
+ model = "drv:///sample.drv/deskjet.ppd";
+ }
+ ];
+ hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
+ };
- nodes.client =
- { lib, ... }:
- {
- services.printing.enable = true;
- services.printing.startWhenNeeded = socket;
- services.printing.listenAddresses = lib.mkIf (!listenTcp) [ ];
- # Add printer to the client as well, via IPP.
- hardware.printers.ensurePrinters = [
- {
- name = "DeskjetRemote";
- deviceUri = "ipp://server/printers/DeskjetLocal";
- model = "drv:///sample.drv/deskjet.ppd";
- }
- ];
- hardware.printers.ensureDefaultPrinter = "DeskjetRemote";
- };
+ testScript = ''
+ import os
+ import re
- testScript = ''
- import os
- import re
+ start_all()
- start_all()
+ with subtest("Make sure that cups is up on both sides and printers are set up"):
+ server.wait_for_unit("ensure-printers.service")
+ client.wait_for_unit("ensure-printers.service")
- with subtest("Make sure that cups is up on both sides and printers are set up"):
- server.wait_for_unit("ensure-printers.service")
- client.wait_for_unit("ensure-printers.service")
+ assert "scheduler is running" in client.succeed("lpstat -r")
- assert "scheduler is running" in client.succeed("lpstat -r")
+ with subtest("UNIX socket is used for connections"):
+ assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
- with subtest("UNIX socket is used for connections"):
- assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
+ with subtest("HTTP server is available too"):
+ ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''}
+ client.succeed(f"curl --fail http://{server.name}:631/")
+ server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
- with subtest("HTTP server is available too"):
- ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''}
- client.succeed(f"curl --fail http://{server.name}:631/")
- server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
+ with subtest("LP status checks"):
+ assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
+ assert "DeskjetLocal accepting requests" in client.succeed(
+ f"lpstat -h {server.name}:631 -a"
+ )
+ client.succeed("cupsdisable DeskjetRemote")
+ out = client.succeed("lpq")
+ print(out)
+ assert re.search(
+ "DeskjetRemote is not ready.*no entries",
+ client.succeed("lpq"),
+ flags=re.DOTALL,
+ )
+ client.succeed("cupsenable DeskjetRemote")
+ assert re.match(
+ "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL
+ )
- with subtest("LP status checks"):
- assert "DeskjetRemote accepting requests" in client.succeed("lpstat -a")
- assert "DeskjetLocal accepting requests" in client.succeed(
- f"lpstat -h {server.name}:631 -a"
- )
- client.succeed("cupsdisable DeskjetRemote")
- out = client.succeed("lpq")
- print(out)
- assert re.search(
- "DeskjetRemote is not ready.*no entries",
- client.succeed("lpq"),
- flags=re.DOTALL,
- )
- client.succeed("cupsenable DeskjetRemote")
- assert re.match(
- "DeskjetRemote is ready.*no entries", client.succeed("lpq"), flags=re.DOTALL
- )
+ # Test printing various file types.
+ for file in [
+ "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+ "${pkgs.groff.doc}/share/doc/*/meref.ps",
+ "${pkgs.cups.out}/share/doc/cups/images/cups.png",
+ "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt",
+ ]:
+ file_name = os.path.basename(file)
+ with subtest(f"print {file_name}"):
+ # Print the file on the client.
+ print(client.succeed("lpq"))
+ client.succeed(f"lp {file}")
+ client.wait_until_succeeds(
+ f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'"
+ )
- # Test printing various file types.
- for file in [
- "${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
- "${pkgs.groff.doc}/share/doc/*/meref.ps",
- "${pkgs.cups.out}/share/doc/cups/images/cups.png",
- "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt",
- ]:
- file_name = os.path.basename(file)
- with subtest(f"print {file_name}"):
- # Print the file on the client.
- print(client.succeed("lpq"))
- client.succeed(f"lp {file}")
- client.wait_until_succeeds(
- f"lpq; lpq | grep -q -E 'active.*root.*{file_name}'"
- )
+ # Ensure that a raw PCL file appeared in the server's queue
+ # (showing that the right filters have been applied). Of
+ # course, since there is no actual USB printer attached, the
+ # file will stay in the queue forever.
+ server.wait_for_file("/var/spool/cups/d*-001")
+ server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'")
- # Ensure that a raw PCL file appeared in the server's queue
- # (showing that the right filters have been applied). Of
- # course, since there is no actual USB printer attached, the
- # file will stay in the queue forever.
- server.wait_for_file("/var/spool/cups/d*-001")
- server.wait_until_succeeds(f"lpq -a | grep -q -E '{file_name}'")
+ # Delete the job on the client. It should disappear on the
+ # server as well.
+ client.succeed("lprm")
+ client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'")
- # Delete the job on the client. It should disappear on the
- # server as well.
- client.succeed("lprm")
- client.wait_until_succeeds("lpq -a | grep -q -E 'no entries'")
+ retry(lambda _: "no entries" in server.succeed("lpq -a"))
- retry(lambda _: "no entries" in server.succeed("lpq -a"))
-
- # The queue is empty already, so this should be safe.
- # Otherwise, pairs of "c*"-"d*-001" files might persist.
- server.execute("rm /var/spool/cups/*")
- '';
- }
-)
+ # The queue is empty already, so this should be safe.
+ # Otherwise, pairs of "c*"-"d*-001" files might persist.
+ server.execute("rm /var/spool/cups/*")
+ '';
+}
diff --git a/nixos/tests/web-apps/writefreely.nix b/nixos/tests/web-apps/writefreely.nix
index 3f56e1df8ead..fe9889e75332 100644
--- a/nixos/tests/web-apps/writefreely.nix
+++ b/nixos/tests/web-apps/writefreely.nix
@@ -1,16 +1,12 @@
{
- system ? builtins.currentSystem,
- config ? { },
- pkgs ? import ../../.. { inherit system config; },
+ runTest,
+ ...
}:
-with import ../../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
let
writefreelyTest =
{ name, type }:
- makeTest {
+ runTest {
name = "writefreely-${name}";
nodes.machine =
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index db313704dfad..b7e810f56fa0 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -38,17 +38,17 @@ let
in
stdenv.mkDerivation rec {
pname = "reaper";
- version = "7.35";
+ version = "7.36";
src = fetchurl {
url = url_for_platform version stdenv.hostPlatform.qemuArch;
hash =
if stdenv.hostPlatform.isDarwin then
- "sha256-X3KNESHUmcs3zcwURKvaDqvkf9P/XncO/hpsOGxKMmg="
+ "sha256-++LWAnOUNVe3EOkBMlHizaBSQ5B2DJPhNUT8w2mTuiI="
else
{
- x86_64-linux = "sha256-VD2VUTZUYi+7rDCG1joElajbfxLiramQwwrUgDDpuPI=";
- aarch64-linux = "sha256-TFhv4CS7VCysup3Xy/uXHxaWhG4J8WCgxtaooGFj4vw=";
+ x86_64-linux = "sha256-wQIDTumxQI8S446u87noYvIx/pyfCa/Xe1U/Ot/7ESY=";
+ aarch64-linux = "sha256-5AkwRG1+xDVAhEOUTdpK1G7+qjE68zr4hs55mMQivmM=";
}
.${stdenv.hostPlatform.system};
};
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index c0f00af9e778..aa13b32ebbf2 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
}:
mkLibretroCore {
core = "mednafen-psx" + lib.optionalString withHw "-hw";
- version = "0-unstable-2025-04-04";
+ version = "0-unstable-2025-04-11";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-psx-libretro";
- rev = "90c09d4b8e6923a22538c35f68ace2d9fead134d";
- hash = "sha256-eVoKmGE3N8uePcNpxWjAjgUjTIfEHZR3K2FLtQtLp+M=";
+ rev = "5d2137e5f15db3b52583e8246bcf2669cebb147b";
+ hash = "sha256-Gu5rubuNsMWOCNaNrqRR/hoErmhYdGC+9o/xDXuaWuM=";
};
extraBuildInputs = lib.optionals withHw [
diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index b2e52fd6202f..d4716778840b 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
- version = "0-unstable-2024-12-04";
+ version = "0-unstable-2025-04-15";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
- rev = "572c91856a5288b7433c619af651e31f00f3ce7e";
- hash = "sha256-fN5zjQGIyx3yIEgIhC50gD3O2F6WPJ/ssiauQ5Z/t9s=";
+ rev = "efaaa1052dc427d64534531cf59a6a9a659dc6a6";
+ hash = "sha256-oCjIQ78YU5SeeefHHwd7l3U+YhwVMf6R2mbsuHAQUYQ=";
};
meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index 07f1f03b2148..846b6d9ddb0f 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bsnes";
- version = "0-unstable-2025-04-04";
+ version = "0-unstable-2025-04-11";
src = fetchFromGitHub {
owner = "libretro";
repo = "bsnes-libretro";
- rev = "8d89089d35bedc257dc13bebd3790f70417311a5";
- hash = "sha256-0n2N2Ks8MIy7dcuj2SESjDNxma7RRhAgOxQ5sC3XJTM=";
+ rev = "b102d6d5817b25aa059b573cd3b7675f2e375fa4";
+ hash = "sha256-a77SSoz0C189iNHUB2bcO3X76LPbA/V7pAZtUR03u48=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix
index 3039615973f7..e245cf7dddb2 100644
--- a/pkgs/applications/emulators/libretro/cores/fceumm.nix
+++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fceumm";
- version = "0-unstable-2025-04-06";
+ version = "0-unstable-2025-04-11";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-fceumm";
- rev = "b349f7f3e211bb7725f133d3818ab98da5059760";
- hash = "sha256-MNYpuipjnDl9GUl5qWGi5W5cFhUCd/weCKuTRdttKJ4=";
+ rev = "43e6496351b544df0de692fbb01b2a6942073f5c";
+ hash = "sha256-kGGvI1rKE/oSF2v3URDY/fLTThYc3Crk9UFN69Rcckg=";
};
meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 4c0f638580f3..5f1252b91c49 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mame2003-plus";
- version = "0-unstable-2025-04-07";
+ version = "0-unstable-2025-04-16";
src = fetchFromGitHub {
owner = "libretro";
repo = "mame2003-plus-libretro";
- rev = "2b5fc26ee64d963021bc266aa45f19d90b282f92";
- hash = "sha256-ZbebYUOUdaLVTh+VD8AQvAv/zQzr6tugJRl3iYSrUeo=";
+ rev = "c2128c3e82d884f39d824b5ef2716ac35dfa406b";
+ hash = "sha256-acicfUJlDT2Tm3aGTs9tAGaAGCC22ebRXnVLAxgcRI8=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
index 445e0cea6ca3..7dc31a0a0e86 100644
--- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
+++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "pcsx-rearmed";
- version = "0-unstable-2025-03-30";
+ version = "0-unstable-2025-04-13";
src = fetchFromGitHub {
owner = "libretro";
repo = "pcsx_rearmed";
- rev = "6091efb4d64ed745495455ba82352ec82f55cb4f";
- hash = "sha256-9FyD3a6FE7xtt/UGvRNfopvQPgAg/0QGrJ1NNMEIsyg=";
+ rev = "febf2246848efb8937ab24c562bba20107bb46f0";
+ hash = "sha256-1mnPYr5A6KmZXXbvkE9XkZiCjx/y0Y9/Ed34LQHDbvE=";
};
dontConfigure = true;
diff --git a/pkgs/applications/emulators/libretro/cores/picodrive.nix b/pkgs/applications/emulators/libretro/cores/picodrive.nix
index 04843e9eee1d..59ab241ed787 100644
--- a/pkgs/applications/emulators/libretro/cores/picodrive.nix
+++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "picodrive";
- version = "0-unstable-2025-04-03";
+ version = "0-unstable-2025-04-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "picodrive";
- rev = "1a08d73159820bb31941d8c5ed6242a74bd4b332";
- hash = "sha256-849XeceXoPHpOMlxVtHgL2TYQTHibUbGs0oHBEiCzvw=";
+ rev = "c4332d608c1005a46ce51236ade9894e0d32e52b";
+ hash = "sha256-qu5pnqHHO/k8OO2XXwd/H7AQsutmnMz+RBT6ZZFXZgk=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index 98861e57c740..d33b09679623 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
}:
mkLibretroCore {
core = "play";
- version = "0-unstable-2025-04-04";
+ version = "0-unstable-2025-04-07";
src = fetchFromGitHub {
owner = "jpd002";
repo = "Play-";
- rev = "225e37d0dc7b8a7bb6dc3534b992373477f9923d";
- hash = "sha256-bY4RwJyS4R/vjae2UCi4SnIW04IzoQyMOYsW4f+UQg8=";
+ rev = "f66e60ffda14cc615336d2997c09b3b1b998e8eb";
+ hash = "sha256-qGIqXc0xouWcOPMmBUFRyA4DHmdNEopxUR/J+o0H+QE=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/emulators/libretro/cores/puae.nix b/pkgs/applications/emulators/libretro/cores/puae.nix
index 3c0cb10e13ca..1d1b91d8dabf 100644
--- a/pkgs/applications/emulators/libretro/cores/puae.nix
+++ b/pkgs/applications/emulators/libretro/cores/puae.nix
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "puae";
- version = "0-unstable-2025-03-27";
+ version = "0-unstable-2025-04-15";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-uae";
- rev = "987ac9bf14b813bf14ee6ab0f9d1f95c9d19ea78";
- hash = "sha256-ONL7KjDMF+syiwBG+ivU7b7D7qFVr2gpw5ulnV3OZU8=";
+ rev = "0faf39cfd84e114d985e020562e75c22b4bc1569";
+ hash = "sha256-eJnCHei0/SdJD33SGsRgUL1+IapcvX/FcxHDlYmkob0=";
};
makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/vecx.nix b/pkgs/applications/emulators/libretro/cores/vecx.nix
index e8a21deae253..b33822d8c9ce 100644
--- a/pkgs/applications/emulators/libretro/cores/vecx.nix
+++ b/pkgs/applications/emulators/libretro/cores/vecx.nix
@@ -7,13 +7,13 @@
}:
mkLibretroCore {
core = "vecx";
- version = "0-unstable-2024-10-21";
+ version = "0-unstable-2025-04-12";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-vecx";
- rev = "a103a212ca8644fcb5d76eac7cdec77223c4fb02";
- hash = "sha256-veCGW5mbR1V7cCzZ4BzDSdPZDycw4WNveie/DDVAzw8=";
+ rev = "841229a6a81a0461d08af6488f252dcec5266c6a";
+ hash = "sha256-bWhXXJCf/ax7n/sOfXibGvcFnCnmULcALoBR1uyIN+I=";
};
extraBuildInputs = [
diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix
index 77223d041c8a..078dbee89617 100644
--- a/pkgs/applications/video/mpv/scripts/manga-reader.nix
+++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix
@@ -8,12 +8,12 @@
buildLua {
pname = "manga-reader";
- version = "0-unstable-2025-02-16";
+ version = "0-unstable-2025-04-16";
src = fetchFromGitHub {
owner = "Dudemanguy";
repo = "mpv-manga-reader";
- rev = "68824666b669ec101835f6d7aa510896e82ec30f";
- hash = "sha256-9PGJ2OrAcbJIBLI/XGT2HQpC3KuoYnn1ws9oB9AnHQA=";
+ rev = "41c4be078fe6250b87eea21545c74d649719f8e4";
+ hash = "sha256-uUaKqPtONuoRuVqtP0FwcUdhG2WlPRfizuZIzDPPjac=";
};
passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
index 2f31975697ca..8aac08543123 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-color-monitor.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "obs-color-monitor";
- version = "0.9.1";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "norihiro";
repo = "obs-color-monitor";
tag = finalAttrs.version;
- hash = "sha256-4Dagga9BgW1Fiaxqs9QlyTax+SgFyTiNiU3yP2GjIDs=";
+ hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index af4c56d640ae..8cbecd2b1b5f 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arc-browser";
- version = "1.87.1-60573";
+ version = "1.90.1-61364";
src = fetchurl {
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
- hash = "sha256-UiB5MQl7hRl6nPu4xiwOdhC40bHYIcpPNtWg98HqCJc=";
+ hash = "sha256-lQelLROhnefvcUholJlABaIgmWebFYGu5rmbnAtHs1c=";
};
nativeBuildInputs = [ undmg ];
diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix
index a146ef653f64..3a65802c2615 100644
--- a/pkgs/by-name/ce/cewler/package.nix
+++ b/pkgs/by-name/ce/cewler/package.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cewler";
- version = "1.2.0";
+ version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "roys";
repo = "cewler";
rev = "v${version}";
- hash = "sha256-lVI3p6YMugQ3yKHFNxISmUY7XZMuX/TXvVUoZfIeJog=";
+ hash = "sha256-Od9O71122jVwqZ5ntoBQQtyNQjt2RRbZT8DzWFPUN84=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/cl/cloudflare-utils/package.nix b/pkgs/by-name/cl/cloudflare-utils/package.nix
index d1f35537098c..80de794035a6 100644
--- a/pkgs/by-name/cl/cloudflare-utils/package.nix
+++ b/pkgs/by-name/cl/cloudflare-utils/package.nix
@@ -5,16 +5,16 @@
}:
buildGoModule rec {
pname = "cloudflare-utils";
- version = "1.3.5";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "Cyb3r-Jak3";
repo = "cloudflare-utils";
rev = "v${version}";
- hash = "sha256-LbqH48ysOp2s+e+52doHIyaxUbzzCdJqhdvLuIJ3CCc=";
+ hash = "sha256-/vausJEe5g6Txgq1z7oUUku0w6sd/mmYcZQ8D7dZ03E=";
};
- vendorHash = "sha256-fg2BJkXdCWAO83kMoxkHlEyZuVezu9rs0hEda17KObE=";
+ vendorHash = "sha256-/kbXAljCe07dC/jL4RMeN8tKXhSPMxXY33CqBDySA8w=";
meta = {
description = "Helpful Cloudflare utility program";
diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix
index 73fffb6c9935..3f1a717a507c 100644
--- a/pkgs/by-name/co/codipack/package.nix
+++ b/pkgs/by-name/co/codipack/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "codipack";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "SciCompKL";
repo = "CoDiPack";
tag = "v${finalAttrs.version}";
- hash = "sha256-ZD9P4yWcF9zGeTyw6ENAcGoPyc8QcBdNZNnqRV4MH8s=";
+ hash = "sha256-feYtPDV0t7b49NIL5s6ZoBttRG2Bkwc0gOX6R6xDIbs=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index b98edd71f986..37182f07f3a2 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -4,15 +4,10 @@
fetchFromGitHub,
rustPlatform,
just,
+ libcosmicAppHook,
which,
- pkg-config,
- makeBinaryWrapper,
- libxkbcommon,
- wayland,
- appstream-glib,
- desktop-file-utils,
- intltool,
nixosTests,
+ nix-update-script,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,25 +24,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
useFetchCargoVendor = true;
cargoHash = "sha256-utip7E8NST88mPaKppkuOcdW+QkFoRqWy3a2McvMHo8=";
- postPatch = ''
- substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
- '';
-
nativeBuildInputs = [
just
which
- pkg-config
- makeBinaryWrapper
- ];
- buildInputs = [
- libxkbcommon
- wayland
- appstream-glib
- desktop-file-utils
- intltool
+ libcosmicAppHook
];
dontUseJustBuild = true;
+ # Runs the default checkPhase instead
+ dontUseJustCheck = true;
justFlags = [
"--set"
@@ -58,26 +43,32 @@ rustPlatform.buildRustPackage (finalAttrs: {
"target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/cosmic-notifications"
];
- postInstall = ''
- wrapProgram $out/bin/cosmic-notifications \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
- '';
+ passthru = {
+ tests = {
+ inherit (nixosTests)
+ cosmic
+ cosmic-autologin
+ cosmic-noxwayland
+ cosmic-autologin-noxwayland
+ ;
+ };
- passthru.tests = {
- inherit (nixosTests)
- cosmic
- cosmic-autologin
- cosmic-noxwayland
- cosmic-autologin-noxwayland
- ;
+ updateScript = nix-update-script {
+ extraArgs = [
+ "--version"
+ "unstable"
+ "--version-regex"
+ "epoch-(.*)"
+ ];
+ };
};
- meta = with lib; {
+ meta = {
homepage = "https://github.com/pop-os/cosmic-notifications";
description = "Notifications for the COSMIC Desktop Environment";
mainProgram = "cosmic-notifications";
- license = licenses.gpl3Only;
- maintainers = teams.cosmic.members;
- platforms = platforms.linux;
+ license = lib.licenses.gpl3Only;
+ maintainers = lib.teams.cosmic.members;
+ platforms = lib.platforms.linux;
};
})
diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix
index 68158f7ec19d..c3fbc6542b78 100644
--- a/pkgs/by-name/dm/dmlive/package.nix
+++ b/pkgs/by-name/dm/dmlive/package.nix
@@ -20,17 +20,17 @@ in
rustPlatform.buildRustPackage {
pname = "dmlive";
- version = "5.5.7-unstable-2025-01-25";
+ version = "5.5.8-unstable-2025-04-06";
src = fetchFromGitHub {
owner = "THMonster";
repo = "dmlive";
- rev = "79b4d9430fca3ebb86c57ee506989f620ea68a21"; # no tag
- hash = "sha256-0DDKKd4IZj+3AyVMG4FXjCbvvMg5iDCiF1B6nB8n3lU=";
+ rev = "b066a637093871de9962e08d4f0ae0b77bd8f1f4"; # no tag
+ hash = "sha256-pAsxr6zGCDZ0qysGT1+2+5+WKI2QopGxnZWpfnxk/fI=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-UwKQivYZyXYADbwf4VA1h2y7YzpxefUgDYQG+NaLMwE=";
+ cargoHash = "sha256-GVko8GK5Muha4uqDMgk7VkFoFCVcmk0vM1GUELvSzgM=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
new file mode 100644
index 000000000000..6c0f419eb511
--- /dev/null
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -0,0 +1,1002 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://jitpack.io": {
+ "com/github/wille#oslib/d6ee6549bb": {
+ "jar": "sha256-gsLPIH1GGImqdghCGBWtZM5PNgUlvfBanhKlQOarw3w=",
+ "pom": "sha256-7wF38tn4fbnw0w7dQy2wLlhqHejMkVb8HcZRgvDh5oA="
+ }
+ },
+ "https://nexus.jixxed.nl/nexus/content/repositories/releases/nl": {
+ "jixxed#opencv/4.5.3-0": {
+ "jar": "sha256-PwimnmKzejFrZdIsiNLtTExlvRvWKxKPDBbMTe4KhQQ=",
+ "pom": "sha256-yE9S2bEo5C5Y+j2+eQOHGnpJ1G1Soee7rNFHiRr/pNo="
+ },
+ "jixxed/lept4j#lept4j/1.16.6": {
+ "jar": "sha256-nZH3ZJ4mabbNGm4rijF22oOPaMqjPQj9Yb1ry7GX81U=",
+ "module": "sha256-dIssWUftjqegtJqcPuyCuti0oFhBYZ16cIPjWPlCweA=",
+ "pom": "sha256-k31BbQcMlLWOjhhkUgrWnOUyb/zKBhRzq8hC6p6d/eY="
+ },
+ "jixxed/tess4j#tess4j/5.2.9": {
+ "jar": "sha256-gsiiiVKkAttbXSZs4Pooxy+z+tY/d+mGBpoUMxPkQ2I=",
+ "module": "sha256-cf6jtMnOwWWJcSa+mJO1j9D21kCWkIhp4E6TzZVOD34=",
+ "pom": "sha256-twbAdpEaiT5DuA7JosdbWEF/kJbt5K5YpKP6ISDgx28="
+ }
+ },
+ "https://plugins.gradle.org/m2": {
+ "com/cedarsoftware#json-io/4.14.1": {
+ "jar": "sha256-UY3ynWhbHfjcpYCfEr9udnDY280SKAt/z5mjWNRs/fw=",
+ "pom": "sha256-4DILOzeTeilHRecS0ZEUBGkLmrL2cNb1UHmtLKhPDHY="
+ },
+ "com/fasterxml#oss-parent/58": {
+ "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+ },
+ "com/fasterxml/jackson#jackson-bom/2.17.2": {
+ "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+ },
+ "com/fasterxml/jackson#jackson-parent/2.17": {
+ "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+ },
+ "com/zaxxer#SparseBitSet/1.3": {
+ "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=",
+ "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g="
+ },
+ "commons-codec#commons-codec/1.17.1": {
+ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=",
+ "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
+ },
+ "commons-io#commons-io/2.18.0": {
+ "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
+ "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
+ },
+ "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+ "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+ },
+ "jakarta/platform#jakartaee-api-parent/9.1.0": {
+ "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+ },
+ "net/jsign#jsign-core/7.1": {
+ "jar": "sha256-92AtTJ/J91V51wwG90cVyEUx5EeHAPcNYw9WgPeMUmo=",
+ "pom": "sha256-EeW9Bzs4r0LcFMdTXH1ZnDEqMe9HxQHqaTNbvZXwDEk="
+ },
+ "net/jsign#jsign-crypto/7.1": {
+ "jar": "sha256-3P5NOHVoAr2A1N52s8a8oHdJEUivci+shVARrLMtorg=",
+ "pom": "sha256-hN+APkSaW0h9usa4LajKuFrlJQnGas4SAnryjoZIN2c="
+ },
+ "net/jsign#jsign-gradle-plugin/7.1": {
+ "jar": "sha256-x01Z+Hu1gbj3eSe4Qofdv0OJKznKrnPirmSa57ziTCY=",
+ "module": "sha256-oT75n6y0JT26M4h7rNSABL10PDpzrMejv74nEjeI8yY=",
+ "pom": "sha256-lHnrsn/BXGGCNMRvRXGZWKiYUoTKAMqm7jwcrW2w8+I="
+ },
+ "net/jsign#jsign-parent/7.1": {
+ "pom": "sha256-IZZHpKDOVcG4bMrbQRLPsaEkteDcISP0ohsCUqcQMMI="
+ },
+ "org/apache#apache/16": {
+ "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+ },
+ "org/apache#apache/21": {
+ "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+ },
+ "org/apache#apache/32": {
+ "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
+ },
+ "org/apache#apache/33": {
+ "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+ },
+ "org/apache/commons#commons-collections4/4.4": {
+ "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
+ "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
+ },
+ "org/apache/commons#commons-lang3/3.17.0": {
+ "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=",
+ "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw="
+ },
+ "org/apache/commons#commons-math3/3.6.1": {
+ "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+ "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+ },
+ "org/apache/commons#commons-parent/39": {
+ "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+ },
+ "org/apache/commons#commons-parent/48": {
+ "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
+ },
+ "org/apache/commons#commons-parent/71": {
+ "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
+ },
+ "org/apache/commons#commons-parent/73": {
+ "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o="
+ },
+ "org/apache/commons#commons-parent/78": {
+ "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
+ },
+ "org/apache/commons#commons-text/1.13.0": {
+ "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=",
+ "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg="
+ },
+ "org/apache/groovy#groovy-bom/4.0.22": {
+ "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
+ "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+ },
+ "org/apache/logging#logging-parent/11.3.0": {
+ "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
+ },
+ "org/apache/logging/log4j#log4j-api/2.24.3": {
+ "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=",
+ "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk="
+ },
+ "org/apache/logging/log4j#log4j-bom/2.24.3": {
+ "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
+ },
+ "org/apache/logging/log4j#log4j/2.24.3": {
+ "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E="
+ },
+ "org/apache/poi#poi/5.4.0": {
+ "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=",
+ "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU="
+ },
+ "org/beryx#badass-jlink-plugin/3.1.1": {
+ "jar": "sha256-nSZZZ0y6Ic/QwU2qCoRboSrTOu9Oi8FSrqHAr9fYRWg=",
+ "module": "sha256-SbchA0l5YXx6x1VVyjjSeL1ZKwLIPY6DAAJHfc7Zzz8=",
+ "pom": "sha256-gpCklq0NVdcv9gBvCrO3NBSX1CBvlRs/+c/cFkKVKJs="
+ },
+ "org/bouncycastle#bcpkix-lts8on/2.73.7": {
+ "jar": "sha256-WHRYb7Se7ryZuH8SNShnm8Wlw4j+pL+E0semmQguKK0=",
+ "pom": "sha256-D3mEND0EU+Y5uoyNTXwNGFLfA8ye4UkoQgi/5KPnH44="
+ },
+ "org/bouncycastle#bcprov-lts8on/2.73.7": {
+ "jar": "sha256-LIzWo/7zyhSubiig3gDBbWJ2d9KML/AqAFE/rrK3/7E=",
+ "pom": "sha256-4MwaYuJQsJ+WbzbXnGUU82JXnb+cNy8t3qlXrd7C+qw="
+ },
+ "org/bouncycastle#bcutil-lts8on/2.73.7": {
+ "jar": "sha256-03ALDCPuKZzSRYYhZyIGpfNIlR84t+iOk7IaHxu+Zxg=",
+ "pom": "sha256-J4GHqnKeqbOMnpcHM5JeJNCsqT+j3yQ1iZ4SZKUDVrU="
+ },
+ "org/bouncycastle/bcutil-lts8on/maven-metadata": {
+ "xml": {
+ "groupId": "org.bouncycastle",
+ "lastUpdated": "20241107225957",
+ "release": "2.73.7"
+ }
+ },
+ "org/eclipse/ee4j#project/1.0.7": {
+ "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+ },
+ "org/gradlex#extra-java-module-info/1.11": {
+ "jar": "sha256-Z3+h2llhAw5z7rmNUoxF/rX69fXLH1ts3297I7L3YCk=",
+ "module": "sha256-HupoMVnjhje5y70/1RGeDKP1R5vGPfKoItJ+Cv4Yxu4=",
+ "pom": "sha256-JmY0IO3vtV1IsgYLN6K8DH0UociY2vZ0v1YuM/8LYnE="
+ },
+ "org/junit#junit-bom/5.10.3": {
+ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+ "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+ },
+ "org/junit#junit-bom/5.11.0": {
+ "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+ "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+ },
+ "org/junit#junit-bom/5.11.0-M2": {
+ "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
+ "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
+ },
+ "org/junit#junit-bom/5.11.2": {
+ "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=",
+ "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI="
+ },
+ "org/mockito#mockito-bom/4.11.0": {
+ "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+ },
+ "org/ow2#ow2/1.5.1": {
+ "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+ },
+ "org/ow2/asm#asm/9.7.1": {
+ "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
+ "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
+ },
+ "org/sonatype/oss#oss-parent/7": {
+ "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+ },
+ "org/springframework#spring-framework-bom/5.3.39": {
+ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+ "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+ }
+ },
+ "https://repo.maven.apache.org/maven2": {
+ "ch/qos/logback#logback-classic/1.5.17": {
+ "jar": "sha256-5700LZHlChXx4W+ApSbOff/EGNr3PNIJTbT4AsAgSIA=",
+ "pom": "sha256-qV4brkazX89CLuy93poeCCBhDtWb6r2D7uIZIYG8rL8="
+ },
+ "ch/qos/logback#logback-core/1.5.17": {
+ "jar": "sha256-L71fAnKxo1RuV0CliOc14HGs0M0CJuBI9xGUajDqwzc=",
+ "pom": "sha256-cWqhFMrn3xr+FcvuqN35EtWtdg82p6ir04+whl9F2G4="
+ },
+ "ch/qos/logback#logback-parent/1.5.17": {
+ "pom": "sha256-mnyL+zxKF2l86OrTojo8ysvccjphQkF98KrrqMHtBno="
+ },
+ "com/fasterxml#oss-parent/30": {
+ "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA="
+ },
+ "com/fasterxml#oss-parent/58": {
+ "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+ },
+ "com/fasterxml#oss-parent/61": {
+ "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+ },
+ "com/fasterxml/jackson#jackson-base/2.17.2": {
+ "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
+ },
+ "com/fasterxml/jackson#jackson-base/2.18.3": {
+ "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0="
+ },
+ "com/fasterxml/jackson#jackson-bom/2.17.2": {
+ "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+ },
+ "com/fasterxml/jackson#jackson-bom/2.18.3": {
+ "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
+ },
+ "com/fasterxml/jackson#jackson-bom/2.9.4": {
+ "pom": "sha256-ez/Ek1+/U/x5ypo75e1NLIL8pMU/hF0+EzgpMTic4CE="
+ },
+ "com/fasterxml/jackson#jackson-parent/2.17": {
+ "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+ },
+ "com/fasterxml/jackson#jackson-parent/2.18.1": {
+ "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
+ },
+ "com/fasterxml/jackson#jackson-parent/2.9.1": {
+ "pom": "sha256-fATwKdKA+7gnTnUCHckPObLGIv40mdrwf8NQgcLZ2f8="
+ },
+ "com/fasterxml/jackson/core#jackson-annotations/2.17.2": {
+ "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=",
+ "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=",
+ "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs="
+ },
+ "com/fasterxml/jackson/core#jackson-annotations/2.18.3": {
+ "jar": "sha256-iqV0DYC1pQJVCLQbutuqH7N3ImfGKLLjBoGk9F+LiTE=",
+ "module": "sha256-RkWF2yH0irFZ6O9XnNfo5tMHoEdhGZZRw+zBf05ydF0=",
+ "pom": "sha256-ucmLqeKephtpPUyMgBlo/qriILKyACNkp7zsUkmYOEs="
+ },
+ "com/fasterxml/jackson/core#jackson-core/2.17.2": {
+ "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=",
+ "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=",
+ "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
+ },
+ "com/fasterxml/jackson/core#jackson-core/2.18.3": {
+ "jar": "sha256-BWvE0+XlPOghRQ+pez+eD43eElz22miENTux8JWC4dk=",
+ "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=",
+ "pom": "sha256-N9xrj2ORpHCawhXKmPojQcbdZWE8InfZak/YKi9Q48k="
+ },
+ "com/fasterxml/jackson/core#jackson-databind/2.17.2": {
+ "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=",
+ "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
+ "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
+ },
+ "com/fasterxml/jackson/core#jackson-databind/2.18.3": {
+ "jar": "sha256-UQvdp1p6YYbFvzO4USOUiKFFCQauV1cSHy4cxIp+EI8=",
+ "module": "sha256-ZCqggPhbIAV3ifrPKsaibhR4NbUDPidSDstpe8RD/Lo=",
+ "pom": "sha256-5Y9IrBTk29SFldaeILrTUBnsEoFRTvfvFV4YByraYX8="
+ },
+ "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": {
+ "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=",
+ "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=",
+ "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs="
+ },
+ "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": {
+ "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs="
+ },
+ "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.18.3": {
+ "jar": "sha256-H1F6+RrOVBUFJc2zCgEvyhmlNhlFZHVvWAwhrPx+BKA=",
+ "module": "sha256-7QX+6N/FAwRMH4PwROBtcYwzYEK8FzqloevfdzQXyG8=",
+ "pom": "sha256-/14lbEPjXWUtZhVeVmqYYqWbuzCM3GNvSIi96PVq9Tw="
+ },
+ "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.3": {
+ "jar": "sha256-Lh3y/rk2g9N5lpzq94t2oKwRXGfQRnGVj9307tbmQB0=",
+ "module": "sha256-Kt37kDio5g8OlWOZLC3sdYpQxDvH8ECVnYXbbp1o04w=",
+ "pom": "sha256-LIA9pFO2CM4OQ6FscvAaWf5Dg++oV6jxszQhc2bqJk0="
+ },
+ "com/fasterxml/jackson/module#jackson-modules-java8/2.18.3": {
+ "pom": "sha256-rehezbxjw22XyQcnNfQfeUGO+K0EA755gtr/9BxfruM="
+ },
+ "com/github/jai-imageio#jai-imageio-core/1.4.0": {
+ "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=",
+ "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw="
+ },
+ "com/github/scribejava#scribejava-core/8.3.3": {
+ "jar": "sha256-sh6swSmDsN5YWwXvMHs18BLkjyiYpKzbpSm7sNN5xEM=",
+ "pom": "sha256-RTjKMQCqU9DsNChWti1s/MSkhMs0eV9V2z1DTOW2trY="
+ },
+ "com/github/scribejava#scribejava-java8/8.3.3": {
+ "jar": "sha256-1d1We3CV8hdA2jD2kddiUh0QWwfiW8TWaP/aHAtTcMw=",
+ "pom": "sha256-BB+QpyayExaVyzy1Z/rUDCn/jPl+qB/dfYrROr7LoXI="
+ },
+ "com/github/scribejava#scribejava/8.3.3": {
+ "pom": "sha256-KkpDgAox1XD2wY1TmtgWIZ2xgTuY/gsjq2X4mg4N+lc="
+ },
+ "com/github/virtuald#curvesapi/1.08": {
+ "jar": "sha256-rZWwi4u/nX0X5eAIFImPojMk8yvFti8aN4AealbOAHk=",
+ "pom": "sha256-Ny4ZrFGNWM5atVPKgDiMf+mSDFVU0TYtGGRabdvF0SY="
+ },
+ "com/google/code/findbugs#annotations/1.3.9": {
+ "jar": "sha256-caURebGKBtZ7JYLc4pM0+hFsS8N8syktVbcIB1FFNm4=",
+ "pom": "sha256-8RHyLXx/ZkZzjuYxx+43p0HoDhScRLHWmKfXF2OxjrE="
+ },
+ "com/google/code/findbugs#jsr305/3.0.2": {
+ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+ "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+ },
+ "com/google/code/gson#gson-parent/2.11.0": {
+ "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
+ },
+ "com/google/code/gson#gson/2.11.0": {
+ "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
+ "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
+ },
+ "com/google/code/javaparser#javaparser/1.0.11": {
+ "jar": "sha256-07/l/m/qZK8XuRm58nlY9cMvmRJbuAjMgtEFW5lZfYI=",
+ "pom": "sha256-3X6lRUWd+GeIiSwv+0ZTXflvVyvAumeVHm5WY4mxSwA="
+ },
+ "com/google/errorprone#error_prone_annotations/2.27.0": {
+ "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
+ "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
+ },
+ "com/google/errorprone#error_prone_annotations/2.36.0": {
+ "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
+ "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
+ },
+ "com/google/errorprone#error_prone_parent/2.27.0": {
+ "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
+ },
+ "com/google/errorprone#error_prone_parent/2.36.0": {
+ "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
+ },
+ "com/google/guava#failureaccess/1.0.2": {
+ "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
+ "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+ },
+ "com/google/guava#guava-parent/26.0-android": {
+ "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+ },
+ "com/google/guava#guava-parent/33.4.0-jre": {
+ "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc="
+ },
+ "com/google/guava#guava/33.4.0-jre": {
+ "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=",
+ "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=",
+ "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s="
+ },
+ "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+ "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+ "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+ },
+ "com/google/j2objc#j2objc-annotations/3.0.0": {
+ "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
+ "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+ },
+ "com/ibm/icu#icu4j/68.1": {
+ "jar": "sha256-B+T4suXJvOIq/BXtmAY8D8k29eYT2CD+rnypB17FUlk=",
+ "pom": "sha256-R/+TDdpm090lSpWVqG7GuYUGTrTGge4gxla02Au7G7Q="
+ },
+ "com/sun/codemodel#codemodel-project/2.6": {
+ "pom": "sha256-8lrv48rP+RHhQrssqJIzSzfoYDJ2jDSvI6qCUL3IA0c="
+ },
+ "com/sun/codemodel#codemodel/2.6": {
+ "jar": "sha256-JzWBbWj4WtyhQReZUYiWU841Wufnq065KjIuoO9nF2c=",
+ "pom": "sha256-zLydWo8aIDows0R6Ax8OQulTuhTJ3TieFl24lK2zEBw="
+ },
+ "com/zaxxer#SparseBitSet/1.3": {
+ "jar": "sha256-92uFrbDAByGuJnt8/eTaf3HTEhzCFgyfwAwMifjFPIo=",
+ "pom": "sha256-EY1n40Uymhjf9OvRVX+V8MCrS0y51nh0nWZvkjAAF2g="
+ },
+ "commons-codec#commons-codec/1.17.1": {
+ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=",
+ "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
+ },
+ "commons-io#commons-io/2.17.0": {
+ "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+ "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
+ },
+ "commons-io#commons-io/2.18.0": {
+ "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
+ "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
+ },
+ "commons-io#commons-io/2.4": {
+ "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI="
+ },
+ "commons-lang#commons-lang/2.6": {
+ "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=",
+ "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE="
+ },
+ "commons-logging#commons-logging/1.2": {
+ "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+ "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+ },
+ "de/saxsys#mvvmfx-parent/1.8.0": {
+ "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs="
+ },
+ "de/saxsys#mvvmfx-testing-utils/1.8.0": {
+ "jar": "sha256-9RoATqZIkdSi+ZH1Ou1TZHW4/yCZtaaS5Ooj14HprZs=",
+ "pom": "sha256-7ilAMnc/PJ3pzZ1SVpCoYrOzoerSjZJtc5gkdoVB3vo="
+ },
+ "eu/lestard#doc-annotations/0.2": {
+ "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=",
+ "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4="
+ },
+ "io/freefair/gradle#lombok-plugin/8.13": {
+ "jar": "sha256-fflln33kA74dOIdl++dhqewWdlHaajzQbouDynEYmaU=",
+ "module": "sha256-mXEiI3+Zn2jUIX6psNFzZUrrbU/c4k8Hn4+FE0RrT18=",
+ "pom": "sha256-L0O8PILyGGcy2G82s+P+rW5Sw1Ckflr1bQ1dFOjRmGo="
+ },
+ "io/github/classgraph#classgraph/4.8.179": {
+ "jar": "sha256-FlWDV/I0BSNwEJEnpF1pqb1thkaSVZR5JjRIbcSLFZ0=",
+ "pom": "sha256-CWp5YnTWPaeMCTueed63lFJp3CK8F+ZqKYhazkQwaJs="
+ },
+ "io/github/pustike#commons-csv/1.7.0": {
+ "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
+ "pom": "sha256-UYDXyvGI2yrRUaUnH7E633Yr0vKsMA67chuOWbCgEzY="
+ },
+ "io/github/pustike#pustike-maven-parent/0.1.2": {
+ "pom": "sha256-plHNjRj4HWkfRLASOeVqdTyLrB7qXCv5Pm7MrITyyfc="
+ },
+ "io/github/secretx33#path-matching-resource-pattern-resolver/0.1": {
+ "jar": "sha256-IGrMJabQ3GkpCeyt1fvgszqdXmjNYtd8TK7ueV8g2Co=",
+ "module": "sha256-xHicQ5mvi3Tvfn92kaJMaNPKWZpEAHYY8tpJ5PCdyu4=",
+ "pom": "sha256-ZMltCzuWkUhheYf0ZSPZAbT7pl4QHgtJmN8rNoeTrYA="
+ },
+ "io/netty#netty-bom/4.1.22.Final": {
+ "pom": "sha256-Bfr/tDn8I95kagaujM1hc0Sz0xcpVXH5PpgykGHZNa8="
+ },
+ "io/projectreactor#reactor-bom/Bismuth-SR7": {
+ "pom": "sha256-8V34qRAvk+7YOr1Aw5XxauNsUKmmB+llR0KUKr49NDk="
+ },
+ "io/reactivex/rxjava3#rxjava/3.1.10": {
+ "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=",
+ "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=",
+ "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60="
+ },
+ "io/sentry#sentry/8.4.0": {
+ "jar": "sha256-TFc6haFIX5k+Uuy0uXI/T/QVqueFWH1RCI+n56jZw98=",
+ "module": "sha256-5yIJjgS/2HbMLx9pBPG8aH8bWfebrQdkHB+OogYVcdQ=",
+ "pom": "sha256-wuHcDpGz4k39fPrdOMEiSRYg1tlJ4rdi7adB1F3Z3BE="
+ },
+ "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
+ "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
+ "pom": "sha256-AXlsHbeq949i6pb7CHZalZb8StYYdCxtJk5F4BrmuFU="
+ },
+ "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+ "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+ },
+ "jakarta/platform#jakartaee-api-parent/9.1.0": {
+ "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+ },
+ "jakarta/validation#jakarta.validation-api/3.0.2": {
+ "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=",
+ "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ="
+ },
+ "javax/json/bind#javax.json.bind-api/1.0": {
+ "jar": "sha256-zTvjkfWZ1L71m/sVUleta5HkUh0ZuOlysN+1LfsMX8E=",
+ "pom": "sha256-LjhZwbI5E9p6sDuwsY2ITXMKCmPE/xda6ZGJnz/R7h8="
+ },
+ "javax/servlet#javax.servlet-api/4.0.1": {
+ "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=",
+ "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E="
+ },
+ "javax/validation#validation-api/2.0.1.Final": {
+ "jar": "sha256-mHO0bfGDPJ7o9bwf9oUzdRFdrdiJe8taDf+1hIg17mw=",
+ "pom": "sha256-q7nT5k03c0RnMqMO6gsbWmOIi7FDMdKioY8zhdGkw4k="
+ },
+ "joda-time#joda-time/2.13.0": {
+ "jar": "sha256-qbRQ2W2QYW+f5WV6KThbTQB3+Z+LyAhB+T4lRaPNYj4=",
+ "pom": "sha256-z3axJyUkKrwNv2c0z4nMKddt3Itnaklq1/xA0cUVUkM="
+ },
+ "joda-time#joda-time/2.4": {
+ "pom": "sha256-hvCkCbZaMW7tZ5shz1hLkhe1WzqJLCz8UIZlNOdvXiQ="
+ },
+ "junit#junit/4.13.2": {
+ "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+ "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+ },
+ "net/bytebuddy#byte-buddy-agent/1.15.11": {
+ "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=",
+ "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag="
+ },
+ "net/bytebuddy#byte-buddy-parent/1.15.11": {
+ "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
+ },
+ "net/bytebuddy#byte-buddy/1.15.11": {
+ "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=",
+ "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
+ },
+ "net/java#jvnet-parent/1": {
+ "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+ },
+ "net/java#jvnet-parent/3": {
+ "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+ },
+ "net/java#jvnet-parent/5": {
+ "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
+ },
+ "net/java/dev/jna#jna-platform/5.17.0": {
+ "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=",
+ "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ="
+ },
+ "net/java/dev/jna#jna/5.17.0": {
+ "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=",
+ "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ="
+ },
+ "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
+ "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
+ "pom": "sha256-7Q14MGZb9YiDq6YmLjFkhd8K1MfrNHPbLVCV3vKN8UE="
+ },
+ "net/sf/opencsv#opencsv/2.3": {
+ "jar": "sha256-3Aulv/YUDckjOZcwJqDsvdwqOwG91G7Z0WvswvbXjeY=",
+ "pom": "sha256-V/VgdWXWqQ3uZyKAHUUkgT2dJ4UEbylUoYhh379KIUk="
+ },
+ "org/apache#apache/13": {
+ "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+ },
+ "org/apache#apache/16": {
+ "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+ },
+ "org/apache#apache/18": {
+ "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc="
+ },
+ "org/apache#apache/19": {
+ "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+ },
+ "org/apache#apache/21": {
+ "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+ },
+ "org/apache#apache/31": {
+ "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+ },
+ "org/apache#apache/32": {
+ "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
+ },
+ "org/apache#apache/33": {
+ "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
+ },
+ "org/apache#apache/7": {
+ "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU="
+ },
+ "org/apache#apache/9": {
+ "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
+ },
+ "org/apache/commons#commons-collections4/4.4": {
+ "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
+ "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
+ },
+ "org/apache/commons#commons-compress/1.27.1": {
+ "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=",
+ "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw="
+ },
+ "org/apache/commons#commons-compress/1.8": {
+ "jar": "sha256-nPUKdbYsyFMU/43jSUkoOwTi3E3KEuWMYoP3M1i3tuQ=",
+ "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk="
+ },
+ "org/apache/commons#commons-lang3/3.16.0": {
+ "jar": "sha256-CHCd101gK3Bc5AF9JlRCEAVqS6WD1bIMCTc0Bv56APg=",
+ "pom": "sha256-4oA4OVbC5ywd6zowezt18F7kNkm31D8CFfe2x7Fe6iw="
+ },
+ "org/apache/commons#commons-lang3/3.17.0": {
+ "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=",
+ "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw="
+ },
+ "org/apache/commons#commons-math3/3.6.1": {
+ "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+ "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+ },
+ "org/apache/commons#commons-parent/17": {
+ "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg="
+ },
+ "org/apache/commons#commons-parent/25": {
+ "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo="
+ },
+ "org/apache/commons#commons-parent/33": {
+ "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps="
+ },
+ "org/apache/commons#commons-parent/34": {
+ "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+ },
+ "org/apache/commons#commons-parent/39": {
+ "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+ },
+ "org/apache/commons#commons-parent/48": {
+ "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
+ },
+ "org/apache/commons#commons-parent/69": {
+ "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
+ },
+ "org/apache/commons#commons-parent/71": {
+ "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM="
+ },
+ "org/apache/commons#commons-parent/72": {
+ "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
+ },
+ "org/apache/commons#commons-parent/73": {
+ "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o="
+ },
+ "org/apache/commons#commons-parent/74": {
+ "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
+ },
+ "org/apache/commons#commons-parent/78": {
+ "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
+ },
+ "org/apache/commons#commons-text/1.12.0": {
+ "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=",
+ "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08="
+ },
+ "org/apache/groovy#groovy-bom/4.0.22": {
+ "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=",
+ "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U="
+ },
+ "org/apache/logging#logging-parent/1": {
+ "pom": "sha256-NLK/T1MagJFolhZy/0GdGr+WcluN/lKYDwDIxOsTS9Y="
+ },
+ "org/apache/logging#logging-parent/11.3.0": {
+ "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A="
+ },
+ "org/apache/logging/log4j#log4j-api/2.24.3": {
+ "jar": "sha256-W0oKDNDnUd7UMcFiRCvb3VMyjR+Lsrrl/Bu+7g9m2A8=",
+ "pom": "sha256-vAXeM1M6Elmtusv8yCbNZjdqLZxO5T+4NgCfRKRbgjk="
+ },
+ "org/apache/logging/log4j#log4j-bom/2.10.0": {
+ "pom": "sha256-8CEjRUmwLxK23xRaaw5ixrl4FCfjDjckmgX2XF3R7WY="
+ },
+ "org/apache/logging/log4j#log4j-bom/2.24.2": {
+ "pom": "sha256-NQKIlCeybxfvStgWgCxJtJQ/DJOXJoYdEmPlenKiMEY="
+ },
+ "org/apache/logging/log4j#log4j-bom/2.24.3": {
+ "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg="
+ },
+ "org/apache/logging/log4j#log4j/2.24.3": {
+ "pom": "sha256-wUG0hj/AzqtYOJShPh+eUsAfwtdYcn1nR/a5nVBA87E="
+ },
+ "org/apache/pdfbox#fontbox/2.0.26": {
+ "jar": "sha256-lGdMfRDqRdmw3BA4eJJjf8jvtcadLnJpTxxm/rm7btc=",
+ "pom": "sha256-/9HyFyWhzqeUvBLaOkkbcuFtvI0C4hxkBytWlulTaEo="
+ },
+ "org/apache/pdfbox#jbig2-imageio/3.0.4": {
+ "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=",
+ "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s="
+ },
+ "org/apache/pdfbox#pdfbox-debugger/2.0.26": {
+ "jar": "sha256-3CEgFauTVbQKUuxoedRz3/8gXNBZgvJIIjtON2CIjck=",
+ "pom": "sha256-yifQaKzj1+7LJYTubcnnHA9BM712dI3UmA3U6HbQDGs="
+ },
+ "org/apache/pdfbox#pdfbox-parent/2.0.26": {
+ "pom": "sha256-AbK5hUr4mKXO1gWzRpbLY6QFRc0TID9jILvltoDjPD0="
+ },
+ "org/apache/pdfbox#pdfbox-tools/2.0.26": {
+ "jar": "sha256-pzhZchSiCFreKRcr6GAmdIW95JAGY63ZUS9vy+qXzU8=",
+ "pom": "sha256-Gj86SvqIlLz1A5vKNk8wOUxtUqaUeDLm6W8tZa5dxY8="
+ },
+ "org/apache/pdfbox#pdfbox/2.0.26": {
+ "jar": "sha256-tG67QUA4S0WjnpHiO1lc6dzYujqe6RTxX0CkKp+AU3M=",
+ "pom": "sha256-KNkHvwQvNchyx5J0uBE1zIs9EE0p38twug3vly8oVyg="
+ },
+ "org/apache/poi#poi-ooxml-lite/5.4.0": {
+ "jar": "sha256-u1qKbIMyec7VGvtgQqoVrl1coxLuaC5XDiORe1IrB54=",
+ "pom": "sha256-YQpkM3ly/xl/ozbmjHfmOVWxFYa8Htsfxnk55FUvF+I="
+ },
+ "org/apache/poi#poi-ooxml/5.4.0": {
+ "jar": "sha256-mGk0Qu19RHkd5KV5YrbIIK5njg66nPhUaBti/2LJYR0=",
+ "pom": "sha256-WI8k6TVvKMHQmJw0q15ia/NIq8Aie4rIy0ZmpPgICnY="
+ },
+ "org/apache/poi#poi/5.4.0": {
+ "jar": "sha256-rOceeYcwWeJzA2Z0VgtQw9a5RbfKFosNSWKtdlCuHuw=",
+ "pom": "sha256-rK0VkHGQpeZ7hZfM+wEx795ZbC+gXYrZ9LnGHaMfNkU="
+ },
+ "org/apache/xmlbeans#xmlbeans/5.3.0": {
+ "jar": "sha256-bMado7TTW4PF5HfNTauiBORBCYM+NK8rmoosh4gomRc=",
+ "pom": "sha256-kG0Z2CtlNlFIxGTw3znNwzkeJ5/kYPBZAIukzofJD1c="
+ },
+ "org/apiguardian#apiguardian-api/1.1.2": {
+ "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+ "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+ },
+ "org/assertj#assertj-core/3.27.3": {
+ "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=",
+ "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w="
+ },
+ "org/checkerframework#checker-qual/3.43.0": {
+ "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
+ "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
+ "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
+ },
+ "org/controlsfx#controlsfx/11.2.1": {
+ "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=",
+ "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc="
+ },
+ "org/eclipse/ee4j#project/1.0.6": {
+ "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+ },
+ "org/eclipse/ee4j#project/1.0.7": {
+ "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+ },
+ "org/eclipse/ee4j#project/1.0.9": {
+ "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
+ },
+ "org/eclipse/jetty#jetty-bom/9.4.8.v20171121": {
+ "pom": "sha256-XGevE5TfPI1hIb5IJZBXONeF8MdwavuFUEofoi1dhN4="
+ },
+ "org/eclipse/parsson#jakarta.json/1.1.7": {
+ "jar": "sha256-WQX1IoOnSR4GulhVYQPUXDGZpCYCq8021RDO2mVJD/A=",
+ "pom": "sha256-93B73rz8Qp+mp0HmwoVRFWD3e3QCyneU5hE0/XYfBMo="
+ },
+ "org/eclipse/parsson#parsson-bundles/1.1.7": {
+ "pom": "sha256-2YsPO+YvMNOU4FQabtJeq+MMN7kYd88c4tjjo1vIJHo="
+ },
+ "org/eclipse/parsson#project/1.1.7": {
+ "pom": "sha256-r171oT3deNwLoRUh3IOhKkVytRPILxAbsxDxGGxccU0="
+ },
+ "org/hamcrest#hamcrest-core/1.3": {
+ "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+ "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+ },
+ "org/hamcrest#hamcrest-parent/1.3": {
+ "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+ },
+ "org/jboss#jboss-parent/20": {
+ "pom": "sha256-EPDPw9IEh4JYXQ2yWkN40BAvn0hQy/5v1sWf4tI6gb8="
+ },
+ "org/jboss#jboss-parent/9": {
+ "pom": "sha256-FMdH0KO7ovUps/hgsHiA+xzvICZW5mSc2iy5jbY+x54="
+ },
+ "org/jboss#jboss-vfs/3.2.16.Final": {
+ "jar": "sha256-UXVXDX63voy3azf//+HSS1w3pqcdWuf82khHM65KdR4=",
+ "pom": "sha256-YUO95rZLf0gG3jFCkvJ508tL8Lb+RWaSbB4iKu4E3Mo="
+ },
+ "org/jboss/logging#jboss-logging/3.1.4.GA": {
+ "jar": "sha256-SGo2AO/ihtfjgOVw+Ol8rKCxStg2fEo4oyYaCNww3Ug=",
+ "pom": "sha256-56t6X2Bh4kP/bEvAuTggWhHqyq5+GvNDhpB8jaPOql4="
+ },
+ "org/jfxtras#jmetro/11.6.16": {
+ "jar": "sha256-X6v+k5kULSxCzepdifdJ0n1e8N01698l4LYwkspZ3vE=",
+ "pom": "sha256-zRJGTYfPiIZTRNQ12wQtbuNsHgs+C+ik+orKAn4r/Ws="
+ },
+ "org/jsonschema2pojo#jsonschema2pojo-core/1.2.2": {
+ "jar": "sha256-0epGqRFUHRDrKehIOPdvBmZkoJqOZuHUmPyQzcuyffo=",
+ "pom": "sha256-mtHVe8hrJzXr7xqJinGIgJR8I7wa95dJ0J702YzRluE="
+ },
+ "org/jsonschema2pojo#jsonschema2pojo-gradle-plugin/1.2.2": {
+ "jar": "sha256-OBH9Jv72Sa+cgkMzcz3Iy6KiaNjViqr91z98XAMDZJI=",
+ "pom": "sha256-enXFZUIwx7+kFKQB96w4vzMzuclEZxomD0pOazBFfJA="
+ },
+ "org/jsonschema2pojo#jsonschema2pojo/1.2.2": {
+ "pom": "sha256-PEgC9gguyH1+igs206MyaDTRj9c8E5EM8pFrhQvNrDM="
+ },
+ "org/junit#junit-bom/5.10.2": {
+ "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+ "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+ },
+ "org/junit#junit-bom/5.10.3": {
+ "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+ "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+ },
+ "org/junit#junit-bom/5.11.0": {
+ "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+ "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+ },
+ "org/junit#junit-bom/5.11.0-M2": {
+ "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
+ "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
+ },
+ "org/junit#junit-bom/5.11.2": {
+ "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=",
+ "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI="
+ },
+ "org/junit#junit-bom/5.12.1": {
+ "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=",
+ "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A="
+ },
+ "org/junit/jupiter#junit-jupiter-api/5.12.1": {
+ "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=",
+ "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=",
+ "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w="
+ },
+ "org/junit/jupiter#junit-jupiter-engine/5.12.1": {
+ "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=",
+ "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=",
+ "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao="
+ },
+ "org/junit/jupiter#junit-jupiter-params/5.12.1": {
+ "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=",
+ "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=",
+ "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M="
+ },
+ "org/junit/jupiter#junit-jupiter/5.12.1": {
+ "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=",
+ "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=",
+ "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ="
+ },
+ "org/junit/platform#junit-platform-commons/1.12.1": {
+ "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=",
+ "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=",
+ "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM="
+ },
+ "org/junit/platform#junit-platform-engine/1.12.1": {
+ "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=",
+ "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=",
+ "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w="
+ },
+ "org/junit/platform#junit-platform-launcher/1.12.1": {
+ "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=",
+ "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=",
+ "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk="
+ },
+ "org/junit/platform#junit-platform-runner/1.12.1": {
+ "jar": "sha256-8CRNhGbpUwHWD8ApxTmnIoisMyjQbj85i17ExH+g6HA=",
+ "module": "sha256-5//N1KRB6el0+dplvHFeGWxq7cUCb0xAs+25Z5ujIzA=",
+ "pom": "sha256-M5dYHbZeZOijCNkGv+E1d/qLgkKxDvGiIfVYuCxHjHA="
+ },
+ "org/junit/platform#junit-platform-suite-api/1.12.1": {
+ "jar": "sha256-s0gUUihPfFDV4KeXsTrRwuNp2QCxfQpOhQBampjT8Ss=",
+ "module": "sha256-ghsnFZa3qC3Onrjj/DVF+KenIkvU02HgOjFSv6LnZwY=",
+ "pom": "sha256-gqr1cn4YGh2dKvvUM5xdAUPOIIbJ/0HY6b52LZo2w8A="
+ },
+ "org/junit/platform#junit-platform-suite-commons/1.12.1": {
+ "jar": "sha256-C0oBRu0aKysb94NhNDn0sdFHvM+0PlGokbgEXs9PFd4=",
+ "module": "sha256-+LP4UlNiXd4TqWypShqH74pqJeF7fJpXbFrNQyPAan0=",
+ "pom": "sha256-C1cZJGVJXHjj5px8Ko2oVs6xHV+tlO/1pw8aYtepW3M="
+ },
+ "org/leadpony/justify#justify-parent/3.1.0": {
+ "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
+ },
+ "org/leadpony/justify#justify/3.1.0": {
+ "jar": "sha256-zQVe+z52gWhOHP7Vx9AnyrguHbqYrXPSGbTijzgndGg=",
+ "pom": "sha256-oXqgosC8+KGRF6qSDoYcxKIEIb0aOR0iTJGjhsgezak="
+ },
+ "org/mockito#mockito-bom/4.11.0": {
+ "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+ },
+ "org/mockito#mockito-core/5.16.1": {
+ "jar": "sha256-1yv30j7BnQUTxoC8fruszvDGQ68iyCxez9mZshCfx5c=",
+ "pom": "sha256-5p0IpMRp7l0fa3BXYsKKZWEUOSDSfHbrSnrFYGPurnw="
+ },
+ "org/mockito#mockito-inline/5.2.0": {
+ "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
+ "pom": "sha256-cG00cOVtMaO1YwaY0Qeb79uYMUWwGE5LorhNo4eo9oQ="
+ },
+ "org/mockito#mockito-junit-jupiter/5.16.1": {
+ "jar": "sha256-fd+TxJfcsHv09pR2aj2NXupvom8CwYywoeWYpTR+c/A=",
+ "pom": "sha256-XTWQpYRiDj/p8nCrppdmeBs0aUB0JoMLT71pYYDu8kc="
+ },
+ "org/objenesis#objenesis-parent/3.3": {
+ "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
+ },
+ "org/objenesis#objenesis/3.3": {
+ "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
+ "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
+ },
+ "org/ocpsoft#ocpsoft-parent/9": {
+ "pom": "sha256-8XwebTdP/zgg7hx7ZBsy+fE6mF6/u0J3mhbjSHRiOWY="
+ },
+ "org/ocpsoft/prettytime#prettytime-parent/3.2.5.Final": {
+ "pom": "sha256-z20CLDkObRRnpgtIGusI+qNPpvDq+i2jkgi5yPoxxKQ="
+ },
+ "org/ocpsoft/prettytime#prettytime/3.2.5.Final": {
+ "jar": "sha256-My3AACjoNlsnD7+1rAd7gHfp4OtYdGSiUqjtBHAiV+k=",
+ "pom": "sha256-pxdAoV6nREoA8+5lj8XBLxONl1aqPvHAeq8KImyN+/k="
+ },
+ "org/openjfx#javafx-base/23.0.1": {
+ "jar": "sha256-iEU6jUzJIXQMhOMV6AIbnZhLCSDTySMYfF/QwswdaDw=",
+ "pom": "sha256-0mUw12g4dhZPL+FpnXe//CbJlfUSgCr0IFUXwhSs+mc="
+ },
+ "org/openjfx#javafx-base/23.0.1/linux": {
+ "jar": "sha256-7sBxSvCRmRxVt9v23ePYWSsf6LoEbagc2IUDuAvpi2M="
+ },
+ "org/openjfx#javafx-controls/23.0.1": {
+ "jar": "sha256-3XcaHc2LdE4WcgNao8YoM+Y0ZfpgZrOgwuon8XfL1O8=",
+ "pom": "sha256-zUsIKtIxRfbipieHQ3FsCu3fit8vO/iu1ihYCFWk46g="
+ },
+ "org/openjfx#javafx-controls/23.0.1/linux": {
+ "jar": "sha256-LQyxs8l1c4lHywYBT+IkCrNrS29oxG6SbQiWCYJbqdw="
+ },
+ "org/openjfx#javafx-fxml/23.0.1": {
+ "pom": "sha256-h45/OrAgdht3KLq0VkfIU7z+Qnc4MCqlLdOrzHXsDuo="
+ },
+ "org/openjfx#javafx-fxml/23.0.1/linux": {
+ "jar": "sha256-+zQCUfl7tvMxg/oBzlqXaBbjFqmI3EBIGj57VQgtmJo="
+ },
+ "org/openjfx#javafx-graphics/23.0.1": {
+ "jar": "sha256-kJCrtogUiOdLj4fkWoI47DMk7ETsxg/B+3tQMtgJURE=",
+ "pom": "sha256-st72CewOe6tjk5EdDP7xnZZo0NPcsvAB/luMWaiU24g="
+ },
+ "org/openjfx#javafx-graphics/23.0.1/linux": {
+ "jar": "sha256-NVPB6tM9naWVgGkCKlBr/X4FxX7m9nR5spFz8taBZEw="
+ },
+ "org/openjfx#javafx-media/23.0.1": {
+ "pom": "sha256-tfRj6GKtVPWcSsQbkRA/4PqvPe6WOL4AczNi7p6cWko="
+ },
+ "org/openjfx#javafx-media/23.0.1/linux": {
+ "jar": "sha256-OP/Uy68DzVJMKslEStdK5ZNGuJpgmM15G1zSvzzUU6I="
+ },
+ "org/openjfx#javafx-swing/23.0.1": {
+ "jar": "sha256-nNkwvgpUAQhXNRTE+aSL/yln3Kg/XjGR7//vQH7ade0=",
+ "pom": "sha256-uht/UEeiXgkbdKJpJKQ2St+eoWqKLESnEbvledqikyw="
+ },
+ "org/openjfx#javafx-swing/23.0.1/linux": {
+ "jar": "sha256-+FtFmvQtjKJ18NiRocwcjUuMudSPMuXhYau9Rt6YaqY="
+ },
+ "org/openjfx#javafx/23.0.1": {
+ "pom": "sha256-S7WEqBPU9lbMNxf+dQpLLI/2mj1W+6E53MHms4FV2F4="
+ },
+ "org/opentest4j#opentest4j/1.3.0": {
+ "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+ "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+ "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+ },
+ "org/ow2#ow2/1.5.1": {
+ "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+ },
+ "org/ow2/asm#asm/9.7.1": {
+ "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
+ "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
+ },
+ "org/projectlombok#lombok/1.18.36": {
+ "jar": "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4=",
+ "pom": "sha256-iaIdJYdshWLBShDxsh77/M6dU7BYaGuChf6iJ2xTKQ4="
+ },
+ "org/rauschig#jarchivelib/0.6.0": {
+ "jar": "sha256-u/9XGPF0HRYkJreWaPJKznhTPHicnEBJtbewxTF39BQ=",
+ "pom": "sha256-Y0BG5S8/+G4gszZgQlw+1rbubYRjE8CLPJ/lLuTWOE8="
+ },
+ "org/reactivestreams#reactive-streams/1.0.4": {
+ "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
+ "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
+ },
+ "org/slf4j#slf4j-api/2.0.17": {
+ "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
+ "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
+ },
+ "org/slf4j#slf4j-bom/2.0.17": {
+ "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
+ },
+ "org/slf4j#slf4j-parent/2.0.17": {
+ "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
+ },
+ "org/sonatype/oss#oss-parent/7": {
+ "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+ },
+ "org/sonatype/oss#oss-parent/9": {
+ "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+ },
+ "org/springframework#spring-framework-bom/5.0.4.RELEASE": {
+ "pom": "sha256-vARmNMfO1m+IEPEWTqcG1f7DrZOJtWasn8TvgXStI9U="
+ },
+ "org/springframework#spring-framework-bom/5.3.39": {
+ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+ "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+ },
+ "org/springframework/boot#spring-boot-dependencies/2.0.0.RELEASE": {
+ "pom": "sha256-VdUqa8/P2w40ocAbbPHaMU07cT7feez+0eRhSFdBxbA="
+ },
+ "org/springframework/boot#spring-boot-starter-parent/2.0.0.RELEASE": {
+ "pom": "sha256-ziyTLoAco1guJxzDiVbuGjpI2i2X5h3FDKCq2do0ofU="
+ },
+ "org/springframework/data#spring-data-releasetrain/Kay-SR5": {
+ "pom": "sha256-lV8UZffEvad8rka5LUbnISQt3PBrxALEGwOmrN3wq14="
+ },
+ "org/springframework/data/build#spring-data-build/2.0.5.RELEASE": {
+ "pom": "sha256-fllWbrTcJFEQsPt+V1ER8Bb6DMogNJwpweRswQHF6Cg="
+ },
+ "org/springframework/integration#spring-integration-bom/5.0.3.RELEASE": {
+ "pom": "sha256-zogyzAu5v9EzwXRPeq7FCz+IJRt0Ar82vncUAR69fcA="
+ },
+ "org/springframework/security#spring-security-bom/5.0.3.RELEASE": {
+ "pom": "sha256-wMstyax5q53Efb0R7cDxtAzoq4XRdPZmzzEcIY146tI="
+ },
+ "org/springframework/session#spring-session-bom/Apple-SR1": {
+ "pom": "sha256-qsKfFgb+KZpdGQjrE1ekXyMMvTTtqNGDVYiGiTIaw1U="
+ },
+ "org/tukaani#xz/1.5": {
+ "jar": "sha256-hvMPqHdfo6Ys2znR7XimAZFkwQWIZASNQsvuJE4m6EA=",
+ "pom": "sha256-Q5HcceKs5oshCpdj6SnnNlNIAD3bXh9g9G7ciAnCLw4="
+ },
+ "org/yaml#snakeyaml/2.2": {
+ "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=",
+ "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y="
+ }
+ }
+}
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
new file mode 100644
index 000000000000..c9d9aa86786e
--- /dev/null
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -0,0 +1,120 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ gradle,
+ jdk23,
+ makeWrapper,
+ wrapGAppsHook3,
+ libXxf86vm,
+ libXtst,
+ libglvnd,
+ glib,
+ copyDesktopItems,
+ makeDesktopItem,
+ nix-update-script,
+}:
+stdenv.mkDerivation rec {
+ pname = "ed-odyssey-materials-helper";
+ version = "2.156";
+
+ src = fetchFromGitHub {
+ owner = "jixxed";
+ repo = "ed-odyssey-materials-helper";
+ tag = version;
+ hash = "sha256-T7Mh9QZRQbDJmW976bOg5YNQoFxJ2SUFl6qBjos8LSo=";
+ };
+
+ nativeBuildInputs = [
+ gradle
+ makeWrapper
+ wrapGAppsHook3
+ copyDesktopItems
+ ];
+
+ patches = [
+ # We'll set up the edomh: URL scheme in makeDesktopItem,
+ # so this removes 1) the popup about it when you first start the program, 2) the option in the settings
+ # and makes the program always know that it is set up
+ ./remove-urlscheme-settings.patch
+ ];
+ postPatch = ''
+ # oslib doesn't seem to do releases and hasn't had a change since 2021, so always use commit d6ee6549bb
+ # it is not the latest commit because using a commit here whose hash starts with a number causes issues, but this works
+ substituteInPlace build.gradle \
+ --replace-fail '"com.github.wille:oslib:master-SNAPSHOT"' '"com.github.wille:oslib:d6ee6549bb"'
+ substituteInPlace application/src/main/java/module-info.java \
+ --replace-fail 'requires oslib.master.SNAPSHOT;' 'requires oslib.d6ee6549bb;'
+ '';
+
+ mitmCache = gradle.fetchDeps {
+ inherit pname;
+ data = ./deps.json;
+ };
+
+ gradleFlags = [ "-Dorg.gradle.java.home=${jdk23}" ];
+
+ gradleBuildTask = "application:jpackage";
+ gradleUpdateTask = "application:nixDownloadDeps";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{share/ed-odyssey-materials-helper,bin}
+ cp -r application/build/jpackage/Elite\ Dangerous\ Odyssey\ Materials\ Helper/* $out/share/ed-odyssey-materials-helper
+
+ mkdir -p $out/share/icons/hicolor/512x512/apps/
+ ln -s $out/share/ed-odyssey-materials-helper/lib/Elite\ Dangerous\ Odyssey\ Materials\ Helper.png $out/share/icons/hicolor/512x512/apps/ed-odyssey-materials-helper.png
+
+ runHook postInstall
+ '';
+
+ dontWrapGApps = true;
+
+ postFixup = ''
+ # The logs would go into the current directory, so the wrapper will cd to the config dir first
+ makeShellWrapper $out/share/ed-odyssey-materials-helper/bin/Elite\ Dangerous\ Odyssey\ Materials\ Helper $out/bin/ed-odyssey-materials-helper \
+ --run 'mkdir -p ~/.config/odyssey-materials-helper/ && cd ~/.config/odyssey-materials-helper/' \
+ --prefix LD_LIBRARY_PATH : ${
+ lib.makeLibraryPath [
+ libXxf86vm
+ glib
+ libXtst
+ libglvnd
+ ]
+ } "''${gappsWrapperArgs[@]}"
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "ed-odyssey-materials-helper";
+ type = "Application";
+ desktopName = "Elite Dangerous Odyssey Materials Helper";
+ comment = "Helper for managing materials in Elite Dangerous Odyssey";
+ icon = "ed-odyssey-materials-helper";
+ exec = "ed-odyssey-materials-helper %u";
+ categories = [ "Game" ];
+ mimeTypes = [ "x-scheme-handler/edomh" ];
+ })
+ ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Helper for managing materials in Elite Dangerous Odyssey";
+ homepage = "https://github.com/jixxed/ed-odyssey-materials-helper";
+ downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
+ changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}";
+ license = lib.licenses.gpl3Only;
+ sourceProvenance = with lib.sourceTypes; [
+ fromSource
+ binaryBytecode # mitm cache
+ ];
+ maintainers = with lib.maintainers; [
+ elfenermarcell
+ toasteruwu
+ ];
+ mainProgram = "ed-odyssey-materials-helper";
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch
new file mode 100644
index 000000000000..f2afddaeb1eb
--- /dev/null
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/remove-urlscheme-settings.patch
@@ -0,0 +1,42 @@
+diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java
+index a38ae02d..1c164911 100644
+--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java
++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/FXApplication.java
+@@ -112,7 +112,6 @@ public class FXApplication extends Application {
+ }
+ PreferencesService.setPreference(PreferenceConstants.APP_SETTINGS_VERSION, System.getProperty("app.version"));
+ whatsnewPopup();
+- urlSchemePopup();
+ eddnPopup();
+ versionPopup();
+ MaterialTrackingService.initialize();
+diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java
+index 6ac788ea..a5281983 100644
+--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java
++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/service/registry/UbuntuRegistrationHandler.java
+@@ -62,11 +62,7 @@ public class UbuntuRegistrationHandler implements RegistrationHandler {
+
+ @Override
+ public boolean isRegistered() {
+- if (!IS_JAVA) {
+- final File file = new File(System.getProperty(USER_HOME) + DESKTOP_FILE_PATH);
+- return file.exists() && file.isFile();
+- }
+- return false;
++ return true;
+ }
+
+
+diff --git a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java
+index 3b00de60..78d6afd7 100644
+--- a/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java
++++ b/application/src/main/java/nl/jixxed/eliteodysseymaterials/templates/settings/sections/General.java
+@@ -99,7 +99,7 @@ public class General extends VBox implements Template {
+ final HBox supportPackageSetting = createSupportPackageSetting();
+ final HBox wipSetting = createWIPSetting();
+ this.getStyleClass().addAll("settingsblock", SETTINGS_SPACING_10_CLASS);
+- this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, urlSchemeLinkingSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting);
++ this.getChildren().addAll(generalLabel, langSetting, fontSetting, customJournalFolderSetting, pollSetting, exportInventory, blueprintExpandedSetting, importFromClipboardSetting,importSlefFromClipboardSetting,supportPackageSetting);
+ }
+
+ @Override
diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix
index afc0879a9631..27a309f52acf 100644
--- a/pkgs/by-name/er/erigon/package.nix
+++ b/pkgs/by-name/er/erigon/package.nix
@@ -7,7 +7,7 @@
let
pname = "erigon";
- version = "3.0.0";
+ version = "3.0.2";
in
buildGoModule {
inherit pname version;
@@ -16,11 +16,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
- hash = "sha256-63wh9D5D9qzABEvKCBxBRHYuGBnlX+hrme56STkyoQU=";
+ hash = "sha256-1rMlRlEUheW6g3kigh+DjQxtNJOrqrADPkjQn7TQr1g=";
fetchSubmodules = true;
};
- vendorHash = "sha256-Mvat9+mbgpept9g8pYNf4a/bAGZGBM0MAM417DDIT9w=";
+ vendorHash = "sha256-tCohubwCk5HERoAaGWgEsl5kpI8w8dn0oZCZ2AxkKXk=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:
diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index c7d49ff6baef..a5fb9d0ff9a0 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
- version = "2025-04-14";
+ version = "2025-04-17";
src = fetchFromGitLab {
owner = "exploit-database";
repo = "exploitdb";
rev = "refs/tags/${version}";
- hash = "sha256-yoQB2QM9Fg4tKKPeGTM68+Su98mt8znkINNQY9cVUoI=";
+ hash = "sha256-nHiXbbKDzdTTPWkW8g/mX25IfgcOAcOUHkycqBM1eqU=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
index e809565a6179..0b3155ff4e00 100644
--- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "fcitx5-pinyin-moegirl";
- version = "20250309";
+ version = "20250409";
src = fetchurl {
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
- hash = "sha256-0ZXlPpeaxXK3dI2uGBmISpCGM9isQdPxJRTcoIa75fg=";
+ hash = "sha256-OuAJbuQs/yiCFJAG1qkS+0INdpmjdwc7vvz5WZruQ98=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix
index f066d23f6427..455488c62c7c 100644
--- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix
+++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "fleeting-plugin-aws";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitLab {
owner = "gitlab-org/fleeting/plugins";
repo = "aws";
tag = "v${version}";
- hash = "sha256-8vEduf+xh9R3+GoouXJS2h/ELlzKXDmLBLekaXGn7SE=";
+ hash = "sha256-3m7t2uGO7Rlfckb8mdYVutW0/ng0OiUAH5XTBoB//ZU=";
};
- vendorHash = "sha256-bfEzPPP280peOK4Jyu1fyfFCaFnRLoPmsjJ+G1BoVW4=";
+ vendorHash = "sha256-hfuszGVWfMreGz22+dkx0/cxznjq2XZf7pAn4TWOQ5M=";
subPackages = [ "cmd/fleeting-plugin-aws" ];
diff --git a/pkgs/by-name/fr/freetds/package.nix b/pkgs/by-name/fr/freetds/package.nix
index ccb6c6fbc87c..b8726b762384 100644
--- a/pkgs/by-name/fr/freetds/package.nix
+++ b/pkgs/by-name/fr/freetds/package.nix
@@ -15,11 +15,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
pname = "freetds";
- version = "1.4.26";
+ version = "1.4.27";
src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
- hash = "sha256-dGQaZswr+uMCwqZKSyaKPbj7DMc2TceXXETFfWXNjRw=";
+ hash = "sha256-jAcexiW401UtI54kvtjdVfkJjg/Jk5fhySajwnpKMs0=";
};
buildInputs = [
diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index e20e2b18532d..420770cc04a9 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -4,6 +4,11 @@
"version": "1.44.1",
"hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="
},
+ {
+ "pname": "Azure.Identity",
+ "version": "1.13.0",
+ "hash": "sha256-BXru3jP4oQchrBF/c3WDekZeRJlUxenBwVZ5YsifseI="
+ },
{
"pname": "Azure.Storage.Blobs",
"version": "12.24.0",
@@ -21,8 +26,8 @@
},
{
"pname": "KeraLua",
- "version": "1.4.1",
- "hash": "sha256-ouRL7+0bW/VYUNNYQoXenXzYO0HNF3D1IsScqtah3DE="
+ "version": "1.4.4",
+ "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs="
},
{
"pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -104,6 +109,21 @@
"version": "9.0.3",
"hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
},
+ {
+ "pname": "Microsoft.Identity.Client",
+ "version": "4.65.0",
+ "hash": "sha256-gkBVLb8acLYexNM4ZzMJ0qfDp2UqjUt0yiu3MfMcWig="
+ },
+ {
+ "pname": "Microsoft.Identity.Client.Extensions.Msal",
+ "version": "4.65.0",
+ "hash": "sha256-Xmy/evicLvmbC+6ytxwVE646uVcJB5yMpEK73H5tzD0="
+ },
+ {
+ "pname": "Microsoft.IdentityModel.Abstractions",
+ "version": "6.35.0",
+ "hash": "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="
+ },
{
"pname": "Microsoft.IdentityModel.Abstractions",
"version": "8.6.1",
@@ -179,6 +199,11 @@
"version": "6.0.1",
"hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
},
+ {
+ "pname": "System.Memory",
+ "version": "4.5.5",
+ "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+ },
{
"pname": "System.Memory.Data",
"version": "1.0.2",
@@ -199,6 +224,11 @@
"version": "6.0.0",
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
},
+ {
+ "pname": "System.Security.Cryptography.ProtectedData",
+ "version": "4.5.0",
+ "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
+ },
{
"pname": "System.Text.Encodings.Web",
"version": "6.0.0",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index dd613b092872..da96b1357102 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -8,13 +8,13 @@
buildDotnetModule rec {
pname = "garnet";
- version = "1.0.61";
+ version = "1.0.63";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
tag = "v${version}";
- hash = "sha256-Xvc/ECu/aIduHABZ08J3+iDgvOBs3vLCpzHJwfuLSp0=";
+ hash = "sha256-pOAeWQcZTkvnJGAP8H4dOABcHSEfGI4xTC/eS/3QoTM=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";
diff --git a/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch
similarity index 100%
rename from pkgs/by-name/ge/geocode-glib/installed-tests-path.patch
rename to pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch
diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix
similarity index 70%
rename from pkgs/by-name/ge/geocode-glib/package.nix
rename to pkgs/by-name/ge/geocode-glib_2/package.nix
index 9461c9fcb412..46cf04ba34d4 100644
--- a/pkgs/by-name/ge/geocode-glib/package.nix
+++ b/pkgs/by-name/ge/geocode-glib_2/package.nix
@@ -11,13 +11,13 @@
docbook-xsl-nons,
gobject-introspection,
gnome,
- libsoup_2_4,
+ libsoup_3,
json-glib,
glib,
nixosTests,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "geocode-glib";
version = "3.26.4";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
+ url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor finalAttrs.version}/geocode-glib-${finalAttrs.version}.tar.xz";
sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o=";
};
@@ -53,28 +53,30 @@ stdenv.mkDerivation rec {
buildInputs = [
glib
- libsoup_2_4
+ libsoup_3
json-glib
];
mesonFlags = [
- "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}"
+ "-Dsoup2=false"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
passthru = {
updateScript = gnome.updateScript {
- packageName = pname;
+ packageName = "geocode-glib";
};
tests = {
installed-tests = nixosTests.installed-tests.geocode-glib;
};
};
- meta = with lib; {
+ meta = {
+ changelog = "https://gitlab.gnome.org/GNOME/geocode-glib/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
description = "Convenience library for the geocoding and reverse geocoding using Nominatim service";
- license = licenses.lgpl2Plus;
- maintainers = teams.gnome.members;
- platforms = platforms.unix;
+ homepage = "https://gitlab.gnome.org/GNOME/geocode-glib";
+ license = lib.licenses.lgpl2Plus;
+ maintainers = lib.teams.gnome.members;
+ platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/by-name/ha/hardinfo/package.nix b/pkgs/by-name/ha/hardinfo/package.nix
deleted file mode 100644
index c7cb86f6d6ef..000000000000
--- a/pkgs/by-name/ha/hardinfo/package.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- which,
- pkg-config,
- gtk2,
- pcre,
- glib,
- libxml2,
- libsoup_2_4 ? null,
-}:
-
-stdenv.mkDerivation rec {
- pname = "hardinfo";
- version = "0.5.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2";
- sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0";
- };
-
- # Not adding 'hostname' command, the build shouldn't depend on what the build
- # host is called.
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- which
- gtk2
- pcre
- glib
- libxml2
- libsoup_2_4
- ];
-
- # Fixes '#error You must compile this program without "-O"'
- hardeningDisable = [ "all" ];
-
- # Ignore undefined references to a bunch of libsoup symbols
- NIX_LDFLAGS = "--unresolved-symbol=ignore-all";
-
- preConfigure = ''
- patchShebangs configure
-
- # -std=gnu89 fixes build error, copied from
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525
- sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in
-
- substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo
- substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.cc.libc}/lib/libc.so
- '';
-
- # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/).
- installFlags = [ "DESTDIR=$(out)" ];
- postInstall = ''
- mv "$out/usr/"* "$out"
- rmdir "$out/usr"
- '';
-
- meta = with lib; {
- homepage = "http://hardinfo.org/";
- description = "Display information about your hardware and operating system";
- license = licenses.gpl2Only;
- maintainers = with maintainers; [ bjornfor ];
- platforms = [
- "x86_64-linux"
- "i686-linux"
- ]; # ARMv7 and AArch64 are unsupported
- mainProgram = "hardinfo";
- };
-}
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 2f6765b866ab..ea361f736518 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "harper";
- version = "0.28.0";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "Automattic";
repo = "harper";
rev = "v${version}";
- hash = "sha256-g+noAc+vKli2T8C2EAK4ejw/2DWZPhtKbezyt53iHYg=";
+ hash = "sha256-wsCUB3UO5czqJPGctb3ZsTtcVXMqBB7/8/uk5ShL8ZA=";
};
buildAndTestSubdir = "harper-ls";
useFetchCargoVendor = true;
- cargoHash = "sha256-Ql1WdwDnXBC4JHO/uzJJlacQC44bOaHo2i3M9atjf3I=";
+ cargoHash = "sha256-KrW4I4Tg30/Yg5PuZCEWkrtjNUKMZmzqCmFAnKtj7A4=";
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index 9e00162f8c3c..7bbb04ea228a 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -8,15 +8,15 @@
rustPlatform.buildRustPackage rec {
pname = "jsonschema-cli";
- version = "0.29.1";
+ version = "0.30.0";
src = fetchCrate {
inherit pname version;
- hash = "sha256-HHS8dt3bJZ3dPWqB5K0h5KQTn/wHRYvIROfYmqfxolw=";
+ hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-RIt+b1Yokc4UMFPxOzO5GARsI32wL71ZmcoN+P/KE5c=";
+ cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE=";
nativeInstallCheckInputs = [
versionCheckHook
diff --git a/pkgs/by-name/li/libhttpseverywhere/package.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix
deleted file mode 100644
index c24eb6ab7780..000000000000
--- a/pkgs/by-name/li/libhttpseverywhere/package.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- pkg-config,
- meson,
- ninja,
- makeFontsConf,
- vala,
- fetchpatch,
- gnome,
- libgee,
- glib,
- json-glib,
- libarchive,
- libsoup_2_4,
- gobject-introspection,
-}:
-
-let
- pname = "libhttpseverywhere";
- version = "0.8.3";
-in
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
- };
-
- nativeBuildInputs = [
- vala
- gobject-introspection
- meson
- ninja
- pkg-config
- ];
- buildInputs = [
- glib
- libgee
- json-glib
- libsoup_2_4
- libarchive
- ];
-
- patches = [
- # Fixes build with vala >=0.42
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
- sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f";
- })
- # fix build with meson 0.60
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/-/commit/4c38b2ca25802c464f3204a62815201d8cf549fd.patch";
- sha256 = "sha256-1+fmR0bpvJ9ISN2Hr+BTIQz+Bf6VfY1RdVZ/OohUlWU=";
- })
- ];
-
- mesonFlags = [ "-Denable_valadoc=true" ];
-
- doCheck = true;
-
- checkPhase = "(cd test && ./httpseverywhere_test)";
-
- FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
-
- outputs = [
- "out"
- "devdoc"
- ];
-
- passthru = {
- updateScript = gnome.updateScript {
- packageName = pname;
- versionPolicy = "odd-unstable";
- };
- };
-
- meta = with lib; {
- description = "Library to use HTTPSEverywhere in desktop applications";
- homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere";
- license = licenses.lgpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members;
- };
-}
diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix
index bdd7d3293f82..4bb3eb86d7ea 100644
--- a/pkgs/by-name/ni/nitter/package.nix
+++ b/pkgs/by-name/ni/nitter/package.nix
@@ -10,13 +10,13 @@
buildNimPackage (
finalAttrs: prevAttrs: {
pname = "nitter";
- version = "0-unstable-2025-04-05";
+ version = "0-unstable-2025-04-15";
src = fetchFromGitHub {
owner = "zedeus";
repo = "nitter";
- rev = "83b0f8b55ae7bfb8a19a0bf14de52f30d06b8db6";
- hash = "sha256-2QIcAhzYrIo1q80959980H+hzLYtPHAOy0+CItDZ1d4=";
+ rev = "94c83f38114abaef10c36903fbcd59d78db7a578";
+ hash = "sha256-J5w16EpQf98fozSfci7xua9AeULB0JZNbOsCzMGrnJg=";
};
lockFile = ./lock.json;
diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix
index c699118ca75e..3c8fe2fc3d2a 100644
--- a/pkgs/by-name/ns/nsc/package.nix
+++ b/pkgs/by-name/ns/nsc/package.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "nsc";
- version = "2.10.2";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
- hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE=";
+ hash = "sha256-/xfNl91cb82kV2IC/m56p94nb3WLDPU5O+1H+sTZnW4=";
};
ldflags = [
@@ -24,7 +24,7 @@ buildGoModule rec {
"-X main.builtBy=nixpkgs"
];
- vendorHash = "sha256-MxkpK3CgQ+eoxGfLRqE3kudyZounDD0+cmzOoiPf1wc=";
+ vendorHash = "sha256-Ms+chBbQCo3TGWPgIy4OSXNpxO5jpm1zxEe9upiPmnY=";
nativeBuildInputs = [ installShellFiles ];
@@ -47,7 +47,7 @@ buildGoModule rec {
# the test strips table formatting from the command output in a naive way
# that removes all the table characters, including '-'.
# The nix build directory looks something like:
- # /private/tmp/nix-build-nsc-2.10.2.drv-0/nsc_test2000598938/keys
+ # /private/tmp/nix-build-nsc-2.11.0.drv-0/nsc_test2000598938/keys
# Then the `-` are removed from the path unintentionally and the test fails.
# This should be fixed upstream to avoid mangling the path when
# removing the table decorations from the command output.
diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 78018aa4dcc7..ba5531df44c2 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "nu_scripts";
- version = "0-unstable-2025-04-07";
+ version = "0-unstable-2025-04-14";
src = fetchFromGitHub {
owner = "nushell";
repo = pname;
- rev = "b7869a8f337dc64f4d1dbf8f2c7a5833bc3abfbf";
- hash = "sha256-IoyClULiILl5wPwyf7zzTK5Rb0yEbkVpFRtUSHksrjc=";
+ rev = "c639113adebdf05f25e0e33b833798a6b0c624d4";
+ hash = "sha256-aeYe642070aAvhIES9apQAC/vyj7pnXiQbn7QTYVVlQ=";
};
installPhase = ''
diff --git a/pkgs/by-name/op/opengrok/package.nix b/pkgs/by-name/op/opengrok/package.nix
index 69efb208b6bf..42ba35995c16 100644
--- a/pkgs/by-name/op/opengrok/package.nix
+++ b/pkgs/by-name/op/opengrok/package.nix
@@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "opengrok";
- version = "1.13.27";
+ version = "1.13.28";
# binary distribution
src = fetchurl {
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
- hash = "sha256-Qr30+paSn3I3+tWpzALTIXP8kxireL96rKopDDj/qnM=";
+ hash = "sha256-WomA61x6/IeEZdsQJwIzmaPZdYttGLJ+Yw36gOnAUK4=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index ddf69d31d81c..b6db9594c541 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm2pgsql";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "osm2pgsql-dev";
repo = "osm2pgsql";
rev = finalAttrs.version;
- hash = "sha256-YKlw/YIRogu0AbkRA3kZ4j4tbbVYbgVcLVYifYarmjE=";
+ hash = "sha256-5rENMcYCfHUdb4QsyOnnGe/qCbdYLoXI15e7OqJXit4=";
};
postPatch = ''
diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index f9e678ccc439..b6dd44bef0fd 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -1,19 +1,22 @@
{
lib,
+ stdenv,
python3Packages,
fetchFromGitHub,
+ versionCheckHook,
+ nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "oterm";
- version = "0.9.3";
+ version = "0.11.1";
pyproject = true;
src = fetchFromGitHub {
owner = "ggozad";
repo = "oterm";
tag = version;
- hash = "sha256-2zzDVUZc+H2tBO5scRUjwz859uaQIbpvCaC0bm4B7NM=";
+ hash = "sha256-b/+siNzmM6RUJ3jv/2dNJJFueejChKde0D5r8J0lTqM=";
};
pythonRelaxDeps = [
@@ -23,6 +26,7 @@ python3Packages.buildPythonApplication rec {
"ollama"
"packaging"
"pillow"
+ "pydantic"
"textual"
"typer"
];
@@ -43,14 +47,24 @@ python3Packages.buildPythonApplication rec {
python-dotenv
rich-pixels
textual
+ textual-image
textualeffects
typer
];
pythonImportsCheck = [ "oterm" ];
- # Tests require a HTTP connection to ollama
- doCheck = false;
+ # Python tests require a HTTP connection to ollama
+
+ # Fails on darwin with: PermissionError: [Errno 1] Operation not permitted: '/var/empty/Library'
+ nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = "--version";
+
+ passthru = {
+ updateScript = nix-update-script { };
+ };
meta = {
description = "Text-based terminal client for Ollama";
diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix
index 90ae5b91d429..af6b31cd406d 100644
--- a/pkgs/by-name/pg/pgbouncer/package.nix
+++ b/pkgs/by-name/pg/pgbouncer/package.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "pgbouncer";
- version = "1.24.0";
+ version = "1.24.1";
src = fetchurl {
url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz";
- hash = "sha256-52rflBoxkaQW4iPAss2/cxWe74CioyMUr2+9guQaHUE=";
+ hash = "sha256-2nKjq6EwcodtBVo+WN1Kukpd5O1hSOcwMxhSRVmP0+A=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 31782dafb32e..d8ddb64c2f8d 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "pluto";
- version = "5.21.3";
+ version = "5.21.4";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = "pluto";
rev = "v${version}";
- hash = "sha256-/gq6BdlNG9vUazVt7Ucvv2679BytUEZrx6u8znnsxG4=";
+ hash = "sha256-tUMQ9d5q4dK63In8uj4+gdrADMMrQLW37UipnSw7hnA=";
};
vendorHash = "sha256-PABCma+pfguDHxRhvQYCHcjr7Epy2AteC+QiXbAx04k=";
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
new file mode 100644
index 000000000000..26d58f9e297a
--- /dev/null
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "postfix-tlspol";
+ version = "1.8.8";
+
+ src = fetchFromGitHub {
+ owner = "Zuplu";
+ repo = "postfix-tlspol";
+ tag = "v${version}";
+ hash = "sha256-XEQ2SOITUPmqI/+R7/O9ST5m5lHJT5fcBoBQk7GoOZM=";
+ };
+
+ vendorHash = null;
+
+ # don't run tests, they perform checks via the network
+ doCheck = false;
+
+ ldflags = [ "-X main.Version=${version}" ];
+
+ meta = {
+ description = "Lightweight MTA-STS + DANE/TLSA resolver and TLS policy server for Postfix, prioritizing DANE.";
+ homepage = "https://github.com/Zuplu/postfix-tlspol";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ valodim ];
+ };
+}
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 3e5ad769353d..1ee71e17b23c 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "reindeer";
- version = "2025.03.31.00";
+ version = "2025.04.14.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "reindeer";
tag = "v${version}";
- hash = "sha256-ocnd/4bIZwrGik2r8HSeyPfLQycmJJrKikgLIZhsb6A=";
+ hash = "sha256-Htmc2z2umh9RKRvrOSGUXqk/Clzw+1+SB8EOGLJZKqM=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-DguWlibOB8z0Blj5ZVFycyJrxJHK3uUROt8hGxacxOY=";
+ cargoHash = "sha256-i0TmB+JtJKCS/eQxOb5SIKi8jf1qqygndDdJOmGl66A=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 73a8d0ca78dc..84f1938b6a4a 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
- version = "0.8.3";
+ version = "0.8.4";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
tag = version;
- hash = "sha256-9jsn7oydaOYOAq6XYYlPjzzy6LSiKOpRtp+PxMlzwz0=";
+ hash = "sha256-0NLxu+aelp36m3ocPhyYz3LDeq310fkyu8WSpZML3Pc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index bad5b18ac8e0..f01f9147c548 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -7,11 +7,11 @@
let
pname = "simplex-chat-desktop";
- version = "6.3.1";
+ version = "6.3.2";
src = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
- hash = "sha256-jCBCZ5nzA8WxIQFsGpuuyZ1Jmt+PJmqybFHFOUkw9L0=";
+ hash = "sha256-zGF8K0Dqi79EYq8UptwD9kAvsuzdvdGrRxuS3z0Ve/c=";
};
appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index a4a065084d27..a5e2c1605eb0 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "sing-box";
- version = "1.11.6";
+ version = "1.11.7";
src = fetchFromGitHub {
owner = "SagerNet";
repo = pname;
rev = "v${version}";
- hash = "sha256-/RTpdbDFCDk1sq7lBIXQ3ElgYqflDumffZy1DVP0zOY=";
+ hash = "sha256-lNgvJ2ycIP/dWFskiDcabFjXfLifueQIXfMW/m3Y8EA=";
};
- vendorHash = "sha256-+XDkza0rymQAWUCmHhKas7FFS8lRPSmGHwAV/072aeo=";
+ vendorHash = "sha256-sq7qjEXB0XqUQ+HDItfjWryBDHXU2jqMRMQDfKHOdB0=";
tags = [
"with_quic"
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 8323994dd7c8..45eae21acf3b 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "slumber";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "LucasPickering";
repo = "slumber";
tag = "v${version}";
- hash = "sha256-7MPNs2vAzCo5TPJZFhd3xaZW0YbF724gfKNLB08IU8A=";
+ hash = "sha256-GFkssVTOohEdczIi4+OV7qKHBPqa2yFZNhAoMAIBZN0=";
};
useFetchCargoVendor = true;
- cargoHash = "sha256-eWox5NrvZr+mEGGwxYbAW5EgEOQ8WQUy2pughBlpXgM=";
+ cargoHash = "sha256-4RDnIWr0Z6FGnUQxh+yk7L/mg/Jw6JROns4DXkYIbuE=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 40d1d302c0dd..706e29f931fb 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -134,6 +134,9 @@ buildGoModule {
# test for a dev util which helps to fork golang.org/x/crypto/acme
# not necessary and fails to match
"TestSyncedToUpstream" # tempfork/acme
+
+ # flaky: https://github.com/tailscale/tailscale/issues/7030
+ "TestConcurrent"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# syscall default route interface en0 differs from netstat
diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 1a94b765c7ef..d17bb2f496ea 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "tbls";
- version = "1.84.1";
+ version = "1.85.0";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
tag = "v${version}";
- hash = "sha256-c4LxntQhni6dHbjs0QZLWgioU2GT101x4lDC43buiwk=";
+ hash = "sha256-zXaygbcKUZ5BzTKur+K0gUGtoc4FFG0EPwl0KxaJGJo=";
};
- vendorHash = "sha256-6b5JYWjJIbZakrOkB1Xgg4HyBBBecN31iutOMZpLeHc=";
+ vendorHash = "sha256-hARsbsy9us/knGg6dwNgDezjas5IC6GtL7neEZbwgvo=";
excludedPackages = [ "scripts/jsonschema" ];
diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix
index ce4dc34a82e2..5c3be6074447 100644
--- a/pkgs/by-name/tu/tuner/package.nix
+++ b/pkgs/by-name/tu/tuner/package.nix
@@ -12,8 +12,6 @@
desktop-file-utils,
libsoup_3,
json-glib,
- geoclue2,
- geocode-glib,
libgee,
gtk3,
pantheon,
@@ -45,8 +43,6 @@ stdenv.mkDerivation rec {
buildInputs = [
libsoup_3
json-glib
- geoclue2
- geocode-glib
libgee
glib
gtk3
diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix
index 53f4526ce2e7..8222cac03c2b 100644
--- a/pkgs/by-name/ur/urn-timer/package.nix
+++ b/pkgs/by-name/ur/urn-timer/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation {
pname = "urn-timer";
- version = "0-unstable-2025-02-07";
+ version = "0-unstable-2025-04-17";
src = fetchFromGitHub {
owner = "paoloose";
repo = "urn";
- rev = "0486ff9af0a404e73d66ea3d8ad7f9107efff35f";
- hash = "sha256-3fgKs0cWr972pYLTfIy6HLDP+GUdNog4FEQ70ACKYKI=";
+ rev = "5eea3f9efb03758bfafcd029406797d34e4c875b";
+ hash = "sha256-rlUFZiA2fMa5QkKqKBRkiM8o2nioD0MPn6eJTJSJq3M=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/va/vale/styles.nix b/pkgs/by-name/va/vale/styles.nix
index c910014fbca0..72c9306f1bc1 100644
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -61,12 +61,12 @@ in
google = buildStyle rec {
name = "Google";
- version = "0.6.2";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "errata-ai";
repo = "Google";
rev = "v${version}";
- hash = "sha256-ldwK9tMA04H/jTd3dQeRX/sZOwZcyPb+I56cDg0vZDg=";
+ hash = "sha256-1aN7wCdShhMsBN83u7l+5Ffm2WKC8ltZyT3hPZCNWYo=";
};
meta = {
description = "Vale-compatible implementation of the Google Developer Documentation Style Guide";
@@ -93,12 +93,12 @@ in
microsoft = buildStyle rec {
name = "Microsoft";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "errata-ai";
repo = "Microsoft";
rev = "v${version}";
- hash = "sha256-4j05bIGAVEy6untUqtrUxdLKlhyOcJsbcsow8OxRp1A=";
+ hash = "sha256-Sie4bBeKPOFOJhgd+mLbiz4vG+xpKL0LnwnRQHzOw+Q=";
};
meta = {
description = "Vale-compatible implementation of the Microsoft Writing Style Guide";
diff --git a/pkgs/by-name/vi/vimb-unwrapped/package.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix
index 269e78b8c05b..d01cb36edc07 100644
--- a/pkgs/by-name/vi/vimb-unwrapped/package.nix
+++ b/pkgs/by-name/vi/vimb-unwrapped/package.nix
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
pkg-config,
- libsoup_2_4,
+ libsoup_3,
webkitgtk_4_1,
gtk3,
glib-networking,
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
- libsoup_2_4
+ libsoup_3
webkitgtk_4_1
glib-networking
gsettings-desktop-schemas
diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index f76ee2bb3183..8d567ddfd761 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -6,20 +6,20 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
- version = "1.228.0";
+ version = "1.229.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasm-tools";
rev = "v${version}";
- hash = "sha256-lVrZCjLhSCyD3aEr6IyRZejqwdiT89w0/ppmQE8Thto=";
+ hash = "sha256-fJQN5AKhILP7d+0GEtnHKuZtZEr/61TfGwpH1EbbSg4=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
useFetchCargoVendor = true;
- cargoHash = "sha256-yUOgQRdducguVinceeIs9PGk8Pq9Y24I3KbsRcCWpAY=";
+ cargoHash = "sha256-OqQJ2jvceHPoSx7Iic/hsJWv8vJnEo9F1bbpqfL5HsM=";
cargoBuildFlags = [
"--package"
"wasm-tools"
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index 7bcf5d3369f3..be929ce90544 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -11,15 +11,15 @@
buildGoModule rec {
pname = "witness";
- version = "0.8.1";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "in-toto";
repo = "witness";
rev = "v${version}";
- sha256 = "sha256-ylCUy44sX1KPfQqEldixmLcXkk+Uwca4q1gZRgxHdeg=";
+ sha256 = "sha256-taTK/b3HA18UPyi3zxGWBG6Wy4XtHcfTaA8NiYZaPA0=";
};
- vendorHash = "sha256-CR95CsGthdjq/dtxmIjmZlQeyKimumCP9mWr6tNrBJI=";
+ vendorHash = "sha256-3/vn+rWVbljkPksiNXoTU0volV3xwxunMwCV9w9fAWo=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index 8ce975e4c9cc..61021c6d4fc8 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
buildGoModule {
pname = "zoekt";
- version = "3.7.2-2-unstable-2025-03-25";
+ version = "3.7.2-2-unstable-2025-04-15";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "zoekt";
- rev = "47287adecfbd6b068cf7ad5fb67c9548a7062156";
- hash = "sha256-RRlCfv34hSBWpeXxvXsPtfziE0L0FhZfMIfBi8i2XWg=";
+ rev = "0978c13fb6683be9908ee1a578360734e61cc8b5";
+ hash = "sha256-1Ris2GsZnHHrxvXxOCRSPvvk35YEhqDxNHkd7cjv0YY=";
};
vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo=";
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 0240ade0d6e8..0463248e0a7f 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -42,12 +42,12 @@ in
);
julia_111-bin = wrapJulia (
callPackage (import ./generic-bin.nix {
- version = "1.11.4";
+ version = "1.11.5";
sha256 = {
- x86_64-linux = "fb3d3c5fccef82158a70677c0044ac5ae40410eceb0604cdc8e643eeff21df8d";
- aarch64-linux = "859f1a8cc4bce6911bc912f0e226a6ba2b1c144110b9d559d88f5077513d0e37";
- x86_64-darwin = "7e693914399f2ebe1fafe5c670af0373474145cfe2bfda661f370559a680720a";
- aarch64-darwin = "5adfb4482bba9610405c0f9b5a3c1aa09cabf70c8751d75970f2dab0fa819488";
+ x86_64-linux = "723e878c642220cc0251a0e13758c059a389cadc7f01376feaf1ea7388fe8f9c";
+ aarch64-linux = "f63203574fba25c9bda5e98b2f87f985d4672109855633a46bae32bfba3cbc0d";
+ x86_64-darwin = "9bee8cc79a7dda56a38bbef88e72687ea0cb35d4c382eb9076ee8a3c53c3a8cf";
+ aarch64-darwin = "2c279005f5059d10eade27a59e25f5ea53e00b0caa30a6d73fa32529ec046735";
};
}) { }
);
@@ -79,8 +79,8 @@ in
);
julia_111 = wrapJulia (
callPackage (import ./generic.nix {
- version = "1.11.4";
- hash = "sha256-xJNlYtBRKIQtf+K+MHNDM1GeqUpUhhtdC/440QPpa1s=";
+ version = "1.11.5";
+ hash = "sha256-FHYm22toh7+2YSy2zSpI1omAZkn6403HSf3cg3XCxiU=";
patches = [
./patches/1.11/0002-skip-failing-and-flaky-tests.patch
];
diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix
index cbcfbd14cd99..e22de3e9956b 100644
--- a/pkgs/development/libraries/gensio/default.nix
+++ b/pkgs/development/libraries/gensio/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "gensio";
- version = "2.8.12";
+ version = "2.8.14";
src = fetchFromGitHub {
owner = "cminyard";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DlveXTkdNu6Pb/0sL9K5HaOJ9HEhv2gwk5Kka9nI7U0=";
+ sha256 = "sha256-vxa1r0vloiqMrGhXriIbBfJC6wmm54YWg0nCnB8MDG0=";
};
passthru = {
diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch
deleted file mode 100644
index 0aa2034e3996..000000000000
--- a/pkgs/development/libraries/gsignond/conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/meson.build b/meson.build
-index cb1e0df..d90c85c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,6 +95,6 @@ endif
- configure_file(
- input: 'gsignond.conf.in',
- configuration: conf_data,
-- install_dir: sysconf_dir,
-+ install_dir: 'etc/',
- output: 'gsignond.conf'
- )
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
deleted file mode 100644
index f3f992ea8dac..000000000000
--- a/pkgs/development/libraries/gsignond/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitLab,
- pkg-config,
- meson,
- ninja,
- glib,
- glib-networking,
- sqlite,
- gobject-introspection,
- vala,
- gtk-doc,
- libsecret,
- docbook_xsl,
- docbook_xml_dtd_43,
- docbook_xml_dtd_45,
- glibcLocales,
- makeWrapper,
- symlinkJoin,
- gsignondPlugins,
- plugins,
-}:
-
-let
- unwrapped = stdenv.mkDerivation rec {
- pname = "gsignond";
- version = "1.2.0";
-
- outputs = [
- "out"
- "dev"
- "devdoc"
- ];
-
- src = fetchFromGitLab {
- owner = "accounts-sso";
- repo = pname;
- rev = version;
- sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
- };
-
- nativeBuildInputs = [
- docbook_xml_dtd_43
- docbook_xml_dtd_45
- docbook_xsl
- glibcLocales
- gobject-introspection
- gtk-doc
- meson
- ninja
- pkg-config
- vala
- ];
-
- buildInputs = [
- glib
- glib-networking
- libsecret
- ];
-
- propagatedBuildInputs = [ sqlite ];
-
- mesonFlags = [
- "-Dbus_type=session"
- "-Dextension=desktop"
- ];
-
- LC_ALL = "en_US.UTF-8";
-
- patches = [
- ./conf.patch
- ./plugin-load-env.patch
- ];
-
- meta = with lib; {
- description = "D-Bus service which performs user authentication on behalf of its clients";
- mainProgram = "gsignond";
- homepage = "https://gitlab.com/accounts-sso/gsignond";
- license = licenses.lgpl21Plus;
- maintainers = [ ];
- platforms = platforms.linux;
- };
- };
-
-in
-if plugins == [ ] then
- unwrapped
-else
- import ./wrapper.nix {
- inherit makeWrapper symlinkJoin plugins;
- gsignond = unwrapped;
- }
diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch
deleted file mode 100644
index 5da2b4c157e8..000000000000
--- a/pkgs/development/libraries/gsignond/plugin-load-env.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
-index 5497b32..979e1b4 100644
---- a/src/gplugind/gsignond-plugin-loader.c
-+++ b/src/gplugind/gsignond-plugin-loader.c
-@@ -38,11 +38,10 @@ gsignond_load_plugin (
- gchar *plugin_filename;
- GSignondPlugin *plugin;
-
--# ifdef ENABLE_DEBUG
- const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
- if (env_val)
- plugin_path = env_val;
--# endif
-+
- plugin_filename = g_module_build_path (plugin_path, plugin_type);
- plugin = gsignond_load_plugin_with_filename (plugin_type,
- plugin_filename);
-diff --git a/src/gplugind/main.c b/src/gplugind/main.c
-index 1c6cdb6..c85c623 100644
---- a/src/gplugind/main.c
-+++ b/src/gplugind/main.c
-@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
- static const gchar* _plugin_path(void)
- {
- const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
--# ifdef ENABLE_DEBUG
-+
- const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
- if (env_val)
- plugin_path = env_val;
--# endif
-+
- return plugin_path;
- }
-
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
deleted file mode 100644
index 9f55e89e32b6..000000000000
--- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitLab,
- pkg-config,
- meson,
- ninja,
- vala,
- glib,
- gsignond,
- json-glib,
- libsoup_2_4,
- gobject-introspection,
-}:
-
-stdenv.mkDerivation {
- pname = "gsignond-plugin-lastfm";
- version = "2018-05-07";
-
- src = fetchFromGitLab {
- owner = "accounts-sso";
- repo = "gsignond-plugin-lastfm";
- rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c";
- sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f";
- };
-
- nativeBuildInputs = [
- gobject-introspection
- meson
- ninja
- pkg-config
- vala
- ];
-
- buildInputs = [
- glib
- gsignond
- json-glib
- libsoup_2_4
- ];
-
- PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
-
- meta = with lib; {
- description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials";
- homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm";
- license = licenses.lgpl21Plus;
- maintainers = [ ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
deleted file mode 100644
index 610f3e100de2..000000000000
--- a/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitLab,
- pkg-config,
- meson,
- ninja,
- vala,
- glib,
- gsignond,
- gobject-introspection,
-}:
-
-stdenv.mkDerivation rec {
- pname = "gsignond-plugin-mail";
- version = "0.3.0";
-
- src = fetchFromGitLab {
- owner = "accounts-sso";
- repo = "gsignond-plugin-mail";
- rev = version;
- sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
- };
-
- nativeBuildInputs = [
- gobject-introspection
- meson
- ninja
- pkg-config
- vala
- ];
-
- buildInputs = [
- glib
- gsignond
- ];
-
- PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
-
- meta = with lib; {
- description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials";
- homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail";
- license = licenses.lgpl21Plus;
- maintainers = [ ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
deleted file mode 100644
index a26ce6caa1c6..000000000000
--- a/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitLab,
- pkg-config,
- meson,
- ninja,
- glib,
- gsignond,
- check,
- json-glib,
- libsoup_2_4,
- gnutls,
- gtk-doc,
- docbook_xml_dtd_43,
- docbook_xml_dtd_45,
- docbook_xsl,
- glibcLocales,
- gobject-introspection,
-}:
-
-stdenv.mkDerivation {
- pname = "gsignond-plugin-oauth";
- version = "2018-10-15";
-
- src = fetchFromGitLab {
- owner = "accounts-sso";
- repo = "gsignond-plugin-oa";
- rev = "d471cebfd7c50567b1244277a9559f18f8d58691";
- sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx";
- };
-
- nativeBuildInputs = [
- check
- docbook_xml_dtd_43
- docbook_xml_dtd_45
- docbook_xsl
- glibcLocales
- gobject-introspection
- gtk-doc
- meson
- ninja
- pkg-config
- ];
-
- buildInputs = [
- glib
- gnutls
- gsignond
- json-glib
- libsoup_2_4
- ];
-
- LC_ALL = "en_US.UTF-8";
-
- PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
-
- meta = with lib; {
- description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols";
- homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa";
- license = licenses.lgpl21Plus;
- maintainers = [ ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
deleted file mode 100644
index 5a89d996743a..000000000000
--- a/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitLab,
- pkg-config,
- meson,
- ninja,
- glib,
- gsignond,
- gsasl,
- check,
- gtk-doc,
- docbook_xml_dtd_43,
- docbook_xml_dtd_45,
- docbook_xsl,
- glibcLocales,
- gobject-introspection,
-}:
-
-stdenv.mkDerivation {
- pname = "gsignond-plugin-sasl";
- version = "2018-10-15";
-
- src = fetchFromGitLab {
- owner = "accounts-sso";
- repo = "gsignond-plugin-sasl";
- rev = "b304c70b7dad9368b23b1205122d10de684c896a";
- sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va";
- };
-
- nativeBuildInputs = [
- check
- docbook_xml_dtd_43
- docbook_xml_dtd_45
- docbook_xsl
- glibcLocales
- gobject-introspection
- gtk-doc
- meson
- ninja
- pkg-config
- ];
-
- buildInputs = [
- glib
- gsasl
- gsignond
- ];
-
- LC_ALL = "en_US.UTF-8";
-
- PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
-
- meta = with lib; {
- description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol";
- homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl";
- license = licenses.lgpl21Plus;
- maintainers = [ ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix
deleted file mode 100644
index ab7f6b9817df..000000000000
--- a/pkgs/development/libraries/gsignond/wrapper.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- makeWrapper,
- symlinkJoin,
- gsignond,
- plugins,
-}:
-
-symlinkJoin {
- name = "gsignond-with-plugins-${gsignond.version}";
-
- paths = [ gsignond ] ++ plugins;
-
- nativeBuildInputs = [ makeWrapper ];
-
- postBuild = ''
- wrapProgram $out/bin/gsignond \
- --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins"
-
- rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service
- rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
-
- substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \
- --replace ${gsignond} $out
-
- substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
- --replace ${gsignond} $out
- '';
-
- inherit (gsignond) meta;
-}
diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix
deleted file mode 100644
index 73b22e6c9035..000000000000
--- a/pkgs/development/libraries/libgrss/default.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
- lib,
- stdenv,
- fetchurl,
- fetchpatch,
- pkg-config,
- vala,
- gobject-introspection,
- gtk-doc,
- docbook_xsl,
- docbook_xml_dtd_412,
- glib,
- libxml2,
- libsoup_2_4,
- gnome,
- buildPackages,
- Foundation,
- AppKit,
-}:
-
-stdenv.mkDerivation rec {
- pname = "libgrss";
- version = "0.7.0";
-
- outputs = [
- "out"
- "dev"
- "devdoc"
- ];
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
- };
-
- patches = [
- (fetchpatch {
- name = "CVE-2016-20011.patch";
- # https://gitlab.gnome.org/GNOME/libgrss/-/merge_requests/7, not yet merged!
- url = "https://gitlab.gnome.org/GNOME/libgrss/-/commit/2c6ea642663e2a44efc8583fae7c54b7b98f72b3.patch";
- sha256 = "1ijvq2jl97vphcvrbrqxvszdmv6yyjfygdca9vyaijpafwyzzb18";
- })
- ];
-
- nativeBuildInputs = [
- pkg-config
- vala
- gobject-introspection
- gtk-doc
- docbook_xsl
- docbook_xml_dtd_412
- ];
-
- buildInputs =
- [
- glib
- libxml2
- libsoup_2_4
- ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [
- Foundation
- AppKit
- ];
-
- configureFlags =
- [
- "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
- ]
- ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
- "--enable-gtk-doc"
- ];
-
- doCheck = true;
-
- passthru = {
- updateScript = gnome.updateScript {
- packageName = pname;
- versionPolicy = "none";
- };
- };
-
- meta = with lib; {
- description = "Glib abstaction to handle feeds in RSS, Atom and other formats";
- homepage = "https://gitlab.gnome.org/GNOME/libgrss";
- license = licenses.lgpl3Plus;
- maintainers = teams.gnome.members;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 3b2da021c212..a6a2974ce53c 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -3,6 +3,7 @@
fetchFromGitHub,
buildDunePackage,
ocaml,
+ ounit,
qtest,
qcheck,
num,
@@ -24,7 +25,10 @@ buildDunePackage rec {
};
nativeCheckInputs = [ qtest ];
- checkInputs = [ qcheck ];
+ checkInputs = [
+ ounit
+ qcheck
+ ];
propagatedBuildInputs = [
camlp-streams
num
diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix
index 9ddcdcc1d5e5..e5a6d52cc45c 100644
--- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix
+++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix
@@ -9,8 +9,6 @@ buildDunePackage {
inherit (qcheck-core) version src patches;
- duneVersion = "3";
-
propagatedBuildInputs = [
qcheck-core
alcotest
diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix
index b266f47ffcfa..bfa2cffdc4c2 100644
--- a/pkgs/development/ocaml-modules/qcheck/core.nix
+++ b/pkgs/development/ocaml-modules/qcheck/core.nix
@@ -6,15 +6,15 @@
buildDunePackage rec {
pname = "qcheck-core";
- version = "0.24";
+ version = "0.25";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
owner = "c-cube";
repo = "qcheck";
- rev = "v${version}";
- hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
+ tag = "v${version}";
+ hash = "sha256-Z89jJ21zm89wb9m5HthnbHdnE9iXLyaH9k8S+FAWkKQ=";
};
meta = {
diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix
index 7189c2fb3461..a1749cfc60dd 100644
--- a/pkgs/development/ocaml-modules/qcheck/default.nix
+++ b/pkgs/development/ocaml-modules/qcheck/default.nix
@@ -5,8 +5,6 @@ buildDunePackage {
inherit (qcheck-ounit) version src patches;
- duneVersion = "3";
-
propagatedBuildInputs = [ qcheck-ounit ];
meta = qcheck-ounit.meta // {
diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix
index 6a09f20dfdf0..31c24ab1f7fe 100644
--- a/pkgs/development/ocaml-modules/qcheck/ounit.nix
+++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix
@@ -1,7 +1,7 @@
{
buildDunePackage,
qcheck-core,
- ounit,
+ ounit2,
}:
buildDunePackage {
@@ -9,11 +9,9 @@ buildDunePackage {
inherit (qcheck-core) version src patches;
- duneVersion = "3";
-
propagatedBuildInputs = [
qcheck-core
- ounit
+ ounit2
];
meta = qcheck-core.meta // {
diff --git a/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix b/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix
index 70bf69ecacf7..bc45242a719c 100644
--- a/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix
+++ b/pkgs/development/ocaml-modules/qcheck/ppx_deriving_qcheck.nix
@@ -1,6 +1,6 @@
{
buildDunePackage,
- qcheck-core,
+ fetchFromGitHub,
qcheck,
ppxlib,
ppx_deriving,
@@ -8,10 +8,14 @@
buildDunePackage {
pname = "ppx_deriving_qcheck";
+ version = "0.6";
- inherit (qcheck-core) version src patches;
-
- duneVersion = "3";
+ src = fetchFromGitHub {
+ owner = "c-cube";
+ repo = "qcheck";
+ tag = "v0.24";
+ hash = "sha256-iuFlmSeUhumeWhqHlaNqDjReRf8c4e76hhT27DK3+/g=";
+ };
propagatedBuildInputs = [
qcheck
@@ -19,7 +23,7 @@ buildDunePackage {
ppx_deriving
];
- meta = qcheck-core.meta // {
+ meta = qcheck.meta // {
description = "PPX Deriver for QCheck";
};
}
diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index 73798537809a..c1d714e277a8 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -73,6 +73,10 @@ buildPythonPackage rec {
];
disabledTests = [
+ # Fatal Python error: Aborted
+ # line 414 in test_display_screen
+ "test_display_screen"
+
# test_atari_env.py tests fail on the majority of the environments because the ROM are missing.
# The user is expected to manually download the roms:
# https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 68f94eae1804..ca7b54ba06ad 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
- version = "1.37.34";
+ version = "1.37.35";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
- hash = "sha256-55s1NWY0F9P7T2W/FqAFzhtCbrN3sjYF48EZTXkclb4=";
+ hash = "sha256-OQDIBsLGaIBPFxPm79VmoGyZv/zI43CemCKp3saBkj8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 53358facc149..7c2b8916b22f 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "cyclopts";
- version = "3.12.0";
+ version = "3.13.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "BrianPugh";
repo = "cyclopts";
tag = "v${version}";
- hash = "sha256-VV2C9SvVOF2452lP20WJaSppXrenUhSf2QTh0t3WjgM=";
+ hash = "sha256-L8RHBjOfXS2VocyVG/GL4LgfYN/ev+BbMqK8uE3lkOw=";
};
build-system = [
diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix
index 010ab5493cb0..c0cbd3bc477b 100644
--- a/pkgs/development/python-modules/dinghy/default.nix
+++ b/pkgs/development/python-modules/dinghy/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "dinghy";
- version = "1.3.3";
+ version = "1.4.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "nedbat";
repo = pname;
tag = version;
- hash = "sha256-fn8SRzhFJyyr2Wr9/cp8Sm6kbVARq2LEeKSE0HU9V74=";
+ hash = "sha256-51BXQdDxlI6+3ctDSa/6tyRXBb1E9BVej9qy7WtkOGM=";
};
nativeBuildInputs = [ setuptools ];
@@ -56,7 +56,7 @@ buildPythonPackage rec {
description = "GitHub activity digest tool";
mainProgram = "dinghy";
homepage = "https://github.com/nedbat/dinghy";
- changelog = "https://github.com/nedbat/dinghy/blob/${version}/CHANGELOG.rst";
+ changelog = "https://github.com/nedbat/dinghy/blob/${src.tag}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [
trundle
diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index 504ed1cb9136..14341ea1ce5e 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -62,7 +62,7 @@ buildPythonPackage rec {
];
preBuild = ''
- ${python.interpreter} -m django compilemessages
+ ${python.pythonOnBuildForHost.interpreter} -m django compilemessages
'';
optional-dependencies = {
diff --git a/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/pkgs/development/python-modules/esphome-dashboard-api/default.nix
index dd2f3e3c8295..48b7b31db203 100644
--- a/pkgs/development/python-modules/esphome-dashboard-api/default.nix
+++ b/pkgs/development/python-modules/esphome-dashboard-api/default.nix
@@ -3,35 +3,29 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
- wheel,
aiohttp,
+ orjson,
}:
buildPythonPackage rec {
pname = "esphome-dashboard-api";
- version = "1.2.3";
- format = "pyproject";
+ version = "1.3.0";
+ pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "dashboard-api";
tag = version;
- hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g=";
+ hash = "sha256-b3PnMzlA9N8NH6R5ed6wf5QF45i887iQk2QgH7e755k=";
};
- postPatch = ''
- substituteInPlace pyproject.toml \
- --replace "setuptools~=65.6" "setuptools" \
- --replace "wheel~=0.37.1" "wheel"
- '';
+ build-system = [ setuptools ];
- nativeBuildInputs = [
- setuptools
- wheel
+ dependencies = [
+ aiohttp
+ orjson
];
- propagatedBuildInputs = [ aiohttp ];
-
doCheck = false; # no tests
pythonImportsCheck = [ "esphome_dashboard_api" ];
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 58821e1fb933..51a02ae98c96 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -350,8 +350,8 @@ rec {
"sha256-5rf6lym+LUdtellsFlCOPcL7ZR44cxL7ozMG77QBp4U=";
mypy-boto3-connectcases =
- buildMypyBoto3Package "connectcases" "1.37.0"
- "sha256-xDjzytVFmlZuYKcvzgMsVfyT8Xn9X0a4/OHZzLW80pI=";
+ buildMypyBoto3Package "connectcases" "1.37.35"
+ "sha256-Lnnfhpgau08hnTT73wGvGi3ssGIzGzZanRb/BO8JHXU=";
mypy-boto3-connectparticipant =
buildMypyBoto3Package "connectparticipant" "1.37.0"
@@ -470,8 +470,8 @@ rec {
"sha256-uKccWDS0zhFrs6CQ9ve6by4rYL43T6iFZ3rjNy7SiyI=";
mypy-boto3-eks =
- buildMypyBoto3Package "eks" "1.37.24"
- "sha256-Fh3hdSfyUHT9DTHjp7GVk4GPDbI1IbK1+u2LIbFGhY4=";
+ buildMypyBoto3Package "eks" "1.37.35"
+ "sha256-Uk7r11ayOnQl6HSiFHlfpj7whRFjSz8nJMxxs0ZZn/w=";
mypy-boto3-elastic-inference =
buildMypyBoto3Package "elastic-inference" "1.36.0"
@@ -518,8 +518,8 @@ rec {
"sha256-jKo/VYOtHEWPFh3w0Q3rg3nlreizEcNG7C/eADRNy88=";
mypy-boto3-events =
- buildMypyBoto3Package "events" "1.37.28"
- "sha256-U8L97t7Tql+SpCSpfOTF22RRKLFvN+2SoTkweGAMe0c=";
+ buildMypyBoto3Package "events" "1.37.35"
+ "sha256-HIZTGaVSNsddZxDxenpzNFWZDvV7Hl21ZKVfbGYYF9g=";
mypy-boto3-evidently =
buildMypyBoto3Package "evidently" "1.37.0"
@@ -1118,8 +1118,8 @@ rec {
"sha256-031skcPZd/jBWIod9JAbIc9NUcEBBN33UxIoGc2IiAA=";
mypy-boto3-resource-groups =
- buildMypyBoto3Package "resource-groups" "1.37.0"
- "sha256-38L7Iirnj8n6MnWSCY1ZylCAECSW4wo3gvddKq74aIs=";
+ buildMypyBoto3Package "resource-groups" "1.37.35"
+ "sha256-ae1MUUGAapRCLaWrMzlzQvNc+9ijTQxFMlxqvOFD4WI=";
mypy-boto3-resourcegroupstaggingapi =
buildMypyBoto3Package "resourcegroupstaggingapi" "1.37.0"
@@ -1238,8 +1238,8 @@ rec {
"sha256-toCWU6Bh5IJ5lupehKJ6EvsMKZz5s/uPWG9qF+4P5uM=";
mypy-boto3-servicecatalog =
- buildMypyBoto3Package "servicecatalog" "1.37.0"
- "sha256-/MJaP0iTix/cyCxJrTuTWHf0lSCt8dfJI67Y6+PdJF4=";
+ buildMypyBoto3Package "servicecatalog" "1.37.35"
+ "sha256-blNOCdn3J1XNwGjWMo5eN+a2SzKqCt/1at8l8AzNZsg=";
mypy-boto3-servicecatalog-appregistry =
buildMypyBoto3Package "servicecatalog-appregistry" "1.37.0"
diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix
index 98c863d89356..d14141e18966 100644
--- a/pkgs/development/python-modules/nbdev/default.nix
+++ b/pkgs/development/python-modules/nbdev/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "nbdev";
- version = "2.3.37";
+ version = "2.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-6Z/p71t9FopVcSh4TCFSPP382AM1CYen00eQOD8Jx8A=";
+ hash = "sha256-OtCpN2Jw4ghv19jY4N2Yn46CxxZuPQSybFw62MIIf0g=";
};
pythonRelaxDeps = [ "ipywidgets" ];
diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix
index e88644abdd45..e627c3d23fe0 100644
--- a/pkgs/development/python-modules/nutpie/default.nix
+++ b/pkgs/development/python-modules/nutpie/default.nix
@@ -1,5 +1,6 @@
{
lib,
+ stdenv,
buildPythonPackage,
fetchFromGitHub,
rustPlatform,
@@ -81,6 +82,11 @@ buildPythonPackage rec {
writableTmpDirAsHomeHook
];
+ disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+ # flaky (assert np.float64(0.0017554642626285276) > 0.01)
+ "test_normalizing_flow"
+ ];
+
disabledTestPaths = [
# Require unpackaged bridgestan
"tests/test_stan.py"
diff --git a/pkgs/development/python-modules/open-interpreter/default.nix b/pkgs/development/python-modules/open-interpreter/default.nix
index dcd9ec37333c..c6b93896adb1 100644
--- a/pkgs/development/python-modules/open-interpreter/default.nix
+++ b/pkgs/development/python-modules/open-interpreter/default.nix
@@ -2,88 +2,104 @@
lib,
fetchFromGitHub,
buildPythonPackage,
- pythonOlder,
poetry-core,
- setuptools,
+ anthropic,
astor,
- inquirer,
- pyyaml,
- rich,
- six,
- tokentrim,
- wget,
- psutil,
+ fastapi,
+ google-generativeai,
html2image,
- send2trash,
+ html2text,
+ inquirer,
ipykernel,
jupyter-client,
- matplotlib,
- toml,
- tiktoken,
- platformdirs,
- pydantic,
- google-generativeai,
- pynput,
- pyperclip,
- yaspin,
- shortuuid,
litellm,
+ matplotlib,
+ platformdirs,
+ psutil,
+ pyautogui,
+ pydantic,
+ pyperclip,
+ pyyaml,
+ rich,
+ selenium,
+ send2trash,
+ setuptools,
+ shortuuid,
+ six,
+ starlette,
+ tiktoken,
+ tokentrim,
+ toml,
+ typer,
+ uvicorn,
+ webdriver-manager,
+ wget,
+ yaspin,
nltk,
}:
buildPythonPackage rec {
pname = "open-interpreter";
- version = "0.3.6";
+ version = "0.4.2";
pyproject = true;
- disabled = pythonOlder "3.9";
-
src = fetchFromGitHub {
owner = "KillianLucas";
repo = "open-interpreter";
- rev = "v${version}";
- hash = "sha256-TeBiRylrq5CrAG9XS47Z9GlruAv7V7Nsl4QbSV55isM=";
+ tag = "v${version}";
+ hash = "sha256-fogCcWAhcrCrrcV0q4oKttkf/GeJaJSZnbgiFxvySs8=";
};
pythonRemoveDeps = [ "git-python" ];
pythonRelaxDeps = [
+ "anthropic"
"google-generativeai"
"psutil"
- "pynput"
+ "rich"
+ "starlette"
"tiktoken"
+ "typer"
"yaspin"
];
build-system = [ poetry-core ];
dependencies = [
- setuptools
+ anthropic
astor
- inquirer
- pyyaml
- rich
- six
- tokentrim
- wget
- psutil
+ fastapi
+ google-generativeai
html2image
- send2trash
+ html2text
+ inquirer
ipykernel
jupyter-client
- matplotlib
- toml
- tiktoken
- platformdirs
- pydantic
- google-generativeai
- pynput
- pyperclip
- yaspin
- shortuuid
litellm
+ matplotlib
+ platformdirs
+ psutil
+ pyautogui
+ pydantic
+ pyperclip
+ pyyaml
+ rich
+ selenium
+ send2trash
+ setuptools
+ shortuuid
+ six
+ starlette
+ tiktoken
+ tokentrim
+ toml
+ typer
+ uvicorn
+ webdriver-manager
+ wget
+ yaspin
# marked optional in pyproject.toml but still required?
nltk
@@ -94,12 +110,12 @@ buildPythonPackage rec {
# Most tests required network access
doCheck = false;
- meta = with lib; {
+ meta = {
description = "OpenAI's Code Interpreter in your terminal, running locally";
homepage = "https://github.com/KillianLucas/open-interpreter";
- license = licenses.mit;
+ license = lib.licenses.mit;
changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";
- maintainers = with maintainers; [ happysalada ];
+ maintainers = with lib.maintainers; [ happysalada ];
mainProgram = "interpreter";
};
}
diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix
index f4dac76c278d..51f013b9f438 100644
--- a/pkgs/development/python-modules/picos/default.nix
+++ b/pkgs/development/python-modules/picos/default.nix
@@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "picos";
- version = "2.6.0";
+ version = "2.6.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-LU5OxinhDBewQ/32cxyOSQyUexMD8xdJIkrsiaWBils=";
+ hash = "sha256-u9yaKeP34YW55+PyVy3wPR0p0jBmiLywvZzw2zWdd6g=";
};
# Needed only for the tests
diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index cd279c31760f..afce4f09f3e9 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -28,7 +28,10 @@ buildPythonPackage rec {
hash = "sha256-kp2S3xnclMktEi6aqMBahQVZQeLriSigq77mRu+7A9I=";
};
- pythonRelaxDeps = [ "pipdeptree" ];
+ pythonRelaxDeps = [
+ "rich"
+ "pipdeptree"
+ ];
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix
index d3919d9b742d..165d18dc770f 100644
--- a/pkgs/development/python-modules/reflex/default.nix
+++ b/pkgs/development/python-modules/reflex/default.nix
@@ -51,26 +51,28 @@
buildPythonPackage rec {
pname = "reflex";
- version = "0.7.6";
+ version = "0.7.7";
pyproject = true;
src = fetchFromGitHub {
owner = "reflex-dev";
repo = "reflex";
tag = "v${version}";
- hash = "sha256-LwonbORSoNKi1dHmKxjI2H3G+ZtEGFSpQGwPi/2lRv4=";
+ hash = "sha256-27sgU9ugSkStDOg64W1RgiqmlbOzrdxg7kz2AztfERA=";
};
+ # 'rich' is also somehow checked when building the wheel,
+ # pythonRelaxDepsHook modifies the wheel METADATA in postBuild
+ pypaBuildFlags = [ "--skip-dependency-check" ];
+
pythonRelaxDeps = [
+ # needed
+ "rich"
+ # preventative
"fastapi"
"gunicorn"
];
- pythonRemoveDeps = [
- "setuptools"
- "build"
- ];
-
build-system = [ hatchling ];
dependencies = [
diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 2835fff213cc..ea5a1419f7cd 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -45,6 +45,10 @@ buildPythonPackage rec {
build-system = [ setuptools ];
+ pythonRelaxDeps = [
+ "pillow"
+ ];
+
dependencies = [
duckduckgo-search
huggingface-hub
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 8cd85e9e711f..42a5589d2042 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
- version = "3.0.1359";
+ version = "3.0.1361";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
tag = version;
- hash = "sha256-ey1bFsaEbetTLDtmTO3xFtAO1OeChS9lJf23cXGyG5Q=";
+ hash = "sha256-wYqHc3PFLX3qRHOpPdcsJb4MYNCeJIRDSDGLV782ysw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix
index 5423d178817c..9b9709945b76 100644
--- a/pkgs/development/tools/viceroy/default.nix
+++ b/pkgs/development/tools/viceroy/default.nix
@@ -8,19 +8,19 @@
rustPlatform.buildRustPackage rec {
pname = "viceroy";
- version = "0.12.4";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "fastly";
repo = pname;
rev = "v${version}";
- hash = "sha256-mx6zqSuSePvBf7AL807+CzhST5wpmGuuRgFYvhD08Vo=";
+ hash = "sha256-DeViAqL+7mta/wH7rLyltOCtHCTFXZczn2vAL1k+R2Y=";
};
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
useFetchCargoVendor = true;
- cargoHash = "sha256-jW7iWe3hYNeEv5kagTQQK4GIgQQ/mbLhL1cxGJtn9n8=";
+ cargoHash = "sha256-LBJD1w8/jLw5xYdHxR+EM2Cb4eVFpRw+M/K7K4Z0OUw=";
cargoTestFlags = [
"--package viceroy-lib"
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 90e5f637e2d4..5682130d7c79 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
- version = "3.88.23";
+ version = "3.88.24";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
- hash = "sha256-dGk3cVFEaeaZfZxJYeGMvexssbUPssAqdJbBTOV8b6I=";
+ hash = "sha256-50IKxJAuR8IMcKArnIE8BHlssKSGthfFVc+h+M/+204=";
};
- vendorHash = "sha256-vJl2gIS14NA9nV9j+81xKv3NnsDce4V7XoeipOZV+wI=";
+ vendorHash = "sha256-eyAHR9tx9Fvih/KZZX8FtcDZyMn93X6b08iADEyIiZw=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 3c220cf9fd05..d61e7432ce10 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -5,9 +5,10 @@
fetchFromGitHub,
installShellFiles,
IOKit,
+ writableTmpDirAsHomeHook,
}:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
pname = "gotop";
version = "4.2.0";
@@ -18,8 +19,8 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "xxxserxxx";
- repo = pname;
- rev = "v${version}";
+ repo = "gotop";
+ rev = "v${finalAttrs.version}";
hash = "sha256-W7a3QnSIR95N88RqU2sr6oEDSqOXVfAwacPvS219+1Y=";
};
@@ -29,28 +30,26 @@ buildGoModule rec {
ldflags = [
"-s"
"-w"
- "-X main.Version=v${version}"
+ "-X main.Version=v${finalAttrs.version}"
];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ];
- preCheck = ''
- export HOME=$(mktemp -d)
- '';
+ nativeCheckInputs = [ writableTmpDirAsHomeHook ];
postInstall = ''
$out/bin/gotop --create-manpage > gotop.1
installManPage gotop.1
'';
- meta = with lib; {
+ meta = {
description = "Terminal based graphical activity monitor inspired by gtop and vtop";
homepage = "https://github.com/xxxserxxx/gotop";
- changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md";
- license = licenses.mit;
- maintainers = [ maintainers.magnetophon ];
+ changelog = "https://github.com/xxxserxxx/gotop/raw/v${finalAttrs.version}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.magnetophon ];
mainProgram = "gotop";
};
-}
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bbd041d7be33..166aef96892c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -683,6 +683,7 @@ mapAliases {
gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
+ geocode-glib = "throw 'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
@@ -793,6 +794,8 @@ mapAliases {
gringo = clingo; # added 2022-11-27
grub2_full = grub2; # Added 2022-11-18
grun = throw "grun has been removed due to lack of maintenance upstream and depending on gtk2"; # Added 2025-03-29
+ gsignond = throw "'gsignond' and its plugins have been removed due to lack of maintenance upstream"; # added 2025-04-17
+ gsignondPlugins = throw "'gsignondPlugins' have been removed alongside 'gsignond' due to lack of maintenance upstream and depending on libsoup_2"; # added 2025-04-17
gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
@@ -805,6 +808,7 @@ mapAliases {
hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
+ hardinfo = throw "'hardinfo' has been removed as it was abandoned upstream. Consider using 'hardinfo2' instead."; # added 2025-04-17
haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
HentaiAtHome = hentai-at-home; # Added 2024-06-12
hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
@@ -932,7 +936,9 @@ mapAliases {
libgme = game-music-emu; # Added 2022-07-20
libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
+ libgrss = throw "'libgrss' has been removed as it was archived upstream and had no users in nixpkgs"; # Added 2025-04-17
libheimdal = heimdal; # Added 2022-11-18
+ libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17
libiconv-darwin = darwin.libiconv;
libixp_hg = libixp;
libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 683a8a9613f9..17a85881e71d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9376,10 +9376,6 @@ with pkgs;
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
- geocode-glib_2 = geocode-glib.override {
- libsoup_2_4 = libsoup_3;
- };
-
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
drvName = "geoip-tools";
geoipDatabase = geolite-legacy;
@@ -10081,10 +10077,6 @@ with pkgs;
callPackage ../development/libraries/libgnome-games-support/2.0.nix
{ };
- libgrss = callPackage ../development/libraries/libgrss {
- inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
- };
-
libiio = callPackage ../development/libraries/libiio {
inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices;
python = python3;
@@ -11495,17 +11487,6 @@ with pkgs;
aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv;
- gsignond = callPackage ../development/libraries/gsignond {
- plugins = [ ];
- };
-
- gsignondPlugins = recurseIntoAttrs {
- sasl = callPackage ../development/libraries/gsignond/plugins/sasl.nix { };
- oauth = callPackage ../development/libraries/gsignond/plugins/oauth.nix { };
- lastfm = callPackage ../development/libraries/gsignond/plugins/lastfm.nix { };
- mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { };
- };
-
### DEVELOPMENT / LIBRARIES / DARWIN SDKS
apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; };