3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

6925 commits

Author SHA1 Message Date
nixpkgs-upkeep-bot 55834d4ca5 vscode: 1.64.0 -> 1.64.2 2022-02-11 00:10:33 +00:00
Vlad M afa9bb4d3a
Merge pull request #158889 from r-ryantm/auto-update/tiled
tiled: 1.7.2 -> 1.8.0
2022-02-10 20:12:33 +02:00
R. Ryantm 5bed4e1db9 tiled: 1.7.2 -> 1.8.0 2022-02-10 04:53:12 +00:00
Jonathan Ringer 5df08e00cd
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/opensimplex/default.nix
	pkgs/development/python-modules/pygame-gui/default.nix
	pkgs/top-level/aliases.nix
	pkgs/top-level/python-aliases.nix
2022-02-08 21:19:24 -08:00
Jörg Thalheim 2909f5b041 jetbrains: allow to override JAVA_HOME/ANDROID_JAVA_HOME/JDK_HOME
Otherwise one cannot use a different java version i.e. jdk17
2022-02-08 11:57:32 -08:00
Max Hille ff811677cc
android-studio-stable: 2021.1.1.20 -> 2021.1.1.21 2022-02-07 13:51:29 +01:00
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Zack A 4251189327 lite-xl: 2.0.4 -> 2.0.5 2022-02-06 17:06:07 -08:00
c0bw3b 82da8aaa53 heme: remove
Upstream project on Sourceforge doesn't exist anymore
2022-02-06 16:56:17 -08:00
Luke Granger-Brown fbd030fb2d
Merge pull request #158200 from bobby285271/vscode
vscode, vscodium: 1.63.2 -> 1.64.0
2022-02-07 00:32:25 +00:00
AndersonTorres eca8a5d694 pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix: manual fixup 2022-02-06 14:38:07 -03:00
AndersonTorres 8b36faa20b elpa-packages 2022-02-06 2022-02-06 14:38:07 -03:00
AndersonTorres 88a7c0e327 melpa-packages 2022-02-06 2022-02-06 14:38:07 -03:00
AndersonTorres 12b90a49fb nongnu-packages 2022-02-06 2022-02-06 14:38:06 -03:00
github-actions[bot] c86cbc2a8a
Merge master into staging-next 2022-02-05 18:01:08 +00:00
Christian Kögler 87631775cb neovide: 2021-10-09 -> 2022-02-04 2022-02-05 14:26:44 +01:00
Matthias Thym 9d65a3bd2d jove: fix typo in package description 2022-02-05 12:46:07 +01:00
Bobby Rong 6d982a2c88
vscodium: 1.63.2 -> 1.64.0 2022-02-05 12:44:07 +08:00
Bobby Rong 0c618de480
vscode: 1.63.2 -> 1.64.0 2022-02-05 12:43:47 +08:00
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