From 8dd7518fbfa0bf1ffe08e2e8fb767ebcb55c3c68 Mon Sep 17 00:00:00 2001 From: brahyerr Date: Sun, 2 Jun 2024 04:11:09 -0400 Subject: [PATCH 1/2] emacsPackage.el-easydraw: fix passthru.updateScript Use the same update script that is inlined in some other manual package derivations as has an incompatible version string format. --- .../manual-packages/el-easydraw/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 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 608777208bb6..c1dbfe835f88 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 @@ -2,7 +2,7 @@ , melpaBuild , fetchFromGitHub , writeText -, unstableGitUpdater +, writeScript , gzip }: @@ -33,7 +33,19 @@ melpaBuild { "msg")) ''; - passthru.updateScript = unstableGitUpdater { }; + 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" + ''; meta = { homepage = "https://github.com/misohena/el-easydraw"; From bab3620eda27c8c1562e2836430b010ab8b3b162 Mon Sep 17 00:00:00 2001 From: brahyerr Date: Sun, 2 Jun 2024 04:13:40 -0400 Subject: [PATCH 2/2] =?UTF-8?q?emacsPackage.el-easydraw:=201.1.0=20?= =?UTF-8?q?=E2=86=92=2020240529.1009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elisp-packages/manual-packages/el-easydraw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 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 c1dbfe835f88..9cfa97c4346d 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 @@ -7,17 +7,17 @@ }: let - rev = "de68851724072c6695e675f090b33a8abec040c9"; + rev = "13c9fa22155066acfb5a2e444fe76245738e7fb7"; in melpaBuild { pname = "edraw"; - version = "1.1.0"; + version = "20240529.1009"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; inherit rev; - hash = "sha256-l9i+HCRKnKiDqID+bfAOPE7LpVBZp1AOPkceX8KbDXM="; + hash = "sha256-h2auwVIWjrOBPHPCuLdJv5y3FpoV4V+MEOPf4xprfYg="; }; commit = rev;