3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

946 commits

Author SHA1 Message Date
Eric Seidel fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward Tjörnhammar 96d6344b13 idea updates:
idea-{community,ultimate}: 14.0.2 -> 14.0.3
  android-studio: 1.0.2 -> 1.1.0b2
  clion: eap bump
2015-01-31 20:50:34 +01:00
Peter Simons 008256d8bd emacs-flycheck: add current snapshot from Git 2015-01-30 18:30:59 +01:00
Peter Simons 9f1cb04876 emacs-let-alist: add version 1.0.3 2015-01-30 18:30:38 +01:00
Peter Simons c8648e14a4 haskell-mode: update git version to current HEAD 2015-01-21 18:47:56 +01:00
vbgl 7edbd7ad19 Merge pull request #5041 from vbgl/mono
Updates mono, fsharp and monodevelop

Closes #4782.
2015-01-21 13:54:37 +01:00
宋文武 b202dcb606 tiled: Update to 0.11.0, renamed from tiled-qt. 2015-01-21 13:14:12 +08:00
Vincent Laporte ba0e5d7be1 Adds monodevelop 5.1 2015-01-20 09:30:09 +01:00
Vincent Laporte dea34aeb4b Removes monodoc (obsolete and broken) 2015-01-20 09:30:08 +01:00
Vincent Laporte 1556527ddc Removes monodevelop (obsolete and broken) 2015-01-20 09:30:08 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Eric Seidel 48f63c2f2e rename gcc-wrapper to cc-wrapper.
also makes cc-wrapper compatible with clang in the darwin fork.
2015-01-14 20:26:56 -08:00
Domen Kožar b9cb0ce2ce Merge pull request #5756 from fredlebel/atom_0.171.0
Atom: updated to 0.171.0
2015-01-14 11:32:23 +01:00
Frederic LeBel 99c1916484 Atom: updated to 0.171.0 2015-01-13 19:46:48 -05:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Johannes Bornhold f8247edd1c Add meta attributes to emacsPackages.d 2015-01-11 18:46:48 +01:00
Johannes Bornhold 860336e786 Add d-mode to emacs modes 2015-01-11 18:46:48 +01:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Edward Tjörnhammar d8d9cc654a idea-{community,ultimate}: 14.0.1 -> 14.0.2
android-studio: 1.0.0-rc1 -> 1.0.2
clion: eap update
2015-01-07 23:48:26 +01:00
John Wiegley 0d1a16d48f emacs24: Add #define for building on Yosemite (darwin) 2015-01-03 07:32:38 -05:00
Bjørn Forsman f364e3f8e8 eclipse: add webkit as dependency
This makes the Eclipse internal web browser work.

The internal web browser is the default browser, and Eclipse requires
manual configuration for any other (external) web browser. To me this
means the internal browser should be working by default, unless users
will get an error popup if they click any links.

This change increases the closure size from 714 to 880 MiB
(attribute eclipses.eclipse_cpp_43).
2015-01-01 13:40:16 +01:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Peter Simons f0c80e1ced haskell-mode: add current snapshot of git 'master' branch as a low-prio alternative to the (fairly old) release version 2014-12-23 12:50:43 +01:00
Pascal Wittmann f55545c0c9 fix maintainer information
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
John Wiegley f6c491891f emacsPackages.haskellMode: regress to 13.10 until next release 2014-12-19 13:57:02 -06:00
Matej Cotman 05e40cb1f2 zed: upgrade to 1.0.0 version 2014-12-19 17:53:34 +01:00
Pascal Wittmann b5dadcb429 Merge pull request #5336 from schristo/phpstorm-8.0.2
Bumped PHPStorm to 8.0.2
2014-12-19 10:45:16 +01:00
Aycan iRiCAN 389670985f emacs24Packages.haskellMode upgrade to use fetchFromGitHub 2014-12-18 14:51:56 +02:00
Aycan iRiCAN e1c2ac404d emacs24Packages.haskellMode update to use fetchurl 2014-12-18 09:36:19 +02:00
Aycan iRiCAN 7ebc62059e emacs24Packages.haskellMode updated to latest git. 2014-12-17 14:41:10 +02:00
Scott Christopher 05a22c0174 Bumped PHPStorm to 8.0.2
- also removed fsnotifier from global bin to prevent colisions when multiple Jetbrains IDEs are installed.
2014-12-15 13:58:36 +11:00
Jascha Geerds 268ea28b78 pycharm: Update to 4.0.1 2014-12-01 18:27:51 +01:00
Michael Fellinger 917bf6865a add neovim 2014-11-27 22:16:43 +01:00
Edward Tjörnhammar 4b287deccd ideas version bumps 2014-11-25 22:08:26 +01:00
Merlin Gaillard 5ee08d42f1 updated to v0.150.0 and fixed apm LD_LIBRARY_PATH 2014-11-23 14:18:55 +01:00
Thomas Tuegel 1286572302 qvim: add ttuegel to maintainers 2014-11-20 05:14:02 -06:00
Thomas Tuegel f383ecb8c4 qvim: upgrade to 20140827 (stable) 2014-11-20 05:14:02 -06:00
Aycan iRiCAN f578c0ce5d emacsPackages.js2-mode updated to latest release. 2014-11-20 00:37:37 +02:00
Cillian de Róiste 546ece8f25 emacs24Packages.rainbowDelimiters: update from 1.3.12 to 1.3.13 2014-11-18 21:23:41 +01:00
Charles Strahan 4d807e55aa sublime3: set rpath for libbz2 and libssl
This fixes the Package Control package.
2014-11-18 00:38:36 +00:00
John Wiegley adeb4fb56b emacs24Macport: emacs-24.4-mac-5.0 -> emacs-24.4-mac-5.1 2014-11-17 02:49:06 -06:00
Aristid Breitkreuz 199e7908a5 emacs-clang-complete-async: fix build (untested, but at least it builds) 2014-11-16 17:12:05 +01:00
Vladimír Čunát c76b399644 vim-configurable: update the patch-version 2014-11-14 23:16:17 +01:00
Vladimír Čunát 6d6695ec14 vim: improve *.nix plugin (#4662)
- Sync syntax from source.
- Add indentation conventions.
2014-11-14 22:08:31 +01:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Vincent Laporte 7361406e20 Adds bluefish
Bluefish is a powerful editor targeted towards programmers and
webdevelopers, with many options to write websites, scripts and
programming code.

Homepage: http://bluefish.openoffice.nl/
2014-11-13 19:49:44 +00:00
Michael Raskin 2126714a84 Merge pull request #4979 from bosu/vim-cscope
vim_configurable: add cscope support by default
2014-11-13 19:49:07 +03:00
Boris Sukholitko 8bc9e80d94 vim_configurable: add cscope support by default 2014-11-13 18:02:14 +02:00
Vincent Laporte 6e737145d7 jEdit: update from 4.4.2 to 5.1.0 2014-11-13 07:53:37 +00:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Peter Simons 7da8ef80a7 emacs-ess: update checksum of the tarball 2014-11-08 18:44:15 +01:00
Peter Simons 6835392708 Merge pull request #4895 from joachifm/ess-14_09
ess: bump version to 14.09
2014-11-08 16:06:52 +01:00
Joachim Fasting 47bc68a687 ess: bump version to 14.09 2014-11-08 16:01:07 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Peter Simons 69bb66902f emacs-icicles: add current icicles snapshot to emacsPackages 2014-11-07 11:55:57 +01:00
Mateusz Kowalczyk b8c561451f haskell-yi: update to version 0.11.1
cc @peti ; I took the courtesy to cherry-pick your yi-rope update ahead
2014-11-07 02:51:01 +00:00
Edward Tjörnhammar beb14981bb idea-{community,ultimate}: 14pre -> 14 2014-11-06 21:19:47 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Mathijs Kwik 8913f14a5f emacs-idris-mode: upgrade to 0.9.15 2014-11-05 18:28:59 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Edward Tjörnhammar 6c1ebab0a0 idea.ruby-mine: added 6.3.3 2014-11-04 21:22:42 +01:00
Edward Tjörnhammar a7d3aed056 idea.clion: added eap 2014-11-04 21:22:42 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Michael Raskin fe624050e8 Merge pull request #4737 from ambrop72/kdevelop-dependencies
KDevelop: Add some propagatedUserEnvPkgs dependencies.
2014-11-04 12:39:09 +03:00
John Wiegley 4c81ac3320 macvim: Update sha256 2014-11-03 15:27:32 -06:00
Edward Tjörnhammar 263d618d2c idea-{community,ultimate}: 13.1.5 -> 14pre 2014-11-03 18:47:55 +01:00
John Wiegley 198874e489 emacs24Macport: allow installing either 24.3 or 24.4 2014-11-03 10:51:29 -06:00
Peter Simons f2ae7bd844 magit: update to version 90141025 2014-11-03 14:41:05 +01:00
Allan Espinosa c6089871bb Use fetchurl and the exact release tag 2014-11-03 22:15:58 +09:00
Allan Espinosa 21880ab6fb Update the sha256sum of the new MacVim build
Correct the update from #4576
2014-11-03 22:15:58 +09:00
Georges Dubus 5258211e32 focuswriter: added expression 2014-11-01 21:20:59 +01:00
ambrop7@gmail.com 2d38837355 KDevelop: Add some propagatedUserEnvPkgs dependencies.
Now KDevelop should start in a functional form without having to
manually install those.
2014-10-30 22:18:39 +01:00
Scott Christopher 36308f6bbc IDEA Editor: Adds PHPStorm support. 2014-10-30 22:25:28 +11:00
Pascal Wittmann 5b542ec902 org: update from 8.2.8 to 8.2.10 2014-10-28 12:47:09 +01:00
karsten gebbert 3071a57c34 Add hsc3 haskell package. 2014-10-26 16:22:29 +01:00
Georges Dubus af5c2d6579 Merge pull request #4650 from madjar/master
Atom: updated to 0.139.0
2014-10-26 13:21:46 +01:00
Mateusz Kowalczyk 19e665126b haskell-yi: update to 0.11.0 2014-10-26 03:45:25 +00:00
Pascal Wittmann f8d64212b3 bvi: update from 1.3.2 to 1.4.0 and adopt it 2014-10-26 02:37:33 +02:00
Moritz Ulrich 635d49e973 Emacs: remove --with-crt-dir (no longer supported) 2014-10-25 20:34:51 +02:00
Mateusz Kowalczyk 9eaee3fd54 haskell-yi-custom: use NIX_* vars for nicer wrap
According to @bennofs , this should now work regardless of what kind of
mess the user is in.
2014-10-24 14:36:08 +01:00
Mateusz Kowalczyk bd43ff7b6a haskell-yi-custom: improve wrapper
Apparently it is possible for the config to be compiled correctly but
for ‘hint’ still not know where the packages are: it seems to ignore the
GHC in PATH and does whatever.
2014-10-24 10:04:27 +01:00
Georges Dubus 03d6843b87 Atom: updated to 0.139.0 2014-10-24 11:04:06 +02:00
Markus Kohlhase 4bc0d5bc92 leafpad: added platform information to the meta section 2014-10-23 20:35:02 +02:00
Markus Kohlhase 137eb4c98a added leafpad editor 2014-10-23 17:54:56 +02:00
Peter Simons b31ac058cc magit: don't install lisp files into a "magit" sub-directory
After this change, Emacs can load the magit-*.el files without further
configuration. Just add

    (require 'magit-autoloads)

to ~/.emacs, and run M-x magit-status or any other magit command.
2014-10-22 13:06:43 +02:00
Peter Simons dba01b2e77 magit: update to the latest release from Melpa 2014-10-22 11:46:56 +02:00
Peter Simons 3b4a72c3d6 git-modes: add git-modes package version 0.15.0-8-g4e10851 for Emacs
These files are required by the latest version of Magit.
2014-10-22 11:46:56 +02:00
Mateusz Kowalczyk 917c1638bf emacs-magit: fix URL (hopefully) 2014-10-21 22:40:28 +01:00
Mateusz Kowalczyk 2026054746 emacs-magit: update to 1.2.1 2014-10-21 20:21:11 +01:00
John Wiegley 0fdd8b312e emacs24Macport: 23.4-mac-4.8 -> 24.4-mac-5.0 2014-10-21 13:40:53 -05:00
Moritz Ulrich 7e78166563 emacs24: Update to 24.4. 2014-10-20 22:08:19 +02:00
Aristid Breitkreuz 5d6e039cd6 Merge pull request #4576 from cstrahan/macvim-clang
Fix MacVim by using clang.
2014-10-18 16:15:34 +02:00
Charles Strahan bad51b0b02 Fix MacVim by using clang. 2014-10-18 01:15:45 -04:00
Mateusz Kowalczyk 0fac38fd48 haskell-yi: make the wrapper less cumbersome
It still suffers from ‘everything breaks’ if there is any Haskell in
user env: https://github.com/NixOS/nixpkgs/issues/4560
2014-10-17 00:39:31 +01:00
Mateusz Kowalczyk 5badd8445e haskell-yi-custom: broken = true for now 2014-10-15 06:08:18 +01:00
Mateusz Kowalczyk 8842fcfdb1 haskell-yi-custom: convenience wrapper for configs
Now to use Yi along with its config the user passes all the extra
libraries wanted by their config as extraPackages and builds the
expression. This means there is no hassle from the user about having to
manually create a cabal file and wrap over the Yi binary.
2014-10-15 04:31:03 +01:00