gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into current

Browse Source
This commit is contained in:
Florian Brandes
2025-10-11 09:07:47 +02:00
parent 0b09c6740e 5395582b5c
commit e74d7c029b
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/lxd-image-server.nix
View File

@@ -73,10 +73,7 @@ in
description = "LXD Image Server"; description = "LXD Image Server";
script = '' reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];
${pkgs.lxd-image-server}/bin/lxd-image-server init
${pkgs.lxd-image-server}/bin/lxd-image-server watch
'';
serviceConfig = { serviceConfig = {
User = "lxd-image-server"; User = "lxd-image-server";
@@ -84,6 +81,8 @@ in
DynamicUser = true; DynamicUser = true;
LogsDirectory = "lxd-image-server"; LogsDirectory = "lxd-image-server";
RuntimeDirectory = "lxd-image-server"; RuntimeDirectory = "lxd-image-server";
ExecStartPre = "${pkgs.lxd-image-server}/bin/lxd-image-server init";
ExecStart = "${pkgs.lxd-image-server}/bin/lxd-image-server watch";
ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload"; ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
ReadWritePaths = [ location ]; ReadWritePaths = [ location ];
}; };

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@@ -3863,8 +3863,8 @@ let
mktplcRef = { mktplcRef = {
publisher = "redhat"; publisher = "redhat";
name = "vscode-yaml"; name = "vscode-yaml";
version = "1.19.0"; version = "1.19.1";
hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls="; hash = "sha256-ZLuGtB7DjIVrcYomcwptwJxGmIjz0Vu1fCFqYb2XLk4=";
}; };
meta = { meta = {
description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support"; description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";

4
pkgs/by-name/ba/bashunit/package.nix
View File

@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bashunit"; pname = "bashunit";
version = "0.24.0"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TypedDevs"; owner = "TypedDevs";
repo = "bashunit"; repo = "bashunit";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-TIt1EG/KQCslwZH9seF5SUgH242ZkUkWf8HWqNBIrD0="; hash = "sha256-GYHI1vrZ+WlHCWR9O1LrVSFr3+HKO8aBLSs79RJyl2Y=";
forceFetchGit = true; # needed to include the tests directory for the check phase forceFetchGit = true; # needed to include the tests directory for the check phase
}; };

6
pkgs/by-name/bo/bookstack/package.nix
View File

@@ -8,16 +8,16 @@
php83.buildComposerProject2 (finalAttrs: { php83.buildComposerProject2 (finalAttrs: {
pname = "bookstack"; pname = "bookstack";
version = "25.07.2"; version = "25.07.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bookstackapp"; owner = "bookstackapp";
repo = "bookstack"; repo = "bookstack";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-j6vDox70HPLwBlBDyewpwi1FUpNq62fj9RvqppjZ16Q="; hash = "sha256-DR15EkvoFzAFo8Gv1bqD9ry4WtbNSIiR7qii1Va2b2g=";
}; };
vendorHash = "sha256-UjIFk23BFfghieHnvomU0UAwZJslN8ya+IDat001RrE="; vendorHash = "sha256-OTsH7MOmbhu6xeBg9YfUk08bjQEFU0Br+oXcuZUCVME=";
passthru = { passthru = {
phpPackage = php83; phpPackage = php83;

6
pkgs/by-name/cl/cloudflare-warp/package.nix
View File

@@ -24,15 +24,15 @@
}: }:
let let
version = "2025.7.176"; version = "2025.8.779";
sources = { sources = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb"; url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_amd64.deb";
hash = "sha256-tRz7T3Sevf00ViWYALzSdiyY1i3BEnFQUjRFs+Uybbk="; hash = "sha256-488sXR0CqZAkeXSMawYVXHszK9NXsTCQc5RAd87Hj9k=";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb"; url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_arm64.deb";
hash = "sha256-GYMC+v3yqP2G+WILhTTGg5SGnb7ts5MpWrhulj4udqA="; hash = "sha256-rLDGY8kmYU/B0wks20oE1sQ7luaX6teTNfWZ6atJzhU=";
}; };
}; };
in in

4
pkgs/development/php-packages/xdebug/default.nix
View File

@@ -5,7 +5,7 @@
}: }:
let let
version = "3.4.5"; version = "3.4.6";
in in
buildPecl { buildPecl {
inherit version; inherit version;
@@ -16,7 +16,7 @@ buildPecl {
owner = "xdebug"; owner = "xdebug";
repo = "xdebug"; repo = "xdebug";
rev = version; rev = version;
hash = "sha256-tJNN1GNEH3z/bsmzNMPoF6TAgOQ4EiM4QheqmhCQzM4="; hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
}; };
doCheck = true; doCheck = true;