Unverified Commit a1401376 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #248111 from NixOS/guacamole/bump-1.5.3

guacamole-{client, server}: 1.5.2 -> 1.5.3
parents 9ae97d9a 58d81c5a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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;
+3 −3
Original line number Diff line number Diff line
@@ -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";
  };
})