about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-12-09 18:00:56 +0000
committerGitHub <noreply@github.com>2023-12-09 18:00:56 +0000
commit7c846b760dc09e6bf57b1f7c89f099c53f7a34c8 (patch)
treea5f584f5eca3e5d42c286f332fa463a5d82fd02b /pkgs/servers
parent870c9dd13915963df9c5c3591661e10bea62c8c9 (diff)
parent68f23b0bbe1953968f94b007dec4a0f5529acbbf (diff)
downloadnixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar.gz
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar.bz2
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar.lz
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar.xz
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.tar.zst
nixlib-7c846b760dc09e6bf57b1f7c89f099c53f7a34c8.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/caddy/default.nix6
-rw-r--r--pkgs/servers/guacamole-client/default.nix4
-rw-r--r--pkgs/servers/guacamole-server/default.nix4
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 26140404cc55..399ce426d9dc 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -7,7 +7,7 @@
 , installShellFiles
 }:
 let
-  version = "2.7.5";
+  version = "2.7.6";
   dist = fetchFromGitHub {
     owner = "caddyserver";
     repo = "dist";
@@ -23,10 +23,10 @@ buildGoModule {
     owner = "caddyserver";
     repo = "caddy";
     rev = "v${version}";
-    hash = "sha256-0IZZ7mkEzZI2Y8ed//m0tbBQZ0YcCXA0/b10ntNIXUk=";
+    hash = "sha256-th0R3Q1nGT0q5PGOygtD1/CpJmrT5TYagrwQR4t/Fvg=";
   };
 
-  vendorHash = "sha256-YNcQtjPGQ0XMSog+sWlH4lG/QdbdI0Lyh/fUGqQUFaY=";
+  vendorHash = "sha256-ebnSehuhbCY58ctM8IRVMfNxxbJBp6ht9cbuLdGFNek=";
 
   subPackages = [ "cmd/caddy" ];
 
diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix
index d4e94dea0dad..db10f2851df2 100644
--- a/pkgs/servers/guacamole-client/default.nix
+++ b/pkgs/servers/guacamole-client/default.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "guacamole-client";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchurl {
     url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war";
-    hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE=";
+    hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix
index 8f14e7d9545c..58628b48a5b8 100644
--- a/pkgs/servers/guacamole-server/default.nix
+++ b/pkgs/servers/guacamole-server/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guacamole-server";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "guacamole-server";
     rev = finalAttrs.version;
-    hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM=";
+    hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY=";
   };
 
   NIX_CFLAGS_COMPILE = [