Commit Graph

6906 Commits

Author SHA1 Message Date
Jan Tojnar
bfd44c17cd Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/top-level/aliases.nix
2022-02-04 19:54:59 +01:00
Sandro
38b555efa7
Merge pull request #157856 from LibreCybernetics/update-android-studio-preview 2022-02-04 11:03:00 +01:00
Sandro
54d21fbb0e
Merge pull request #157854 from LibreCybernetics/update-jetbrains 2022-02-04 11:02:46 +01:00
Jonathan Ringer
9a16965c75
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/awesomeversion/default.nix
	pkgs/development/python-modules/md2gemini/default.nix
	pkgs/development/python-modules/mill-local/default.nix
	pkgs/development/python-modules/pyatv/default.nix
	pkgs/development/python-modules/pyezviz/default.nix
	pkgs/development/python-modules/pyinsteon/default.nix
	pkgs/development/python-modules/pylitterbot/default.nix
	pkgs/development/python-modules/pynuki/default.nix
	pkgs/development/python-modules/pypck/default.nix
	pkgs/development/python-modules/types-requests/default.nix
	pkgs/top-level/aliases.nix
2022-02-03 21:29:24 -08:00
Artturi
0f491bd7a3
Merge pull request #157264 from FliegendeWurst/disable-broken-parallel 2022-02-03 16:04:57 +02:00
Fabián Heredia Montiel
b9fa206fe3 android-studio-canary: 2021.2.1.5 → 2021.3.1.1 2022-02-02 09:29:48 -06:00
Fabián Heredia Montiel
865fa855a9 android-studio-beta: 2021.1.1.18 → 2021.2.1.8 2022-02-02 09:27:27 -06:00
Fabián Heredia Montiel
94cd939c49 jetbrains: update 2022-02-02 09:19:42 -06:00
FliegendeWurst
049e715ba7 deadpixi-sam: disable parallel build 2022-02-02 11:59:01 +01:00
Dmitry Kalinkin
3087088c41
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
2022-02-01 21:37:39 -05:00
Martin Weinelt
778d148959
Merge pull request #155061 from piegamesde/gnome 2022-02-01 20:53:10 +01:00
github-actions[bot]
e977885cba
Merge staging-next into staging 2022-02-01 18:05:39 +00:00
Sandro
40cbc5b172
Merge pull request #157663 from maxhille/android-studio-update 2022-02-01 16:35:15 +01:00
Paul Grandperrin
5150255146 (vscode|vscodium)-fhs: fix missing desktop icon 2022-02-01 13:55:42 +01:00
Max Hille
45b5eaf288
android-studio-stable: 2020.3.1.26 -> 2021.1.1.20 2022-02-01 10:33:13 +01:00
Jan Tojnar
54b828006e Merge branch 'staging-next' into staging 2022-01-31 12:57:47 +01:00
ajs124
3382af30ee
Merge pull request #157252 from r-ryantm/auto-update/texstudio
texstudio: 4.2.0 -> 4.2.1
2022-01-30 20:41:46 +01:00
piegames
768672d596 monodevelop: drop
It was marked as broken for some time now anyways
2022-01-29 18:08:53 +01:00
github-actions[bot]
f50f916355
Merge staging-next into staging 2022-01-29 12:01:37 +00:00
R. Ryantm
51d1b081b5 texstudio: 4.2.0 -> 4.2.1 2022-01-29 09:13:43 +00:00
R. Ryantm
ed89447f2c vim: 8.2.4186 -> 8.2.4227 2022-01-28 23:47:19 -08:00
Vlad M
3dbe8ff6d6
Merge pull request #157187 from dotlambda/tiled-python3
tiled: use python3
2022-01-29 09:29:08 +02:00
Sergei Trofimovich
e87db3c8c3
poke: 1.4 -> 2.0 (#157108)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-01-28 22:04:54 +01:00
Robert Schütz
3749e6df5b tiled: use python3
Supported according to https://doc.mapeditor.org/en/stable/manual/python/
2022-01-28 19:53:05 +00:00
Wout Mertens
b2eb5f62a7 wayland: enable ozone via $NIXOS_OZONE_WL
Chrome, Chromium, VSCode, Slack, Signal, Discord, element-desktop,
schildichat.

For the latter two, the feature flag useWayland was removed and a
wrapper script was provided.
2022-01-27 09:46:36 +01:00
Jonathan Ringer
91e5be0fc0 neovim: fix treesitter for darwin 2022-01-25 16:22:05 -08:00
github-actions[bot]
bbbd0a92af
Merge master into staging-next 2022-01-25 00:02:13 +00:00
Cody Hiar
abe84c21a9 neovim: add ldflag for treesitter plugins requiring libstdc++ 2022-01-24 15:33:23 -08:00
Patrick Hilhorst
4ed7bed68d
Merge branch 'master' into nixos-tests-missing 2022-01-24 12:05:30 +01:00
FliegendeWurst
fde0b2e2f2
vim: 8.2.3877 -> 8.2.4186 (security)
(cherry picked from staging commit ea5a1dd5e7, PR #155587)
I believe this qualifies for staging-next; rebuilds aren't that huge,
and they look relatively cheap (mostly vim plugins).
2022-01-24 11:21:43 +01:00
github-actions[bot]
b261cac75a
Merge master into staging-next 2022-01-24 06:01:18 +00:00
Sandro
08402fa922
Merge pull request #156235 from c0bw3b/pkg/rehex 2022-01-24 01:05:03 +01:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages 2022-01-23 21:08:10 +01:00
Renaud
f2ed702e7e rehex: 0.3.92 -> 0.4.1
* enable parallel building
* use SPDX 3.0 license identifier
* fix Darwin build
* add meta.changelog
2022-01-23 17:11:47 +01:00
github-actions[bot]
e156d59d2b
Merge master into staging-next 2022-01-21 12:01:24 +00:00
Bobby Rong
aa78569a49
Merge pull request #156011 from r-ryantm/auto-update/cudatext
cudatext: 1.153.0 -> 1.155.0
2022-01-21 16:38:49 +08:00
github-actions[bot]
69b5682348
Merge master into staging-next 2022-01-21 06:01:27 +00:00
Bobby Rong
b6c9ddd7f9
Merge pull request #155913 from veprbl/pr/broken_jove
jove: mark as broken on darwin
2022-01-21 13:21:27 +08:00
R. Ryantm
78668ffca4 cudatext: 1.153.0 -> 1.155.0 2022-01-21 05:17:26 +00:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next 2022-01-21 00:01:42 +00:00
adisbladis
8120952dc6
Merge pull request #155887 from a12l/emacs-update-packages
emacs.pkgs.melpa*: 2022-01-20
2022-01-21 08:07:12 +12:00
Dmitry Kalinkin
7deb2dbbe5
jove: mark as broken on darwin 2022-01-20 12:15:12 -05:00
Albin Otterhäll
ee226b91dd emacs.pkgs.nongnu: 2022-01-20 2022-01-20 16:46:07 +01:00
github-actions[bot]
264c91d4e8
Merge master into staging-next 2022-01-20 12:01:11 +00:00
Albin Otterhäll
2222e9b3f3 emacs.pkgs.melpa*: 2022-01-20 2022-01-20 12:43:02 +01:00
Bobby Rong
928c15fe2c
Merge pull request #154526 from r-ryantm/auto-update/gophernotes
gophernotes: 0.7.3 -> 0.7.4
2022-01-20 19:28:07 +08:00
github-actions[bot]
1b54e5bb50
Merge master into staging-next 2022-01-19 06:01:24 +00:00
Matthieu Coudron
711a269add rstudio: set meta.mainProgram 2022-01-18 22:43:21 +01:00
github-actions[bot]
0eee7ee8c8
Merge master into staging-next 2022-01-17 12:01:25 +00:00
Frederik Rietdijk
afef6d0e81
Merge pull request #154687 from dotlambda/python-alias
python,pythonPackages: make aliases
2022-01-17 09:37:49 +01:00