Commit graph

5620 commits

Author SHA1 Message Date
github-actions[bot] 5884dca2b9
Merge master into staging-next 2021-02-20 12:19:39 +00:00
adisbladis e59a33db58
Merge pull request #113730 from collares/parallel-trampolines
emacs: precompile trampolines in parallel
2021-02-20 12:48:01 +01:00
github-actions[bot] abe7db36a4
Merge staging-next into staging 2021-02-20 00:36:40 +00:00
Mauricio Collares 4d60e14ad2 emacs: precompile trampolines in parallel 2021-02-19 19:35:07 -03:00
ajs124 9816b99e71
Merge pull request #113616 from r-ryantm/auto-update/texstudio
texstudio: 3.0.4 -> 3.1.0
2021-02-19 20:06:45 +01:00
Sandro 41edfe8c20
Merge pull request #113295 from siraben/cc-eq-cc 2021-02-19 19:25:41 +01:00
github-actions[bot] daab056dd9
Merge staging-next into staging 2021-02-19 18:16:58 +00:00
Ben Siraphob 223f25cf4a treewide: add targetPrefix to hardcoded references to CC=cc 2021-02-20 01:01:46 +07:00
Olli Helenius 8534707a7d
emacsPackages.magit-delta: add git as a build-time dependency 2021-02-19 18:15:34 +01:00
Olli Helenius 1f9b5eaa5e
emacsPackages: group all buildWithGit packages together 2021-02-19 18:15:34 +01:00
Olli Helenius 336fc0a77a
emacsPackages: add buildWithGit helper 2021-02-19 18:15:34 +01:00
Jan Tojnar 8f50f1ce10
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0 and 2b28822d8d
- clojure-lsp between 3fa00685ce and e03c068af5
2021-02-19 17:15:31 +01:00
Mauricio Collares ca4db1bc79
emacs: add currently compiling package dirs to load-path
Co-authored-by: Tad Fisher <tadfisher@gmail.com>
2021-02-19 16:46:31 +01:00
Ben Siraphob e03c068af5 treewide: makeWrapper buildInputs to nativeBuildInputs 2021-02-19 20:09:16 +07:00
Mauricio Collares 2ff98c2f17
emacs: precompile all trampolines 2021-02-19 11:41:29 +01:00
R. RyanTM f511c53697 texstudio: 3.0.4 -> 3.1.0 2021-02-18 17:14:23 +00:00
Sandro 499bada83b
Merge pull request #113141 from SCOTT-HAMILTON/formiko
formiko: init at 1.4.3
2021-02-18 12:37:30 +01:00
LeUlukai 8199872bba jetbrains: updates 2021-02-18 08:53:12 +00:00
github-actions[bot] 683536ab2a
Merge master into staging-next 2021-02-18 00:40:58 +00:00
Matt McHenry 1692303551
eclipses.plugins.freemarker: init at 1.5.305 2021-02-17 21:09:58 +01:00
github-actions[bot] afcea01614
Merge master into staging-next 2021-02-17 18:14:04 +00:00
Gytis Ivaskevicius c1441787d2 maintainers: add gytis-ivaskevicius 2021-02-17 15:33:05 +00:00
Gytis Ivaskevicius 6508977c17 Add extraLdPath to main jetbrains builder 2021-02-17 15:33:05 +00:00
Arnout Engelen dc0e2bfd78 jetbrains: replace overrideDerivation with overrideAttr
This fixes error-checking of function arguments (
https://nixos.org/manual/nixpkgs/stable/#sec-pkg-overrideDerivation),
notably checking the license (https://github.com/NixOS/nixpkgs/issues/107250)
2021-02-17 07:30:16 -08:00
SCOTT-HAMILTON 90f346ffc9 formiko: init at 1.4.3
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-02-17 15:15:41 +01:00
Sandro 83c9307474
Merge pull request #113098 from SuperSandro2000/fix-collection12 2021-02-17 13:28:08 +01:00
github-actions[bot] f68cf6f574
Merge master into staging-next 2021-02-17 12:20:00 +00:00
Daniël de Kok 6e2a2df3ab
Merge pull request #113159 from r-ryantm/auto-update/kibi
kibi: 0.2.1 -> 0.2.2
2021-02-17 09:15:54 +01:00
github-actions[bot] 79b7a67b55
Merge master into staging-next 2021-02-17 00:36:31 +00:00
Ingo Blechschmidt 83919e4c79 qemacs: init at 0.3.3 2021-02-16 13:57:49 +01:00
R. RyanTM 7379f969dd kibi: 0.2.1 -> 0.2.2 2021-02-14 22:38:03 +00:00
Sandro Jäckel 2e4ff2aaa7
spacevim: remove unused inputs 2021-02-14 06:34:21 +01:00
Martin Weinelt 286f8cdbfc Merge branch 'master' into staging-next 2021-02-14 00:40:47 +01:00
adisbladis bdfc5f6749
emacs.pkgs.melpa-packages: 2021-02-13 2021-02-13 23:50:48 +01:00
adisbladis f8c77c3dfc
emacs.pkgs.org-packages: 2021-02-13 2021-02-13 23:49:06 +01:00
adisbladis a8378cc310
emacs.pkgs.elpa-packages: 2021-02-13 2021-02-13 23:49:04 +01:00
github-actions[bot] 1d62dc37db
Merge master into staging-next 2021-02-13 00:36:11 +00:00
Luke Granger-Brown cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
github-actions[bot] b23b455f9a
Merge master into staging-next 2021-02-12 18:16:46 +00:00
upkeep-bot a7e625d017 vscode: 1.53.0 -> 1.53.2 2021-02-12 17:12:36 +01:00
adisbladis d1b631471c
Merge pull request #112900 from alyssais/emacs-motif
emacs: add withMotif option
2021-02-12 14:41:26 +01:00
Alyssa Ross 7eaa07dd3f
emacs: add withMotif option
Why not? ;)
2021-02-12 12:59:52 +00:00
github-actions[bot] 15db604744
Merge master into staging-next 2021-02-12 12:20:20 +00:00
upkeep-bot 0582093d37 vscodium: 1.52.1 -> 1.53.2 2021-02-12 12:13:14 +00:00
Jörg Thalheim f94df5f25f
Merge pull request #112882 from alyssais/kakoune
kakoune: enable parallel building
2021-02-12 11:30:15 +00:00
adisbladis 0f77944b6d
Merge pull request #112880 from alyssais/jam-mode
emacs.pkgs.jam-mode: init at 0.3
2021-02-12 12:06:24 +01:00
github-actions[bot] 5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
github-actions[bot] 7d94bb26bb
Merge master into staging-next 2021-02-10 18:16:36 +00:00
meutraa 337aecf983
androidStudioPackages: set JAVA_HOME in wrapper to bundled version 2021-02-10 17:30:03 +00:00
meutraa 7de86f2897
androidStudioPackages.{canary,dev}: 2020.3.1.4 -> 2020.3.1.5 2021-02-10 16:50:39 +00:00