3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5599 commits

Author SHA1 Message Date
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
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
meutraa f8ada463e7
androidStudioPackages.beta: 4.2.0.19 -> 4.2.0.20 2021-02-10 16:26:01 +00:00
github-actions[bot] bb5521a62c
Merge master into staging-next 2021-02-10 12:20:06 +00:00
Sandro e5d4513a51
Merge pull request #112529 from evenbrenden/retext-remove-overrides
retext: remove markdown and chardet overrides
2021-02-10 09:13:25 +01:00
Alyssa Ross d6529dd53e
kakoune: enable parallel building
Tested at -j4.
2021-02-10 00:38:37 +00:00
github-actions[bot] e090cb1f96
Merge master into staging-next 2021-02-10 00:35:16 +00:00
Kevin Cox 9b9e31e3c5
Merge pull request #112349 from IvarWithoutBones/android-studio-debugger
androidStudioPackages.{stable,beta,canary,dev}: Fix LLDB debugger
2021-02-09 19:22:18 -05:00
Even Brenden f035e41219 retext: remove markdown and chardet overrides
python-markdown 3.0.1 breaks the build, latest (3.2.2) works fine.

No need to pin chardet, latest (3.0.4) works fine.
2021-02-09 16:36:26 +01:00
github-actions[bot] 30dddce5e8
Merge master into staging-next 2021-02-09 06:16:02 +00:00
Alyssa Ross 01348aae1e
emacs.pkgs.jam-mode: init at 0.3 2021-02-09 02:37:57 +00:00
Mario Rodas 87e7f2bed0
Merge pull request #111990 from r-ryantm/auto-update/okteta
okteta: 0.26.4 -> 0.26.5
2021-02-08 20:47:30 -05:00
github-actions[bot] 1848e071c9
Merge master into staging-next 2021-02-08 18:17:03 +00:00
Manuel Bärenz 10b3773db0 vscode/vscodium: Add integration test 2021-02-08 13:59:37 +01:00
IvarWithoutBones 3c350e4b75 androidStudioPackages.{stable,beta,canary,dev}: Fix LLDB debugger 2021-02-08 02:00:12 +01:00
github-actions[bot] 1c86cb40e9
Merge master into staging-next 2021-02-08 00:36:16 +00:00
fortuneteller2k 78da91d97c ox: init at 0.2.7 2021-02-07 13:21:34 +08:00
github-actions[bot] 77db03ceac
Merge master into staging-next 2021-02-06 12:19:10 +00:00
Orivej Desh 671fd3a3c1 ht: fix build with gcc10
It builds with -Wall and fails on -Wnarrowing.
2021-02-06 11:39:57 +00:00
github-actions[bot] 86e1706582
Merge master into staging-next 2021-02-06 06:16:20 +00:00
upkeep-bot 83c85ca7e5 vscode: 1.52.1 -> 1.53.0 2021-02-05 12:11:45 +00:00
R. RyanTM 5cd325c344 okteta: 0.26.4 -> 0.26.5 2021-02-05 07:50:17 +00:00
github-actions[bot] 3c4d8b38c4
Merge staging-next into staging 2021-02-05 00:36:22 +00:00