org: package renamed, org-contrib added

See 9811756e80
This commit is contained in:
László Vaskó
2021-07-27 15:23:38 +02:00
parent 8aa15e59b3
commit b9bfa3cedb
3 changed files with 36 additions and 9 deletions

27
flake.lock generated
View File

@ -208,14 +208,14 @@
"type": "github"
}
},
"org-mode": {
"org": {
"flake": false,
"locked": {
"lastModified": 1626291384,
"narHash": "sha256-HxsTCj03rRES2o7I4yNAWM1jeAzqCvUdnwlwc+NkPEQ=",
"lastModified": 1627155762,
"narHash": "sha256-XS1eA6P0ePabdrnUNe5lN19EA9dfK615gMGObr9wfBQ=",
"owner": "emacs-straight",
"repo": "org-mode",
"rev": "604bfd9d755770e12c368c15148780ec723211df",
"rev": "c9dfed48a607c7f6524f1c6480f09cf61a5d6237",
"type": "github"
},
"original": {
@ -224,6 +224,22 @@
"type": "github"
}
},
"org-contrib": {
"flake": false,
"locked": {
"lastModified": 1623339452,
"narHash": "sha256-E3pioqkmAKQm5N7YsgJZil0/ozkdRE7//tE9FGbrluM=",
"ref": "master",
"rev": "fc81309cf6756607a836f93049a9393c2967c4e0",
"revCount": 2599,
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
},
"original": {
"type": "git",
"url": "https://git.sr.ht/~bzg/org-contrib"
}
},
"org-yt": {
"flake": false,
"locked": {
@ -287,7 +303,8 @@
"nixpkgs": "nixpkgs",
"nose": "nose",
"ob-racket": "ob-racket",
"org-mode": "org-mode",
"org": "org",
"org-contrib": "org-contrib",
"org-yt": "org-yt",
"php-extras": "php-extras",
"revealjs": "revealjs",

View File

@ -58,8 +58,10 @@
nose.flake = false;
ob-racket.url = "github:xchrishawk/ob-racket";
ob-racket.flake = false;
org-mode.url = "github:emacs-straight/org-mode";
org-mode.flake = false;
org-contrib.url = "git+https://git.sr.ht/~bzg/org-contrib";
org-contrib.flake = false;
org.url = "github:emacs-straight/org-mode";
org.flake = false;
org-yt.url = "github:TobiasZawada/org-yt";
org-yt.flake = false;
php-extras.url = "github:arnested/php-extras";

View File

@ -46,8 +46,16 @@ self: super: {
pname = "nose";
};
org-mode = self.straightBuild rec {
pname = "org-mode";
org-contrib = self.straightBuild {
pname = "org-contrib";
installPhase = ''
mkdir -p $out/share/emacs/site-lisp
cp -r lisp/* $out/share/emacs/site-lisp
'';
};
org = self.straightBuild rec {
pname = "org";
version = "9.4";
installPhase = ''
LISPDIR=$out/share/emacs/site-lisp