go1.19 -> go1.20 upgrade for dendrite

Signed-off-by: Enes Öztürk <[email protected]>
mbssrc · May 16, 2024 · 1afd458 · 1afd458
1 parent 2ca6421
commit 1afd458
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/modules/common/services/dendrite-pinecone.nix b/modules/common/services/dendrite-pinecone.nix
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 {
   config,
-  options,
   lib,
   pkgs,
   ...
@@ -15,10 +14,10 @@ in
     ];
 
     options.ghaf.services.dendrite-pinecone = {
-      firewallConfig = mkEnableOption "Enable dendrite pinecone module firewall configurations. It must be enabled only in netvm";
-
       enable = mkEnableOption "Enable dendrite pinecone module";
 
+      firewallConfig = mkEnableOption "Enable dendrite pinecone module firewall configurations. It must be enabled only in netvm";
+
       externalNic = mkOption {
         type = types.str;
         default = "";

diff --git a/packages/dendrite-pinecone/default.nix b/packages/dendrite-pinecone/default.nix
@@ -3,7 +3,7 @@
 #
 {pkgs, ...}:
 with pkgs;
-  buildGo119Module rec {
+  buildGoModule rec {
     pname = "dendrite-pinecone";
     version = "0.9.1";
 
@@ -16,11 +16,11 @@ with pkgs;
       owner = "tiiuae";
       repo = "dendrite";
       # branch is feature/ghaf-integration
-      rev = "53036309e34420bde92b81ac214985c3fa3fb975";
-      sha256 = "sha256-UhA9deqWu3ERa08GMGV6/NVHEBZaAdPf7hXQb3GTRcA=";
+      rev = "d8e62f3d1bf6607d243c53673fc02064fed863e8";
+      sha256 = "sha256-GtaFDfXssym3eNrTSOB8JW2awIvZsTGdUPdLL+ae7Pw=";
     };
     subPackages = ["cmd/dendrite-demo-pinecone"];
     # patches = [./turnserver-crendentials-flags.patch];
 
-    vendorHash = "sha256-xMOd4N3hjajpNl9zxJnPrPIJjS292mFthpIQUHWqoYI=";
+    vendorHash = "sha256-599pZlX7SdUYOmGnYGIngyPKagIxri6KKJh+e5UDBps=";
   }
diff --git a/targets/lenovo-x1/netvmExtraModules.nix b/targets/lenovo-x1/netvmExtraModules.nix
@@ -90,6 +90,7 @@
     time.timeZone = "Asia/Dubai";
 
     ghaf.services.dendrite-pinecone = {
+      enable = true;
       firewallConfig = true;
       externalNic = "${externalNic}";
       internalNic = "${internalNic}";