diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index bc6583442edf..a8476bd2aaed 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -214,7 +214,8 @@ in
''
# Create the required /bin/sh symlink; otherwise lots of things
# (notably the system() function) won't work.
- mkdir -m 0755 -p /bin
+ mkdir -p /bin
+ chmod 0755 /bin
ln -sfn "${cfg.binsh}" /bin/.sh.tmp
mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
'';
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index c39a3c8d509b..0c1461709c22 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -12,6 +12,7 @@ let
''
#! ${pkgs.runtimeShell} -e
export DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^DISPLAY=\(.*\)/\1/; t; d')"
+ export XAUTHORITY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^XAUTHORITY=\(.*\)/\1/; t; d')"
export WAYLAND_DISPLAY="$(systemctl --user show-environment | ${pkgs.gnused}/bin/sed 's/^WAYLAND_DISPLAY=\(.*\)/\1/; t; d')"
exec ${cfg.askPassword} "$@"
'';
diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix
index 750dca9d0373..4e419aafa990 100644
--- a/nixos/modules/services/misc/moonraker.nix
+++ b/nixos/modules/services/misc/moonraker.nix
@@ -103,7 +103,7 @@ in {
config = mkIf cfg.enable {
warnings = []
- ++ optional (cfg.settings ? update_manager)
+ ++ optional (cfg.settings.update_manager.enable_system_updates or false)
''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''
++ optional (cfg.configDir != null)
''
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index d3164373ec01..4480c0cae60c 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -196,6 +196,7 @@ in
systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
description = "ClamAV virus database updater (freshclam)";
restartTriggers = [ freshclamConfigFile ];
+ requires = [ "network-online.target" ];
after = [ "network-online.target" ];
serviceConfig = {
@@ -243,6 +244,7 @@ in
systemd.services.clamav-fangfrisch = mkIf cfg.fangfrisch.enable {
description = "ClamAV virus database updater (fangfrisch)";
restartTriggers = [ fangfrischConfigFile ];
+ requires = [ "network-online.target" ];
after = [ "network-online.target" "clamav-fangfrisch-init.service" ];
serviceConfig = {
diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix
index 3b1d87ccb483..e545869ca432 100644
--- a/nixos/modules/services/web-servers/ttyd.nix
+++ b/nixos/modules/services/web-servers/ttyd.nix
@@ -180,10 +180,11 @@ in
# Runs login which needs to be run as root
# login: Cannot possibly work without effective root
User = "root";
+ LoadCredential = lib.optionalString (cfg.passwordFile != null) "TTYD_PASSWORD_FILE:${cfg.passwordFile}";
};
script = if cfg.passwordFile != null then ''
- PASSWORD=$(cat ${escapeShellArg cfg.passwordFile})
+ PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/TTYD_PASSWORD_FILE")
${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \
--credential ${escapeShellArg cfg.username}:"$PASSWORD" \
${pkgs.shadow}/bin/login
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e719e0892736..5238cd24567b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -906,6 +906,7 @@ in {
trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
tsja = handleTest ./tsja.nix {};
tsm-client-gui = handleTest ./tsm-client-gui.nix {};
+ ttyd = handleTest ./web-servers/ttyd.nix {};
txredisapi = handleTest ./txredisapi.nix {};
tuptime = handleTest ./tuptime.nix {};
turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index 900ea6320100..b5a8cb532ae0 100644
--- a/nixos/tests/elk.nix
+++ b/nixos/tests/elk.nix
@@ -1,6 +1,6 @@
# To run the test on the unfree ELK use the following command:
# cd path/to/nixpkgs
-# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6
+# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-7
{ system ? builtins.currentSystem,
config ? {},
@@ -120,7 +120,7 @@ let
};
elasticsearch-curator = {
- enable = true;
+ enable = elk ? elasticsearch-curator;
actionYAML = ''
---
actions:
@@ -246,7 +246,7 @@ let
one.wait_until_succeeds(
expect_hits("SuperdupercalifragilisticexpialidociousIndeed")
)
- '' + ''
+ '' + lib.optionalString (elk ? elasticsearch-curator) ''
with subtest("Elasticsearch-curator works"):
one.systemctl("stop logstash")
one.systemctl("start elasticsearch-curator")
diff --git a/nixos/tests/web-servers/stargazer.nix b/nixos/tests/web-servers/stargazer.nix
index 6365d6a4fff1..f56d1b8c9454 100644
--- a/nixos/tests/web-servers/stargazer.nix
+++ b/nixos/tests/web-servers/stargazer.nix
@@ -1,4 +1,41 @@
{ pkgs, lib, ... }:
+let
+ test_script = pkgs.stdenv.mkDerivation rec {
+ pname = "stargazer-test-script";
+ inherit (pkgs.stargazer) version src;
+ buildInputs = with pkgs; [ (python3.withPackages (ps: with ps; [ cryptography ])) ];
+ dontBuild = true;
+ doCheck = false;
+ installPhase = ''
+ mkdir -p $out/bin
+ cp scripts/gemini-diagnostics $out/bin/test
+ '';
+ };
+ test_env = pkgs.stdenv.mkDerivation rec {
+ pname = "stargazer-test-env";
+ inherit (pkgs.stargazer) version src;
+ buildPhase = ''
+ cc test_data/cgi-bin/loop.c -o test_data/cgi-bin/loop
+ '';
+ doCheck = false;
+ installPhase = ''
+ mkdir -p $out
+ cp -r * $out/
+ '';
+ };
+ scgi_server = pkgs.stdenv.mkDerivation rec {
+ pname = "stargazer-test-scgi-server";
+ inherit (pkgs.stargazer) version src;
+ buildInputs = with pkgs; [ python3 ];
+ dontConfigure = true;
+ dontBuild = true;
+ doCheck = false;
+ installPhase = ''
+ mkdir -p $out/bin
+ cp scripts/scgi-server $out/bin/scgi-server
+ '';
+ };
+in
{
name = "stargazer";
meta = with lib.maintainers; { maintainers = [ gaykitty ]; };
@@ -7,25 +44,84 @@
geminiserver = { pkgs, ... }: {
services.stargazer = {
enable = true;
+ connectionLogging = false;
+ requestTimeout = 1;
routes = [
{
route = "localhost";
- root = toString (pkgs.writeTextDir "index.gmi" ''
- # Hello NixOS!
- '');
+ root = "${test_env}/test_data/test_site";
+ }
+ {
+ route = "localhost=/en.gmi";
+ root = "${test_env}/test_data/test_site";
+ lang = "en";
+ charset = "ascii";
+ }
+ {
+ route = "localhost~/(.*).gemini";
+ root = "${test_env}/test_data/test_site";
+ rewrite = "\\1.gmi";
+ lang = "en";
+ charset = "ascii";
+ }
+ {
+ route = "localhost=/plain.txt";
+ root = "${test_env}/test_data/test_site";
+ lang = "en";
+ charset = "ascii";
+ cert-path = "/var/lib/gemini/certs/localhost.crt";
+ key-path = "/var/lib/gemini/certs/localhost.key";
+ }
+ {
+ route = "localhost:/cgi-bin";
+ root = "${test_env}/test_data";
+ cgi = true;
+ cgi-timeout = 5;
+ }
+ {
+ route = "localhost:/scgi";
+ scgi = true;
+ scgi-address = "127.0.0.1:1099";
+ }
+ {
+ route = "localhost=/root";
+ redirect = "..";
+ permanent = true;
+ }
+ {
+ route = "localhost=/priv.gmi";
+ root = "${test_env}/test_data/test_site";
+ client-cert = "${test_env}/test_data/client_cert/good.crt";
+ }
+ {
+ route = "example.com~(.*)";
+ redirect = "gemini://localhost";
+ rewrite = "\\1";
+ }
+ {
+ route = "localhost:/no-exist";
+ root = "./does_not_exist";
}
];
};
+ systemd.services.scgi_server = {
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${scgi_server}/bin/scgi-server";
+ };
+ };
};
};
testScript = { nodes, ... }: ''
+ geminiserver.wait_for_unit("scgi_server")
+ geminiserver.wait_for_open_port(1099)
geminiserver.wait_for_unit("stargazer")
geminiserver.wait_for_open_port(1965)
- with subtest("check is serving over gemini"):
- response = geminiserver.succeed("${pkgs.gemget}/bin/gemget --header -o - gemini://localhost:1965")
+ with subtest("stargazer test suite"):
+ response = geminiserver.succeed("sh -c 'cd ${test_env}; ${test_script}/bin/test'")
print(response)
- assert "Hello NixOS!" in response
'';
}
diff --git a/nixos/tests/web-servers/ttyd.nix b/nixos/tests/web-servers/ttyd.nix
new file mode 100644
index 000000000000..d161673684b3
--- /dev/null
+++ b/nixos/tests/web-servers/ttyd.nix
@@ -0,0 +1,19 @@
+import ../make-test-python.nix ({ lib, pkgs, ... }: {
+ name = "ttyd";
+ meta.maintainers = with lib.maintainers; [ stunkymonkey ];
+
+ nodes.machine = { pkgs, ... }: {
+ services.ttyd = {
+ enable = true;
+ username = "foo";
+ passwordFile = pkgs.writeText "password" "bar";
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("ttyd.service")
+ machine.wait_for_open_port(7681)
+ response = machine.succeed("curl -vvv -u foo:bar -s -H 'Host: ttyd' http://127.0.0.1:7681/")
+ assert 'ttyd - Terminal' in response, "Page didn't load successfully"
+ '';
+})
diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix
index d31ece0187d3..98be95b3bf12 100644
--- a/pkgs/applications/audio/mmlgui/default.nix
+++ b/pkgs/applications/audio/mmlgui/default.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
# Don't force building tests
substituteInPlace Makefile \
--replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)'
+
+ # Breaking change in libvgm
+ substituteInPlace src/emu_player.cpp \
+ --replace 'Resmpl_SetVals(&resmpl, 0xff' 'Resmpl_SetVals(&resmpl, RSMODE_LINEAR'
'';
strictDeps = true;
diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix
index 199f75ff2027..75701682e128 100644
--- a/pkgs/applications/audio/vgmplay-libvgm/default.nix
+++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix
@@ -9,15 +9,15 @@
, inih
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vgmplay-libvgm";
- version = "unstable-2023-04-12";
+ version = "unstable-2024-01-03";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "vgmplay-libvgm";
- rev = "813abab549e99bb7e936acbfa1199cf435c237c6";
- sha256 = "sdQO+xk3a7AFXo3jpbcuNBkd19PjKoBMRhr4IK06oHg=";
+ rev = "7db1c63c056d79a8f9f533aa7eb82b7fdf7d456c";
+ hash = "sha256-GjBwu8Y/lOI8SLO4SrAWcntQIwKe/hXuh9tKbOPHQiA=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index 0b353b61a9f0..8a6c5588494f 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "rsClock";
- version = "0.1.10";
+ version = "0.1.11";
src = fetchFromGitHub {
owner = "valebes";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-bxka9qTow5aL8ErYQudB+WRi2HecYn4/M3lBSxjd5/U=";
+ sha256 = "sha256-z+WGi1Jl+YkdAc4Nu818vi+OXg54GfAM6PbWYkgptpo=";
};
- cargoHash = "sha256-ESBeXLBkDAmuQkazcXYdo5VnMCTaxfZmzKP+d5V4lEo=";
+ cargoHash = "sha256-/uAxIV7eroJNGsLl4T/6RskoTIWKu5Cgmv48eMkDZQw=";
meta = with lib; {
description = "A simple terminal clock written in Rust";
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 1ea1b673920d..b8e530545b76 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -64,14 +64,14 @@ let
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
- version = "4.14.8";
+ version = "4.14.9";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-ACpY8SsbuZRCF3arBtEIYjdQRy/2xkP1/g5caxmmSo4=";
+ hash = "sha256-VqLCkGav6qtam9qk2MsjCdyVSj3630FGQg50Mv0OBNE=";
};
patches = [
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
index 931f95158354..092cb3299990 100644
--- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix
@@ -5,23 +5,47 @@
, libnotify
}:
-python3.pkgs.buildPythonApplication rec {
+let
+ py = python3.override {
+ packageOverrides = self: super: {
+
+ # Requires "urwid~=2.1.2", otherwise some tests are failing
+ urwid = super.urwid.overridePythonAttrs (oldAttrs: rec {
+ version = "2.1.2";
+ src = fetchFromGitHub {
+ owner = "urwid";
+ repo = "urwid";
+ rev = "refs/tags/${version}";
+ hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo=";
+ };
+ doCheck = false;
+ });
+ };
+ };
+in
+with py.pkgs;
+
+buildPythonApplication rec {
pname = "zulip-term";
version = "0.7.0";
+ pyproject = true;
- # no tests on PyPI
src = fetchFromGitHub {
owner = "zulip";
repo = "zulip-terminal";
- rev = version;
- sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
};
patches = [
./pytest-executable-name.patch
];
- propagatedBuildInputs = with python3.pkgs; [
+ nativeBuildInputs = with py.pkgs; [
+ setuptools
+ ];
+
+ propagatedBuildInputs = with py.pkgs; [
beautifulsoup4
lxml
pygments
@@ -50,6 +74,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Zulip's official terminal client";
homepage = "https://github.com/zulip/zulip-terminal";
+ changelog = "https://github.com/zulip/zulip-terminal/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ dotlambda ];
};
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index e46714801bd7..079d73be15fa 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -44,13 +44,13 @@ rec {
thunderbird-115 = (buildMozillaMach rec {
pname = "thunderbird";
- version = "115.6.0";
+ version = "115.6.1";
application = "comm/mail";
applicationName = "Mozilla Thunderbird";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "2484a99a62fc960b7926b1daa6055e14b1f9e1006ea45522d16131071b33003d4f7ef95911fd2ceb3e941f9d251c66d917013d6a5ecd717d2b1c6d33944f2e01";
+ sha512 = "f2efaff8b209234b202671b5322fb14a367b955e28c4b24b139af091b838186126e3d387ca21e57ed089629af876e86b38588789b1ef3db14f4f8703095467b3";
};
extraPatches = [
# The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix
index 0796e03a17d5..fc3cbbcd1109 100644
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@@ -76,13 +76,13 @@ let
in
stdenv.mkDerivation rec {
pname = "freerdp";
- version = "2.11.2";
+ version = "2.11.5";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
- sha256 = "sha256-buInsfjzpY4EF7bSojy42YNXssbNriSQGYBFE/DUJ7A=";
+ hash = "sha256-WyYBIiIQNDHydJqU3jWNItJU2/sYnRpGHCXE9Xhom5M=";
};
postPatch = ''
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index 7c28f65f3bf7..fb3b26a12edf 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -7,32 +7,40 @@
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20230213100550";
- format = "setuptools";
+ version = "3.1.20240112164112";
+ pyproject = true;
src = fetchFromGitHub {
owner = "common-workflow-language";
- repo = pname;
+ repo = "cwltool";
rev = "refs/tags/${version}";
- hash = "sha256-BtHkIVadcccnYYX8lRqiCzO+/qFeBaZfdUuu6qrjysk=";
+ hash = "sha256-Y0DORypXlTDv04qh796oXPSTxCXGb7rLQ8Su+/As7Lo=";
};
postPatch = ''
substituteInPlace setup.py \
- --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \
+ --replace "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
--replace "prov == 1.5.1" "prov" \
- --replace "setup_requires=PYTEST_RUNNER," ""
+ --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
+ --replace "PYTEST_RUNNER + " ""
+ substituteInPlace pyproject.toml \
+ --replace "mypy==1.8.0" "mypy" \
+ --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
'';
nativeBuildInputs = [
git
- ];
+ ] ++ (with python3.pkgs; [
+ setuptools
+ setuptools-scm
+ ]);
propagatedBuildInputs = with python3.pkgs; [
argcomplete
bagit
coloredlogs
cwl-utils
+ mypy
mypy-extensions
prov
psutil
@@ -42,6 +50,10 @@ python3.pkgs.buildPythonApplication rec {
ruamel-yaml
schema-salad
shellescape
+ spython
+ toml
+ types-psutil
+ types-requests
typing-extensions
];
diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix
index 95d3e1269350..266118e881bf 100644
--- a/pkgs/applications/science/robotics/mujoco/default.nix
+++ b/pkgs/applications/science/robotics/mujoco/default.nix
@@ -129,15 +129,15 @@ let
in stdenv.mkDerivation rec {
pname = "mujoco";
- version = "3.1.0";
+ version = "3.1.1";
# Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins!
src = fetchFromGitHub {
owner = "google-deepmind";
- repo = pname;
- rev = version;
- hash = "sha256-a8h30psoAlj9dI4j8IfY3WzWjY4MrRosGbvgt79s1BQ=";
+ repo = "mujoco";
+ rev = "refs/tags/${version}";
+ hash = "sha256-+2nt7G8j6Pi60cfMBPYWPGwD8wpxDOSylenm0oCitzM=";
};
patches = [ ./mujoco-system-deps-dont-fetch.patch ];
@@ -180,6 +180,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Multi-Joint dynamics with Contact. A general purpose physics simulator.";
homepage = "https://mujoco.org/";
+ changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ samuela tmplt ];
};
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 06eba06ab2c7..54527f339f50 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-slim";
- version = "1.40.9";
+ version = "1.40.10";
src = fetchFromGitHub {
owner = "slimtoolkit";
repo = "slim";
rev = version;
- hash = "sha256-tVGD5DbrnAiifCYEjI8l8Zsij2qAUkW5yxllr//6510=";
+ hash = "sha256-NpQyIOR8FkOgPHi3UwBAEpouJF/eaSAWD2zQ5dj+gAg=";
};
vendorHash = null;
diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix
index cc91256e4371..2f266ec84e90 100644
--- a/pkgs/applications/virtualization/podman-tui/default.nix
+++ b/pkgs/applications/virtualization/podman-tui/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "podman-tui";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
- hash = "sha256-DXodgpa/oWDBlJYTXcJb8cBkG1DCjFv8vKEzLhu0pN4=";
+ hash = "sha256-Ndy7B0T2RgdkBA+nTYvAJ2RnIH48bUu9MdUDAVQUa6s=";
};
vendorHash = null;
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index b5eda761ab33..27b54b23fa84 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -12,17 +12,17 @@
, libxcb
, libxdg_basedir
, libXext
-, libXinerama
, libxml2
, libxslt
, makeWrapper
, meson
, ninja
-, pcre
+, pcre2
, pixman
, pkg-config
, stdenv
, uthash
+, xcbutil
, xcbutilimage
, xcbutilrenderutil
, xorgproto
@@ -32,13 +32,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "picom";
- version = "10.2";
+ version = "11";
src = fetchFromGitHub {
owner = "yshui";
repo = "picom";
rev = "v${finalAttrs.version}";
- hash = "sha256-C+icJXTkE+XMaU7N6JupsP8xhmRVggX9hY1P7za0pO0=";
+ hash = "sha256-KIblpEEW33ZxxTYuQ/lbUGEJcVdmSWdNOrVCvhOY/OU=";
fetchSubmodules = true;
};
@@ -63,11 +63,11 @@ stdenv.mkDerivation (finalAttrs: {
libxcb
libxdg_basedir
libXext
- libXinerama
libxml2
libxslt
- pcre
+ pcre2
pixman
+ xcbutil
xcbutilimage
xcbutilrenderutil
xorgproto
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
license = licenses.mit;
homepage = "https://github.com/yshui/picom";
- maintainers = with maintainers; [ ertes twey thiagokokada ];
+ maintainers = with maintainers; [ ertes gepbird twey thiagokokada ];
platforms = platforms.linux;
mainProgram = "picom";
};
diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix
index 0efb67f641bb..e0086142f1c3 100644
--- a/pkgs/applications/window-managers/picom/picom-allusive.nix
+++ b/pkgs/applications/window-managers/picom/picom-allusive.nix
@@ -1,4 +1,4 @@
-{ picom, lib, fetchFromGitHub, installShellFiles }:
+{ picom, lib, fetchFromGitHub, installShellFiles, pcre }:
picom.overrideAttrs (oldAttrs: rec {
pname = "picom-allusive";
@@ -11,7 +11,7 @@ picom.overrideAttrs (oldAttrs: rec {
hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8=";
};
- nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs;
+ nativeBuildInputs = [ installShellFiles pcre ] ++ oldAttrs.nativeBuildInputs;
postInstall = ''
installManPage $src/man/picom.1.gz
diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix
index 2c08a355dde8..d04cf5f4ecd6 100644
--- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix
+++ b/pkgs/applications/window-managers/picom/picom-jonaburg.nix
@@ -1,4 +1,4 @@
-{ picom, lib, fetchFromGitHub }:
+{ picom, lib, fetchFromGitHub, pcre }:
picom.overrideAttrs (oldAttrs: rec {
pname = "picom-jonaburg";
@@ -10,6 +10,8 @@ picom.overrideAttrs (oldAttrs: rec {
sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y=";
};
+ nativeBuildInputs = [ pcre ] ++ oldAttrs.nativeBuildInputs;
+
meta = with lib; {
description = "A fork of picom featuring animations and improved rounded corners.";
homepage = "https://github.com/jonaburg/picom";
diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index c32b89af37d0..e34f12652ede 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -23,7 +23,7 @@ let
in
buildPythonApplication rec {
pname = "kikit";
- version = "1.3.0";
+ version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -31,8 +31,8 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "yaqwsx";
repo = "KiKit";
- rev = "v${version}";
- hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-88/1bL3MtawR/8P8U1jHatMbq+JxF1qb+plH3rYh1qU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
new file mode 100644
index 000000000000..78f1b3bebc4e
--- /dev/null
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -0,0 +1,44 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+let
+ version = "0.0.38";
+in
+buildGoModule {
+
+ pname = "mcap-cli";
+
+ inherit version;
+
+ src = fetchFromGitHub {
+ repo = "mcap";
+ owner = "foxglove";
+ rev = "releases/mcap-cli/v${version}";
+ hash = "sha256-mwKWf0kJ3uMx1cLUac+AqXgQ1Af3tLDOCTFKgq8FtHE=";
+ };
+
+ vendorHash = "sha256-Gl0zLBTWscKGtVOS6rPRL/r8KHYHpZwoUDbEyCL4Ijk=";
+
+ modRoot = "go/cli/mcap";
+
+ GOWORK="off";
+
+ # copy the local versions of the workspace modules
+ postConfigure = ''
+ chmod -R u+w vendor
+ rm -rf vendor/github.com/foxglove/mcap/go/{mcap,ros}
+ cp -r ../../{mcap,ros} vendor/github.com/foxglove/mcap/go
+ '';
+
+ checkFlags = [
+ # requires git-lfs and network
+ # https://github.com/foxglove/mcap/issues/895
+ "-skip=TestCat|TestInfo"
+ ];
+
+ meta = with lib; {
+ description = "MCAP CLI tool to inspect and fix MCAP files";
+ homepage = "https://github.com/foxglove/mcap";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ squalus therishidesai ];
+ };
+
+}
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index 02c39c1bbb50..c0ddfee356b5 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -12,7 +12,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "monophony";
- version = "2.5.1";
+ version = "2.5.2";
format = "other";
sourceRoot = "source/source";
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
owner = "zehkira";
repo = "monophony";
rev = "v${version}";
- hash = "sha256-kBFznJcH6UOlzgUnhPSOUBxqqsHzIEpirN63gRYC/u0=";
+ hash = "sha256-DIAvRxUC1JIK4Tyc+REqgO6kZRokPcmLCKwI/+YRGx8=";
};
pythonPath = with python3Packages; [
diff --git a/pkgs/by-name/op/openswitcher/package.nix b/pkgs/by-name/op/openswitcher/package.nix
index f8e3a5edef8e..569ed3597ea6 100644
--- a/pkgs/by-name/op/openswitcher/package.nix
+++ b/pkgs/by-name/op/openswitcher/package.nix
@@ -14,14 +14,14 @@
python3Packages.buildPythonApplication rec {
pname = "openswitcher";
- version = "0.9.1";
+ version = "0.10.0";
format = "other";
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "pyatem";
rev = version;
- hash = "sha256-264XqBl+1qsAc5vOxJabbkubY+F72xo06WWishVEQOI=";
+ hash = "sha256-O+f1vVwfGJjLem25hsYE1Q1V4vzjrc0HxTBUCANCEwE=";
};
outputs = [
diff --git a/pkgs/by-name/pa/paralus-cli/package.nix b/pkgs/by-name/pa/paralus-cli/package.nix
index 1b0c5cf14a3a..81ef70de32f7 100644
--- a/pkgs/by-name/pa/paralus-cli/package.nix
+++ b/pkgs/by-name/pa/paralus-cli/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "paralus-cli";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
repo = "cli";
owner = "paralus";
rev = "v${version}";
- hash = "sha256-2lTT53VTvwcxYSn9koLKMIc7pmAdrOmeuBvAHjMkqu0=";
+ hash = "sha256-cVrT8wU9MJgc/hzMVe1b0lzm7f+0Prv9w1IjMOAh69E=";
};
- vendorHash = "sha256-M4ur9V2HP/bxG4LzM4xoGdzd4l54pc8pjWiT5GQ3X04=";
+ vendorHash = "sha256-fO+armn5V/dXQfx8fdavohiiutHGGQ/5mRENfDNHCY8=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/pe/persistent-cache-cpp/package.nix b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
index c7d212a477af..7dfd1810b917 100644
--- a/pkgs/by-name/pe/persistent-cache-cpp/package.nix
+++ b/pkgs/by-name/pe/persistent-cache-cpp/package.nix
@@ -57,13 +57,18 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-2/6EYBh71S4dzqWEde+3dLOGp015fN6IifAj1bI1XAI=";
})
- # Enable linking based on stdenv (static or dynamic)
+ # Enable linking based on stdenv (static or dynamic), only propagate leveldb link requirement when linked statically
# Remove when https://gitlab.com/ubports/development/core/lib-cpp/persistent-cache-cpp/-/merge_requests/16 merged & in release
(fetchpatch {
name = "0004-persistent-cache-cpp-Un-hardcode-static-linking.patch";
url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/45cd84fe76e3a0e1da41a662df695009a6f4f07e.patch";
hash = "sha256-1UjdhzrjnIUO1ySaZTm0vkdNgok0RNlGtNOWUoAUlzU=";
})
+ (fetchpatch {
+ name = "0005-persistent-cache-cpp-Propagate-leveldb-dependency-only-when-needed.patch";
+ url = "https://gitlab.com/OPNA2608/persistent-cache-cpp/-/commit/6204b65df32360a7e358558041219a867652c429.patch";
+ hash = "sha256-cIewdtF0OdQuLz94KNY2HL8XZp1IaKlZz2hNlMvKLw4=";
+ })
];
postPatch = ''
@@ -87,9 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
boost
lomiri.cmake-extras
- ];
-
- propagatedBuildInputs = [
leveldb
];
diff --git a/pkgs/by-name/re/redocly-cli/package.nix b/pkgs/by-name/re/redocly-cli/package.nix
index d22b09b53a41..aa1c49cae249 100644
--- a/pkgs/by-name/re/redocly-cli/package.nix
+++ b/pkgs/by-name/re/redocly-cli/package.nix
@@ -31,7 +31,10 @@ buildNpmPackage rec {
cp -R packages/core $out/lib/node_modules/@redocly/cli/node_modules/@redocly/openapi-core
mkdir $out/bin
- makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js $out/bin/redocly-cli --set REDOCLY_TELEMETRY off
+ makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \
+ $out/bin/redocly-cli \
+ --set-default REDOCLY_TELEMETRY off \
+ --set-default CI true # Silence update messages
'';
installCheckPhase = ''
diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock
index 8a648a2c5171..4e4072d44157 100644
--- a/pkgs/by-name/rq/rqbit/Cargo.lock
+++ b/pkgs/by-name/rq/rqbit/Cargo.lock
@@ -1253,7 +1253,7 @@ dependencies = [
[[package]]
name = "librqbit"
-version = "5.4.1"
+version = "5.4.2"
dependencies = [
"anyhow",
"axum 0.7.3",
@@ -2025,7 +2025,7 @@ dependencies = [
[[package]]
name = "rqbit"
-version = "5.4.1"
+version = "5.4.2"
dependencies = [
"anyhow",
"bytes",
diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index 71fa1fc69826..42b3c9e61aa6 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "rqbit";
- version = "5.4.1";
+ version = "5.4.2";
src = fetchFromGitHub {
owner = "ikatson";
repo = "rqbit";
rev = "v${version}";
- hash = "sha256-dD9nGxyUA+Vw5efB4eXdz4WdxXlwyhT6mSyblcX65Bs=";
+ hash = "sha256-ZC68RQi0UcdALKVgwRUyO0+ZmKtGMjudYQabsAnghzg=";
};
cargoLock = {
diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
new file mode 100644
index 000000000000..96e926f15008
--- /dev/null
+++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "wireguard-vanity-keygen";
+ version = "0.0.7";
+
+ src = fetchFromGitHub {
+ owner = "axllent";
+ repo = "wireguard-vanity-keygen";
+ rev = version;
+ hash = "sha256-+q6l2531APm67JqvFNQb4Zj5pyWnHgncwxcgWNiBCJw=";
+ };
+
+ vendorHash = "sha256-F3AoN8NgXjePy7MmI8jzLDxaIZBCfOPRbe0ZYmt6vm8=";
+
+ ldflags = [ "-s" "-w" "-X main.appVersion=${version}" ];
+
+ meta = with lib; {
+ changelog = let
+ versionWithoutDots = concatStrings (splitString "." version);
+ in "https://github.com/axllent/wireguard-vanity-keygen/blob/develop/CHANGELOG.md#${versionWithoutDots}";
+ description = "WireGuard vanity key generator";
+ homepage = "https://github.com/axllent/wireguard-vanity-keygen";
+ license = licenses.mit;
+ maintainers = with maintainers; [ arikgrahl ];
+ mainProgram = "wireguard-vanity-keygen";
+ };
+}
diff --git a/pkgs/development/cuda-modules/backend-stdenv.nix b/pkgs/development/cuda-modules/backend-stdenv.nix
index 72685b541d15..bcca7118b163 100644
--- a/pkgs/development/cuda-modules/backend-stdenv.nix
+++ b/pkgs/development/cuda-modules/backend-stdenv.nix
@@ -13,8 +13,10 @@ let
gccMajorVersion = nvccCompatibilities.${cudaVersion}.gccMaxMajorVersion;
cudaStdenv = stdenvAdapters.useLibsFrom stdenv pkgs."gcc${gccMajorVersion}Stdenv";
passthruExtra = {
- nixpkgsCompatibleLibstdcxx = lib.warn "cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx is misnamed, deprecated, and will be removed after 24.05" cudaStdenv.cc.cxxStdlib.package;
- # cc already exposed
+ # cudaPackages.backendStdenv.nixpkgsCompatibleLibstdcxx has been removed,
+ # if you need it you're likely doing something wrong. There has been a
+ # warning here for a month or so. Now we can no longer return any
+ # meaningful value in its place and drop the attribute entirely.
};
assertCondition = true;
in
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 942507d7d355..877bde775262 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.3.1";
- hash = "sha256-xA+ukZf6aKUy9qBiwxba/jsExUUTa1S56tSTL8JsauE=";
+ version = "8.3.2";
+ hash = "sha256-WCs8g3qNlS7//idKXklwbEOojBYoMMKow1gIn+dEkoQ=";
});
in
base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix
index 73bc80ef9d5b..79186d9149f7 100644
--- a/pkgs/development/libraries/imgui/default.nix
+++ b/pkgs/development/libraries/imgui/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imgui";
- version = "1.90";
+ version = "1.90.1";
src = fetchFromGitHub {
owner = "ocornut";
repo = "imgui";
rev = "v${version}";
- sha256 = "sha256-rJMWCPVhho34NcPvJZaB5d6EbZkJyLXEfeotplOOaiA=";
+ sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg=";
};
dontBuild = true;
diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/development/libraries/imtui/default.nix
index e534a55ae5a4..86b488c1a888 100644
--- a/pkgs/development/libraries/imtui/default.nix
+++ b/pkgs/development/libraries/imtui/default.nix
@@ -8,6 +8,7 @@
, withCurl ? (!withEmscripten), curl
, withNcurses ? (!withEmscripten), ncurses
, static ? withEmscripten
+, darwin
}:
stdenv.mkDerivation rec {
@@ -25,10 +26,14 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional withEmscripten emscripten
++ lib.optional withCurl curl
- ++ lib.optional withNcurses ncurses;
+ ++ lib.optional withNcurses ncurses
+ ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
postPatch = ''
cp -r ${imgui}/include/imgui third-party/imgui
+ '' + lib.optionalString (lib.versionAtLeast imgui.version "1.90.1") ''
+ substituteInPlace src/imtui-impl-{emscripten,ncurses}.cpp \
+ --replace "ImGuiKey_KeyPadEnter" "ImGuiKey_KeypadEnter"
'';
cmakeFlags = [
@@ -54,5 +59,6 @@ stdenv.mkDerivation rec {
changelog = "https://github.com/ggerganov/imtui/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ azahi ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index bbcae6ab19d1..6d9481d1da2d 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "libjcat";
- version = "0.2.0";
+ version = "0.2.1";
outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "libjcat";
rev = version;
- sha256 = "sha256-nLn2s9hX9f6I1Avxzs24ZPQHglJqKSUTpBpwskVyJKw=";
+ sha256 = "sha256-tCXz62MEqYBnrx2RxlTBwKGTahfhUCVdet4VnXw5klQ=";
};
patches = [
diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix
index 31508b01fbd0..0d7c098255f2 100644
--- a/pkgs/development/libraries/libvgm/default.nix
+++ b/pkgs/development/libraries/libvgm/default.nix
@@ -40,15 +40,15 @@ let
inherit (lib) optional optionals;
onOff = val: if val then "ON" else "OFF";
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libvgm";
- version = "unstable-2023-08-14";
+ version = "unstable-2024-01-03";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "libvgm";
- rev = "079c4e737e6a73b38ae20125521d7d9eafda28e9";
- sha256 = "hmaGIf9AQOYqrpnmKAB9I2vO+EXrzvoRaQ6Epdygy4o=";
+ rev = "223b6f9d629feda1982dc4bbeebd19fa63b987fb";
+ hash = "sha256-CrqgDuOsY+Hpp41De6oWJduj8d8ftMUanMEWJKh79rw=";
};
outputs = [
diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix
index bd9dc3ede2dc..59274326723b 100644
--- a/pkgs/development/python-modules/aiovodafone/default.nix
+++ b/pkgs/development/python-modules/aiovodafone/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiovodafone";
- version = "0.5.1";
+ version = "0.5.3";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "chemelli74";
repo = "aiovodafone";
rev = "refs/tags/v${version}";
- hash = "sha256-4Pcdf5yAzjXbmWehon9DdZfaIdEjPLcdzf/EjYKEamk=";
+ hash = "sha256-a9V5rocQmloNkg9IsxOAle8zmOIQ7jf1xPLjdsjntVw=";
};
postPatch = ''
@@ -47,7 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to control Vodafon Station";
homepage = "https://github.com/chemelli74/aiovodafone";
- changelog = "https://github.com/chemelli74/aiovodafone/blob/${version}/CHANGELOG.md";
+ changelog = "https://github.com/chemelli74/aiovodafone/blob/v${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix
index 3211eed5aa3f..171deeebda8c 100644
--- a/pkgs/development/python-modules/apispec-webframeworks/default.nix
+++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix
@@ -3,6 +3,7 @@
, bottle
, buildPythonPackage
, fetchFromGitHub
+, flit-core
, flask
, mock
, pytestCheckHook
@@ -12,18 +13,22 @@
buildPythonPackage rec {
pname = "apispec-webframeworks";
- version = "0.5.2";
- format = "setuptools";
+ version = "1.0.0";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "marshmallow-code";
repo = "apispec-webframeworks";
- rev = version;
- hash = "sha256-ByNmmBLO99njw9JrT+cCW/K4NJBH92smAiIgg47Cvkk=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-zrsqIZ5ZogZsK1ZOL2uy8igS4T8a+19IwL5dMhKw7OA=";
};
+ nativeBuildInputs = [
+ flit-core
+ ];
+
propagatedBuildInputs = [
apispec
] ++ apispec.optional-dependencies.yaml;
diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix
index 426c0b5bd548..4d283d1d5ed8 100644
--- a/pkgs/development/python-modules/async-upnp-client/default.nix
+++ b/pkgs/development/python-modules/async-upnp-client/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "async-upnp-client";
- version = "0.38.0";
+ version = "0.38.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "StevenLooman";
repo = "async_upnp_client";
rev = "refs/tags/${version}";
- hash = "sha256-hCgZsoccrHCXTZPnFX5OFhCGnd2WufxWo84jW3k9KiY=";
+ hash = "sha256-tYGJwmzyVTry3KIMv1JjoBsE6kNw7FJb1nq1+39bEdU=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix
index cb27d3231d4f..2ec814f56aef 100644
--- a/pkgs/development/python-modules/biopython/default.nix
+++ b/pkgs/development/python-modules/biopython/default.nix
@@ -1,25 +1,43 @@
{ lib
, buildPythonPackage
, fetchPypi
+, pythonOlder
+, setuptools
, numpy
-, isPy3k
}:
buildPythonPackage rec {
pname = "biopython";
- version = "1.82";
- format = "setuptools";
+ version = "1.83";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
- hash = "sha256-qbENlZroipdEqRxs42AfTIbn7EFnm8k8KfZ5IY9hZ7s=";
+ hash = "sha256-eOa/t43mMDQDev01/nfLbgqeW2Jwa+z3in2SKxbtg/c=";
};
- disabled = !isPy3k;
+ nativeBuildInputs = [
+ setuptools
+ ];
propagatedBuildInputs = [ numpy ];
- # Checks try to write to $HOME, which does not work with nix
- doCheck = false;
+
+ pythonImportsCheck = [
+ "Bio"
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ export HOME=$(mktemp -d)
+ cd Tests
+ python run_tests.py --offline
+
+ runHook postCheck
+ '';
+
meta = {
description = "Python library for bioinformatics";
longDescription = ''
diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index ac53b567e5a9..18437efceb4b 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -1,53 +1,50 @@
{ lib
, buildPythonPackage
-, fetchPypi
, distro
+, fetchFromGitHub
+, pyasyncore
, pysnmp
+, pytestCheckHook
, python-gnupg
+, pythonAtLeast
+, pythonOlder
, qrcode
, requests
-, sseclient-py
-, zfec
-, pytestCheckHook
-, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "blocksat-cli";
- version = "0.4.6";
- format = "setuptools";
+ version = "2.4.6";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg=";
+ src = fetchFromGitHub {
+ owner = "Blockstream";
+ repo = "satellite";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
distro
pysnmp
python-gnupg
qrcode
requests
- sseclient-py
- zfec
+ ] ++ lib.optionals (pythonAtLeast "3.12") [
+ pyasyncore
];
nativeCheckInputs = [
pytestCheckHook
];
- disabledTestPaths = [
- # disable tests which require being connected to the satellite
- "blocksatcli/test_satip.py"
- "blocksatcli/api/test_listen.py"
- "blocksatcli/api/test_msg.py"
- "blocksatcli/api/test_net.py"
- # disable tests which require being online
- "blocksatcli/api/test_order.py"
- ];
-
disabledTests = [
"test_monitor_get_stats"
"test_monitor_update_with_reporting_enabled"
@@ -61,6 +58,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Blockstream Satellite CLI";
homepage = "https://github.com/Blockstream/satellite";
+ changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ prusnak ];
};
diff --git a/pkgs/development/python-modules/bx-py-utils/default.nix b/pkgs/development/python-modules/bx-py-utils/default.nix
index 55d1c971cf21..582bc6b8ca0c 100644
--- a/pkgs/development/python-modules/bx-py-utils/default.nix
+++ b/pkgs/development/python-modules/bx-py-utils/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "bx-py-utils";
- version = "88";
+ version = "91";
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "boxine";
repo = "bx_py_utils";
rev = "refs/tags/v${version}";
- hash = "sha256-Ds7Ljgp6OdbFkEWl1E0X03o0oJ/Nk8U3pO/ztK42DbY=";
+ hash = "sha256-W8NP5h9fHyTJj6TIpBunoPcNOu8eWV1rA8ZaoGUnmBQ=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 443d24d3f695..8c0a04f59cd2 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
- version = "2023.11.27.17";
+ version = "2024.1.17.17";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "coinmetrics_api_client";
- hash = "sha256-UDcegRnDtz6LYAN9S8wiW/TCsIsQHr5sSX+chEkeFnw=";
+ hash = "sha256-mYA67oiWWvEdNU2MrjtOPyDW3LbxH/mgh+MOuZg2ljo=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index b98e52695836..a8e4b6dc9618 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "cvxpy";
- version = "1.4.1";
+ version = "1.4.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-ep7zTjxX/4yETYbwo4NPtVda8ZIzlHY53guld8YSLj4=";
+ hash = "sha256-CjhqV4jb14t7IN0HFSTsY2yPpys2KOafGrxxTI+YEeU=";
};
# we need to patch out numpy version caps from upstream
diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix
index cfd1cebd6620..874af6d65941 100644
--- a/pkgs/development/python-modules/cwl-upgrader/default.nix
+++ b/pkgs/development/python-modules/cwl-upgrader/default.nix
@@ -7,29 +7,33 @@
, pythonOlder
, ruamel-yaml
, schema-salad
+, setuptools
}:
buildPythonPackage rec {
pname = "cwl-upgrader";
- version = "1.2.10";
- format = "setuptools";
+ version = "1.2.11";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "common-workflow-language";
- repo = pname;
+ repo = "cwl-upgrader";
rev = "refs/tags/v${version}";
- hash = "sha256-D/MIvn/jyxK++CMgKM8EYDVo94WFgdlTtMZjsXoQ4W4=";
+ hash = "sha256-P8607Io/KIJqAnrValM+rRK59tQITcC/jyGwkge8qN0=";
};
postPatch = ''
- substituteInPlace setup.py \
- --replace "ruamel.yaml >= 0.15, < 0.17.22" "ruamel.yaml" \
- --replace "setup_requires=PYTEST_RUNNER," ""
- sed -i "/ruamel.yaml/d" setup.py
+ # Version detection doesn't work for schema_salad
+ substituteInPlace pyproject.toml \
+ --replace '"schema_salad",' ""
'';
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
mypy-extensions
ruamel-yaml
@@ -46,9 +50,9 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = "Library to interface with Yolink";
- homepage = "https://github.com/common-workflow-language/cwl-utils";
- changelog = "https://github.com/common-workflow-language/cwl-utils/releases/tag/v${version}";
+ description = "Library to upgrade CWL syntax to a newer version";
+ homepage = "https://github.com/common-workflow-language/cwl-upgrader";
+ changelog = "https://github.com/common-workflow-language/cwl-upgrader/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix
index b0671d789510..a8953369304a 100644
--- a/pkgs/development/python-modules/django-sesame/default.nix
+++ b/pkgs/development/python-modules/django-sesame/default.nix
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "django-sesame";
- version = "3.2.1";
- format = "pyproject";
+ version = "3.2.2";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "aaugustin";
- repo = pname;
+ repo = "django-sesame";
rev = "refs/tags/${version}";
- hash = "sha256-R7ySuop7E1lkxtRSVNFfzyb3Ba1mW0o6PDiTxTztK/Y=";
+ hash = "sha256-8jbYhD/PfPnutJZonmdrqLIQdXiUHF12w0M9tuyyDz0=";
};
nativeBuildInputs = [
@@ -46,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "URLs with authentication tokens for automatic login";
homepage = "https://github.com/aaugustin/django-sesame";
+ changelog = "https://github.com/aaugustin/django-sesame/blob/${version}/docs/changelog.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ elohmeier ];
};
diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix
index 7ca684149800..dfb726a55b01 100644
--- a/pkgs/development/python-modules/django-two-factor-auth/default.nix
+++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix
@@ -17,8 +17,8 @@
buildPythonPackage rec {
pname = "django-two-factor-auth";
- version = "1.15.1";
- format = "setuptools";
+ version = "1.15.5";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "jazzband";
repo = "django-two-factor-auth";
rev = "refs/tags/${version}";
- hash = "sha256-+E6kSD00ChPiRLT2i43dNlVkbvuR1vKkbSZfD1Bf3qc=";
+ hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index a42b0cced7cf..2f4442161f55 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -10,12 +10,13 @@
, cryptography
, joblib
, gitpython
+, sqlalchemy
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "edk2-pytool-library";
- version = "0.19.9";
+ version = "0.20.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "refs/tags/v${version}";
- hash = "sha256-eQcto4pd+y9fCjuiaSezA3okfW+xrR01Kc/N2tQdf5A=";
+ hash = "sha256-uqXQbSk/diyTq4d+J1ubc6ylJpETmJt699vfbSuY290=";
};
nativeBuildInputs = [
@@ -44,6 +45,7 @@ buildPythonPackage rec {
cryptography
joblib
gitpython
+ sqlalchemy
];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/find-libpython/default.nix b/pkgs/development/python-modules/find-libpython/default.nix
index 21ce69e071d7..7a26be2b38ed 100644
--- a/pkgs/development/python-modules/find-libpython/default.nix
+++ b/pkgs/development/python-modules/find-libpython/default.nix
@@ -1,30 +1,42 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, pytestCheckHook
, pythonOlder
+, setuptools
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "find-libpython";
- version = "0.3.0";
- format = "setuptools";
-
- src = fetchPypi {
- inherit version;
- pname = "find_libpython";
- sha256 = "sha256-bn/l2a9/rW3AZstVFaDpyQpx8f6yuy+OTNu0+DJ26eU=";
- };
+ version = "0.3.1";
+ pyproject = true;
disabled = pythonOlder "3.7";
- pythonImportsCheck = [ "find_libpython" ];
+ src = fetchFromGitHub {
+ owner = "ktbarrett";
+ repo = "find_libpython";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-DBBAgfYQ4UBFn5Osb1kpVBWbrZVBAvcVGQ/J4rJO/rQ=";
+ };
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeBuildInputs = [
+ setuptools
+ setuptools-scm
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "find_libpython"
+ ];
meta = with lib; {
description = "Finds the libpython associated with your environment, wherever it may be hiding";
- changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/${version}";
+ changelog = "https://github.com/ktbarrett/find_libpython/releases/tag/v${version}";
homepage = "https://github.com/ktbarrett/find_libpython";
license = licenses.mit;
maintainers = with maintainers; [ jleightcap ];
diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix
index 8f23f51fe979..0be4e2ffe251 100644
--- a/pkgs/development/python-modules/flask-marshmallow/default.nix
+++ b/pkgs/development/python-modules/flask-marshmallow/default.nix
@@ -2,9 +2,9 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
+, flit-core
, flask
, marshmallow
-, packaging
, pytestCheckHook
, flask-sqlalchemy
, marshmallow-sqlalchemy
@@ -12,22 +12,25 @@
buildPythonPackage rec {
pname = "flask-marshmallow";
- version = "0.15.0";
- format = "setuptools";
+ version = "1.1.0";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "marshmallow-code";
repo = "flask-marshmallow";
rev = "refs/tags/${version}";
- hash = "sha256-N21M/MzcvOaDh5BgbbZtNcpRAULtWGLTMberCfOUoEM=";
+ hash = "sha256-+5L4OfBRMkS6WRXT7dI/uuqloc/PZgu+DFvOCinByh8=";
};
+ nativeBuildInputs = [
+ flit-core
+ ];
+
propagatedBuildInputs = [
flask
marshmallow
- packaging
];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix
index 5d762be3fb86..6a066fad36d8 100644
--- a/pkgs/development/python-modules/immutabledict/default.nix
+++ b/pkgs/development/python-modules/immutabledict/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "immutabledict";
- version = "4.0.0";
+ version = "4.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "corenting";
repo = "immutabledict";
rev = "refs/tags/v${version}";
- hash = "sha256-z03s2mOJiMVnvLmeFJFgCRvkP+9VUcALiIoIPBAHUPw=";
+ hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix
index 42aa42638013..f10f9bbb8b82 100644
--- a/pkgs/development/python-modules/jsonrpc-base/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-base/default.nix
@@ -4,22 +4,27 @@
, pytest-asyncio
, pytestCheckHook
, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "jsonrpc-base";
- version = "2.1.1";
- format = "setuptools";
+ version = "2.2.0";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "emlove";
- repo = pname;
- rev = version;
- hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ=";
+ repo = "jsonrpc-base";
+ rev = "refs/tags/${version}";
+ hash = "sha256-AbpuAW+wuGc+Vj4FDFlyB2YbiwDxPLuyAGiNcmGU+Ss=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
index 6c1569055b5d..eb50c3f3a32e 100644
--- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix
+++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix
@@ -1,35 +1,42 @@
{ lib
+, aiohttp
+, async-timeout
, buildPythonPackage
, fetchFromGitHub
-, aiohttp
, jsonrpc-base
, pytest-asyncio
, pytestCheckHook
, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "jsonrpc-websocket";
- version = "3.1.4";
- format = "setuptools";
+ version = "3.1.5";
+ pyproject = true;
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "emlove";
repo = "jsonrpc-websocket";
- rev = version;
- hash = "sha256-xSOITOVtsNMEDrq610l8LNipLdyMWzKOQDedQEGaNOQ=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-CdYa4gcbG3EM1glxLU1hyqbNse87KJKjwSRQSFfDMM0=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
aiohttp
+ async-timeout
jsonrpc-base
];
nativeCheckInputs = [
- pytestCheckHook
pytest-asyncio
+ pytestCheckHook
];
pytestFlagsArray = [
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 6081f17c2727..a9bdff4e46df 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -1,14 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, rns
, pythonOlder
+, rns
+, setuptools
}:
buildPythonPackage rec {
pname = "lxmf";
- version = "0.3.8";
- format = "setuptools";
+ version = "0.3.9";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -16,9 +17,13 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "lxmf";
rev = "refs/tags/${version}";
- hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k=";
+ hash = "sha256-nZDcSVHR8IKlGBa5ljd3MmgzUPvG7Hv76WRfXxMsndY=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
rns
];
diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 27e243ff61b8..9dcc2d4a3a56 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -1,4 +1,5 @@
{ lib
+, bleak
, buildPythonPackage
, dotmap
, fetchFromGitHub
@@ -20,7 +21,7 @@
buildPythonPackage rec {
pname = "meshtastic";
- version = "2.2.18";
+ version = "2.2.19";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -29,7 +30,7 @@ buildPythonPackage rec {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = "refs/tags/${version}";
- hash = "sha256-r3Hs3oD6CyYa/Ew0wMiLeUj/R4aa8Wc/W65EXMrPGmw=";
+ hash = "sha256-5VXvh0W3llSnpIalg1e+JyFgmlTV5J2x4VC/j2+9Xb8=";
};
nativeBuildInputs = [
@@ -37,6 +38,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
+ bleak
dotmap
pexpect
protobuf
diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix
index 881253845ed6..3586cec51f60 100644
--- a/pkgs/development/python-modules/mujoco/default.nix
+++ b/pkgs/development/python-modules/mujoco/default.nix
@@ -1,20 +1,23 @@
-{ buildPythonPackage
+{ absl-py
+, buildPythonPackage
, cmake
+, etils
, fetchPypi
, glfw
, lib
, mujoco
, numpy
, perl
-, pkgs
, pybind11
+, pyopengl
, python
, setuptools
+, stdenv
}:
buildPythonPackage rec {
pname = "mujoco";
- version = "3.1.0";
+ version = "3.1.1";
pyproject = true;
@@ -24,13 +27,19 @@ buildPythonPackage rec {
# in the project's CI.
src = fetchPypi {
inherit pname version;
- hash = "sha256-rZNVihIuvNJnQWqA5tV9DG5r3/LttWNW6fN2js+fDb8=";
+ hash = "sha256-ESEnPeL79O0wnllEo9s50B84WyINIOeMRg7E78BpRbM=";
};
nativeBuildInputs = [ cmake setuptools ];
dontUseCmakeConfigure = true;
buildInputs = [ mujoco pybind11 ];
- propagatedBuildInputs = [ glfw numpy ];
+ propagatedBuildInputs = [
+ absl-py
+ etils
+ glfw
+ numpy
+ pyopengl
+ ];
pythonImportsCheck = [ "${pname}" ];
@@ -48,11 +57,15 @@ buildPythonPackage rec {
# E.g. 3.11.2 -> "311"
pythonVersionMajorMinor = with lib.versions;
"${major python.pythonVersion}${minor python.pythonVersion}";
+
+ # E.g. "linux-aarch64"
+ platform = with stdenv.hostPlatform.parsed;
+ "${kernel.name}-${cpu.name}";
in ''
${perl}/bin/perl -0777 -i -pe "s/GIT_REPO\n.*\n.*GIT_TAG\n.*\n//gm" mujoco/CMakeLists.txt
${perl}/bin/perl -0777 -i -pe "s/(FetchContent_Declare\(\n.*lodepng\n.*)(GIT_REPO.*\n.*GIT_TAG.*\n)(.*\))/\1\3/gm" mujoco/simulate/CMakeLists.txt
- build="/build/${pname}-${version}/build/temp.linux-x86_64-cpython-${pythonVersionMajorMinor}/"
+ build="/build/${pname}-${version}/build/temp.${platform}-cpython-${pythonVersionMajorMinor}/"
mkdir -p $build/_deps
ln -s ${mujoco.pin.lodepng} $build/_deps/lodepng-src
ln -s ${mujoco.pin.eigen3} $build/_deps/eigen-src
@@ -63,6 +76,7 @@ buildPythonPackage rec {
description =
"Python bindings for MuJoCo: a general purpose physics simulator.";
homepage = "https://mujoco.org/";
+ changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ tmplt ];
};
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 68160474f078..19488765269b 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -1,17 +1,18 @@
{ lib
, buildPythonPackage
-, rns
, fetchFromGitHub
, lxmf
-, urwid
, pythonOlder
, qrcode
+, rns
+, setuptools
+, urwid
}:
buildPythonPackage rec {
pname = "nomadnet";
- version = "0.4.4";
- format = "setuptools";
+ version = "0.4.5";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,9 +20,13 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "NomadNet";
rev = "refs/tags/${version}";
- hash = "sha256-k2KJSqOIBU1UwcmNgLek+XVI/C1YwOlAg+l/XJvTx5E=";
+ hash = "sha256-+w/Earu76mMJFp8ALvaDEkZOGJqlKbO7jfpW/xxvd1o=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
rns
lxmf
diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index 82af53c55119..94252131d9a0 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -1,22 +1,20 @@
{ lib
, buildPythonPackage
-, fetchFromGitLab
-, pythonOlder
-
-# dependencies
, et-xmlfile
-
-# tests
+, fetchFromGitLab
, lxml
, pandas
, pillow
, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "openpyxl";
version = "3.1.2";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,10 +22,14 @@ buildPythonPackage rec {
domain = "foss.heptapod.net";
owner = "openpyxl";
repo = "openpyxl";
- rev = version;
+ rev = "refs/tags/${version}";
hash = "sha256-SWRbjA83AOLrfe6on2CSb64pH5EWXkfyYcTqWJNBEP0=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
et-xmlfile
];
@@ -40,20 +42,29 @@ buildPythonPackage rec {
];
pytestFlagsArray = [
- # broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
- "--deselect=openpyxl/chart/tests/test_reader.py::test_read"
- "--deselect=openpyxl/comments/tests/test_comment_reader.py::test_read_comments"
- "--deselect=openpyxl/drawing/tests/test_spreadsheet_drawing.py::TestSpreadsheetDrawing::test_ignore_external_blip"
- "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_from_xml"
- "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_filenames"
- "--deselect=openpyxl/packaging/tests/test_manifest.py::TestManifest::test_exts"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_from_complex"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_merge_named_styles"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_unprotected_cell"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_none_values"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_rgb_colors"
- "--deselect=openpyxl/styles/tests/test_stylesheet.py::TestStylesheet::test_named_styles"
- "--deselect=openpyxl/workbook/external_link/tests/test_external.py::test_read_ole_link"
+ "-W"
+ "ignore::DeprecationWarning"
+ ];
+ disabledTests = [
+ # Tests broken since lxml 2.12; https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2116
+ "test_read"
+ "test_read_comments"
+ "test_ignore_external_blip"
+ "test_from_xml"
+ "test_filenames"
+ "test_exts"
+ "test_from_complex"
+ "test_merge_named_styles"
+ "test_unprotected_cell"
+ "test_none_values"
+ "test_rgb_colors"
+ "test_named_styles"
+ "test_read_ole_link"
+ ] ++ lib.optionals (pythonAtLeast "3.11") [
+ "test_broken_sheet_ref"
+ "test_name_invalid_index"
+ "test_defined_names_print_area"
+ "test_no_styles"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pyatem/default.nix b/pkgs/development/python-modules/pyatem/default.nix
index 5b7749ea57c9..1792d2699d80 100644
--- a/pkgs/development/python-modules/pyatem/default.nix
+++ b/pkgs/development/python-modules/pyatem/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "pyatem";
- version = "0.9.0"; # check latest version in setup.py
+ version = "0.10.0"; # check latest version in setup.py
pyproject = true;
src = fetchFromSourcehut {
owner = "~martijnbraam";
repo = "pyatem";
rev = version;
- hash = "sha256-ntwUhgC8Cgrim+kU3B3ckgPDmPe+aEHDP4wsB45KbJg=";
+ hash = "sha256-O+f1vVwfGJjLem25hsYE1Q1V4vzjrc0HxTBUCANCEwE=";
};
nativeBuildInputs = [
@@ -49,15 +49,6 @@ buildPythonPackage rec {
pushd $TESTDIR
'';
- disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
- # colorspace mapping has weird, but constant offsets on aarch64-linux
- "test_blueramp"
- "test_greenramp"
- "test_hues"
- "test_primaries"
- "test_redramp"
- ];
-
postCheck = ''
popd
'';
diff --git a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
index 8d3037baa454..e55936a8e41c 100644
--- a/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
+++ b/pkgs/development/python-modules/pyhanko-certvalidator/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pyhanko-certvalidator";
- version = "0.26.2";
+ version = "0.26.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "MatthiasValvekens";
repo = "certvalidator";
rev = "refs/tags/v${version}";
- hash = "sha256-yGFaRpAOTbuVfY5UefC1sdJS4FFkgkIZnHHG35p3n3E=";
+ hash = "sha256-uUmsWiN182g+kxrCny7UNLDHdAdqKk64w6vnjmGBNjM=";
};
postPatch = ''
@@ -68,8 +68,8 @@ buildPythonPackage rec {
"test_revocation_mode_hard_aiohttp_autofetch"
# The path could not be validated because no revocation information could be found for intermediate certificate 1
"test_revocation_mode_hard"
- # certificate expired 2022-09-17
- "test_revocation_mode_soft"
+ # ValueError: Hash algorithm not known for ed448
+ "test_ed"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix
index 790b41626bf0..a49967ee6c3e 100644
--- a/pkgs/development/python-modules/pykwalify/default.nix
+++ b/pkgs/development/python-modules/pykwalify/default.nix
@@ -1,10 +1,10 @@
{ lib
, buildPythonPackage
+, fetchpatch
, python-dateutil
, docopt
, fetchPypi
, pytestCheckHook
-, pyyaml
, ruamel-yaml
, testfixtures
}:
@@ -19,10 +19,18 @@ buildPythonPackage rec {
hash = "sha256-eWsq0+1MuZuIMItTP7L1WcMPpu+0+p/aETR/SD0kWIQ=";
};
+ patches = [
+ # fix test failures with ruamel.yaml 0.18+
+ (fetchpatch {
+ name = "pykwalify-fix-tests-ruamel-yaml-0.18.patch";
+ url = "https://github.com/Grokzen/pykwalify/commit/57bb2ba5c28b6928edb3f07ef581a5a807524baf.diff";
+ hash = "sha256-XUiebDzFSvNrPpRMoc2lv9m+30cfFh0N0rznMiSdQ/0=";
+ })
+ ];
+
propagatedBuildInputs = [
python-dateutil
docopt
- pyyaml
ruamel-yaml
];
@@ -31,10 +39,6 @@ buildPythonPackage rec {
testfixtures
];
- disabledTests = [
- "test_multi_file_support"
- ];
-
pythonImportsCheck = [ "pykwalify" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix
index bbc67a278855..1942a362a176 100644
--- a/pkgs/development/python-modules/pytest-cases/default.nix
+++ b/pkgs/development/python-modules/pytest-cases/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "pytest-cases";
- version = "3.8.1";
+ version = "3.8.2";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-Sdf2+K1TTlpuc/uPX9OJhmBvF7Ru5V9+vuB6VcZ3ygE=";
+ hash = "sha256-JM7AEoyCL1G19AL6zgnnBJlU2WddsspnX84e9/j3Seg=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-random-order/default.nix b/pkgs/development/python-modules/pytest-random-order/default.nix
index 5218f0a778e5..2b2b6624c099 100644
--- a/pkgs/development/python-modules/pytest-random-order/default.nix
+++ b/pkgs/development/python-modules/pytest-random-order/default.nix
@@ -1,28 +1,49 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pythonOlder
+, py
, pytest
+, pytest-xdist
+, pytestCheckHook
+, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
- version = "1.1.0";
- format = "setuptools";
pname = "pytest-random-order";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-2+beu5NTp6+YTMnt2+s1d91Nu8wVKaeePSH2jtm0VgU=";
- };
+ version = "1.1.1";
+ pyproject = true;
disabled = pythonOlder "3.5";
- buildInputs = [ pytest ];
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-RHLX008fHF86NZxP/FwT7QZSMvMeyhnIhEwatAbnkIA=";
+ };
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
+ buildInputs = [
+ pytest
+ ];
+
+ nativeCheckInputs = [
+ py
+ pytest-xdist
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "random_order"
+ ];
meta = with lib; {
homepage = "https://github.com/jbasko/pytest-random-order";
description = "Randomise the order of tests with some control over the randomness";
+ changelog = "https://github.com/jbasko/pytest-random-order/releases/tag/v${version}";
license = licenses.mit;
- maintainers = [ maintainers.prusnak ];
+ maintainers = with maintainers; [ prusnak ];
};
}
diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix
index 9b4023bc498d..91f5d0d89f89 100644
--- a/pkgs/development/python-modules/pyutil/default.nix
+++ b/pkgs/development/python-modules/pyutil/default.nix
@@ -1,33 +1,66 @@
{ lib
, buildPythonPackage
, fetchPypi
-, simplejson
-, mock
-, twisted
, isPyPy
+, mock
+, pytestCheckHook
+, pythonAtLeast
+, pythonOlder
+, setuptools
+, simplejson
+, twisted
+, versioneer
}:
buildPythonPackage rec {
pname = "pyutil";
version = "3.3.6";
- format = "setuptools";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-XcPWu5xbq6u10Ldz4JQEXXVxLos0ry0psOKGAmaCZ8A=";
};
- propagatedBuildInputs = [ simplejson ];
-
- nativeCheckInputs = [ mock twisted ];
-
prePatch = lib.optionalString isPyPy ''
grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g"
'';
- meta = with lib; {
- description = "Pyutil, a collection of mature utilities for Python programmers";
+ nativeBuildInputs = [
+ setuptools
+ versioneer
+ ];
+ passthru.optional-dependencies = {
+ jsonutil = [
+ simplejson
+ ];
+ # Module not available
+ # randcookie = [
+ # zbase32
+ # ];
+ };
+
+ nativeCheckInputs = [
+ mock
+ twisted
+ pytestCheckHook
+ ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+
+ pythonImportsCheck = [
+ "pyutil"
+ ];
+
+ disabledTests = lib.optionals (pythonAtLeast "3.12") [
+ # https://github.com/tpltnt/pyutil/issues/10
+ "test_decimal"
+ "test_float"
+ ];
+
+ meta = with lib; {
+ description = "Collection of mature utilities for Python programmers";
longDescription = ''
These are a few data structures, classes and functions which
we've needed over many years of Python programming and which
@@ -37,7 +70,6 @@ buildPythonPackage rec {
Python language or its standard library, thus showing that
we're not alone in wanting tools like these.
'';
-
homepage = "https://github.com/tpltnt/pyutil";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ prusnak ];
diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix
index d7b733f83322..3bbbbedf1d22 100644
--- a/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -2,33 +2,31 @@
, buildPythonPackage
, fetchPypi
, requests
-, six
, urllib3
, packaging
, setuptools
-, wheel
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "qbittorrent-api";
- version = "2023.11.57";
- format = "pyproject";
+ version = "2024.1.58";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-fmFJW4PDQc7szu0ymE+fV9k6wUDLRHkOriEHDnzDSQg=";
+ hash = "sha256-6JyU9mr0xfRLB7AJOcnPc+PpF0EWi/R/Wy3lCKanAmA=";
};
propagatedBuildInputs = [
requests
- six
urllib3
packaging
];
nativeBuildInputs = [
setuptools
- wheel
+ setuptools-scm
];
# Tests require internet access
diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix
index 43379422263d..0b8f69889c33 100644
--- a/pkgs/development/python-modules/qrcode/default.nix
+++ b/pkgs/development/python-modules/qrcode/default.nix
@@ -1,20 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
-, setuptools
+, mock
, pillow
, pypng
-, typing-extensions
-, mock
, pytestCheckHook
-, testers
+, pythonAtLeast
, qrcode
+, setuptools
+, testers
+, typing-extensions
}:
buildPythonPackage rec {
pname = "qrcode";
version = "7.4.2";
- format = "pyproject";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
@@ -48,11 +49,15 @@ buildPythonPackage rec {
};
};
+ disabledTests = lib.optionals (pythonAtLeast "3.12") [
+ "test_change"
+ ];
+
meta = with lib; {
description = "Python QR Code image generator";
homepage = "https://github.com/lincolnloop/python-qrcode";
changelog = "https://github.com/lincolnloop/python-qrcode/blob/v${version}/CHANGES.rst";
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix
index f2ddbff5d43f..6cc0471b854b 100644
--- a/pkgs/development/python-modules/riscv-config/default.nix
+++ b/pkgs/development/python-modules/riscv-config/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "riscv-config";
- version = "3.14.3";
+ version = "3.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "riscv-software-src";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-a6rTKCLAHrdfP/M8Q8YYSck4q+7tmospMFcCdIdNyy0=";
+ hash = "sha256-dMs900w5sXggqxU+2W8qKrKjGpyrXhA2QEbXQeaKZTs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 4b1ccc9bad62..3fc348be7561 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -5,12 +5,13 @@
, netifaces
, pyserial
, pythonOlder
+, setuptools
}:
buildPythonPackage rec {
pname = "rns";
- version = "0.6.9";
- format = "setuptools";
+ version = "0.7.0";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,9 +19,13 @@ buildPythonPackage rec {
owner = "markqvist";
repo = "Reticulum";
rev = "refs/tags/${version}";
- hash = "sha256-L99eeDGbXXS9bff+r4j5AmmuICfeNKRD8+71+ojw320=";
+ hash = "sha256-iwW52jPSCwelfByerKHxKgH4NbWwCJLPyHXyBeJPwaM=";
};
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
cryptography
netifaces
diff --git a/pkgs/development/python-modules/socialscan/default.nix b/pkgs/development/python-modules/socialscan/default.nix
index db9cd3c1f8ca..7a6cc52e3514 100644
--- a/pkgs/development/python-modules/socialscan/default.nix
+++ b/pkgs/development/python-modules/socialscan/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "socialscan";
- version = "2.0.0";
+ version = "2.0.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "iojw";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-jiyTcpJ00DvfweChawj1ugdCVHHAdwDbHEp9jivH7gs=";
+ hash = "sha256-4JJVhB6x1NGagtfzE03Jae2GOr25hh+4l7gQ23zc7Ck=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/spython/default.nix b/pkgs/development/python-modules/spython/default.nix
new file mode 100644
index 000000000000..e5a2fdf161c8
--- /dev/null
+++ b/pkgs/development/python-modules/spython/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "spython";
+ version = "0.3.12";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "singularityhub";
+ repo = "singularity-cli";
+ rev = "refs/tags/${version}";
+ hash = "sha256-fRtqOpDgVMYlVDwbPkrnpd7PT4fV+2WS6RmpJoxaKdQ=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace '"pytest-runner"' ""
+ '';
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "spython"
+ ];
+
+ disabledTests = [
+ # Assertion errors
+ "test_has_no_instances"
+ "test_check_install"
+ "test_check_get_singularity_version"
+ ];
+
+ disabledTestPaths = [
+ # Tests are looking for something that doesn't exist
+ "spython/tests/test_client.py"
+ ];
+
+ meta = with lib; {
+ description = "Streamlined singularity python client (spython) for singularity";
+ homepage = "https://github.com/singularityhub/singularity-cli";
+ changelog = "https://github.com/singularityhub/singularity-cli/blob/${version}/CHANGELOG.md";
+ license = licenses.mpl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix
index b03038c4aa5f..3cf2170ed084 100644
--- a/pkgs/development/python-modules/thermopro-ble/default.nix
+++ b/pkgs/development/python-modules/thermopro-ble/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "thermopro-ble";
- version = "0.5.0";
+ version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "bluetooth-devices";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-4lk/K9XW9naPDRXmuqKFBdOwMtLlQE8etJFEbNgfIvA=";
+ hash = "sha256-ENzFX0rD97hCnllFKjcSGbAbEksqln/Hj0MuDVOKGDo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index 66a8d830cc2d..cf42463c19b2 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -1,26 +1,32 @@
{ lib
, buildPythonPackage
+, exceptiongroup
, fetchFromGitHub
-
-# build-system
+, glibcLocales
+, pygobject3
+, pyserial
+, pytestCheckHook
+, pythonOlder
+, pyzmq
, setuptools
, setuptools-scm
-
-# tests
-, glibcLocales
-, pytestCheckHook
+, tornado
+, trio
+, twisted
}:
buildPythonPackage rec {
pname = "urwid";
- version = "2.2.3";
- format = "pyproject";
+ version = "2.4.3";
+ pyproject = true;
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "urwid";
repo = "urwid";
rev = "refs/tags/${version}";
- hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo=";
+ hash = "sha256-raDsUZaXBC4s/48KNH8Thrpm8Bq8wj9+Rahk+LkxcDo=";
};
postPatch = ''
@@ -32,10 +38,35 @@ buildPythonPackage rec {
setuptools-scm
];
+ passthru.optional-dependencies = {
+ glib = [
+ pygobject3
+ ];
+ tornado = [
+ tornado
+ ];
+ trio = [
+ exceptiongroup
+ trio
+ ];
+ twisted = [
+ twisted
+ ];
+ zmq = [
+ pyzmq
+ ];
+ serial = [
+ pyserial
+ ];
+ lcd = [
+ pyserial
+ ];
+ };
+
nativeCheckInputs = [
glibcLocales
pytestCheckHook
- ];
+ ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
env.LC_ALL = "en_US.UTF8";
@@ -53,8 +84,8 @@ buildPythonPackage rec {
];
meta = with lib; {
- changelog = "https://github.com/urwid/urwid/releases/tag/${version}";
description = "A full-featured console (xterm et al.) user interface library";
+ changelog = "https://github.com/urwid/urwid/releases/tag/${version}";
downloadPage = "https://github.com/urwid/urwid";
homepage = "https://urwid.org/";
license = licenses.lgpl21Plus;
diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix
index bba0f14e159b..5106ee3b0556 100644
--- a/pkgs/development/python-modules/whispers/default.nix
+++ b/pkgs/development/python-modules/whispers/default.nix
@@ -4,6 +4,7 @@
, buildPythonPackage
, crossplane
, fetchFromGitHub
+, fetchpatch
, jellyfish
, jproperties
, luhn
@@ -12,22 +13,52 @@
, pytestCheckHook
, pythonOlder
, pyyaml
+, setuptools
}:
buildPythonPackage rec {
pname = "whispers";
version = "2.2.0";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "adeptex";
- repo = pname;
+ repo = "whispers";
rev = "refs/tags/${version}";
hash = "sha256-9vXku8BWJtlf+lmAcQ8a7qTisRNc+xVw0T0Eunc4lt4=";
};
+ patches = [
+ # Support astroid > 3, https://github.com/adeptex/whispers/pull/117
+ (fetchpatch {
+ url = "https://github.com/adeptex/whispers/commit/ff25e81cb3d775e5fb186c2d135b77c27d9ed43a.patch";
+ hash = "sha256-jKm7fs04mGUD7MZYAA/3xt01e9knuLun3c3u8PlLebg=";
+ })
+ (fetchpatch {
+ url = "https://github.com/adeptex/whispers/commit/ba6a56dddb12d1cb62f94dd7659ba24fdc4363ee.patch";
+ hash = "sha256-eHWnXHT0lzS7BqneMqfvV3w6GfrCiTJ5i+av82J+fpk=";
+ })
+ (fetchpatch {
+ url = "https://github.com/adeptex/whispers/commit/8b7b1593eb86abfc09b3581d463fc7d0e06309dc.patch";
+ hash = "sha256-JcRdv5eIyXKWaVqbJZlYqiSieE4z0MKF4dvO/hRBBMs=";
+ })
+ (fetchpatch {
+ url = "https://github.com/adeptex/whispers/commit/71dcb614e4d9e0247afc50cd4214659739f8844e.patch";
+ hash = "sha256-7XIFuc8Rf2ValN3BoAJOjSqjgmiOauxCFonMgGljFg0=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace '"pytest-runner"' ""
+ '';
+
+ nativeBuildInputs = [
+ setuptools
+ ];
+
propagatedBuildInputs = [
astroid
beautifulsoup4
@@ -44,11 +75,6 @@ buildPythonPackage rec {
pytestCheckHook
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace '"pytest-runner"' ""
- '';
-
preCheck = ''
# Some tests need the binary available in PATH
export PATH=$out/bin:$PATH
@@ -60,7 +86,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Tool to identify hardcoded secrets in static structured text";
- homepage = "https://github.com/Skyscanner/whispers";
+ homepage = "https://github.com/adeptex/whispers";
+ changelog = "https://github.com/adeptex/whispers/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index 39e5f233ccd2..d9d6e0398355 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "XStatic";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchPypi {
inherit version pname;
- sha256 = "80b78dfe37bce6dee4343d64c65375a80bcf399b46dd47c0c7d56161568a23a8";
+ sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg=";
};
# no tests implemented
diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix
index fc3b710919bc..1e135da34b3a 100644
--- a/pkgs/development/python-modules/zfec/default.nix
+++ b/pkgs/development/python-modules/zfec/default.nix
@@ -1,8 +1,9 @@
{ lib
, buildPythonPackage
, fetchPypi
-, setuptools
+, hypothesis
, pyutil
+, setuptools
, twisted
}:
@@ -20,17 +21,26 @@ buildPythonPackage rec {
setuptools
];
- propagatedBuildInputs = [ pyutil ];
+ propagatedBuildInputs = [
+ pyutil
+ ];
- nativeCheckInputs = [ twisted ];
+ nativeCheckInputs = [
+ hypothesis
+ twisted
+ ];
- checkPhase = "trial zfec";
+ checkPhase = ''
+ trial zfec
+ '';
- pythonImportsCheck = [ "zfec" ];
+ pythonImportsCheck = [
+ "zfec"
+ ];
meta = with lib; {
homepage = "https://github.com/tahoe-lafs/zfec";
- description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell";
+ description = "Fast erasure codec which can be used with the command-line, C, Python, or Haskell";
longDescription = ''
Fast, portable, programmable erasure coding a.k.a. "forward
error correction": the generation of redundant blocks of
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 05ee6c4019db..c55c8ed63133 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.15.5";
+ version = "2.16.0";
dontConfigure = true;
dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- hash = "sha256-FkiGyug8kYxiVdsnljwka4PJz5BSFVRVlOOf5pjTvM8=";
+ hash = "sha256-1XqpERNM4rNyv9HT1jyZIqSkEDsajIJ9D0FzWcFm20c=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 1a7a1c0f4c95..dd9d790f1257 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck";
- version = "2.13.0";
+ version = "2.13.1";
outputs = [ "out" "man" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar";
repo = "cppcheck";
rev = finalAttrs.version;
- hash = "sha256-+z8mMwI4hHpE3enIriTsxZEocqifppYgjZz3UPGswIo=";
+ hash = "sha256-X2HMC0Mij4odyyl79bgCyaw3qRMjEQBbHO3Q2kE9YLE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index afdd4fe022b5..ea7bbb242d36 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.50.1";
+ version = "0.50.2";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- hash = "sha256-r/mVLgJudHyNvQa9H9pQ1qhiFx11RikIg4IIz5tC6Us=";
+ hash = "sha256-MZx8lJTUWrKDXWGlmsCDT4Fjf56GrTJ/byn+htXOFfg=";
};
- vendorHash = "sha256-iyJx5dp+NYbaJhZL67ZjFd28ms3vyF38z9P8qJscryQ=";
+ vendorHash = "sha256-N8J9s9gJEooqrsAUMcC9BZ65qlmpERPoqdknzYZxIIk=";
doCheck = false;
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index b8f252f17923..f475fb54d1cb 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -8,14 +8,14 @@
stdenv.mkDerivation rec {
pname = "apktool";
- version = "2.9.2";
+ version = "2.9.3";
src = fetchurl {
urls = [
"https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
"https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
];
- hash = "sha256-gx8P/Je28g9RHWGDy/Z4VGTTQarLD7fm8i7wx7IokRo=";
+ hash = "sha256-eVbrBBlDAM4NCoStGHce68lLifuNHdzOjqTAVoGGRvQ=";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index 59ea3f5b15e6..0868ab8e7f8c 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "avro-tools";
- version = "1.11.1";
+ version = "1.11.3";
src = fetchurl {
url =
"mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
- sha256 = "sha256-uVTnWXbCS3JQkHWxopixhNue/ihzvukJ0CNDL5gm24g=";
+ sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI=";
};
dontUnpack = true;
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index f0ec96250977..909e83468d65 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -3,16 +3,16 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-QY0JaQVI60WAzWNWDXZRejFODA+p0LMjYvk2CMF8czs=",
+ "hash": "sha256-NncDuvceqh2QU7EeHaeyIBEp1kXpPLKkhXlqfqaRmGM=",
"owner": "electron",
"repo": "electron",
- "rev": "v28.1.3"
+ "rev": "v28.1.4"
},
"src": {
"fetcher": "fetchFromGitiles",
- "hash": "sha256-7tGDiHumIfb5ST8tCNUCN7pjlcU+R13j68vYKTu0wiQ=",
+ "hash": "sha256-4ET4+Yd0VwKS/Ze/KO3yhehAdmjCSswaoWmMTo+8KK8=",
"url": "https://chromium.googlesource.com/chromium/src.git",
- "rev": "120.0.6099.199",
+ "rev": "120.0.6099.216",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; "
},
"src/third_party/clang-format/script": {
@@ -873,12 +873,12 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
- "version": "28.1.3",
+ "version": "28.1.4",
"modules": "119",
- "chrome": "120.0.6099.199",
+ "chrome": "120.0.6099.216",
"node": "18.18.2",
"chromium": {
- "version": "120.0.6099.199",
+ "version": "120.0.6099.216",
"deps": {
"gn": {
"version": "2023-10-23",
@@ -895,10 +895,10 @@
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-C9Oj6xuPFnj5Wh+VeeXc9AJ3Pgxq+SGn624OFWseO4M=",
+ "hash": "sha256-UHrY5DOwkkVS7j5WgY4vTWIH747jX/gMM3AfnxHc+do=",
"owner": "electron",
"repo": "electron",
- "rev": "v27.2.2"
+ "rev": "v27.2.3"
},
"src": {
"fetcher": "fetchFromGitiles",
@@ -1765,7 +1765,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
- "version": "27.2.2",
+ "version": "27.2.3",
"modules": "118",
"chrome": "118.0.5993.159",
"node": "18.17.1",
@@ -1780,17 +1780,17 @@
}
}
},
- "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ=",
- "electron_yarn_hash": "1rxijv3fspjfan7mmw4cmxcb231ny7gn72yzsdnqs0225alrjac0"
+ "electron_yarn_hash": "1rxijv3fspjfan7mmw4cmxcb231ny7gn72yzsdnqs0225alrjac0",
+ "chromium_npm_hash": "sha256-5cjqpYB45nw2gop54VP+tL7/0w63nQGfQ4x6a6KS7XQ="
},
"26": {
"deps": {
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-KTvbe8reOTqzqXoPHBQY24mxvUSokGh8JlxCJTdNxbc=",
+ "hash": "sha256-Y9SiwDHCkHi+s5zYWPtFPhxjpCQMrpZP+IBi/xYZFVo=",
"owner": "electron",
"repo": "electron",
- "rev": "v26.6.5"
+ "rev": "v26.6.6"
},
"src": {
"fetcher": "fetchFromGitiles",
@@ -2609,7 +2609,7 @@
"rev": "78d3966b3c331292ea29ec38661b25df0a245948"
}
},
- "version": "26.6.5",
+ "version": "26.6.6",
"modules": "116",
"chrome": "116.0.5845.228",
"node": "18.16.1",
diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/development/tools/language-servers/csharp-ls/default.nix
index f354b3220fc7..f3c412232136 100644
--- a/pkgs/development/tools/language-servers/csharp-ls/default.nix
+++ b/pkgs/development/tools/language-servers/csharp-ls/default.nix
@@ -3,17 +3,17 @@
, dotnetCorePackages
}:
let
- inherit (dotnetCorePackages) sdk_7_0;
+ inherit (dotnetCorePackages) sdk_8_0;
in
buildDotnetGlobalTool rec {
pname = "csharp-ls";
- version = "0.10.0";
+ version = "0.11.0";
- nugetSha256 = "sha256-1t8U2Q4lIlj2QwbnevAMMGcqtpPh5zk0Bd7EHa7qvCI=";
+ nugetSha256 = "sha256-zB8uJqlf8kL8jh3WNsPQF7EJpONqi23co3O/iBzfEoU=";
- dotnet-sdk = sdk_7_0;
- dotnet-runtime = sdk_7_0;
+ dotnet-sdk = sdk_8_0;
+ dotnet-runtime = sdk_8_0;
meta = with lib; {
description = "Roslyn-based LSP language server for C#";
diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock
index 41a6e31df128..414d7d2d41e4 100644
--- a/pkgs/development/tools/rye/Cargo.lock
+++ b/pkgs/development/tools/rye/Cargo.lock
@@ -1781,7 +1781,7 @@ dependencies = [
[[package]]
name = "rye"
-version = "0.18.0"
+version = "0.19.0"
dependencies = [
"age",
"anyhow",
@@ -1827,6 +1827,7 @@ dependencies = [
"whattheshell",
"which",
"winapi",
+ "winreg",
"zip",
"zstd",
]
@@ -2654,6 +2655,16 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "winreg"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "x25519-dalek"
version = "1.1.1"
diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix
index 4a952fb84bdd..870c9ac2ae39 100644
--- a/pkgs/development/tools/rye/default.nix
+++ b/pkgs/development/tools/rye/default.nix
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "rye";
- version = "0.18.0";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "rye";
rev = "refs/tags/${version}";
- hash = "sha256-IxR9FUzX4i9QeQ2vDtwMC36nSvYuKTSLnhJl+r7fTOo=";
+ hash = "sha256-c5PIJMqe5ljNy582LuYJK18ixrphVhYRtiF5X5CB20Y=";
};
cargoLock = {
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index bc8c9d9ff0d0..6f2effcf94f2 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "minify";
- version = "2.20.10";
+ version = "2.20.14";
src = fetchFromGitHub {
owner = "tdewolff";
repo = pname;
rev = "v${version}";
- hash = "sha256-HNb9Sf1do2VfqpXTW+EqizkOV4kcJz9ySAaji66xkAE=";
+ hash = "sha256-/4iIN3L3hARxpa7bQcMBQ8DF6SfqrK+rFgJn/MYoUL8=";
};
- vendorHash = "sha256-SGjwRLzXnIr5EduPPJRgt+WSkgq0kxOAANH7cW03tBs=";
+ vendorHash = "sha256-iTHUZUmT1LLS8wtPTDaay2Mx+Trv8TUox6PHwYTuY2U=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix
index 0f25ff36fa86..64be757c35ad 100644
--- a/pkgs/games/lgames/lbreakouthd/default.nix
+++ b/pkgs/games/lgames/lbreakouthd/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lbreakouthd";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchurl {
url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz";
- hash = "sha256-dejGWf/UQaXHaT3Q79T7IO1WBFE1ZbqE9QW5nRPbDeo=";
+ hash = "sha256-Gor2LnM8vi6skJbzfR5023J13GxvqcpIrua9S+nT/S0=";
};
buildInputs = [
diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix
index d2138759bca8..9b06c2b93314 100644
--- a/pkgs/games/vintagestory/default.nix
+++ b/pkgs/games/vintagestory/default.nix
@@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "vintagestory";
- version = "1.18.15";
+ version = "1.19.1";
src = fetchurl {
url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
- hash = "sha256-luZwRKVptSd69tCaf6Jv0YOfwOeDOcuY7VoL+21tTEo=";
+ hash = "sha256-PrsClGSXTah5kkhww7slfkwpo0gJryf6pm61LsCYbiE=";
};
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index ad4d00a8149e..5d0629d1fb69 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -8,10 +8,10 @@ let beat = package: extraArgs: buildGoModule (rec {
owner = "elastic";
repo = "beats";
rev = "v${version}";
- hash = "sha256-Quq32/3NeGhrsy17GrIeBiB3LGQuMFTFl3lAyyU6GZM=";
+ hash = "sha256-0qwWHRIDLlnaPOCRmiiFGg+/jdanWuQtggM2QSaMR1o=";
};
- vendorHash = "sha256-UJjwCRxY1rrymroBqC/SfCVM9vmnQOtLlS3OONih3kM=";
+ vendorHash = "sha256-rwCCpptppkpvwQWUtqTjBUumP8GSpPHBTCaj0nYVQv8=";
subPackages = [ package ];
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 7765ce0aa52a..a99100ad8f4e 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "android-udev-rules";
- version = "20231207";
+ version = "20240114";
src = fetchFromGitHub {
owner = "M0Rf30";
repo = "android-udev-rules";
rev = version;
- hash = "sha256-wNGIDOHbQ4qtKqtGqLOGEopWgnox3cATY77daRNVUFM=";
+ hash = "sha256-qf+KcEcWOsgLMifUOqNbi5t4s62p1gUfna45MyD01U0=";
};
installPhase = ''
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 40538920d100..a13a7b7fd2cc 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.6.12"; #lqx
+ version = "6.7.1"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "13wj7w66mrkabf7f03svq8x9dqy7w3dnh9jqpkr2hdkd6l2nf6c3"; #lqx
+ sha256 = "12fsf7wigma1wmqcpqp1aabmwxsf4yhwa6y3xhbnmiz83cakx27z"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix
index 310b4592b20f..c5c6ae60362e 100644
--- a/pkgs/servers/home-assistant/custom-components/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/default.nix
@@ -6,6 +6,8 @@
govee-lan = callPackage ./govee-lan {};
+ gpio = callPackage ./gpio {};
+
miele = callPackage ./miele {};
prometheus_sensor = callPackage ./prometheus_sensor {};
diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/default.nix
new file mode 100644
index 000000000000..98cf56a3b52a
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/gpio/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildHomeAssistantComponent
+, fetchFromGitea
+, libgpiod
+}:
+
+buildHomeAssistantComponent rec {
+ owner = "raboof";
+ domain = "gpio";
+ version = "0.0.2";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "raboof";
+ repo = "ha-gpio";
+ rev = "v${version}";
+ hash = "sha256-oito5W7uQYgxUQFIynW9G7jbIpmFONWC8FslRdX3gsE=";
+ };
+
+ propagatedBuildInputs = [ libgpiod ];
+
+ meta = with lib; {
+ description = "Home Assistant GPIO custom integration";
+ homepage = "https://codeberg.org/raboof/ha-gpio";
+ maintainers = with maintainers; [ raboof ];
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 7be36afc6291..66594ee3dd7c 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -2,7 +2,6 @@
, buildGoModule
, fetchFromGitHub
, fetchNpmDeps
-, fetchpatch
, cacert
, go
, git
@@ -17,24 +16,15 @@
buildGoModule rec {
pname = "evcc";
- version = "0.123.7";
+ version = "0.123.8";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
- hash = "sha256-I8qcKrCuiUpDdsWDMiEZdo+PBkMELo5V6GW+nKFaD3Y=";
+ hash = "sha256-AsLprF4Szv91mShE1Ch6qOIkAIwHTw5lWm38DjQGOZM=";
};
- patches = [
- (fetchpatch {
- # https://github.com/evcc-io/evcc/pull/11547
- name = "evcc-mockgen.patch";
- url = "https://github.com/evcc-io/evcc/commit/5ec02a9dba79a733f71fc02a9552eb01e4e08f0b.patch";
- hash = "sha256-uxKdtwdhUcMFCMkG756OD9aSMP9rdOL4Tg0HBWwp3kw=";
- })
- ];
-
vendorHash = "sha256-FKF6+64mjrKgzFAb+O0QCURieOoRB//QNbpMFMcNG8s=";
npmDeps = fetchNpmDeps {
@@ -56,8 +46,6 @@ buildGoModule rec {
mockgen
];
- inherit patches;
-
preBuild = ''
make assets
'';
diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix
index 9efa621e5b4b..f439b0ae4304 100644
--- a/pkgs/servers/search/elasticsearch/7.x.nix
+++ b/pkgs/servers/search/elasticsearch/7.x.nix
@@ -18,10 +18,10 @@ let
plat = elemAt info 1;
hashes =
{
- x86_64-linux = "sha512-eiAT5Dx/w56GoxpzPMdMWH7yu6DAE/lc6HT5i0iKT48Ob7JUoe7dXAsOIQrtmgGV9zWPqWU8iQ4jRBP/kxkIBw==";
- x86_64-darwin = "sha512-5vSefA9Z4mCz49Q+Vzdck1KXbE9REYAF46kSf0G1n5XlHqFYzTGOmUEObZhGTqH4RDLJBdEqhLj2iyzjWQX5RA==";
- aarch64-linux = "sha512-8nkPSbecOBJGu/h0MZGUUq+Tqk/YqmvJwfkDHn7V2cZJ9bq4Z8KKfRYC4ihdP0pfePgJrAV0SwKtZ9aGELtnfQ==";
- aarch64-darwin = "sha512-dbZrYGULuC3FF/SllPpAgW077Lkr87NJ8+gyTMayl8i8rOvAjnZhiR/U7eA6CZ/qVsFQkpGATdAzRXF8NlZBcg==";
+ x86_64-linux = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw==";
+ x86_64-darwin = "sha512-V/vKYL96+M1lp7ZJlvuneRBePWZmucUANfUrFPMuq+fnUP4nN69RStLWcgwgt65EspFMBwKVyQbak4swV8rWxw==";
+ aarch64-linux = "sha512-fNgVRaIIGx01reNHOnGKhMOG1aYU7gC8HLpIESSbM3+9xO1q9IHIaL/ObI/w2RYj/lD22d7PAdX5N6Hd1pVSAA==";
+ aarch64-darwin = "sha512-DgexeyoxZ1YTPw9HjSUAM6eC8XtzIw7MY1WUVsIa8zl5j3RpCp25s3oI12BWefjYYCTjdtFDMsnoFSqZBabLig==";
};
in
stdenv.mkDerivation rec {
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index c23b5ad7a2bd..58e74b746ee9 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -38,7 +38,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
hash =
- if version == "7.17.10" then "sha256-D08CVW/qHpZZaKnploM4aCJ4bunvPjVmieDYr1d6jQA="
+ if version == "7.17.16" then "sha256-wgm6N5fofs5wTM25ZT3dJkg7iDesXsc3Up419IAY9gk="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -54,7 +54,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
hash =
- if version == "7.17.10" then "sha256-cpgr2zPCpsLrmshWJWoGNcGl0X+bO/K4A9bMqLv8+H8="
+ if version == "7.17.16" then "sha256-SShdBcWfm21XoVhghSSiWIhsoXzG7wz6162iOmuf5EU="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -87,7 +87,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
hash =
- if version == "7.17.10" then "sha256-UmykO+hZDvlFhEbf7zL2bdw4j6NhByRBu9eH3F6/EtM="
+ if version == "7.17.16" then "sha256-S/Cp9opeLitFh2/3Qw7/MFt6GcYKufxXKD6cJSi3SaQ="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -103,7 +103,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
hash =
- if version == "7.17.10" then "sha256-Y/AbLfHSdocX0NQbnKm63gTWgwzssb4kpSwRqLozD9w="
+ if version == "7.17.16" then "sha256-hMErTLd5fXg420Olz+j6Zv7WByA1aNq9FlEgCtkYIxY="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -119,7 +119,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
hash =
- if version == "7.17.10" then "sha256-QIYD7cGpJQg+csv/tekN6GFtdnuhYU6VyAXk7nY/uWs="
+ if version == "7.17.16" then "sha256-z0gfdx98urCzdQNlVn99CmteG6jweOmUDmGJW89twtU="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -135,7 +135,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
hash =
- if version == "7.17.10" then "sha256-L8lS+EPYuhNNTnP3ImeZsBQ5a5DAncs3qBFDWGWISRI="
+ if version == "7.17.16" then "sha256-TWMN8jzFjzBVTUB+zn4tJr47VMXHC8U+014BvnArK8M="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -151,7 +151,7 @@ in
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip";
hash =
- if version == "7.17.10" then "sha256-eXstbxlyS8WzW8u5YiMFXGpILCcEWrIb/IxXVzAGFLU="
+ if version == "7.17.16" then "sha256-hG5wy1Xw4T1NzI7pja3CejwJg002/n6YqM1/QaVSWbg="
else throw "unsupported version ${version} for plugin ${pluginName}";
};
meta = with lib; {
@@ -167,13 +167,13 @@ in
pluginName = "search-guard";
version =
# https://docs.search-guard.com/latest/search-guard-versions
- if esVersion == "7.17.10" then "${esVersion}-53.7.0"
+ if esVersion == "7.17.16" then "${esVersion}-53.8.0"
else throw "unsupported version ${esVersion} for plugin ${pluginName}";
src =
- if esVersion == "7.17.10" then
+ if esVersion == "7.17.16" then
fetchurl {
url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip";
- hash = "sha256-FIF4O8z0U2giXVA2cNEdCDbpuJDJhaxHBOmv2fACucw=";
+ hash = "sha256-j8dz7rUKWqMvT6EksoFIuGJzYcgdMipKeg2d8UtzlDI=";
}
else throw "unsupported version ${version} for plugin ${pluginName}";
meta = with lib; {
diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix
index 9741a23f9851..68731b6f717d 100644
--- a/pkgs/servers/ttyd/default.nix
+++ b/pkgs/servers/ttyd/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
+ passthru.tests = {
+ inherit (nixosTests) ttyd;
+ };
+
meta = {
description = "Share your terminal over the web";
homepage = "https://github.com/tsl0922/ttyd";
diff --git a/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix b/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix
index aaf1f153c787..2a3bf376ac64 100644
--- a/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/riscv64-unknown-linux-gnu.nix
@@ -1,12 +1,26 @@
+#
+# Files came from this Hydra build:
+#
+# https://hydra.nixos.org/build/246376732
+#
+# Which used nixpkgs revision 160cedc144aced7a35a91440b46b74ffacd52682
+# to instantiate:
+#
+# /nix/store/cpiajh4l83b08pynwiwkpxj53d78pcxr-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu.drv
+#
+# and then built:
+#
+# /nix/store/8a92pj40awdw585mcb9dvm4nyb03k3q3-stdenv-bootstrap-tools-riscv64-unknown-linux-gnu
+#
{
busybox = import {
- url = "http://tarballs.nixos.org/stdenv-linux/riscv64/9bd3cf0063b80428bd85a286205adab4b6ffcbd6/busybox";
- sha256 = "6f61912f94bc4ef287d1ff48a9521ed16bd07d8d8ec775e471f32c64d346583d";
+ url = "http://tarballs.nixos.org/stdenv-linux/riscv64/160cedc144aced7a35a91440b46b74ffacd52682/busybox";
+ sha256 = "sha256-OGO96QUzs2n5pGipn/V87AxzUY9OWKZl417nE8HdZIE=";
executable = true;
};
bootstrapTools = import {
- url = "http://tarballs.nixos.org/stdenv-linux/riscv64/9bd3cf0063b80428bd85a286205adab4b6ffcbd6/bootstrap-tools.tar.xz";
- sha256 = "5466b19288e980125fc62ebb864d09908ffe0bc50cebe52cfee89acff14d5b9f";
+ url = "http://tarballs.nixos.org/stdenv-linux/riscv64/160cedc144aced7a35a91440b46b74ffacd52682/bootstrap-tools.tar.xz";
+ sha256 = "sha256-0LxRd7fdafQezNJ+N2tuOfm0KEwgfRSts5fhP0e0r0s=";
};
}
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 9b2611dde210..c70ef9da2e3c 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "ffcast";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "ropery";
repo = "FFcast";
rev = version;
- sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
+ sha256 = "sha256-kxqwDGEguFTFHkQzXctXqxslt0+bYnfUdQ8C/8+eTXo=";
};
nativeBuildInputs = [ autoreconfHook makeWrapper perl /*for pod2man*/ ];
diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index ae6b7e17b26d..c6ae24dc6906 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -9,6 +9,7 @@
, mp3gain
, mp3val
, python3Packages
+, version
, ...
}: {
absubmit = {
@@ -123,4 +124,16 @@
unimported.testPaths = [ ];
web.propagatedBuildInputs = [ python3Packages.flask ];
zero = { };
+ # NOTE: Condition can be removed once stable beets updates
+} // lib.optionalAttrs ((lib.versions.majorMinor version) != "1.6") {
+ limit = { };
+ substitute = {
+ testPaths = [ ];
+ };
+ advancedrewrite = {
+ testPaths = [ ];
+ };
+ autobpm = {
+ testPaths = [ ];
+ };
}
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index d4e589f098e4..fb8b6be0ed8a 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -36,7 +36,21 @@
let
inherit (lib) attrNames attrValues concatMap;
- mkPlugin = { name, enable ? !disableAllPlugins, builtin ? false, propagatedBuildInputs ? [ ], testPaths ? [ "test/test_${name}.py" ], wrapperBins ? [ ] }: {
+ mkPlugin = { name
+ , enable ? !disableAllPlugins
+ , builtin ? false
+ , propagatedBuildInputs ? [ ]
+ , testPaths ? [
+ # NOTE: This conditional can be removed when beets-stable is updated and
+ # the default plugins test path is changed
+ (if (lib.versions.majorMinor version) == "1.6" then
+ "test/test_${name}.py"
+ else
+ "test/plugins/test_${name}.py"
+ )
+ ]
+ , wrapperBins ? [ ]
+ }: {
inherit name enable builtin propagatedBuildInputs testPaths wrapperBins;
};
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index ba468895cc41..391974c4a4fd 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -22,6 +22,8 @@ lib.makeExtensible (self: {
beets-stable = callPackage ./common.nix rec {
inherit python3Packages;
+ # NOTE: ./builtin-plugins.nix and ./common.nix can have some conditionals
+ # be removed when stable version updates
version = "1.6.0";
src = fetchFromGitHub {
owner = "beetbox";
diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix
index e6800d943725..90c8719b48b3 100644
--- a/pkgs/tools/audio/patray/default.nix
+++ b/pkgs/tools/audio/patray/default.nix
@@ -6,11 +6,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "patray";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchPypi {
inherit version pname;
- sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g";
+ sha256 = "sha256-O8CBUexL2V1qI7bB/Lns3yjUvFOpC6spd/6asXa5+pw=";
};
patchPhase = ''
diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix
index 894840d2dd04..e34822845b40 100644
--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@@ -24,6 +24,12 @@ let
inherit sha256;
};
+ postPatch = ''
+ # Starting in 0.9.x series, Garage is using mold in local development
+ # and this leaks in this packaging, we remove it to use the default linker.
+ rm .cargo/config.toml || true
+ '';
+
inherit cargoSha256;
nativeBuildInputs = [ protobuf pkg-config ];
@@ -68,6 +74,7 @@ let
meta = {
description = "S3-compatible object store for small self-hosted geo-distributed deployments";
+ changelog = "https://git.deuxfleurs.fr/Deuxfleurs/garage/releases/tag/v${version}";
homepage = "https://garagehq.deuxfleurs.fr";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ nickcao _0x4A6F teutat3s raitobezarius ];
@@ -82,28 +89,22 @@ rec {
# we have to keep all the numbers in the version to handle major/minor/patch level.
# for <1.0.
- garage_0_8_4 = generic {
- version = "0.8.4";
- sha256 = "sha256-YgMw41ofM59h7OnHK1H8+Se5mZEdYypPIdkqbyX9qfs=";
- cargoSha256 = "sha256-dEtksOVqy5wAPoqCuXJj3c4TB6UbR8PTaB70fbL6iR8=";
+ garage_0_8_5 = generic {
+ version = "0.8.5";
+ sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I=";
+ cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI=";
+ broken = stdenv.isDarwin;
};
- garage_0_8 = garage_0_8_4;
+ garage_0_8 = garage_0_8_5;
- garage_0_9_0 = (generic {
- version = "0.9.0";
- sha256 = "sha256-Bw7ohMAfnbkhl43k8KxYu2OJd5689PqDS0vAcgU09W8=";
- cargoSha256 = "sha256-JqCt/8p24suQMRzEyTE2OkbzZCGUDLuGq32kCq3eZ7o=";
- }).overrideAttrs (oldAttrs: {
- patches = oldAttrs.patches or [ ] ++ [
- (fetchpatch {
- url = "https://git.deuxfleurs.fr/Deuxfleurs/garage/commit/c7f5dcd953ff1fdfa002a8bccfb43eafcc6fddd4.patch";
- sha256 = "sha256-q7E6gtPjnj5O/K837LMP6LPEFcgdkifxRFrYzBuqkk0=";
- })
- ];
- });
+ garage_0_9_1 = generic {
+ version = "0.9.1";
+ sha256 = "sha256-AXLaifVmZU4j5D/wKn/0TzhjHZBzZW1+tMyhsAo2eBU=";
+ cargoSha256 = "sha256-4/+OsM73TroBB1TGqare2xASO5KhqVyNkkss0Y0JZXg=";
+ };
- garage_0_9 = garage_0_9_0;
+ garage_0_9 = garage_0_9_1;
garage = garage_0_9;
}
diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix
index 9bbc98e729c4..c7e21e0521d4 100644
--- a/pkgs/tools/misc/logstash/7.x.nix
+++ b/pkgs/tools/misc/logstash/7.x.nix
@@ -16,14 +16,14 @@ let
hashes =
if enableUnfree
then {
- x86_64-linux = "sha512-U5G/7wnEA6NlUYo6jo8HW7eXSxNwlbPH/SoBc8+m29SnRRFwo2V6/vPmpGjpCjjW56W2aXmYePk4n6RP+P7gJg==";
- x86_64-darwin = "sha512-jjUWuCMppHUFNY+36rSGyjlCOtxEofBhw19roiWsLzczDyr8PjfrZStlNuXKNdd6wkhd7HQ/qNmd1PzGC928IQ==";
- aarch64-linux = "sha512-BvkaWqv/D4akFQ3mwf0C+20KRLBKxmBZfLTINWzx0iVSqqd4mdtCpJpeNbPK1zvl17rYys+0sX5iKUkynN95Gg==";
+ x86_64-linux = "sha512-ze0hJxUHCN52bOxUs5upDj64tIE58P2BTow2kaCo6HreRiF9rfTTzNkNr/hCmEgE+/oFbgSEuOQLz+6G373RDQ==";
+ x86_64-darwin = "sha512-FOFd8d+4UddSGorjuUWW/JbQ5fQH4LU1f1HJLmdbfnb8Q5L4GEveb2LmWNILU8/a85V4HGmD6lL8mCJqH9CULQ==";
+ aarch64-linux = "sha512-giYqW88/6iT3haXzJVn/+b7uxjYhHq4GERmiq3tMIvjxDyu7B6g+X7JneaTYxhpNdn6gOD/hfXgNv+hFRq6lgg==";
}
else {
- x86_64-linux = "sha512-uiLExBT0dRU4e7KMxHYSvqWK/5fEB/JXGGPoMXSivvJzYn9l3VMe2DPkBmjHkUSlAdScPsaRwbHE2PsMsSSwUg==";
- x86_64-darwin = "sha512-gal8oGwIb6wz8y6QEk9knV3c4J1kkCECD0NLdbW/9jBl+dyKome3LO3VgQibwk2xISL3Be+Laaz49Z8Rdxy/dw==";
- aarch64-linux = "sha512-ZK20GnobFLIdRjszPz9EcKTbkUDiiNN5v3lRDIMJHVyifpl5YddXzuIym4XRbabaihA4oArqux50q4+VuEGtCg==";
+ x86_64-linux = "sha512-OC9gx76k+RMdjqcDkrJCNbPYSQameyddaYMxUIB0foVxCmo6UvbdcwZGXRLPPn95in8rYOCjvPoBkmupiQw9xQ==";
+ x86_64-darwin = "sha512-1OEfEED/jjlT3Fd095Y5VYiWKnovytI3UYCCy1Rs3tEvkZPHYwqIQHfMQYeAvGgUci37ADwEDu8xrSQULHToLw==";
+ aarch64-linux = "sha512-QWW0AXOMNIXThxpUiRomvINm+917MvGrSDndrEw11IYYuvi0d0dckJiRytfnBbBNoOKpVhB68uOmfjIcZBNpWQ==";
};
this = stdenv.mkDerivation rec {
version = elk7Version;
diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix
index 5e41535a220d..ddfc8b7f11f7 100644
--- a/pkgs/tools/misc/steampipe/default.nix
+++ b/pkgs/tools/misc/steampipe/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "steampipe";
- version = "0.21.2";
+ version = "0.21.3";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
- hash = "sha256-baZF1qrRCAF3MjwDb43ejHSFsqVFrIULOsopRRaUZPs=";
+ hash = "sha256-Qbg6f8fIupAEiiT7gDRQCs3pe1lw+tO5va5PpwgATfk=";
};
vendorHash = "sha256-XwFBXQw6OfxIQWYidTj+TLn0TrVTrfVry6MgiQWIoV4=";
diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix
index ad430b9163e6..c068c4ac1f42 100644
--- a/pkgs/tools/networking/kapp/default.nix
+++ b/pkgs/tools/networking/kapp/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kapp";
- version = "0.59.2";
+ version = "0.60.0";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "kapp";
rev = "v${version}";
- sha256 = "sha256-fDGQQo5REKtBlyBDZ4FTLGeayc14cppMmfLsXZtUJpA=";
+ sha256 = "sha256-o1MFbyjgOvhgcrlkbYGn0+nHENL2STFiD9CUkCdB56E=";
};
vendorHash = null;
diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/tools/security/govulncheck/default.nix
index 1b7ee6cf015d..746c72a017e8 100644
--- a/pkgs/tools/security/govulncheck/default.nix
+++ b/pkgs/tools/security/govulncheck/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "govulncheck";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "golang";
repo = "vuln";
rev = "refs/tags/v${version}";
- hash = "sha256-cewQ03dK/k3mXevE09M01Yox/3ZWP6IrG0H4QsZMzy8=";
+ hash = "sha256-vTHP7I3r7EAt4puh7bonKj6A94j169tKWgTfxASWyo0=";
};
patches = [
@@ -23,7 +23,7 @@ buildGoModule rec {
})
];
- vendorHash = "sha256-r9XshbgVA5rppJF46SFYPad344ZHMLWTHTnL6vbIFH8=";
+ vendorHash = "sha256-Jg2Nx63Xak149111jbBP6SgK3hze21Dx5qcDKXCqa48=";
subPackages = [
"cmd/govulncheck"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66d25d7a6c16..0a5755ef0451 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7952,7 +7952,7 @@ with pkgs;
# The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
# When updating make sure to update all plugins or they will break!
- elk7Version = "7.17.10";
+ elk7Version = "7.17.16";
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
util-linux = util-linuxMinimal;
@@ -8472,7 +8472,7 @@ with pkgs;
})
garage
garage_0_8 garage_0_9
- garage_0_8_4 garage_0_9_0;
+ garage_0_8_5 garage_0_9_1;
garmintools = callPackage ../development/libraries/garmintools { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 572ccc701e51..e1e4f350ceb8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -22426,6 +22426,13 @@ with self; {
url = "mirror://cpan/authors/id/F/FR/FRACTAL/Session-Token-1.503.tar.gz";
hash = "sha256-MsPflu9FXHGHA2Os2VDdxPvISMWU9LxVshtEz5efeaE=";
};
+ patches = [
+ # Add final null-byte to tokens. https://github.com/hoytech/Session-Token/pull/3
+ (fetchpatch {
+ url = "https://github.com/hoytech/Session-Token/commit/cd64e7b69986054bb715755290811308159b7959.patch";
+ hash = "sha256-nMQmdvVQW8cQYO0+bLJcdVfSOLVIsongk+71fQ7fQdU=";
+ })
+ ];
meta = {
description = "Secure, efficient, simple random session token generation";
homepage = "https://github.com/hoytech/Session-Token";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b07c3644e9c..5748a058846d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13706,6 +13706,8 @@ self: super: with self; {
spyse-python = callPackage ../development/python-modules/spyse-python { };
+ spython = callPackage ../development/python-modules/spython { };
+
sqids = callPackage ../development/python-modules/sqids { };
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };