From 92b5736994c4a4ad5c6bd3ad0f4aedf2faf2bd93 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 21 Jul 2024 00:56:31 -0300 Subject: [PATCH 01/11] emacsPackages.acm-terminal: cleanup - get rid of nested with - change update script to unstableGitUpdater --- .../manual-packages/acm-terminal/default.nix | 51 ++++++------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix index 970174f20c9f..07e909b34a68 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix @@ -1,55 +1,34 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, acm -, popon -, writeText -, writeScript +{ + lib, + melpaBuild, + fetchFromGitHub, + acm, + popon, + unstableGitUpdater, }: -let - rev = "1851d8fa2a27d3fd8deeeb29cd21c3002b8351ba"; -in melpaBuild { pname = "acm-terminal"; - version = "20231206.1141"; + version = "0-unstable-2023-12-06"; src = fetchFromGitHub { owner = "twlz0ne"; repo = "acm-terminal"; - inherit rev; - sha256 = "sha256-EYhFrOo0j0JSNTdcZCbyM0iLxaymUXi1u6jZy8lTOaY="; + rev = "1851d8fa2a27d3fd8deeeb29cd21c3002b8351ba"; + hash = "sha256-EYhFrOo0j0JSNTdcZCbyM0iLxaymUXi1u6jZy8lTOaY="; }; - commit = rev; - packageRequires = [ acm popon ]; - recipe = writeText "recipe" '' - (acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github) - ''; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; - 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/twlz0ne/acm-terminal.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.acm-terminal $version --rev="$commit" - ''; - - meta = with lib; { - description = "Patch for LSP bridge acm on Terminal"; + meta = { homepage = "https://github.com/twlz0ne/acm-terminal"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kira-bruneau ]; + description = "Patch for LSP bridge acm on Terminal"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kira-bruneau ]; }; } From d310c489e987ea4188089fccc80f43d01b31a1ea Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 01:00:16 -0300 Subject: [PATCH 02/11] emacsPackages.color-theme-solarized: use melpaBuild - get rid of nested with - remove samuelrivas from maintainers --- .../color-theme-solarized/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index 94486bdbfb4b..ccfbc7605dc7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -1,10 +1,11 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, color-theme +{ + lib, + color-theme, + fetchFromGitHub, + melpaBuild, }: -trivialBuild { +melpaBuild { pname = "color-theme-solarized"; version = "0-unstable-2017-10-24"; @@ -17,10 +18,10 @@ trivialBuild { packageRequires = [ color-theme ]; - meta = with lib; { + meta = { homepage = "http://ethanschoonover.com/solarized"; description = "Precision colors for machines and people; Emacs implementation"; - license = licenses.mit; - maintainers = with maintainers; [ samuelrivas AndersonTorres ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } From aac589487f983e545244af6ea381798c6f396918 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:30:20 -0300 Subject: [PATCH 03/11] emacsPackages.emacs-conflict: use melpaBuild --- .../emacs-conflict/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix index b32ee2f8a9f6..74c9498b0bf7 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix @@ -1,10 +1,10 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs +{ + lib, + fetchFromGitHub, + melpaBuild, }: -trivialBuild { +melpaBuild { pname = "emacs-conflict"; version = "0-unstable-2022-11-21"; @@ -12,14 +12,13 @@ trivialBuild { owner = "ibizaman"; repo = "emacs-conflict"; rev = "9f236b93930f3ceb4cb0258cf935c99599191de3"; - sha256 = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; + hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; }; - meta = with lib; { - description = "Resolve conflicts happening when using file synchronization tools"; + meta = { homepage = "https://github.com/ibizaman/emacs-conflict"; - license = licenses.gpl3; - maintainers = with maintainers; [ ibizaman ]; - inherit (emacs.meta) platforms; + description = "Resolve conflicts happening when using file synchronization tools"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ibizaman ]; }; } From a12ddd7ffcc7413a91f11f51a3f0732c5e8e481c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:39:19 -0300 Subject: [PATCH 04/11] emacsPackages.evil-markdown: use melpaBuild --- .../manual-packages/evil-markdown/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix index b95b05f98610..f210907ffeda 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix @@ -1,12 +1,12 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -, evil -, markdown-mode +{ + lib, + evil, + fetchFromGitHub, + markdown-mode, + melpaBuild, }: -trivialBuild rec { +melpaBuild { pname = "evil-markdown"; version = "0-unstable-2021-07-21"; @@ -17,18 +17,15 @@ trivialBuild rec { hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8="; }; - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ + packageRequires = [ evil markdown-mode ]; - meta = with lib; { + meta = { homepage = "https://github.com/Somelauw/evil-markdown"; description = "Integrates Emacs evil and markdown"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; }; } From 51cddfc4a557fc5ebf54a6f9b459ad6baae99c9d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 11:09:22 -0300 Subject: [PATCH 05/11] emacsPackages.git-undo: use melpaBuild - get rid of nested with --- .../manual-packages/git-undo/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix index f0f16c8cf063..69330664473e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix @@ -1,10 +1,10 @@ -{ lib -, fetchFromGitHub -, emacs -, trivialBuild +{ + lib, + fetchFromGitHub, + melpaBuild, }: -trivialBuild { +melpaBuild { pname = "git-undo"; version = "0-unstable-2019-12-21"; @@ -12,14 +12,13 @@ trivialBuild { owner = "jwiegley"; repo = "git-undo-el"; rev = "cf31e38e7889e6ade7d2d2b9f8719fd44f52feb5"; - sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; + hash = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; }; - meta = with lib; { + meta = { homepage = "https://github.com/jwiegley/git-undo-el"; description = "Revert region to most recent Git-historical version"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ leungbk ]; }; } From 98361e18c9ffdec0c36c6b4a6fad570a802995fe Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 00:53:03 -0300 Subject: [PATCH 06/11] emacsPackages.grid: convert version string to Nix format Just as a test - it works! --- .../emacs/elisp-packages/manual-packages/grid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix index 91b69b0fbbda..efc2ccc87da8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix @@ -6,7 +6,7 @@ melpaBuild { pname = "grid"; - version = "20240526.1305"; + version = "0-unstable-2024-05-26"; src = fetchFromGitHub { owner = "ichernyshovvv"; From 676868e8122ded94acdd19c450edc1ba521e9d2e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:41:22 -0300 Subject: [PATCH 07/11] emacsPackages.helm-words: use melpaBuild --- .../manual-packages/helm-words/default.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix index eb16701f3856..8e99b427cb44 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix @@ -1,28 +1,30 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, dictionary -, emacs -, helm +{ + lib, + dictionary, + fetchFromGitHub, + helm, + melpaBuild, }: -trivialBuild rec { +melpaBuild { pname = "helm-words"; version = "0-unstable-2019-03-12"; src = fetchFromGitHub { owner = "emacsmirror"; - repo = pname; + repo = "helm-words"; rev = "e6387ece1940a06695b9d910de3d90252efb8d29"; hash = "sha256-rh8YKDLZZCUE6JnnRnFyDDyUjK+35+M2dkawR/+qwNM="; }; - packageRequires = [ helm dictionary ]; + packageRequires = [ + dictionary + helm + ]; - meta = with lib; { + meta = { homepage = "https://github.com/emacsmirror/helm-words"; description = "Helm extension for looking up words in dictionaries and thesauri"; - license = licenses.gpl3Plus; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; }; } From 0b364f0988ff839d48fd8935eeb41c756b159f79 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:43:44 -0300 Subject: [PATCH 08/11] emacsPackages.idris2-mode: use melpaBuild --- .../manual-packages/idris2-mode/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix index 59dd35bc3442..5148daad1903 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix @@ -1,32 +1,29 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -, prop-menu +{ + lib, + fetchFromGitHub, + melpaBuild, + prop-menu, }: -trivialBuild rec { +melpaBuild rec { pname = "idris2-mode"; version = "1.1"; src = fetchFromGitHub { owner = "idris-community"; - repo = pname; + repo = "idris2-mode"; rev = version; hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q="; }; - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ + packageRequires = [ prop-menu ]; - meta = with lib; { + meta = { homepage = "https://github.com/idris-community/idris2-mode"; - description = "This is an emacs mode for editing Idris 2 code"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ wuyoli ]; - inherit (emacs.meta) platforms; + description = "Emacs mode for editing Idris 2 code"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wuyoli ]; }; } From 4902ab5e7558082ae2e2998797467be28927c598 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 10:36:45 -0300 Subject: [PATCH 09/11] emacsPackages.pod-mode: use melpaBuild --- .../manual-packages/pod-mode/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix index 549633b7dfbd..51c4fb1f8b1f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix @@ -1,18 +1,35 @@ -{ trivialBuild, lib, fetchurl }: +{ + lib, + melpaBuild, + fetchurl +}: -trivialBuild rec { +let pname = "pod-mode"; version = "1.04"; src = fetchurl { url = "mirror://cpan/authors/id/F/FL/FLORA/pod-mode-${version}.tar.gz"; - sha256 = "1wr0khymkaa65blrc5nya607c1a3sjsww49bbf8f0a6176as71sv"; + hash = "sha256-W4ejlTnBKOCQWysRzrXUQwV2gFHeFpbpKkapWT2cIPM="; }; +in +melpaBuild { + inherit pname version src; - meta = with lib; { + outputs = [ + "out" + "doc" + ]; + + postInstall = '' + mkdir -p ''${!outputDoc}/share/doc/pod-mode/ + install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ $sourceRoot/ChangeLog $sourceRoot/README + ''; + + meta = { + homepage = "https://metacpan.org/dist/pod-mode"; description = "Major mode for editing .pod-files"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qyliss ]; }; } From ebf9b608d72883295b0c259b42a2b3d0c2a4d238 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 15 Jul 2024 13:46:09 -0300 Subject: [PATCH 10/11] emacsPackages.voicemacs: use melpaBuild --- ...e.patch => 0000-add-missing-require.patch} | 0 .../manual-packages/voicemacs/default.nix | 58 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/{add-missing-require.patch => 0000-add-missing-require.patch} (100%) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch similarity index 100% rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix index 60f3e3a75e05..4dc7b493cb91 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix @@ -1,21 +1,22 @@ -{ trivialBuild -, lib -, fetchFromGitHub -, avy -, json-rpc-server -, f -, nav-flash -, helm -, cl-lib -, porthole -, default-text-scale -, bind-key -, yasnippet -, company -, company-quickhelp +{ + lib, + avy, + bind-key, + cl-lib, + company, + company-quickhelp, + default-text-scale, + f, + fetchFromGitHub, + helm, + json-rpc-server, + melpaBuild, + nav-flash, + porthole, + yasnippet, }: -trivialBuild { +melpaBuild { pname = "voicemacs"; version = "0-unstable-2022-02-16"; @@ -23,28 +24,29 @@ trivialBuild { owner = "jcaw"; repo = "voicemacs"; rev = "d91de2a31c68ab083172ade2451419d6bd7bb389"; - sha256 = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc="; + hash = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc="; }; - patches = [ ./add-missing-require.patch ]; + patches = [ ./0000-add-missing-require.patch ]; packageRequires = [ avy - json-rpc-server - f - nav-flash - helm - cl-lib - porthole - default-text-scale bind-key - yasnippet + cl-lib + company company-quickhelp + default-text-scale + f + helm + json-rpc-server + nav-flash + porthole + yasnippet ]; meta = { - description = "Voicemacs is a set of utilities for controlling Emacs by voice"; + homepage = "https://github.com/jcaw/voicemacs/"; + description = "Set of utilities for controlling Emacs by voice"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.all; }; } From 411b0251488bd93ceca92b3e83ffae7f13dbe1bd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 7 Jul 2024 01:41:36 -0300 Subject: [PATCH 11/11] emacsPackages.youtube-dl: use melpaBuild - get rid of nested with - remove samuelrivas --- .../manual-packages/youtube-dl/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix index ec25ab9b1bdf..68ffac3697b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix @@ -1,10 +1,10 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs +{ + lib, + fetchFromGitHub, + melpaBuild, }: -trivialBuild { +melpaBuild { pname = "youtube-dl"; version = "1.0-unstable-2018-10-12"; @@ -12,14 +12,13 @@ trivialBuild { owner = "skeeto"; repo = "youtube-dl-emacs"; rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4"; - sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; + hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; - meta = with lib; { + meta = { description = "Emacs youtube-dl download manager"; homepage = "https://github.com/skeeto/youtube-dl-emacs"; - license = licenses.unlicense; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ leungbk ]; }; }