diff --git a/nixos/tests/kimai.nix b/nixos/tests/kimai.nix index 967d531f3c54..526aa7faeeb6 100644 --- a/nixos/tests/kimai.nix +++ b/nixos/tests/kimai.nix @@ -17,5 +17,8 @@ machine.wait_for_unit("nginx.service") machine.wait_for_open_port(80) machine.succeed("curl -v --location --fail http://localhost/") + # Make sure bundled assets are served. + # https://github.com/NixOS/nixpkgs/issues/442208 + machine.succeed("curl -v --location --fail http://localhost/bundles/tabler/tabler.css") ''; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index cb741ef730fd..25663ca9e60c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-y0Bjrxmp7DYV4iUDnQGC0aIYrQNM3oPicajbeVuEtqc="; - x86_64-darwin = "sha256-6/BiMvVp955PW0hz22+NzdvC+IC+pNYjz25n3Op6V/k="; - aarch64-linux = "sha256-DF8QnqvVFqNyxjrphR6NaUXOKr8Koe34NitRa5mTBYs="; - aarch64-darwin = "sha256-v+m8AMpPph6CztUCjneBKC9txEOAKvcHsAXr/8KjIeA="; - armv7l-linux = "sha256-py1FZYd77YVNloQbXm36ou4HGowmteY8HzOiUioGD8Y="; + x86_64-linux = "sha256-0zgsR0nk9zsOeEcKhrmAFbAhvKKFNsC8fXjCnxFcndE="; + x86_64-darwin = "sha256-4+3T3axXNfePEkevhLwRPeqoxKs2OTL7B7TiV2BxZWc="; + aarch64-linux = "sha256-iGLtuVFA5NphiF1PU9Pus/nZ8PyCNNzDOpcQ+utYE2I="; + aarch64-darwin = "sha256-E4BopxbqH1lg1Q2NlyWjH8jytabiv5y4hG5ZJW4nqzs="; + armv7l-linux = "sha256-YIidKSsqK3DSAfPd7O1pbft1C/ny/iB+CFbR/T9u7L8="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.104.1"; + version = "1.104.2"; # This is used for VS Code - Remote SSH test - rev = "0f0d87fa9e96c856c5212fc86db137ac0d783365"; + rev = "e3a5acfb517a443235981655413d566533107e92"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-o0O/WDH+hr3R9np+WPLJo+/nIVBRjP8H2JVwa8volfg="; + hash = "sha256-Tz1P8eGokG+8thao9dRllAdTxvllhfOEDKH9lC2QwB0="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index 9a14753cb219..82c36600c333 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keka"; - version = "1.4.6"; + version = "1.6.0"; src = fetchzip { url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; - hash = "sha256-IgPnXHVtAaSOsaAYvo0ELRqvXpF2qAnJ/1QZ+FHzqn4="; + hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + iedame + ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index a5eb7fd6948b..5588625860bb 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -41,13 +41,16 @@ php.buildComposerProject2 (finalAttrs: { vendorHash = "sha256-smDAz4RnVEgPcGjsQmN0NC8kWgLw78YFuef9gbajAeQ="; composerNoPlugins = false; - composerNoScripts = false; postInstall = '' # Make available the console utility, as Kimai doesn't list this in # composer.json. mkdir -p "$out"/share/php/kimai "$out"/bin ln -s "$out"/share/php/kimai/bin/console "$out"/bin/console + + # Install bundled assets. This is normally done in the `composer install` + # post-install script, but it's being skipped. + (cd "$out"/share/php/kimai && php ./bin/console assets:install) ''; passthru.tests = { diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index 262cc926e074..c505bdb229b2 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.64.1"; + version = "2.64.2"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-qqfJ8nYI1y74sGJDbwrq0mT03em62BmU+y6GPmUUIIo="; + hash = "sha256-82zXMcIQPXTjMnKwhfpkm2apwDXLwKpbyglah6yHz/E="; }; desktopItems = [ diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 5d9cd54783a6..b1766310f304 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.119.0"; + version = "1.127.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gc3B3JmTbINdPJ8PIhcuQhFD+FoxNOskoBEcDoMAUUk="; + hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI="; }; vendorHash = null; @@ -58,6 +58,10 @@ buildGoModule (finalAttrs: { # This appears to be some kind of test server for development purposes only. rm -f app/vmui/packages/vmui/web/{go.mod,main.go} + # Allow older go versions + substituteInPlace go.mod \ + --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}" + # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ --replace-fail "time.After(10 " "time.After(120 " \ diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index 0178f620c1d3..4ac1ade56c3e 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -1,9 +1,7 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system distutils, @@ -23,18 +21,21 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.4"; + version = "3.4.5"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "python-ldap"; repo = "python-ldap"; tag = "python-ldap-${version}"; - hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; + hash = "sha256-olRu5HacRKaAcNbQczA+UCbDxhySUOO7qH0KdWlSbT0="; }; + postPatch = '' + # unused in 3.4.5; https://github.com/python-ldap/python-ldap/pull/597 + sed -i "/setuptools-scm/d" pyproject.toml + ''; + build-system = [ distutils setuptools @@ -68,7 +69,7 @@ buildPythonPackage rec { "test_tls_ext_noca" ]; - doCheck = !stdenv.hostPlatform.isDarwin; + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Python modules for implementing LDAP clients"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 19e411108751..41ed246c4f92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -72,12 +72,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else production; production = generic { - version = "570.153.02"; - sha256_64bit = "sha256-FIiG5PaVdvqPpnFA5uXdblH5Cy7HSmXxp6czTfpd4bY="; - sha256_aarch64 = "sha256-FKhtEVChfw/1sV5FlFVmia/kE1HbahDJaxTlpNETlrA="; - openSha256 = "sha256-2DpY3rgQjYFuPfTY4U/5TcrvNqsWWnsOSX0f2TfVgTs="; - settingsSha256 = "sha256-5m6caud68Owy4WNqxlIQPXgEmbTe4kZV2vZyTWHWe+M="; - persistencedSha256 = "sha256-OSo4Od7NmezRdGm7BLLzYseWABwNGdsomBCkOsNvOxA="; + version = "570.195.03"; + sha256_64bit = "sha256-1H3oHZpRNJamCtyc+nL+nhYsZfJyL7lgxPUxvXrF3B4="; + sha256_aarch64 = "sha256-o4rgB6vo+Cv90lJywovIyVARRGS3R15zYQUj+f1nzWQ="; + openSha256 = "sha256-vCBB/UJgVKHlSEWdgoF45lODr3YJmR6JwjrwWgWszBw="; + settingsSha256 = "sha256-mjKkMEPV6W69PO8jKAKxAS861B82CtCpwVTeNr5CqUY="; + persistencedSha256 = "sha256-BMpo2PIabhHjZQqUQi/W5DYhgAPmfCdFvXdN6ND2Bfs="; patches = [ gpl_symbols_linux_615_patch ]; }; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 744243f19793..56adb31fa006 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec { wordpress = wordpress_6_8; wordpress_6_7 = { - version = "6.7.2"; - hash = "sha256-z9nIPPqd2gNRiY6ptz9YmVyBeZSlQkvhh3f4PohqPPY="; + version = "6.7.3"; + hash = "sha256-zWLpZ/NKla1u4CHh2Bu0P7UmFWvnuTUheRq6Bq5NZjU="; }; wordpress_6_8 = { version = "6.8.3";