home

commit dd1da9fa4fe1b52054f20ce6fa720c0b69d9ccf5
parent 4661701dc8f14fcf19f05db5ca9621d19f52f72c
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 27 May 2024 16:12:48 +0200

Use upstream gosmee package 😅

The PR is finally merged in nixpkgs.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
nix/packages/default.nix
 | 
3
---
D
nix/packages/gosmee/default.nix
 | 
33
---------------------------------
M
systems/modules/services/gosmee.nix
 | 
2
+-
M
users/vincent/dev/go.nix
 | 
2
+-

4 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -24,9 +24,6 @@ rec {
   #protobuild = pkgs.callPackage ./protobuild { };
   rmapi = pkgs.callPackage ./rmapi { };
   yaspell = pkgs.callPackage ./yaspell { };
-  gosmee = pkgs.callPackage ./gosmee {
-    buildGoModule = pkgs.buildGo121Module;
-  };
 
   operator-tool = pkgs.callPackage ./operator-tooling { };
 
diff --git a/nix/packages/gosmee/default.nix b/nix/packages/gosmee/default.nix
@@ -1,33 +0,0 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  name = "gosmee-${version}";
-  version = "0.14.0";
-  rev = "${version}";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "chmouel";
-    repo = "gosmee";
-    sha256 = "sha256-VKH0ajtLndTdW0dOY3XpixkTGy7Kvac7poFZVzj5HQU=";
-  };
-  vendorHash = null;
-
-  postUnpack = ''
-    printf ${version} > $sourceRoot/gosmee/templates/version
-  '';
-
-  postInstall = ''
-    # completions
-    mkdir -p $out/share/bash-completion/completions/
-    $out/bin/gosmee completion bash > $out/share/bash-completion/completions/gosmee
-    mkdir -p $out/share/zsh/site-functions
-    $out/bin/gosmee completion zsh > $out/share/zsh/site-functions/_gosmee
-  '';
-
-  meta = {
-    description = "Command line server and client for webhooks deliveries (and https://smee.io)";
-    homepage = "https://github.com/chmouel/gosmee";
-    license = lib.licenses.asl20;
-  };
-}
diff --git a/systems/modules/services/gosmee.nix b/systems/modules/services/gosmee.nix
@@ -12,7 +12,7 @@ in
       '';
       package = mkOption {
         type = types.package;
-        default = pkgs.my.gosmee;
+        default = pkgs.gosmee;
         description = ''
           gosmee package to use.
         '';
diff --git a/users/vincent/dev/go.nix b/users/vincent/dev/go.nix
@@ -23,7 +23,7 @@
     my.ram
     my.yaspell
     # not really go but still
-    my.gosmee
+    gosmee
     # cue
     deptree
   ];