diff --git a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix index dd08a89ffcdb..28c500f63608 100644 --- a/nixos/modules/services/continuous-integration/gitea-actions-runner.nix +++ b/nixos/modules/services/continuous-integration/gitea-actions-runner.nix @@ -12,6 +12,7 @@ let attrValues concatStringsSep escapeShellArg + getExe hasInfix hasSuffix optionalAttrs @@ -36,7 +37,7 @@ let # Check whether any runner instance label requires a container runtime # Empty label strings result in the upstream defined defaultLabels, which require docker - # https://gitea.com/gitea/act_runner/src/tag/v0.1.5/internal/app/cmd/register.go#L93-L98 + # https://gitea.com/gitea/runner/src/tag/v0.1.5/internal/app/cmd/register.go#L93-L98 hasDockerScheme = instance: instance.labels == [ ] || any (label: hasInfix ":docker:" label) instance.labels; wantsContainerRuntime = any hasDockerScheme (attrValues cfg.instances); @@ -53,7 +54,7 @@ let || (instance.token != null && instance.tokenFile == null); in { - meta.maintainers = [ ]; + meta.maintainers = pkgs.gitea-actions-runner.meta.maintainers; options.services.gitea-actions-runner = with types; { package = mkPackageOption pkgs "gitea-actions-runner" { }; @@ -123,8 +124,8 @@ in }; settings = mkOption { description = '' - Configuration for `act_runner daemon`. - See for an example configuration + Configuration for gitea-runner daemon. + See for an example configuration ''; type = types.submodule { @@ -252,7 +253,7 @@ in rm -v "$INSTANCE_DIR/.runner" || true # perform the registration - ${cfg.package}/bin/act_runner register --no-interactive \ + ${getExe cfg.package} register --no-interactive \ --instance ${escapeShellArg instance.url} \ --token "$TOKEN" \ --name ${escapeShellArg instance.name} \ @@ -266,7 +267,7 @@ in '') ]; - ExecStart = "${cfg.package}/bin/act_runner daemon --config ${configFile}"; + ExecStart = "${getExe cfg.package} daemon --config ${configFile}"; SupplementaryGroups = optionals wantsDocker [ "docker" diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index c58832daac19..3c15fbedfc9c 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -190,7 +190,6 @@ in priority = 1100; extraConfig = '' add_header Cache-Control 'public, max-age=604800, must-revalidate'; - client_max_body_size ${toString cfg.maxAttachmentSize}; ''; }; locations."~ ^/(SQL|bin|config|logs|temp|vendor)/" = { @@ -213,6 +212,8 @@ in fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_split_path_info ^(.+\.php)(/.+)$; include ${config.services.nginx.package}/conf/fastcgi.conf; + + client_max_body_size ${toString cfg.maxAttachmentSize}; ''; }; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 54403b0ea321..df945098ef7b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -79,6 +79,16 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace emacs/notmuch-emacs-mua \ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient' + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # The configure script runs the minimal test program + # when checking support for address and thread sanitizer (asan and tsan). + # On Darwin the minimal test program hangs when compiled + # with the asan and tsan compile options. + # Since asan and tsan are supported on Darwin the runtime + # check is skipped as follows: + substituteInPlace configure \ + --replace './minimal' 'true' ''; configureFlags = [ diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 95a1910bbcd5..ccc934038cdb 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.638" + "codebuff": "^1.0.674" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.638", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.638.tgz", - "integrity": "sha512-AVjN8qPQ+7gZ30Y1NpdtycatSKg/K4FPRrgAr1Lc/tYQ7kmfTKopYpPiawF2Q+v3pO9K2jFNoVihvcLzEv+ewA==", + "version": "1.0.674", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.674.tgz", + "integrity": "sha512-xzsFsB2E/En+pPxIGKcA4V1Yc4ObVe9s3NXW1FQA/KYeTaGUp3IKIS49wp1pQ+rCjaQHkb8YCSrb7Zxq/DNmKg==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index d971428d85ff..9a56657fcce1 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "codebuff"; - version = "1.0.638"; + version = "1.0.674"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz"; - hash = "sha256-Fyu2T3HGwKfECiw0zyRMH29iDAlrtpzvkoqswJiPl6Y="; + hash = "sha256-dWOeqO55A0ZyZyFgtl+aSXeD2EiQBoGPuqaecfgKNaY="; }; strictDeps = true; - npmDepsHash = "sha256-Wb0FbeuzkKg3ljirUFX2ZHx1WS1K2lyuha9qWUncsiI="; + npmDepsHash = "sha256-xFtWLqpzRdXN+JO2ueKqRWe/GaNE1yb2LFrFvAETcBU="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index 271b809729ce..400d2e707612 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs ( inherit steamDisplayName; pname = "dwproton-bin"; - version = "dwproton-10.0-26"; + version = "dwproton-11.0-1"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-TkwhJCHPS0PdDIEL5GrxJPR09uO9U2DR8l9KWFLIF2g="; + hash = "sha256-G8VeHp0POZBHfxN78PCwwm6z7zVNMveAdwf/IMJQ/9Q="; }; preFixup = '' diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix index b0732b0dbd6b..6f8dc249f6f4 100644 --- a/pkgs/by-name/gi/gitea-actions-runner/package.nix +++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix @@ -8,35 +8,45 @@ buildGoModule (finalAttrs: { pname = "gitea-actions-runner"; - version = "0.4.0"; + version = "1.0.3"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; - repo = "act_runner"; + repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-trKp5tIhvvb6VJ04iIpFD4Q/VK/V1urkbXEpGMwaEsE="; + hash = "sha256-p6NdkQiZiEeuQjJp3CKTayStZlyk3d1XGigSI5uuLp0="; }; - vendorHash = "sha256-dUUe4BbBmRP9MImq/PYTGssv3M2Zn84oCxH5BKf9btg="; + vendorHash = "sha256-T1T5ZpGqGmipIkTWlYxlsLdAthW8bhcAvr0xyZ74+wQ="; + + # Tests require network access (artifactcache tests try to determine outbound IP) + doCheck = false; ldflags = [ "-s" "-w" - "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=v${finalAttrs.version}" + "-X gitea.com/gitea/runner/internal/pkg/ver.version=v${finalAttrs.version}" ]; + postInstall = '' + mv "$out/bin/runner" "$out/bin/gitea-runner" + ''; + passthru.tests.version = testers.testVersion { package = gitea-actions-runner; version = "v${finalAttrs.version}"; }; meta = { - mainProgram = "act_runner"; - maintainers = with lib.maintainers; [ techknowlogick ]; - license = lib.licenses.mit; - changelog = "https://gitea.com/gitea/act_runner/releases/tag/v${finalAttrs.version}"; - homepage = "https://gitea.com/gitea/act_runner"; + changelog = "https://gitea.com/gitea/runner/releases/tag/v${finalAttrs.version}"; description = "Runner for Gitea based on act"; + homepage = "https://gitea.com/gitea/runner"; + license = lib.licenses.mit; + mainProgram = "gitea-runner"; + maintainers = with lib.maintainers; [ + superherointj + techknowlogick + ]; }; }) diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 05d08b75441c..6d9d92c75128 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.36.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-VsecD83dz6U6jEaGIxv7M9ePzbTPCXeffSoyyBr2Vh4="; + hash = "sha256-/mrDwRj6A2reMYdbBphgx+cFqjKwefbyWcSiyUOuU00="; }; - npmDepsHash = "sha256-ljko66NYBgwyvgIbqnexfbSaILNf/74qrNXZUsHT8/o="; + npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 2db23a8950b9..bfa500012e6a 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.8.2"; + version = "26.1"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; tag = "v${version}"; - hash = "sha256-VCl0dHnMlmkyGFeLPACi2ZC66ebrDraw+JABNomWP4k="; + hash = "sha256-vvJTEfqkxnh7TWnqBtT39nVyVTVQyAKVI6fDjOiiuPk="; }; nativeBuildInputs = [ qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/un/unity-test/package.nix b/pkgs/by-name/un/unity-test/package.nix index b8e800567c6c..b8b671441320 100644 --- a/pkgs/by-name/un/unity-test/package.nix +++ b/pkgs/by-name/un/unity-test/package.nix @@ -27,6 +27,7 @@ let "-Wno-unsafe-buffer-usage" "-Wno-reserved-identifier" "-Wno-extra-semi-stmt" + "-Wno-implicit-void-ptr-cast" ]; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix index 15e06f9e0fe9..d16ef319149d 100644 --- a/pkgs/by-name/wa/warpgate/package.nix +++ b/pkgs/by-name/wa/warpgate/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage ( patches = [ ./web-ui-package-json.patch ]; - npmDepsHash = "sha256-jRY3vR9rwqQc1WjxIuPb797ZXXrgDYNZ947fERxJ0zA="; + npmDepsHash = "sha256-JW3nibMIETj5PQcaNRS5UVZgguSvGd9Bw8uGD3kb5uM="; nativeBuildInputs = [ openapi-generator-cli ]; @@ -35,16 +35,16 @@ rustPlatform.buildRustPackage ( in { pname = "warpgate"; - version = "0.23.1"; + version = "0.23.4"; src = fetchFromGitHub { owner = "warp-tech"; repo = "warpgate"; tag = "v${finalAttrs.version}"; - hash = "sha256-GayjhHkD9LtuR7dz7tw1smz4fPwOl8R9X9QTgx9snnM="; + hash = "sha256-/IhnDBQq7Ed5vaGiCHNTcE7Uu9b9VrBN1ipCd2Tai1o="; }; - cargoHash = "sha256-Y3oVvQkZDmGmmxUYrWSP6qKZ4hgjly+t98PRmi88oaY="; + cargoHash = "sha256-PRR+bzvmWcWUVdV1HqDqD08SwvDCvGXMvkIVoFEnaQI="; patches = [ (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; }) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 4d020513e380..f7bbb4f571b6 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -97,7 +97,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "1.1.7"; + version = "1.2.3"; outputs = [ "out" @@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-S3LMLJhmLCA5FqjZFk+N2pCLGxDxIcwlSdKor/DQ5ps="; + hash = "sha256-ACoHKgc7kazCSpWkCgbGxqt6mWgpFflkeCUbglELMXs="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-pAoB4cvNsdx8oKq7J+YdFM3VaM+mwBQwUzFFxJGnGMw="; + cargoHash = "sha256-VTNElK6+g2hPJUvI12qbWnCe3TJDWMfsgkCuTnygVTY="; __structuredAttrs = true; diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index e5cdab23eaae..30aaf68b387a 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -15,13 +15,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "6.18.1"; + version = "6.18.2"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-Ev+5BhLkqxluPf86tDgoK/YQD22mMmBWm/LHaUamxX8="; + hash = "sha256-1z/0nvwQ0cyYWl+LDhCTZQhEzKU/RgSbHejqoZLDRSo="; }; # Do not publish cards, currently broken, attempting to write to nix store.