From 804fddcf9b0a8f556a9b38efbc7c8eec1de52444 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Mon, 14 Nov 2022 16:56:16 +0100 Subject: [PATCH 1/6] notmuch-mailmover: init at 0.1.0 --- .../mailreaders/notmuch/notmuch-mailmover.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix new file mode 100644 index 000000000000..73bb50a0fe40 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "notmuch-mailmover"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "michaeladler"; + repo = pname; + rev = "v${version}"; + sha256 = lib.fakeSha256; + }; + + cargoSha256 = lib.fakeSha256; + + meta = with lib; { + description = "Application to assign notmuch tagged mails to IMAP folders"; + homepage = "https://github.com/michaeladler/notmuch-mailmover/"; + license = licenses.asl20; + maintainers = with maintainers; [archer-65]; + platforms = platforms.all; + }; +} From 3c9ab688dd3a33b2be3ad172eea21818bc8bd521 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Mon, 14 Nov 2022 17:13:47 +0100 Subject: [PATCH 2/6] notmuch-mailmover: correct hash --- .../networking/mailreaders/notmuch/notmuch-mailmover.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 73bb50a0fe40..04af1a4ae6d7 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -1,4 +1,5 @@ { + notmuch, lib, stdenv, fetchFromGitHub, @@ -12,10 +13,12 @@ rustPlatform.buildRustPackage rec { owner = "michaeladler"; repo = pname; rev = "v${version}"; - sha256 = lib.fakeSha256; + sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; }; - cargoSha256 = lib.fakeSha256; + buildInputs = [notmuch]; + + cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; meta = with lib; { description = "Application to assign notmuch tagged mails to IMAP folders"; From 4e44595cf8c48d4d2e71124b3411f55e167738fd Mon Sep 17 00:00:00 2001 From: archer-65 Date: Mon, 14 Nov 2022 17:14:36 +0100 Subject: [PATCH 3/6] notmuch: added to pkgs/top-level/all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5f33278036a..4f0d42c179a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30965,6 +30965,8 @@ with pkgs; pythonPackages = python3Packages; }; + notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { }; + notejot = callPackage ../applications/misc/notejot { }; notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { }; From 3d81bc93014d6d9a233cffea453412e72ab55e67 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Mon, 14 Nov 2022 17:23:21 +0100 Subject: [PATCH 4/6] Add myself to mantainers list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6b73c678bc52..ac2c86bda33f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1071,6 +1071,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + archer-65 = { + email = "mario.liguori.056@gmail.com"; + github = "archer-65"; + githubId = 76066109; + name = "Mario Liguori"; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; From 5f0638eadad674bd436423b90af5d6ac02933523 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Mon, 14 Nov 2022 17:56:23 +0100 Subject: [PATCH 5/6] added author to maintainers list --- .../networking/mailreaders/notmuch/notmuch-mailmover.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 04af1a4ae6d7..b51f57e77c87 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "Application to assign notmuch tagged mails to IMAP folders"; homepage = "https://github.com/michaeladler/notmuch-mailmover/"; license = licenses.asl20; - maintainers = with maintainers; [archer-65]; + maintainers = with maintainers; [michaeladler archer-65]; platforms = platforms.all; }; } From 6dd5d4a5d211e67b7f04f4239783d933032fc2e7 Mon Sep 17 00:00:00 2001 From: Mario Liguori <76066109+archer-65@users.noreply.github.com> Date: Sat, 3 Dec 2022 16:05:41 +0100 Subject: [PATCH 6/6] Review formatting --- .../mailreaders/notmuch/notmuch-mailmover.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index b51f57e77c87..12a2437121a5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -1,9 +1,8 @@ -{ - notmuch, - lib, - stdenv, - fetchFromGitHub, - rustPlatform, +{ notmuch +, lib +, stdenv +, fetchFromGitHub +, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; @@ -16,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-b2Q1JcXIp56Niv5kdPgQSM91e8hPPdyhWIG4f7kQn78="; }; - buildInputs = [notmuch]; + buildInputs = [ notmuch ]; cargoSha256 = "sha256-AW0mCdQN3WJhSErJ/MqnNIsRX+C6Pb/zHCQh7v/70MU="; @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { description = "Application to assign notmuch tagged mails to IMAP folders"; homepage = "https://github.com/michaeladler/notmuch-mailmover/"; license = licenses.asl20; - maintainers = with maintainers; [michaeladler archer-65]; + maintainers = with maintainers; [ michaeladler archer-65 ]; platforms = platforms.all; }; }