1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

1469 commits

Author SHA1 Message Date
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Thomas Tuegel a286d876ad melpaStablePackages.docker: don't call builtin dependency 2016-04-26 14:12:53 -05:00
Thomas Tuegel d47fe2bd4a elpa-packages 2016-04-26 2016-04-26 14:07:32 -05:00
Thomas Tuegel de33f4b48b elpa-packages: update package generation instructions 2016-04-26 14:06:42 -05:00
Thomas Tuegel 559010fa9c melpa-stable-packages 2016-04-26 2016-04-26 14:05:25 -05:00
Thomas Tuegel f6828eb247 melpa-stable-packages: update package generation instructions 2016-04-26 14:05:00 -05:00
Thomas Tuegel bf0ae7d45c melpa-packages: update package generation instructions 2016-04-26 14:04:13 -05:00
Thomas Tuegel d3eea5ae35 melpa-packages 2016-04-26 2016-04-26 14:00:20 -05:00
Nikolay Amiantov daa8ba26c9 atomEnv: use makeSearchPathOutput 2016-04-25 13:24:40 +03:00
Nicolas Petton 693942b61a
emacs25pre: 25.0.92 -> 25.0.93
joachifm: also update the name & re-use it in the url
2016-04-24 23:27:16 +02:00
Tobias Geerinckx-Rice 1076c93de3
tiled: 0.12.3 -> 0.16.0; clean up; maintain 2016-04-23 01:30:50 +02:00
Vladimír Čunát e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov 253b84a1eb vscode, electron, atom: run fixup phases 2016-04-22 17:44:30 +03:00
Jakob Gillich 0b8d8b5ca8 vscode: 0.10.10 -> 1.0.0 2016-04-22 16:35:40 +02:00
Jakob Gillich 935493a361 vscode: add desktop file 2016-04-22 16:11:05 +02:00
Nikolay Amiantov 6185f74531 atom, electron, vscode: split dependencies to atomEnv
fixes #14890
2016-04-22 16:10:51 +02:00
Arseniy Seroka 7e934fbf73
android-studio: 2.0.0.0 -> 2.0.0.20 2016-04-21 19:47:02 +03:00
Nikolay Amiantov de7d8e64cf tiled: move to qmakeHook 2016-04-20 18:55:40 +03:00
Nikolay Amiantov 6d96f2f3b4 texstudio: move to qmake4Hook 2016-04-20 18:55:40 +03:00
Nikolay Amiantov b1dcfeeeeb texmaker: move to qmake4Hook 2016-04-20 18:55:39 +03:00
Nikolay Amiantov 448100fe83 focuswriter: move to qmake4Hook 2016-04-20 18:55:39 +03:00
Aneesh Agrawal 2e80f19f39 neovim: 0.1.2 -> 0.1.3 2016-04-19 15:20:34 -04:00
Rahul Gopinath 29f895426c vis: init vis at 0.2x (nightly)
Vis editor is a vim like editor.
This commit provides the initial package for vis (nightly)
2016-04-15 19:44:25 -05:00
joachifm 19e425fa0c Merge pull request #14447 from mucaho/vscode_unfree
vscode: switch to unfree, binary package
2016-04-14 14:16:43 +02:00
Nikolay Amiantov 39eefc0cd0 atom: fix library paths 2016-04-13 22:09:42 +03:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Micxjo Funkcio dd2f24bc0d
nvpy: 0.9.2 -> 0.9.7 2016-04-12 18:54:24 -07:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Moritz Ulrich 6cd2eccdc7 neovim: Fix build by via order of buildInputs
See #14442 for details and further real fixes.
2016-04-06 21:08:23 +02:00
Robert Helgesson 56d45e9b99 eclipse-plugin-scala: 4.3.0.201512011535 -> 4.4.0.201604010956 2016-04-05 20:08:26 +02:00
Peter Simons d2ef7ab10f Merge pull request #14467 from DamienCassou/emacs-25.0.92
emacs25pre: 25.0.50-1b5630e -> 25.0.92
2016-04-05 10:04:32 +02:00
Damien Cassou 9b52caaa0c emacs25pre: 25.0.50-1b5630e -> 25.0.92 2016-04-05 09:57:05 +02:00
mucaho 607a2ae2cb vscode: fix drv
Switch to unfree, binary package.
2016-04-04 17:35:17 +01:00
Christoph Ruegge c251f82de9 emacs25pre: call autogen.sh before configuring 2016-04-04 11:03:02 +02:00
mucaho 0c195db5dd vscode: shrink derivation size
Prune out compile-time dependencies.
2016-04-04 02:49:58 +01:00
joachifm a703bd49a9 Merge pull request #14418 from mucaho/vscode
Add visual studio code editor
2016-04-03 19:07:08 +00:00
mucaho aa38510267 vscode: init at 0.10.10 2016-04-03 19:49:32 +01:00
Tim Steinbach d17dbcb081 atom: 1.6.1 -> 1.6.2 2016-04-02 14:20:13 +00:00
Tim Steinbach 160c7df751 atom: 1.6.0 -> 1.6.1 2016-04-01 08:08:31 -04:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Chris Martin 19abd55420 idea.idea15-ultimate: init at 15.0.5 2016-03-30 02:02:53 -07:00
Nikolay Amiantov 4e9ddd3770 Revert "codeblocks: fix build"
This reverts commit fd9416fb4b.

This shouldn't be needed now that we properly link wxGTK.
2016-03-27 20:54:35 +03:00
Robert Helgesson 1b30674165 eclipse-plugin-testng: 6.9.10 -> 6.9.11 2016-03-27 14:37:05 +02:00
Domen Kožar b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
Joachim Fasting fd9416fb4b codeblocks: fix build
https://hydra.nixos.org/build/33633573/nixlog/1/raw
2016-03-27 03:49:42 +02:00
Domen Kožar 0e6df91569 Merge pull request #14154 from grahamc/codeblocks
codeblocks: ad libX11 build dependency to fix 16.03 hydra build
2016-03-23 15:42:28 +00:00
rnhmjoj a4d5f49603 tweak: init at 3.20 2016-03-23 15:18:03 +01:00
Graham Christensen 3f6023dd16 codeblocks: ad libX11 build dependency to fix hydra build
http://hydra.nixos.org/build/33296816/nixlog/1
2016-03-23 08:04:45 -05:00
Thomas Tuegel 6c05554b85 emacsPackagesNg: remove compatibility cl-lib
ELPA has the compatibility library cl-lib-0.5 which interferes with the
builtin cl-lib-1.0.
2016-03-21 15:36:39 -05:00