1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 07:26:54 +00:00
Commit graph

5280 commits

Author SHA1 Message Date
Frederik Rietdijk 379aaa1e0c Merge master into staging-next 2020-11-10 10:11:08 +01:00
Michael Weiss da8c1a8192
Merge pull request #103136 from meutraa/update/android-studio-canary
androidStudioPackages.{canary,dev}: 4.2.0.15 -> 4.2.0.16
2020-11-09 15:29:41 +01:00
Frederik Rietdijk 20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
Samuel Gräfenstein 2c9497b430 qxmledit: add final newline to qxmledit.json 2020-11-09 11:39:28 +00:00
meutraa 412b1c3ee5
androidStudioPackages.{canary,dev}: 4.2.0.15 -> 4.2.0.16 2020-11-08 14:03:32 +00:00
Niklas Hambüchen ca94c1f0cb
Merge pull request #103035 from nh2/texmacs-1.99.14
texmacs: 1.99.13 -> 1.99.14
2020-11-08 01:18:10 +01:00
StigP c54c614000
Merge pull request #103060 from r-ryantm/auto-update/quilter
quilter: 2.5.0 -> 2.5.1
2020-11-07 14:42:26 +00:00
Michael Raskin 1badf89e03
Merge pull request #102488 from ioplker/textadept-11
Textadept 11
2020-11-07 12:09:29 +00:00
R. RyanTM 7c0d90e11e quilter: 2.5.0 -> 2.5.1 2020-11-07 06:19:11 +00:00
Niklas Hambüchen b5008f9e30 texmacs: 1.99.13 -> 1.99.14 2020-11-06 20:54:12 +01:00
upkeep-bot 55fc82d6d2 vscode: 1.50.1 -> 1.51.0 2020-11-06 09:05:28 -08:00
upkeep-bot d8d1dc1071 vscodium: 1.50.1 -> 1.51.0 2020-11-06 09:04:26 -08:00
Tim Steinbach 831ffe26a7
Merge pull request #102978 from NeQuissimus/nanorc_update
nanorc: 2020-01-25 -> 2020-10-10
2020-11-06 08:52:20 -05:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Lily Ballard 93b0accc76
macvim: fix building with nix-daemon (#102975)
When building MacVim with nix-daemon it tries to place the derived data
into a path rooted in `/var/empty`, which fails. Specifying the derived
data path ourselves fixes this problem.
2020-11-05 21:00:31 -05:00
Tim Steinbach adf334a0c6
nanorc: 2020-01-25 -> 2020-10-10
Add update script
2020-11-05 20:38:18 -05:00
Klemens Nanni e0f258f596
neovim: Do $PATH lookup in neovim.desktop instead of hardcoding derivation
See db236e588d "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

Simply stop adding the full derivation path for neovim and stick with
how upstream uses no path at all.

While here, take care of gnvim.desktop as well by adjusting the sed(1)
expression (and simplifying it in one go);  I do not use gnvim.desktop
but built it and confirmed the resulting files to contain no full paths
any longer.
2020-11-05 11:41:53 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Matthieu Coudron 86d7ed8d10 neovim: take into account vi(m)Alias
restore feature broken by compatibility layer
2020-11-03 09:31:56 +01:00
Matthieu Coudron 42cc40ddc8 neovim: fix nodejs and ruby generation
These were not translated correctly in the new wrapper.
2020-11-02 23:27:49 +01:00
Kevin Cox 8ab0db800e
Merge pull request #101766 from eraserhd/rep-for-kakoune
kakounePlugins.rep: inherit from rep
2020-11-02 09:47:34 -05:00
Kir Ax 2f00a2b066 textadept-11: add textadept 11_beta 2020-11-02 21:19:55 +07:00
Kir Ax ef7fff6a49 textadept: moved to subdir for 10th version 2020-11-02 21:13:09 +07:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Kevin Cox ce3a2e6e49
Merge pull request #91792 from jcpetruzza/kakoune-plugins
kakoune: rework plugin support
2020-11-01 15:07:28 -05:00
Matthieu Coudron 295948f40f neovim: dont wrap when is null
restore previous behavior
2020-11-01 18:55:57 +01:00
Daniel Gorin 464804b43f kakoune: Fix :doc when using plugins
So, kakoune takes the documentation shown for `:doc` from
`$KAKOUNE_RUNTIME/share/kak/doc`. Unfortunately, it seems
that it will ignore files that are symlinks. This is arguably
a bug in kakoune, we workaround it for now by copying the
content of the docfiles.
2020-11-01 14:35:49 +00:00
Daniel Gorin 550389392a kakoune: rework plugin support
The previous implementation of plugin-support for the kakoune derivation
was based on generating, at build time, a `plugins.kak` file that would
source all .kak files in the list of plugins, and wrap the `kak` binary
in a script that would add some command-line arguments so that this
file gets loaded on start-up. The main problem with this approach
is that the plugins' code get executed *after* the user's configuration
file is loaded, so effectively one cannot automatically activate/configure
these plugins.

The idiomatic way of loading plugins is ensuring they end up installed
somwhere under `share/kak/autoload`. Because plugins are already being
packaged to have their code in `share/kak/autoload/plugins/<name-of-plugin>`,
we can obtain a derivation that includes the plugins simply by doing a
`symlinkJoin` of `kakoune-unwrapped` and all the requested plugins.

For this to work, we need to fix two issues:

  1. By default, kakoune makes `share/kak/autoload` a symbolic link to
     `share/kak/rc`, which contains all builtin definitions. We need
     to patch this to put the symlink under `share/kak/autoload/rc`, so that
     the join works.

  2. By default kakoune expects the `autoload` directory to be in
     `../share/kak/autoload` relative to the location of the `kak` binary.
     We need to set the `KAKOUNE_RUNTIME` to point the symlinked
     share/kak for this to work.
2020-11-01 14:35:49 +00:00
Frederik Rietdijk 409ca6f1f9 Merge staging-next into staging 2020-11-01 11:06:35 +01:00
Frederik Rietdijk 54f7498601
Merge pull request #101369 from doronbehar/pkg/kdeApplications/qt515
kdeApplications: Use latest qt515 by default
2020-11-01 11:05:05 +01:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Matthieu Coudron 95702fe6d2 neovim: revert change to extraMakeWrapperArgs
wrapNeovim incited users to use a list instead of a string. Revert that:
the change is not super useful while breaking home-manager.
2020-10-31 14:32:02 +01:00
WORLDofPEACE 99600df584
Merge pull request #101112 from deviant/remove-uemacs
uemacs: remove
2020-10-30 16:01:47 -04:00
Doron Behar 09fd4270d7 kile: some slight improvements/fixes
Use `buildInputs` instead of `propagatedBuildInputs` - should reduce
closure size a bit. Don't wrap executables twice. Move `kdoctools` to
native. Use libsForQt5 - default version (works).

Co-authored-by: Frederik Rietdijk <fridh@fridh.nl>
2020-10-30 20:39:19 +02:00
Benjamin Hipple a2aa0cbf89
Merge pull request #100266 from jnetod/textadept-update
textadept: 10.2 -> 10.8
2020-10-29 22:24:13 -04:00
Timo Kaufmann aee8263788
Merge pull request #100653 from trepetti/marker
marker: init at 2020.04.04
2020-10-29 18:47:37 +01:00
Michael Weiss 4c92053749
Merge pull request #101957 from meutraa/update/android-studio-canary
androidStudioPackages.{canary,dev}: 4.2.0.14 -> 4.2.0.15
2020-10-29 12:56:51 +01:00
Matthieu Coudron 2eb1610725
neovimUtils: neovim utilities to handle more usecases
Current nixpkgs always wraps neovim with the "-u" which has sideeffects as explained in https://github.com/NixOS/nixpkgs/issues/55376 : 
1.  vim won't set the variable $MYVIMRC as explained #34215
 2. vim skips loading folder-specific .vimrc / .nvimrc

I wanted to provide a way for users to better control what flags are used to wrap neovim. This is achived by introducing wrapNeovimUnstable et neovimUtils, utilities to help with that. We provide a compatibility layer so that wrapNeovim still works and to let us experiment with wrapNeovimUnstable to better control neovim configuration, plugin dependencies, haskell environment etc so that it becomes easier to generate per-project neovim config.

With this commit, it's possible for instance for home-manager to wrap neovim without the `-u` and just write the config in the
expected $XDG_CONFIG_HOME/nvim/init.vim .
Expect wrapNeovimUnstable interface to evolve in the upcoming months.
2020-10-29 09:50:26 +01:00
Tom Repetti 7559a99131 marker: init at 2020.04.04 2020-10-28 23:01:47 -04:00
meutraa 01b58c0240
androidStudioPackages.{canary,dev}: 4.2.0.14 -> 4.2.0.15 2020-10-28 17:57:00 +00:00
Vladimír Čunát 0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Mario Rodas 5b4331e2c9
Merge pull request #99949 from marsam/update-micro
micro: 2.0.7 -> 2.0.8
2020-10-28 05:22:00 -05:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Nicolas Martin e129f41522 glow: 1.0.2 -> 1.1.0 2020-10-27 21:58:00 +01:00
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Jason Felice 03faeaa8b3 kakounePlugins.rep: inherit from rep 2020-10-26 10:00:28 -04:00
Jason O'Conal aeb6d3edab idea: 2020.2.2 -> 2020.2.3 2020-10-26 14:25:34 +10:30
Frank Lanitz b1b7551cb0 geany: 1.36.0 -> 1.37.0 2020-10-25 19:56:55 +01:00
Vladimír Čunát 2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
meutraa eb7e78ee99
androidStudioPackages.{canary,dev}: 4.2.0.13 -> 4.2.0.14 2020-10-24 15:02:26 +01:00