Commit Graph

6667 Commits

Author SHA1 Message Date
Jonathan Ringer
6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
Sandro
0cfcd37c77
Merge pull request #146509 from fgaz/libresprite/init 2021-11-19 17:00:10 +01:00
Francesco Gazzetta
f3ece9f26c nixosTests.aseprite: init 2021-11-19 15:09:53 +01:00
Francesco Gazzetta
6ac64dc1c4 libresprite: init at 1.0 2021-11-19 15:09:48 +01:00
Thiago Kenji Okada
6027b11cc9
Merge pull request #146631 from bobby285271/maintainer
vscode, vscodium: add myself as maintainer
2021-11-19 11:04:12 -03:00
Bobby Rong
c4f57b9489
vscodium: add bobby285271 as maintainer 2021-11-19 21:01:28 +08:00
Bobby Rong
e9b7f5564a
vscode: add bobby285271 as maintainer 2021-11-19 21:01:01 +08:00
nixpkgs-upkeep-bot
02b7827778 vscodium: 1.62.2 -> 1.62.3 2021-11-19 12:09:46 +00:00
github-actions[bot]
9d44a614de
Merge master into staging-next 2021-11-19 12:01:09 +00:00
nixpkgs-upkeep-bot
669740ba93 vscode: 1.62.2 -> 1.62.3 2021-11-19 00:10:13 +00:00
github-actions[bot]
91e24d05d7
Merge master into staging-next 2021-11-18 18:01:14 +00:00
Sandro
7280fda66f
Merge pull request #136095 from boppyt/lite-xl 2021-11-18 13:22:05 +01:00
github-actions[bot]
c77daf4da1
Merge master into staging-next 2021-11-17 18:00:59 +00:00
Katharina Fey
f1941733a9
emacs.pkgs.melpa-packages: 2021-11-17 2021-11-17 16:07:18 +01:00
github-actions[bot]
f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Sandro
403abd3302
Merge pull request #146038 from LibreCybernetics/update-android-studio-beta 2021-11-17 03:56:57 +01:00
github-actions[bot]
69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
sternenseemann
b011b33e42 emacs.pkgs.ada-mode: use latest wisi
By upgrading the AdaCore libraries to their 22.*.* versions and GNAT to
version 11 we can finally upgrade wisi beyond 3.1.5 and probably
(hopefully) stay on latest for some time.
2021-11-15 22:41:56 +01:00
github-actions[bot]
faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Vladimír Čunát
64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
Fabián Heredia Montiel
d9a814f4e6 android-studio-beta: 2021.1.1.15 → 2021.1.1.16 2021-11-14 16:35:14 -06:00
tu-maurice
39f5afa229 xed-editor: 2.8.4 -> 3.0.2 2021-11-14 18:42:06 +01:00
Alyssa Ross
4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00
github-actions[bot]
0ca0546665
Merge master into staging-next 2021-11-14 06:01:05 +00:00
Thiago Kenji Okada
a28f2c9e6a
Merge pull request #144387 from r-ryantm/auto-update/leo-editor
leo-editor: 6.2.1 -> 6.5
2021-11-14 01:11:10 -03:00
github-actions[bot]
914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot]
4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
figsoda
5aaa5f5e75 pluginupdate.py: fix compatibility with nix 2.4 2021-11-13 17:33:43 +01:00
github-actions[bot]
65356b24bf
Merge staging-next into staging 2021-11-12 18:01:48 +00:00
github-actions[bot]
699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
nixpkgs-upkeep-bot
5f0b60a463 vscodium: 1.62.1 -> 1.62.2 2021-11-12 12:10:14 +00:00
github-actions[bot]
687cb3dba4
Merge staging-next into staging 2021-11-12 12:01:47 +00:00
github-actions[bot]
4535cfe0ab
Merge master into staging-next 2021-11-12 12:01:10 +00:00
nixpkgs-upkeep-bot
fda6439cea vscode: 1.62.1 -> 1.62.2 2021-11-12 00:10:22 +00:00
Kerstin Humm
bb799694db
epoxy: rename to libepoxy
https://github.com/NixOS/nixpkgs/issues/145040
2021-11-11 05:55:32 +01:00
github-actions[bot]
b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Felix Bühler
f5c12e8311
treewide: replace '-git' packages with 'unstable-' in version (#145396) 2021-11-10 16:21:47 -05:00
Matthew Mazzanti
b834903c0d Fix "session-management-for-emacs" license
- Change "license" to "licenses"
- Change to "gpl2", rather than non-existant "gpl" attr
2021-11-10 14:12:36 -05:00
github-actions[bot]
259e08cd22
Merge master into staging-next 2021-11-10 18:01:21 +00:00
Bobby Rong
d08ca4d117
Merge pull request #145350 from samuela/upkeep-bot/vscodium-1.62.1-1636546254
vscodium: 1.62.0 -> 1.62.1
2021-11-10 22:50:26 +08:00
Bobby Rong
323d835fe5
Merge pull request #145290 from samuela/upkeep-bot/vscode-1.62.1-1636502976
vscode: 1.62.0 -> 1.62.1
2021-11-10 22:27:31 +08:00
nixpkgs-upkeep-bot
bb17e2c937 vscodium: 1.62.0 -> 1.62.1 2021-11-10 12:10:54 +00:00
github-actions[bot]
84d856a651
Merge master into staging-next 2021-11-10 12:01:22 +00:00
uniquepointer
8f6a049920
your-editor: 1203 -> 1206 (#145241)
Co-authored-by: figsoda <figsoda@pm.me>
2021-11-10 11:40:54 +01:00
github-actions[bot]
8c89876ceb
Merge master into staging-next 2021-11-10 06:01:02 +00:00
Bernardo Meurer
a4266d3728
session-management-for-emacs: fix lib attr missing 2021-11-09 20:29:41 -08:00
Sandro
78047a2efb
Merge pull request #143063 from VergeDX/jetbrains 2021-11-10 01:49:20 +01:00
nixpkgs-upkeep-bot
26d329e7a8 vscode: 1.62.0 -> 1.62.1 2021-11-10 00:09:37 +00:00
github-actions[bot]
6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro
9a9ef88b8c
Merge pull request #145178 from SuperSandro2000/applications
Applications
2021-11-09 21:33:41 +01:00