From b1079e41dca991b42c31a2ca7fc0281c77ed196d Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Tue, 5 Apr 2022 15:07:06 +0200 Subject: [PATCH 1/5] maintainers: add fricklerhandwerk --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23e585871ac..1aa34009b78 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5575,6 +5575,12 @@ githubId = 609279; name = "Isaac Shapira"; }; + fricklerhandwerk = { + email = "valentin@fricklerhandwerk.de"; + github = "fricklerhandwerk"; + githubId = 6599296; + name = "Valentin Gagarin"; + }; fridh = { email = "fridh@fridh.nl"; github = "FRidh"; From c2baf09dbe26b86a3446689dfb45acdc98f20ee5 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Tue, 5 Apr 2022 14:34:06 +0200 Subject: [PATCH 2/5] sigtop: init at 2022-03-21 sigtop is a utility to export messages, attachments and other data from Signal Desktop. Co-authored-by: Sandro --- pkgs/tools/backup/sigtop/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/backup/sigtop/default.nix diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix new file mode 100644 index 00000000000..1dfdff7c933 --- /dev/null +++ b/pkgs/tools/backup/sigtop/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, openssl, pkg-config }: + +stdenv.mkDerivation { + name = "sigtop"; + version = "unstable-2022-05-27"; + + src = fetchFromGitHub { + owner = "tbvdm"; + repo = "sigtop"; + # `portable` branch + rev = "945c5844d25e2b130809334cbc8f3fa1cd85aaf9"; + sha256 = "1gmxyjx7kbr2n33aq84ipa2pfhrdw7v7ggz01qd54nqyvp8hdbzs"; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ + "PREFIX=\${out}" + ]; + + meta = with lib; { + description = "Utility to export messages, attachments and other data from Signal Desktop"; + license = licenses.isc; + maintainers = with maintainers; [ fricklerhandwerk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6f3be59fe..10536769c20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12600,6 +12600,8 @@ with pkgs; signumone-ks = callPackage ../applications/misc/signumone-ks { }; + sigtop = callPackage ../tools/backup/sigtop { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; From 7d184531ad180e33b4bc6f35b31ea1aa1d69513a Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Mon, 6 Jun 2022 23:48:10 +0200 Subject: [PATCH 3/5] reorder inputs Co-authored-by: Sandro --- pkgs/tools/backup/sigtop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index 1dfdff7c933..896c6c92894 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation { sha256 = "1gmxyjx7kbr2n33aq84ipa2pfhrdw7v7ggz01qd54nqyvp8hdbzs"; }; - buildInputs = [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + makeFlags = [ "PREFIX=\${out}" ]; From fd3292cafc3135e42e888fd87467dc92c7d1a7e5 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Mon, 6 Jun 2022 23:48:20 +0200 Subject: [PATCH 4/5] update hash format Co-authored-by: Sandro --- pkgs/tools/backup/sigtop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index 896c6c92894..010f2a82b03 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { repo = "sigtop"; # `portable` branch rev = "945c5844d25e2b130809334cbc8f3fa1cd85aaf9"; - sha256 = "1gmxyjx7kbr2n33aq84ipa2pfhrdw7v7ggz01qd54nqyvp8hdbzs"; + sha256 = "sha256-6Ifs8fsNpE3AstNt3Elyy908sQ4JzE1H8DbUeWhGnLE="; }; nativeBuildInputs = [ pkg-config ]; From fe1ef16ea9814ddf2e8b54dadbd4997d09e6f902 Mon Sep 17 00:00:00 2001 From: fricklerhandwerk Date: Sun, 2 Jul 2023 01:23:09 +0200 Subject: [PATCH 5/5] update to 0.3.1 --- pkgs/tools/backup/sigtop/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index 010f2a82b03..f7aae8165ef 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -1,20 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, openssl, pkg-config }: +{ lib, buildGoModule, fetchFromGitHub }: -stdenv.mkDerivation { +buildGoModule rec { name = "sigtop"; - version = "unstable-2022-05-27"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; - # `portable` branch - rev = "945c5844d25e2b130809334cbc8f3fa1cd85aaf9"; - sha256 = "sha256-6Ifs8fsNpE3AstNt3Elyy908sQ4JzE1H8DbUeWhGnLE="; + rev = "v${version}"; + sha256 = "sha256-U+S+VXRkedq2LkO9Fw/AfNS97GvFEfjD8dq/VMlBOv4="; }; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ]; + vendorHash = "sha256-xrJ/KLM/f/HVPL4MJzRc1xDlO4e+Iu2lcPG4GnjFRBo="; makeFlags = [ "PREFIX=\${out}" @@ -23,6 +20,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Utility to export messages, attachments and other data from Signal Desktop"; license = licenses.isc; + platforms = platforms.darwin; maintainers = with maintainers; [ fricklerhandwerk ]; }; }