From 5751ae0ab544634b6fb96f317c5d1912e5531269 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 17 Jul 2024 20:46:29 +0800
Subject: [PATCH 1/3] emacsPackages.el-easydraw: clean

---
 .../manual-packages/el-easydraw/default.nix   | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
index 88749d10d9d5..e22f8adb5bf4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
@@ -1,57 +1,31 @@
 { lib
 , melpaBuild
 , fetchFromGitHub
-, writeText
-, writeScript
 , gzip
+, unstableGitUpdater
 }:
 
-let
-  rev = "a6c849619abcdd80dc82ec5417195414ad438fa3";
-in
 melpaBuild {
   pname = "edraw";
-  version = "20240701.444";
+  version = "1.2.0-unstable-2024-07-01";
 
   src = fetchFromGitHub {
     owner = "misohena";
     repo = "el-easydraw";
-    inherit rev;
+    rev = "a6c849619abcdd80dc82ec5417195414ad438fa3";
     hash = "sha256-CbcI1mmghc3HObg80bjScVDcJ1DHx9aX1WP2HlhAshs=";
   };
 
-  commit = rev;
-
   packageRequires = [ gzip ];
 
-  recipe = writeText "recipe" ''
-    (edraw
-      :repo "misohena/el-easydraw"
-      :fetcher github
-      :files
-      ("*.el"
-       "msg"))
-  '';
+  files = ''(:defaults "msg")'';
 
-  passthru.updateScript = writeScript "update.sh" ''
-    #!/usr/bin/env nix-shell
-    #!nix-shell -i bash -p common-updater-scripts coreutils git gnused
-    set -eu -o pipefail
-    tmpdir="$(mktemp -d)"
-    git clone --depth=1 https://github.com/misohena/el-easydraw.git "$tmpdir"
-    pushd "$tmpdir"
-    commit=$(git show -s --pretty='format:%H')
-    # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533
-    version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|')
-    popd
-    update-source-version emacsPackages.el-easydraw $version --rev="$commit"
-  '';
+  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
 
   meta = {
     homepage = "https://github.com/misohena/el-easydraw";
     description = "Embedded drawing tool for Emacs";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ brahyerr ];
-    platforms = lib.platforms.all;
   };
 }

From 04c28f25a4e596eabcda1a71f2755cb0daec1d63 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 17 Jul 2024 20:47:03 +0800
Subject: [PATCH 2/3] emacsPackages.el-easydraw: format using nixfmt-rfc-style

---
 .../manual-packages/el-easydraw/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
index e22f8adb5bf4..c72a4778f7de 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
@@ -1,8 +1,9 @@
-{ lib
-, melpaBuild
-, fetchFromGitHub
-, gzip
-, unstableGitUpdater
+{
+  lib,
+  melpaBuild,
+  fetchFromGitHub,
+  gzip,
+  unstableGitUpdater,
 }:
 
 melpaBuild {

From ac8eb050fa426fdb4946b0f6c23811ea6c3d7165 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 17 Jul 2024 20:48:52 +0800
Subject: [PATCH 3/3] emacsPackages.el-easydraw: move gzip to
 propagatedUserEnvPkgs

gzip is only needed at runtime.  It is not needed at build time.
---
 .../elisp-packages/manual-packages/el-easydraw/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
index c72a4778f7de..448eb01f802a 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
@@ -17,7 +17,7 @@ melpaBuild {
     hash = "sha256-CbcI1mmghc3HObg80bjScVDcJ1DHx9aX1WP2HlhAshs=";
   };
 
-  packageRequires = [ gzip ];
+  propagatedUserEnvPkgs = [ gzip ];
 
   files = ''(:defaults "msg")'';