about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMoritz Sanft <58110325+msanft@users.noreply.github.com>2024-06-09 19:06:00 +0200
committerMoritz Sanft <58110325+msanft@users.noreply.github.com>2024-06-11 08:23:00 +0200
commit4f1a81e9faf706339b460d8a436b4927c2bf5c21 (patch)
tree1719719eeb10c211e02d1da6593cee53f90d3677
parent8793dda3894cd837baecf5be0be825f1bc284d0f (diff)
coyim: migrate to buildGoModule
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
-rw-r--r--pkgs/by-name/co/coyim/package.nix (renamed from pkgs/applications/networking/instant-messengers/coyim/default.nix)20
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/by-name/co/coyim/package.nix
index 94606d6087a8a..a4790c23f0fd0 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/by-name/co/coyim/package.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, buildGoPackage
+, buildGoModule
 , fetchFromGitHub
 , pkg-config
 , cairo
@@ -11,28 +11,28 @@
 , gtk3
 }:
 
-buildGoPackage rec {
+buildGoModule {
   pname = "coyim";
-  version = "0.4.1";
-
-  goPackagePath = "github.com/coyim/coyim";
+  version = "0.4.1-unstable-2023-09-21";
 
   src = fetchFromGitHub {
     owner = "coyim";
     repo = "coyim";
-    rev = "v${version}";
-    sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI=";
+    rev = "3f84daa8c27277543b1b4ad4536dde5100d9df12";
+    sha256 = "sha256-lzhcUSBuAgYwcmdwnqNxKG0P6ZSjWeLS/g/gaF171D4=";
   };
 
+  vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y=";
+
   nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
 
   buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ];
 
-  meta = with lib; {
-    description = "Safe and secure chat client";
+  meta = {
+    description = "a safe and secure chat client";
     mainProgram = "coyim";
     homepage = "https://coy.im/";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     broken = stdenv.isDarwin;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1068f2ed4f216..96751ca1de3d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30107,8 +30107,6 @@ with pkgs;
 
   coursera-dl = callPackage ../applications/misc/coursera-dl { };
 
-  coyim = callPackage ../applications/networking/instant-messengers/coyim { };
-
   cozy-drive = callPackage ../applications/networking/cozy-drive { };
 
   cplay-ng = callPackage ../applications/audio/cplay-ng { };