From 231d5a72680de8afb3698dd7cad3173e5a8a11ea Mon Sep 17 00:00:00 2001 From: Wolf Mermelstein Date: Tue, 6 Aug 2024 20:50:51 -0400 Subject: [PATCH 1/2] maintainers: add 404wolf mailsy init at 5.0.0 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/ma/mailsy/fix-file-lookup.patch | 22 ++++++++++++++ pkgs/by-name/ma/mailsy/package.nix | 32 ++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/by-name/ma/mailsy/fix-file-lookup.patch create mode 100644 pkgs/by-name/ma/mailsy/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c8a054597e5a..216da9fa3776 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -212,6 +212,12 @@ githubId = 882455; name = "Elliot Cameron"; }; + _404wolf = { + email = "wolfmermelstein@gmail.com"; + github = "404wolf"; + githubId = 108041238; + name = "Wolf Mermelstein"; + }; _414owen = { email = "owen@owen.cafe"; github = "414owen"; diff --git a/pkgs/by-name/ma/mailsy/fix-file-lookup.patch b/pkgs/by-name/ma/mailsy/fix-file-lookup.patch new file mode 100644 index 000000000000..916c11c0be59 --- /dev/null +++ b/pkgs/by-name/ma/mailsy/fix-file-lookup.patch @@ -0,0 +1,22 @@ +--- $src/utils/index.js 2024-08-06 19:13:25.329421171 -0400 ++++ $src/utils/index.js 2024-08-06 19:14:10.896022059 -0400 +@@ -10,7 +10,7 @@ + + const dirname = path.dirname(fileURLToPath(import.meta.url)); + +-const adapter = new JSONFile(path.join(dirname, "../data/account.json")); ++const adapter = new JSONFile(path.join(process.cwd(), "account.json")); + + const db = new Low(adapter); + +@@ -142,7 +142,7 @@ + }); + + // delete the account.json file +- await fs.unlink(path.join(dirname, "../data/account.json")); ++ await fs.unlink(path.join(process.cwd(), "account.json")); + + // stop the spinner + spinner.stop(); + + diff --git a/pkgs/by-name/ma/mailsy/package.nix b/pkgs/by-name/ma/mailsy/package.nix new file mode 100644 index 000000000000..b662a9bb28b8 --- /dev/null +++ b/pkgs/by-name/ma/mailsy/package.nix @@ -0,0 +1,32 @@ +{ + buildNpmPackage, + fetchFromGitHub, + lib, +}: +buildNpmPackage rec { + pname = "mailsy"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "BalliAsghar"; + repo = "Mailsy"; + rev = version; + hash = "sha256-RnOWvu023SOcN83xEEkYFwgDasOmkMwSzJ/QYjvTBDo="; + }; + + npmDepsHash = "sha256-ljmqNmLvRHPdsKyOdDfECBXHTIExM6nPZF45lqV+pDM="; + + npmFlags = ["--legacy-peer-deps"]; + + dontNpmBuild = true; + + patches = [./fix-file-lookup.patch]; + + meta = with lib; { + description = "Quickly generate a disposable email straight from terminal"; + mainProgram = "mailsy"; + homepage = "https://fig.io/manual/mailsy"; + license = licenses.mit; + maintainers = [maintainers._404wolf]; + }; +} From 53798727067f1c9025d00be4813aabff6645a540 Mon Sep 17 00:00:00 2001 From: Wolf Mermelstein Date: Wed, 7 Aug 2024 00:44:41 -0400 Subject: [PATCH 2/2] mailsy: init at 5.0.0 --- pkgs/by-name/ma/mailsy/fix-file-lookup.patch | 22 -------------------- pkgs/by-name/ma/mailsy/package.nix | 16 ++++++++------ 2 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 pkgs/by-name/ma/mailsy/fix-file-lookup.patch diff --git a/pkgs/by-name/ma/mailsy/fix-file-lookup.patch b/pkgs/by-name/ma/mailsy/fix-file-lookup.patch deleted file mode 100644 index 916c11c0be59..000000000000 --- a/pkgs/by-name/ma/mailsy/fix-file-lookup.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- $src/utils/index.js 2024-08-06 19:13:25.329421171 -0400 -+++ $src/utils/index.js 2024-08-06 19:14:10.896022059 -0400 -@@ -10,7 +10,7 @@ - - const dirname = path.dirname(fileURLToPath(import.meta.url)); - --const adapter = new JSONFile(path.join(dirname, "../data/account.json")); -+const adapter = new JSONFile(path.join(process.cwd(), "account.json")); - - const db = new Low(adapter); - -@@ -142,7 +142,7 @@ - }); - - // delete the account.json file -- await fs.unlink(path.join(dirname, "../data/account.json")); -+ await fs.unlink(path.join(process.cwd(), "account.json")); - - // stop the spinner - spinner.stop(); - - diff --git a/pkgs/by-name/ma/mailsy/package.nix b/pkgs/by-name/ma/mailsy/package.nix index b662a9bb28b8..7bda524ab227 100644 --- a/pkgs/by-name/ma/mailsy/package.nix +++ b/pkgs/by-name/ma/mailsy/package.nix @@ -1,7 +1,7 @@ { + lib, buildNpmPackage, fetchFromGitHub, - lib, }: buildNpmPackage rec { pname = "mailsy"; @@ -16,17 +16,21 @@ buildNpmPackage rec { npmDepsHash = "sha256-ljmqNmLvRHPdsKyOdDfECBXHTIExM6nPZF45lqV+pDM="; - npmFlags = ["--legacy-peer-deps"]; + npmFlags = [ "--legacy-peer-deps" ]; dontNpmBuild = true; - patches = [./fix-file-lookup.patch]; + postPatch = '' + substituteInPlace utils/index.js \ + --replace-fail 'dirname, "../data/account.json"' 'process.cwd(), "account.json"' \ + --replace-fail 'dirname, "../data/email.html"' 'process.cwd(), "email.html"' + ''; - meta = with lib; { + meta = { description = "Quickly generate a disposable email straight from terminal"; mainProgram = "mailsy"; homepage = "https://fig.io/manual/mailsy"; - license = licenses.mit; - maintainers = [maintainers._404wolf]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers._404wolf ]; }; }