summary refs log tree commit diff
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2023-08-09 13:07:46 +0200
committerGitHub <noreply@github.com>2023-08-09 13:07:46 +0200
commita14013769370b021e23200e7199d8cfaeb97098a (patch)
tree0b2b9978a3a214599210b0c710d62b4615032852
parent9ae97d9a19ce89b61a4877b1c8097d0dac6456e3 (diff)
parent58d81c5a561153d36317707918356816056aa0f6 (diff)
downloadnixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar.gz
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar.bz2
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar.lz
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar.xz
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.tar.zst
nixpkgs-a14013769370b021e23200e7199d8cfaeb97098a.zip
Merge pull request #248111 from NixOS/guacamole/bump-1.5.3
guacamole-{client, server}: 1.5.2 -> 1.5.3
-rw-r--r--pkgs/servers/guacamole-client/default.nix4
-rw-r--r--pkgs/servers/guacamole-server/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix
index dde48ffc244..d4e94dea0da 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.2";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war";
-    hash = "sha256-hu/DABbkA4lI2MGlw3oLBeONrdMQTbbsA3VbxuMRHEA=";
+    hash = "sha256-FaNObtbPbwP+IPkPZ9LWCXE6ic08syT4nt8edpbm7WE=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix
index 202088c58c2..8f14e7d9545 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.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "guacamole-server";
     rev = finalAttrs.version;
-    hash = "sha256-L1hFZ24kwTSHwqCUslnt5cBKkNh1cpVxu1ntTN1gFr0=";
+    hash = "sha256-8VPhaZ+XnbDElF5MOpbA8MDDTUkou9O2z4NUdWwW4FM=";
   };
 
   NIX_CFLAGS_COMPILE = [
@@ -89,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Clientless remote desktop gateway";
     homepage = "https://guacamole.apache.org/";
     license = lib.licenses.asl20;
+    mainProgram = "guacd";
     maintainers = [ lib.maintainers.drupol ];
     platforms = [ "x86_64-linux" "i686-linux" ];
-    mainProgram = "guacd";
   };
 })