diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-22 00:37:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 00:37:52 +0000 |
| commit | d8f2a7bf5ce44fc6311d3a1b641a269810236dec (patch) | |
| tree | 1bdf07d329c32cbbc862f7b8602f3702e1494046 /pkgs/applications/editors | |
| parent | 93b17c1b4d29ca2f42b04f1413cf3557efe18a06 (diff) | |
| parent | 22ab9f3a8ea8a0f4e495b74ac30af5273400a2d5 (diff) | |
| download | nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.gz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.bz2 nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.lz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.xz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.zst nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index c0ca16a284a..9b28de9440f 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 5f7d602264f..d684c1ef94f 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -113,6 +113,21 @@ jam-mode = callPackage ./jam-mode { }; + llvm-mode = trivialBuild { + pname = "llvm-mode"; + inherit (external.llvmPackages.llvm) src version; + + dontConfigure = true; + buildPhase = '' + cp utils/emacs/*.el . + ''; + + meta = { + inherit (external.llvmPackages.llvm.meta) homepage license; + description = "Major mode for the LLVM assembler language."; + }; + }; + org-mac-link = callPackage ./org-mac-link { }; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 324d8b13f21..34f489bfba3 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 950229baee0..98b77338b9b 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,7 +1,7 @@ -{ pkgs, parinfer-rust, rep }: +{ pkgs, parinfer-rust, rep, kak-lsp }: { - inherit parinfer-rust rep; + inherit parinfer-rust rep kak-lsp; case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; |