JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,867 Commits 2 Branches 0 Tags 13 GiB
4e99a11653
Commit Graph

1241 Commits

Author SHA1 Message Date
Andreas Baldeau
25baba283f Webstorm update => 10.0.2 2015-05-03 15:04:35 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III
f48fe899c3 Simplify some builds with curses compatability 2015-04-30 18:49:28 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Edward Tjörnhammar
63563b2c5f ideas: correct env vars in wrapper 2015-04-22 20:15:05 +02:00
Edward Tjörnhammar
a039f4a584 idea-{community,ultimate}: 14.1.1 -> 14.1.2 2015-04-22 19:19:45 +02:00
Bart Brouns
dfa24f7585 Fix hash of eclipse_sdk_442_hash 32bit 2015-04-21 19:31:49 +02:00
Aycan iRiCAN
3cd32fcbed Merge pull request #7473 from aycanirican/fix_darwin_emacs 
emacs-24: Removed obsolete patch file
 2015-04-20 09:18:10 +03:00
Aycan iRiCAN
236d963a1e Removed all references to darwin-new-sections.patch 2015-04-20 09:04:15 +03:00
Aycan iRiCAN
41944ca5a7 Removed patch file. 2015-04-20 08:30:39 +03:00
Aycan iRiCAN
151456da27 emacs-24: Removed obsolete patch file 2015-04-20 08:28:17 +03:00
Edward Tjörnhammar
74214d6eee ideas: fix sneaky comma 2015-04-18 21:54:16 +02:00
William A. Kennington III
96ea5d3c56 nano: 2.4.0 -> 2.4.1 2015-04-17 14:10:09 -07:00
Luca Bruno
9d3f02c5de Revert "Emacs 24.5: Fix build on Darwin." 
This reverts commit 869b86d925.

It breaks tarball evaluation, see 869b86d925
 2015-04-17 13:01:09 +02:00
Edward Tjörnhammar
e3b4c0be91 IDEA updates 
idea.android-studio: 1.1.0 -> 1.2.0.8
idea.clion: eap -> 1.0
idea.idea-community: 14.1 -> 14.1.1
idea.idea-ultimate: 14.1 -> 14.1.1
 2015-04-16 22:30:47 +02:00
Mateusz Kowalczyk
f7737355d4 haskell-yi: clean-up + meta 2015-04-15 21:36:06 +01:00
Mateusz Kowalczyk
33d52b37f3 haskell-yi: improve wrapper and use haskell-ng 
Now pkgs.yi is the package to use and override
 2015-04-15 21:31:17 +01:00
Moritz Ulrich
869b86d925 Emacs 24.5: Fix build on Darwin. 
`darwin-new-sections.patch' is now in upstream.
 2015-04-15 12:02:38 +02:00
Thomas Tuegel
e75a0c50bd emacs: allow gtk without X on Darwin 2015-04-14 09:16:21 -05:00
Jascha Geerds
04239d4af2 pycharm: Update to 4.0.6 2015-04-13 14:24:56 +02:00
Jascha Geerds
03b87e7243 Merge pull request #7351 from Forkk/fix/cask-init 
cask: fix issue with 'cask init' command
 2015-04-13 11:31:36 +02:00
Joachim Schiele
4bf8c805b1 Merge pull request #6877 from qknight/eclipse_scala 
eclipse-scala: added Scala IDE
 2015-04-13 10:29:07 +02:00
Forkk
d385fd9111 cask: fix issue with 'cask init' command 
Fix an issue where 'cask init' would fail due to missing template files.
 2015-04-13 00:36:49 +02:00
Thomas Tuegel
cebf589462 Merge pull request #7294 from ttuegel/emacs 
emacs: allow choosing gtk2 or gtk3
 2015-04-12 15:12:12 -05:00
Moritz Ulrich
034e1c4aef emacs24: Update to 24.5 2015-04-11 14:24:41 +02:00
John Wiegley
ff555c3b47 emacs24Macports: 24.4-mac-5.3 -> 24.5-mac-5.7 2015-04-11 00:02:56 -05:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Thomas Tuegel
bc4f39f48b emacs: allow choosing gtk2 or gtk3 2015-04-09 11:38:46 -05:00
Domen Kožar
bcc1d0339b Merge pull request #7266 from codyopel/sublime 
sublimetext3: add .desktop entry & icon
 2015-04-08 17:43:06 +02:00
Pascal Wittmann
a3b2058153 writegood: update from 2.0 to 2.0.2 2015-04-08 16:03:56 +02:00
codyopel
ee8e97d803 sublimetext3: add .desktop entry & icon 2015-04-08 09:05:06 -04:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
codyopel
16f5b98e4f sublime-text 3: 3.0.65 -> 3.0.83 2015-04-03 13:22:53 -04:00
Thomas Tuegel
e5b9a42aea texmaker: fix poppler_qt4 name 2015-04-02 11:44:13 -05:00
Thomas Tuegel
c0d5cd0ff9 poppler: fix build of Qt 4 and Qt 5 wrappers 
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
 2015-04-02 09:51:44 -05:00
lethalman
1670a75285 Merge pull request #6982 from obadz/monodevelop 
Monodevelop + Mono upgrade
 2015-03-31 16:30:42 +02:00
obadz
1129f6b0db mono 3.8.0 -> 3.12.1 
monodevelop 5.1.4.0 -> 5.7.0.660
 2015-03-30 23:48:25 +01:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Andreas Baldeau
f079de2dbf Added WebStorm IDE 2015-03-29 16:27:37 +02:00
William A. Kennington III
7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
Eric Seidel
7f0e6b76ff nano: patch for darwin 2015-03-27 12:05:41 -07:00
William A. Kennington III
2c9823713a Merge branch 'master' into staging 2015-03-26 14:49:34 -07:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
=
46d1dd5b11 Downgraded Emacs priority, for exuberant ctags 
Exuberant ctags works with Emacs among with other editors, and if
installed is probably preferred to Emacs' ctags.
 2015-03-26 21:42:36 +00:00
William A. Kennington III
b91e83dc77 vim: 7.4.410 -> 7.4.683 2015-03-26 14:33:35 -07:00
William A. Kennington III
8a8097eb90 nedit: 5.5 -> 5.6 2015-03-26 14:10:06 -07:00
Herwig Hochleitner
df0c059f83 Update Jetbrains IDE versions 2015-03-26 19:08:01 +01:00
William A. Kennington III
5fab3e266e nano: Default to having nls support 2015-03-25 22:10:47 -07:00
William A. Kennington III
247cf8f37a Merge pull request #6986 from joachifm/nano-2_4 
Nano 2.4
 2015-03-25 21:47:44 -07:00
Joachim Fasting
cf74e83057 nano: add option to do tiny build 
Enabling tiny build reduces the binary to 107K on my system
(more than 50% size reduction).
 2015-03-25 23:31:21 +01:00
Joachim Fasting
e1f6d349ec nano: make NLS optional 2015-03-25 23:31:20 +01:00
Joachim Fasting
1533a9aef5 nano: bump to 2.4.0 
Also set license, platforms, and add myself as maintainer.

Changes in this version include a fully functional undo system,
vim-compatible file locking, linter support, formatter support,
and improved highlighter flexibility.
 2015-03-25 23:31:20 +01:00
Peter Simons
9ce41e3fa0 rstudio: fix Emacs syntax highlighting 2015-03-25 19:34:45 +01:00
Emery Hemingway
a3de8552b0 RStudio: initial commit at version 0.98.110 2015-03-25 19:34:45 +01:00
Domen Kožar
58b4f11242 Revert "RStudio: initial commit at version 0.98.110" 
This reverts commit 56e21d05e8.

It's missing a file, see https://github.com/NixOS/nixpkgs/pull/6957
 2015-03-25 10:02:08 +01:00
Thomas Tuegel
8fd5dd89ac Merge branch 'master' into staging 2015-03-24 17:49:30 -05:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Edward Tjörnhammar
7b7ab0cdaa idea-{community,ultimate}: 14.0.3 -> 14.1 2015-03-24 17:01:59 +01:00
Emery Hemingway
56e21d05e8 RStudio: initial commit at version 0.98.110 2015-03-23 16:28:33 -04:00
Vincent Laporte
e4c0225c29 tuareg-mode: update from 2.0.6 to 2.0.9 2015-03-19 19:14:15 +01:00
William Giokas
9e2d8fd259 vim: Fix vim_configurable options 
mzscheme and tcl were using `--enable-mzscheme` and `--enable-tcl` when
those are not actual flags. They should be set to `*interp` instead.
 2015-03-18 15:50:37 -07:00
Joachim Schiele
1010450208 eclipse-scala: added Scala IDE 2015-03-18 16:30:01 +01:00
William Giokas
463c78a509 vim: Add python3 support to vim_configurable 2015-03-17 14:30:47 -07:00
danbst
79e9ca33c8 lighttable: rename package LightTable to lighttable 2015-03-14 18:40:23 +00:00
danbst
5b947b82e6 lighttable: update to 0.7.2 2015-03-14 18:22:14 +00:00
Vincent Laporte
48c6daf491 jedit: update from 5.1.0 to 5.2.0 2015-03-13 22:17:32 +01:00
Mariusz `shd` Gliwiński
75d3a321d6 IDEA-PhpStorm version bump to 8.0.3 2015-03-13 18:53:00 +01:00
Jascha Geerds
328651bfac pycharm: Update to 4.0.5 2015-03-13 14:55:08 +01:00
Pascal Wittmann
c6a0565cfe Merge pull request #6648 from svenkeidel/eclipse-442 
eclipse: update to 4.4.2
 2015-03-13 11:31:54 +00:00
Frederic LeBel
b9f0cfd85a Atom: updated to 0.187.0 2015-03-12 15:37:32 -04:00
Luca Bruno
4a2986e654 tuxguitar: fix nixpkgs tarball job 2015-03-11 18:34:26 +01:00
James Earl Douglas
ff2a48b3ef Fix broken urls 2015-03-11 06:06:26 +01:00
Lluís Batlle i Rossell
44c3256017 Updating gobby and libinfinity. 2015-03-10 14:37:11 +01:00
lethalman
0a83c2a2a9 Merge pull request #6697 from ardumont/add-tuxguitar 
[new] tuxguitar derivation
 2015-03-08 11:54:57 +01:00
Antoine R. Dumont
dd71d7b44b tuxguitar in $out/bin/ folder 
Tuxguitar was installed in $out (as per default wrapper script)
Thus installing tuxguitar was not in ~/.nix-profile when installed.

Now tuxguitar appears in ~/.nix-profile when installed.
 2015-03-08 11:14:02 +01:00
Antoine R. Dumont
00fb3c0b7e Add tuxguitar derivation 2015-03-08 10:22:56 +01:00
Moritz Ulrich
86bd152378 Emacs: Fix `woman'. 2015-03-07 12:03:26 +01:00
Sven Keidel
eb935ffb73 eclipse: update to 4.4.2 2015-03-03 18:53:47 +01:00
Jan Malakhovski
380389bc0b update and convert {apel, flim, semi, wanderlust} to emacs packages 2015-03-03 16:02:18 +00:00
Jan Malakhovski
59ebcccc59 add nyan-mode emacs package 2015-03-03 16:02:17 +00:00
Jan Malakhovski
2c32576a91 add emacs-modes/{apel, flim, semi, wanderlust} 2015-03-03 05:31:38 +00:00
Ambroz Bizjak
d777470c3d KDevelop: Update to 4.7.1. 2015-03-03 01:44:36 +01:00
Edward Tjörnhammar
a46065ce80 idea.android-studio: 1.1.0b2 -> 1.1.0 
add androidsdk as dependency
                     set ANDROID_HOME for android-studio wrapper
 2015-02-23 19:51:18 +01:00
Arseniy Seroka
2550304bb6 Merge pull request #6524 from fkz/master 
add edbrowse to all packages
 2015-02-23 19:43:39 +03:00
Fabian Schmitthenner
8a74fa7723 add edbrowse to all packages 2015-02-22 23:11:01 +00:00
John Wiegley
6f30dcd456 emacs24Macport: upgrade Macport patch to 5.1 -> 5.3 2015-02-21 03:38:07 -06:00
Edward Tjörnhammar
17e6dd2da3 ideas: refactoring, remove snappyPatch as all derivative products are based on the 14 series 2015-02-17 12:27:08 +01:00
Vincent Laporte
10a84b3c69 bluefish: update from 2.2.6 to 2.2.7 2015-02-10 14:03:33 +01:00
Dan Peebles
d8ad39d2e6 Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime) 2015-02-08 19:15:09 -05:00
Dan Peebles
063c901d6c Minor purification of emacs24Macport (for upcoming pure darwin stdenv) 2015-02-08 18:53:38 -05:00
Edward Tjörnhammar
b65e6e873f ideas: use secure transport 2015-02-07 13:20:03 +01:00
Alexei Boronine
f80828c937 idea: change source URLs to "nicer" ones (close #6211) 2015-02-07 13:09:50 +01:00
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
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
Nick Sauce
bfa942c9bf sigil: new package 2014-10-07 18:51:33 +04:00
Aristid Breitkreuz
c892ba93b4 atom: update from 0.129.0 to 0.135.0 2014-10-06 21:54:59 +02:00
Pascal Wittmann
806d2aa68c org-mode: update from 8.2.7c to 8.2.8 2014-10-03 11:23:08 +02:00
Baptist BENOIST
c35a1b828f geany: Update from 1.23.1 to 1.24.1 
Closes #4359
 2014-10-02 06:39:03 +01:00
Mateusz Kowalczyk
ce4ae2aa1e Merge pull request #4305 from vbgl/coq-containers 
Working with Coq
 2014-09-30 15:04:30 +01:00
Mateusz Kowalczyk
f04b0b9879 emacs24Packages.tuaregMode: update from 2.0.6 to 2.0.8 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
3043af8838 emacs24Packages.rainbowDelimiters: update from 1.3.8 to 1.3.12 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
9d246d2cff emacs24Packages.structuredHaskellMode: update from 1.0.3 to 1.0.4 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
c00b69969f flpsed: update from 0.7.1 to 0.7.2 2014-09-30 10:45:42 +01:00
Vincent Laporte
94828070ed ProofGeneral: makes the dependency on TeXLive optional 
And fixes the default value of $PGHOME
 2014-09-28 14:03:15 +01:00
Anonymous
e223bc046c android-studio: new package 2014-09-24 12:13:55 +02:00
Anonymous
a3b565f7a3 idea: hack to get fsnotifier working 
more information: https://bugs.archlinux.org/task/34703
 2014-09-24 12:13:54 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
Edward Tjörnhammar
175a40133a ideas: refactored products into common subexpression. 
Closes #4039
 2014-09-21 15:20:21 +01:00
Mateusz Kowalczyk
cdce34d82a Merge pull request #4153 from ambrop72/kdevelop47 
Update KDevelop to 4.7.0.
 2014-09-20 22:52:16 +01:00
Jan Niklas Hasse
3b45556a3b atom: 0.99.0 -> 0.129.0 
[Bjørn Forsman: include fixupPhase, to fix this startup error on NixOS:
 $ ./result/bin/atom
 ./result/bin/atom: /nix/store/q3r5ww6pg5yb4j6p0d8inrhbgzmik0b6-atom-0.129.0/bin/.atom-wrapped: /bin/bash: bad interpreter: No such file or directory
]
 2014-09-20 14:02:08 +02:00
cillianderoiste
1b8d79e0b2 Merge pull request #4143 from geerds/cask 
Add "cask" package
 2014-09-19 13:23:28 +02:00
ambrop7@gmail.com
2bdc12eeed Update KDevelop to 4.7.0. 2014-09-18 22:23:23 +02:00
Jascha Geerds
771d1bd865 Add "cask" package 2014-09-18 00:46:45 +02:00
wyvie
490dc64347 Fixed file name with new version 2014-09-14 21:19:38 +02:00
wyvie
57f62dd2b4 Bumped version of sublime3 2014-09-14 21:13:54 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Luca Bruno
f5c43d9f62 vanubi: new package 
Programming editor for GTK+ inspired by Emacs

http://vanubi.github.io/vanubi
 2014-09-13 12:39:18 +02:00
Matej Cotman
bca3e21d81 remove nodewebkit patch code and upgrade zed to 0.13 2014-09-13 10:43:28 +02:00
Peter Simons
df4c114252 Merge pull request #4036 from lostdj/ltp/master/ijifix 
IntelliJ IDEA: do not assume that we are using OpenJDK.
 2014-09-12 10:16:55 +02:00
lostdj
f3e0f5e755 IntelliJ IDEA: do not assume that we are using OpenJDK. 2014-09-11 20:51:12 +04:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Peter Simons
6f819ef4f4 emacs-ensime: depend on scala-mode2 and sbt-mode 2014-09-06 13:30:44 +02:00
Peter Simons
1e92a86240 emacs-rainbow-delimiters: add version 1.3.8 2014-09-06 13:30:44 +02:00
gounnoticed
de03197100 Add luna cpp build for eclipse 
didnt have sha512 so used md5 instead.
 2014-09-05 19:35:28 +01:00
Peter Simons
7f5bc10186 emacs-ensime: add current git snapshot 2014-09-05 16:06:16 +02:00
Peter Simons
e8bff6f838 emacs-s: add version 1.9.0 2014-09-05 16:06:16 +02:00
Peter Simons
a4ec7a6316 emacs-dash: add version 1.5.0 2014-09-05 16:06:16 +02:00
Peter Simons
309851f999 scala-mode2: update to latest version 2014-09-05 16:06:16 +02:00
Pascal Wittmann
d812281674 zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux 2014-09-02 17:57:09 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Vladimír Čunát
acba6b4da2 ed: update to 1.10, working around *.lz problem 2014-08-30 23:00:58 +02:00
Eelco Dolstra
74b808a66f Revert "ed: update to 1.10 (close #3852)" 
This reverts commit 60902b97fe. It
breaks building on Darwin:

  http://hydra.nixos.org/build/13832410

It also adds a gratuitous dependency to the stdenv bootstrap.
 2014-08-30 22:41:01 +02:00
Longrin Wischnewski
33cbd6687c wxhexeditor: adding version 0.22 
wxhexeditor: add the package to all-packages.nix

wxhexeditor: fix shebang
 2014-08-30 12:24:43 +01:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Mateusz Kowalczyk
60902b97fe ed: update to 1.10 (close #3852) 2014-08-29 13:58:51 +02:00
Mathijs Kwik
0e1ed7bbc9 fix js2-mode revision 2014-08-25 13:56:53 +02:00
Mathijs Kwik
fb2449c026 add emacs color-theme solarized 2014-08-25 13:56:53 +02:00
Mathijs Kwik
3be7d4b478 idris-mode: upgrade to 0.9.14 2014-08-25 13:56:52 +02:00
Edward Tjörnhammar
8bd3c67552 IDEA: 13.1.3 -> 13.1.4 
Changed, attribute name separator changed to dashes and decription.
Added longDescription.
 2014-08-25 11:03:35 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Cray Elliott
5ec6492ea0 Mark yi and yi-contrib as broken 
They no longer build with lens v4.4.0.1 and up
 2014-08-24 20:28:12 +02:00
Eelco Dolstra
ce6b86cc68 Fix various evaluation problems 
http://hydra.nixos.org/build/13616685
 2014-08-22 11:57:40 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL. 
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
 2014-08-21 12:45:28 +02:00
Vladimír Čunát
56d9b2cc8a merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
Jascha Geerds
bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Mateusz Kowalczyk
83f532fdfd haskell-yi: update to 0.8.2 
Allows it to work with glib/gtk/pango 0.13.x
 2014-08-11 13:56:12 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Eelco Dolstra
0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC 
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
 2014-08-09 19:08:37 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Aycan iRiCAN
c35224efb6 Merge remote-tracking branch 'upstream/master' 2014-08-06 10:21:57 +03:00
Bjørn Forsman
310400e0f5 intellij-idea: don't access 'shortName' license attribute 
I don't think packages should poke into the license attributes.
 2014-08-05 07:22:06 +02:00
Jascha Geerds
eaad8d6923 Packaging PyCharm IDE 2014-08-05 07:15:43 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Aycan iRiCAN
307a08c9a3 removed rev 2014-08-03 21:21:52 +03:00
Aycan iRiCAN
02dcf1e493 Upgrade js2-mod to 20140114 2014-08-03 21:20:26 +03:00
Joachim Fasting
2fc0537018 nano: bump to version 2.3.6 2014-08-01 18:19:03 +02:00
Joachim Fasting
decb4266f1 nano: support system-wide nanorc 
This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
 2014-08-01 18:19:03 +02:00
Matej Cotman
b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Pascal Wittmann
cf744cb715 org: update from 8.2.7b to 8.2.7c 2014-07-30 12:14:15 +02:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Moritz Ulrich
e4f978d09f bbdb3: New package. 2014-07-27 10:55:43 +02:00
Matej Cotman
dbc829f5d4 new package: zed 0.12.0 (installer) 2014-07-26 14:41:20 +02:00
Eelco Dolstra
3ef40e5004 emacs: Remove 23.x 2014-07-22 13:50:52 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Eugene Akentyev
08ca4e2d59 Add Light Table editor. 2014-07-17 12:25:22 +02:00
Pascal Wittmann
70caf388eb org: update from 8.2.7 to 8.2.7b 2014-07-17 12:20:22 +02:00
Paul Colomiets
ab2c7cfff7 vim: Add syntax on and set nocompatible by default 
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
 2014-07-15 14:59:16 +02:00
Paul Colomiets
e376e9731d vim: Update vim to 7.4.335 2014-07-15 14:59:16 +02:00
Paul Colomiets
5e99b0553c vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc 2014-07-15 14:59:16 +02:00
Paul Colomiets
abf19df497 Remove wrapVim 
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?

Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
 2014-07-15 14:59:16 +02:00
Paul Colomiets
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Peter Simons
ac44601157 idea: minor cosmetic chance to fix syntax highlighting in Emacs 2014-07-09 16:10:50 +02:00
Peter Simons
d4fa3e2e54 Rename 'idea_community_1313' attribute to 'idea_community', i.e. drop the 
version number so that it's possible to refer to some "default version of the
package" without knowing what version number that actually is.

The same applies to idea_ultimate_1313.
 2014-07-09 16:10:50 +02:00
Austin Seipp
c734ec6952 Merge pull request #3201 from cstrahan/update-macvim 
Update `macvim` package to v7.4.355
 2014-07-08 11:47:09 -05:00
Moritz Maxeiner
682aadfc91 eclipse: add Eclipse Standard 4.4 Luna 2014-07-08 00:34:56 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan
03391f9894 Update macvim package to v7.4.355 
MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
 2014-07-07 00:16:55 -04:00
cillianderoiste
00cb266c4f Merge pull request #3163 from pSub/writegood-mode 
Update writegood-mode from 1.3 to 2.0
 2014-07-02 14:15:10 +02:00
Pascal Wittmann
da8b931738 Update writegood-mode from 1.3 to 2.0 2014-07-02 13:03:01 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00