Skip to content

Commit fe12fab

Browse files
AndersonTorresAndersonTorres
committed
Revert "Merge pull request #217317 from atorres1985-contrib/remove-bqn-mode"
This reverts commit aff3879, reversing changes made to 573ed79. According to the bug reported at #217317 (comment), the Emacs package ligo-mode returns an unexpected hash.
1 parent 1bf1f7a commit fe12fab

File tree

5 files changed

+1004
-1023
lines changed

5 files changed

+1004
-1023
lines changed

‎pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix‎

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -366,21 +366,6 @@
366366
license = lib.licenses.free;
367367
};
368368
}) {};
369-
beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
370-
elpaBuild {
371-
pname = "beframe";
372-
ename = "beframe";
373-
version = "0.1.11";
374-
src = fetchurl {
375-
url = "https://elpa.gnu.org/packages/beframe-0.1.11.tar";
376-
sha256 = "1r5wlg2xaih197fi3jk0qmnhpy7mc6xrwraxfnygsjwr63dxhnq2";
377-
};
378-
packageRequires = [ emacs ];
379-
meta = {
380-
homepage = "https://elpa.gnu.org/packages/beframe.html";
381-
license = lib.licenses.free;
382-
};
383-
}) {};
384369
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
385370
elpaBuild {
386371
pname = "bind-key";
@@ -1674,16 +1659,16 @@
16741659
license = lib.licenses.free;
16751660
};
16761661
}) {};
1677-
erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
1662+
erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
16781663
elpaBuild {
16791664
pname = "erc";
16801665
ename = "erc";
1681-
version = "5.5";
1666+
version = "5.4.1";
16821667
src = fetchurl {
1683-
url = "https://elpa.gnu.org/packages/erc-5.5.tar";
1684-
sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
1668+
url = "https://elpa.gnu.org/packages/erc-5.4.1.tar";
1669+
sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a";
16851670
};
1686-
packageRequires = [ compat emacs ];
1671+
packageRequires = [ emacs ];
16871672
meta = {
16881673
homepage = "https://elpa.gnu.org/packages/erc.html";
16891674
license = lib.licenses.free;
@@ -2627,10 +2612,10 @@
26272612
elpaBuild {
26282613
pname = "kind-icon";
26292614
ename = "kind-icon";
2630-
version = "0.2.0";
2615+
version = "0.1.9";
26312616
src = fetchurl {
2632-
url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar";
2633-
sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r";
2617+
url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar";
2618+
sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli";
26342619
};
26352620
packageRequires = [ emacs svg-lib ];
26362621
meta = {
@@ -3062,10 +3047,10 @@
30623047
elpaBuild {
30633048
pname = "modus-themes";
30643049
ename = "modus-themes";
3065-
version = "4.1.1";
3050+
version = "3.0.0";
30663051
src = fetchurl {
3067-
url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar";
3068-
sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9";
3052+
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
3053+
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
30693054
};
30703055
packageRequires = [ emacs ];
30713056
meta = {
@@ -3746,10 +3731,10 @@
37463731
elpaBuild {
37473732
pname = "phps-mode";
37483733
ename = "phps-mode";
3749-
version = "0.4.42";
3734+
version = "0.4.39";
37503735
src = fetchurl {
3751-
url = "https://elpa.gnu.org/packages/phps-mode-0.4.42.tar";
3752-
sha256 = "040wrmz9wl0x86vdgzyfdwxdciscd94v9nfgfz0ir2ghwhw6j9x3";
3736+
url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar";
3737+
sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i";
37533738
};
37543739
packageRequires = [ emacs ];
37553740
meta = {
@@ -3836,10 +3821,10 @@
38363821
elpaBuild {
38373822
pname = "posframe";
38383823
ename = "posframe";
3839-
version = "1.4.0";
3824+
version = "1.3.3";
38403825
src = fetchurl {
3841-
url = "https://elpa.gnu.org/packages/posframe-1.4.0.tar";
3842-
sha256 = "0pqy7scdi3qxj518xm0bbr3979byfxqxxh64wny37xzhd4apsw5j";
3826+
url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar";
3827+
sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b";
38433828
};
38443829
packageRequires = [ emacs ];
38453830
meta = {
@@ -4437,10 +4422,10 @@
44374422
elpaBuild {
44384423
pname = "shell-command-plus";
44394424
ename = "shell-command+";
4440-
version = "2.4.2";
4425+
version = "2.4.1";
44414426
src = fetchurl {
4442-
url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
4443-
sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm";
4427+
url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
4428+
sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
44444429
};
44454430
packageRequires = [ emacs ];
44464431
meta = {
@@ -4911,10 +4896,10 @@
49114896
elpaBuild {
49124897
pname = "taxy-magit-section";
49134898
ename = "taxy-magit-section";
4914-
version = "0.12.2";
4899+
version = "0.12.1";
49154900
src = fetchurl {
4916-
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar";
4917-
sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1";
4901+
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
4902+
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
49184903
};
49194904
packageRequires = [ emacs magit-section taxy ];
49204905
meta = {
@@ -5050,10 +5035,10 @@
50505035
elpaBuild {
50515036
pname = "tramp";
50525037
ename = "tramp";
5053-
version = "2.6.0.2";
5038+
version = "2.6.0.1";
50545039
src = fetchurl {
5055-
url = "https://elpa.gnu.org/packages/tramp-2.6.0.2.tar";
5056-
sha256 = "0pfrsgci1rqrykkfyxm9wsn7f0l3rzc2vj1fas27w925l0k0lrci";
5040+
url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar";
5041+
sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8";
50575042
};
50585043
packageRequires = [ emacs ];
50595044
meta = {
@@ -5155,10 +5140,10 @@
51555140
elpaBuild {
51565141
pname = "triples";
51575142
ename = "triples";
5158-
version = "0.2.6";
5143+
version = "0.2.3";
51595144
src = fetchurl {
5160-
url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
5161-
sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
5145+
url = "https://elpa.gnu.org/packages/triples-0.2.3.tar";
5146+
sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39";
51625147
};
51635148
packageRequires = [ emacs seq ];
51645149
meta = {
@@ -5426,10 +5411,10 @@
54265411
elpaBuild {
54275412
pname = "vertico-posframe";
54285413
ename = "vertico-posframe";
5429-
version = "0.7.2";
5414+
version = "0.7.1";
54305415
src = fetchurl {
5431-
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar";
5432-
sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny";
5416+
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar";
5417+
sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a";
54335418
};
54345419
packageRequires = [ emacs posframe vertico ];
54355420
meta = {

‎pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ in
99

1010
agda2-mode = callPackage ./manual-packages/agda2-mode { };
1111

12+
bqn-mode = callPackage ./manual-packages/bqn-mode { };
13+
1214
cask = callPackage ./manual-packages/cask { };
1315

1416
control-lock = callPackage ./manual-packages/control-lock { };

‎pkgs/applications/editors/emacs/elisp-packages/manual-packages/bqn-mode/default.nix‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{ lib
2+
, trivialBuild
3+
, fetchFromGitHub
4+
}:
5+
6+
trivialBuild {
7+
pname = "bqn-mode";
8+
version = "0.pre+date=2022-09-14";
9+
10+
src = fetchFromGitHub {
11+
owner = "museoa";
12+
repo = "bqn-mode";
13+
rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013";
14+
hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a";
15+
};
16+
17+
meta = with lib; {
18+
description = "Emacs mode for BQN programming language";
19+
license = licenses.gpl3Only;
20+
maintainers = with maintainers; [ sternenseemann AndersonTorres ];
21+
};
22+
}

‎pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,10 +3182,10 @@
31823182
elpaBuild {
31833183
pname = "xah-fly-keys";
31843184
ename = "xah-fly-keys";
3185-
version = "22.12.20230301220803";
3185+
version = "22.9.20230207171612";
31863186
src = fetchurl {
3187-
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.12.20230301220803.tar";
3188-
sha256 = "0m1wyhxqsih7777hchjk4v742ar16frdjvxyspa72az881yinv5g";
3187+
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
3188+
sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
31893189
};
31903190
packageRequires = [ emacs ];
31913191
meta = {

0 commit comments

Comments
 (0)