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
Mateusz Kowalczyk
7562afbe19
haskell-yi: use --suffix wrapper
...
This allows further wrappers to get around the problem of ending up with
GHC_PATH with double ‘::’ in it, breaking the whole thing.
2014-10-15 03:54:46 +01:00
Mateusz Kowalczyk
a921dba56a
haskell-yi-contrib: move under libraries instead
2014-10-15 01:00:16 +01:00
Mateusz Kowalczyk
1ccb025729
haskell-yi-contrib: update to 0.10.1
2014-10-15 01:00:16 +01:00
Mateusz Kowalczyk
0d858ba4c0
haskell-yi: update to 0.10.1
2014-10-15 01:00:16 +01:00
Jascha Geerds
a1217e5b1a
Remove legacy pycharm version and rename the new one
2014-10-14 13:26:00 +02:00
Edward Tjörnhammar
d975ba397c
idea.android-studio: bump 0.8.10 -> 0.8.12
2014-10-12 10:27:10 +02:00
Edward Tjörnhammar
9eb5fef92f
idea.idea-{community,ultimate}: bump 13.1.4b -> 13.1.5
2014-10-12 10:27:10 +02:00
Edward Tjörnhammar
a4d94a0042
idea.desktop: fixed that the item got malformed Comment input
2014-10-12 10:27:10 +02:00
Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Michael Raskin
ff371b96df
A sigil cleanup
2014-10-07 18:51:33 +04:00