3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

4818 commits

Author SHA1 Message Date
adisbladis fa31ab9699
emacsPackages.magit-circleci: Fix build 2020-04-24 11:22:12 +01:00
Frederik Rietdijk cff0669a48 Merge master into staging-next 2020-04-23 08:11:16 +02:00
worldofpeace b4d5dd861b
Merge pull request #84673 from mmilata/qt5-mkDerivation-stdenv
Use qt5's mkDerivation in packages that otherwise crash
2020-04-22 13:39:46 -04:00
Frederik Rietdijk 8374a2a0ee Merge master into staging-next 2020-04-22 17:20:20 +02:00
Martin Milata 22af8e8ed7 mindforger: use qt5's mkDerivation 2020-04-22 15:23:09 +02:00
Martin Milata affebc8600 okteta: use qt5's mkDerivation 2020-04-22 15:22:37 +02:00
Nicolas Schneider c296bf7169 android-studio: add ps to closure
When killing processes, android-studio uses `ps` to figure out which
subprocesses to kill. Without `ps` in the closure, this fails and the
process is never killed.
2020-04-21 22:48:47 +02:00
Frederik Rietdijk 23be4a8b4d Merge master into staging-next 2020-04-21 19:59:56 +02:00
sternenseemann c93e4cba92 apostrophe: unstable-2020-03-29 -> 2.2.0.2 2020-04-21 19:37:32 +02:00
Mario Rodas ab7c117805
Merge pull request #85619 from kuznero/vscode
vscode, vscodium: 1.44.1 -> 1.44.2
2020-04-21 07:21:37 -05:00
R. RyanTM 1c7bcaa6db vim: 8.2.0343 -> 8.2.0510 2020-04-21 08:39:52 +02:00
John Wiegley fd494fc013
Merge pull request #84785 from mikesperber/unbreak-emacs-macos 2020-04-20 10:57:17 -07:00
Roman Kuznetsov ba774d4179
vscode, vscodium: 1.44.1 -> 1.44.2 2020-04-20 16:59:16 +02:00
Manuel Bärenz f253da42f8 Add myself (turion) to the maintainers list for several packages
Following nh2's advice, I want to be more involved in nixpkgs,
and I'll start to review changes to programs that are important to me,
and that didn't have a long list of maintainers yet.
2020-04-19 13:14:31 +02:00
Vladimír Čunát e233a9d4dd
Merge #84442: staging-next branch 2020-04-18 23:11:00 +02:00
Jörg Thalheim cd3bc38f40
Merge pull request #85501 from petabyteboy/feature/micro 2020-04-18 19:48:25 +01:00
Milan Pässler 58d165420b micro: 1.4.1 -> 2.0.3 2020-04-18 19:26:43 +02:00
Michael Weiss e5450d9d00
androidStudioPackages.{dev,canary}: 4.1.0.5 -> 4.1.0.6 2020-04-18 12:29:11 +02:00
Michael Weiss b7b1022fb2
android-studio: 3.6.2 -> 3.6.3 2020-04-18 12:29:05 +02:00
Vladimír Čunát d96487b9ca
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1582510
2020-04-18 07:42:26 +02:00
adisbladis 3fe18a5b4e
emacsPackages.pod-mode: Fix platforms meta 2020-04-17 23:27:06 +01:00
Tony O 39b1de0fbf
sv-kalendar: fix meta 2020-04-17 19:03:26 +01:00
worldofpeace 8d428ac33c
Merge pull request #85249 from kuznero/vscode
vscode, vscodium: 1.44.0 -> 1.44.1
2020-04-16 22:29:15 -04:00
Roman Kuznetsov 4fd1f49ea4
vscodium: 1.44.0 -> 1.44.1 2020-04-16 22:31:00 +02:00
Daniel Albert 2355d9d545
eclipse-scala-sdk: 4.4.1 -> 4.7.0
Unfortunately scala-ide is based on eclipse 4.7 (oxygen).
Thus is requires a java SDK 8 and GTK2.
2020-04-16 21:58:48 +02:00
Jan Tojnar 3d8e436917
Merge branch 'master' into staging-next 2020-04-16 10:09:43 +02:00
AndersonTorres 92b28ac63d jupp: 31 -> 39 2020-04-15 01:03:20 -03:00
Roman Kuznetsov 4a129e6a32
vscode: 1.44.0 -> 1.44.1 2020-04-14 22:36:06 +02:00
Jan Tojnar a04625379a
Merge branch 'master' into staging-next 2020-04-13 18:50:35 +02:00
Michael Weiss adcd8baa02
android-studio: Fix the license (unfree)
Android Studio states that it contains proprietary code!
2020-04-12 17:27:54 +02:00
Michael Weiss 70e4e62efb
androidStudioPackages.{dev,canary}: 4.1.0.4 -> 4.1.0.5 2020-04-12 16:55:21 +02:00
Maximilian Bosch ef1e4f8064
Merge pull request #84810 from kuznero/master
jetbrains: update
2020-04-11 14:55:30 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar 1ab03c3a76
Merge branch 'master' into staging-next 2020-04-10 12:12:56 +02:00
worldofpeace f810c28503
Merge pull request #84804 from Synthetica9/vscode1440
vscode, vscodium: 1.43.2 -> 1.44.0
2020-04-09 16:21:27 -04:00
Mario Rodas b89b23b029
Merge pull request #84825 from r-ryantm/auto-update/dit
dit: 0.5 -> 0.6
2020-04-09 14:28:44 -05:00
Jonathan Ringer 63575456ae leo-editor: fix makeDesktopItem categories 2020-04-09 10:47:54 -07:00
Jonathan Ringer e8f668185e leo-editor: add qt support 2020-04-09 10:47:54 -07:00
R. RyanTM 8f86e3c1a3 leo-editor: 5.7.3 -> 6.2 2020-04-09 10:47:54 -07:00
R. RyanTM cdda61ab69 dit: 0.5 -> 0.6 2020-04-09 15:42:03 +00:00
Roman Kuznetsov 85489caa9b
jetbrains: update 2020-04-09 16:08:01 +02:00
Shea Levy 6fac063e09
emacsPackages: Add standalone agda-input package that doesn't require building Agda. 2020-04-09 09:14:40 -04:00
Patrick Hilhorst 939041bce4
vscode, vscodium: 1.43.2 -> 1.44.0 2020-04-09 13:45:38 +02:00
Mike Sperber 076f221a0b emacs: Unbreak on macOS
Backport an unexec fix.
2020-04-09 10:17:38 +02:00
Samuel Leathers 72cb7f81fd
Merge pull request #81442 from manveru/bundler-2.1.4
bundler: 1.17.3 -> 2.1.4
2020-04-08 12:44:54 -04:00
Michael Weiss 20fd05448d
androidStudioPackages.beta: 4.0.0.12 -> 4.0.0.13 2020-04-08 11:54:51 +02:00
zimbatm 9ba63260fd
Merge pull request #81812 from bignaux/standardnotes
standardnotes: 3.0.15 -> 3.3.3
2020-04-07 09:01:17 +00:00
Mario Rodas 1401aa9270
Merge pull request #84478 from eadwu/vscode/1.43.2
vscod{e,ium}: 1.43.0 -> 1.43.2
2020-04-06 20:09:46 -05:00
Jon 6701dbeb7d
Merge pull request #84014 from r-ryantm/auto-update/quilter
quilter: 2.1.2 -> 2.2.2
2020-04-06 12:38:44 -07:00
Edmund Wu 3f75bc2660
vscodium: 1.43.0 -> 1.43.2 2020-04-06 10:36:50 -04:00