From 34b6ed85730156d554ed2adaf4656f6c302050ce Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 8 Jan 2022 18:38:00 -0300 Subject: [PATCH 1/5] emacsPackages.apheleia: 1.1.2+unstable=2021-10-03 -> 1.2 --- .../emacs/elisp-packages/apheleia/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index 0d9028e59fc9..e7d673e3391b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -7,13 +7,13 @@ trivialBuild rec { pname = "apheleia"; - version = "1.1.2+unstable=2021-10-03"; + version = "1.2"; src = fetchFromGitHub { owner = "raxod502"; repo = pname; - rev = "8b9d576f2fda10d0c9051fc03c1eb1d9791e32fd"; - hash = "sha256-QwGlCdHBll16mbfQxGw1EORZFUxYCZSt8ThYTTGjRpo="; + rev = "v${version}"; + hash = "sha256-yd9yhQOs0+RB8RKaXnV/kClDm8cO97RkC8yw5b8IKRo="; }; buildInputs = [ @@ -23,8 +23,12 @@ trivialBuild rec { meta = with lib; { homepage = "https://github.com/raxod502/apheleia"; description = "Asynchronous buffer reformat"; + longDescription = '' + Run code formatter on buffer contents without moving point, using RCS + patches and dynamic programming. + ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres leungbk ]; - platforms = emacs.meta.platforms; + inherit (emacs.meta) platforms; }; } From ce9d3bee88fd01fc4f8e8ec911a1778f6479091c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 8 Jan 2022 18:38:37 -0300 Subject: [PATCH 2/5] emacsPackages.tramp: 2.5.1 -> 2.5.2 --- .../editors/emacs/elisp-packages/tramp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix index fee2cca6926a..b898a4461621 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "tramp"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "mirror://gnu/tramp/${pname}-${version}.tar.gz"; - hash = "sha256-+jjWBcj2dP9Xyj4dzpAX86KnajVa9eFDcjD9xTw6vks="; + hash = "sha256-vSwU484g+WahCJXG8T/efT2k1w0nVbeK3dS1Ee2res4="; }; buildInputs = [ From 6ee417ace669ff6f051d00797046dc11c694cbc7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 8 Jan 2022 18:42:19 -0300 Subject: [PATCH 3/5] emacsPackages.bqn-mode: 0.pre+date=2021-12-03 -> 0.pre+date=2022-01-07 --- .../editors/emacs/elisp-packages/bqn-mode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index 026136d21ea7..80e1b7d115df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+date=2021-12-03"; + version = "0.pre+date=2022-01-07"; src = fetchFromGitHub { owner = "museoa"; repo = "bqn-mode"; - rev = "38fba1193e0d1101f3b90bd76e419c011651ad6f"; - sha256 = "0fdfz3kmrdgmx2i6fgrrj1cvapvrgnc3ahnwx3aayrpl1f091439"; + rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2"; + hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ="; }; meta = with lib; { From b575e8c297302fb1429649f62609ffb4fbf7dc41 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 8 Jan 2022 19:15:59 -0300 Subject: [PATCH 4/5] emacsPackages.tramp: remove It is already provided by ELPA. --- .../emacs/elisp-packages/manual-packages.nix | 2 -- .../emacs/elisp-packages/tramp/default.nix | 29 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index a2a38e60fc3c..676b9bfca9a6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -229,8 +229,6 @@ sv-kalender = callPackage ./sv-kalender { }; - tramp = callPackage ./tramp { }; - youtube-dl = callPackage ./youtube-dl { }; # From old emacsPackages (pre emacsPackagesNg) diff --git a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix deleted file mode 100644 index b898a4461621..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, stdenv -, fetchurl -, emacs -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "tramp"; - version = "2.5.2"; - - src = fetchurl { - url = "mirror://gnu/tramp/${pname}-${version}.tar.gz"; - hash = "sha256-vSwU484g+WahCJXG8T/efT2k1w0nVbeK3dS1Ee2res4="; - }; - - buildInputs = [ - emacs - texinfo - ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/tramp"; - description = "Transparently access remote files from Emacs (latest version)"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (emacs.meta) platforms; - }; -} From 30b3b39f72e7c61844df3dc1fe793d7805aae646 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 8 Jan 2022 19:16:15 -0300 Subject: [PATCH 5/5] org-generated.nix: remove Org packages are now generated by ELPA. --- .../emacs/elisp-packages/org-generated.nix | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/org-generated.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix deleted file mode 100644 index 2c9b066d27c0..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ callPackage }: - { - org = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "org"; - ename = "org"; - version = "20210929"; - src = fetchurl { - url = "https://orgmode.org/elpa/org-20210929.tar"; - sha256 = "1fxhxjy48jxvs16x7270c4qj6n4lm952sn7q369c88gbf2jqxis4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/org.html"; - license = lib.licenses.free; - }; - }) {}; - org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "org-plus-contrib"; - ename = "org-plus-contrib"; - version = "20210929"; - src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210929.tar"; - sha256 = "0bn80kji2h423d39c0am2r3p2hwvdxs9rm31xa4810dff27ihxb1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/org-plus-contrib.html"; - license = lib.licenses.free; - }; - }) {}; - }