Commit graph

52689 commits

Author SHA1 Message Date
Aristid Breitkreuz
392f828c5d Merge pull request #4822 from abbradar/crawl
crawl: fix, update, add console version
2014-11-08 19:42:23 +01:00
Luca Bruno
510fba95e8 nixos-rebuild: reload dbus before starting other units. Closes #4546 2014-11-08 19:40:28 +01:00
Aristid Breitkreuz
8b949e5ff5 Merge pull request #4823 from abbradar/synaptics-fix
synaptics: fix tapButtons setting
2014-11-08 19:38:06 +01:00
Marc Weber
613ca23e85 experimental/vim-vam-pathogen-vimrc-support
This patch implements derving a .vimrc from vim-plugins.nix loading those
plugins by either Pathogen or VAM (VAM seems to be slightly faster and is much
more powerful).

Example:

  environment.systemPackages = [
   # default plain vim
   vim_configurable

   # vim which get's called vim-with-addon-nix
   (vim_configurable.customize {
      name = "vim-with-addon-nix";
     vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
   })
  ];

This way you can provide an "enhanced Vim" and a standard Vim.

Details about what this commit changes:
1) provide a new toplevel name vimrc which
  * provides a way to build up a .vimrc using either pathogen or VAM (knowing about plugin dependencies by name)
  * can enhance vim to support. vim.customize { name = "name-user"; vam.pluginDictionaries and/or pathogen.pluginNames = .. }
  * introduce rtp names for each vim plugin pointing to the runtimepath path
  * suggest naming to be the same as vim-pi so that VAM's dependencies work
  * derive some packages as example from vim-pi using VAM's new autoload/nix.vim
    supporting simple dependencies
  * test case for vim-addon-nix for VAM/pathogen

2) enhance vim_configurable to support .customize

3) update many plugins by using VAM's implementation not rewriting those which
  * vim-pi doesn't know about the git source yet (TODO: make vim-pi be aware of
    those)
  * have special build code

This commit partially conflicts with commits done by Bjørn Forsman starting by
37f961628b, eg the one using lower case attr and pkg names, because they don't
match vim-pi (eg YouCompleteMe). Rather than resolving the conflict this just
adds aliases so that both names can be used
2014-11-08 19:34:17 +01:00
Aristid Breitkreuz
8b50383c45 Merge pull request #4859 from abbradar/git-daemon
nixos/git-daemon: fix a bug and add 'user' and 'group' options
2014-11-08 19:33:24 +01:00
Domen Kožar
9ea81152cc Merge pull request #4891 from pSub/prefer-xresources
Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
2014-11-08 19:32:46 +01:00
Rüdiger Sonderfeld
fa1cec1037 update-users-groups.pl: Use UTF-8 instead of latin1.
Perl seems to write the file in latin1 independent of the actual input
encoding.  This can corrupt the "description" field of /etc/passwd.  By
setting "binmode" to ":utf8" Perl can be forced to write UTF-8.  Ideally
the program would simply read/write the fields by value without any
changes in encoding.  However, assuming/enforcing UTF-8 is a lot better
than using an obsolete coding like latin1.
2014-11-08 19:25:17 +01:00
Peter Simons
7da8ef80a7 emacs-ess: update checksum of the tarball 2014-11-08 18:44:15 +01:00
Vincent Laporte
2e9339891f FileZilla: update from 3.8.1 to 3.9.0.6 2014-11-08 17:27:18 +00:00
Vincent Laporte
8c7d6b8f4c klavaro: update from 2.00 to 3.01 2014-11-08 16:12:37 +00:00
Domen Kožar
c9ec201cd0 pycdio: fix build 2014-11-08 16:18:50 +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
Peter Simons
0b36cbf8e7 cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 2014-11-08 15:50:21 +01:00
Peter Simons
b8d631a604 happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 2014-11-08 15:50:21 +01:00
Peter Simons
64ff17d4e6 haskell-zlib: drop obsolete versions 0.5.0.0, 0.5.2.0, 0.5.3.1, 0.5.3.3, and 0.5.4.0 2014-11-08 15:50:21 +01:00
Peter Simons
b2ac4769ab haskell-xhtml: drop obsolete versions 3000.2.0.1, 3000.2.0.4, and 3000.2.0.5 2014-11-08 15:50:20 +01:00
Peter Simons
e4e0708397 haskell-vector: drop obsolete versions 0.10.0.1 and 0.10.11.0 2014-11-08 15:50:20 +01:00
Peter Simons
6c6f8a5cc8 haskell-unordered-containers: drop obsolete versions 0.2.3.0 and 0.2.4.0 2014-11-08 15:50:20 +01:00
Peter Simons
1676f7a43b haskell-transformers: drop obsolete version 0.2.2.0 2014-11-08 15:50:20 +01:00
Peter Simons
49f0ff941d haskell-text: drop obsolete versions 0.11.0.5, 0.11.0.6, 0.11.1.5, 0.11.2.0, and 0.11.3.1 2014-11-08 15:50:20 +01:00
Peter Simons
b3a3e099d8 haskell-terminfo: drop obsolete version 0.3.2.6 2014-11-08 15:50:20 +01:00
Peter Simons
fad637f23f haskell-stm: drop obsolete versions 2.1.1.2 2.1.2.1, 2.2.0.1, 2.3, and 2.4 2014-11-08 15:50:19 +01:00
Peter Simons
7503e32356 haskell-split: drop obsolete version 0.2.1.1 2014-11-08 15:50:19 +01:00
Peter Simons
837b903cb4 haskell-syb: drop obsolete 0.3.x versions 2014-11-08 15:50:19 +01:00
Peter Simons
8e1b3f3635 haskell-shelly: drop obsolete version 0.15.4.1 2014-11-08 15:50:19 +01:00
Peter Simons
eef8352a92 haskell-regex-posix: drop obsolete versions 0.72.0.3, 0.94.1, 0.94.2, 0.94.4, and 0.95.1 2014-11-08 15:50:19 +01:00
Peter Simons
cbc39a26f7 haskell-regex-compat: drop obsolete versions 0.71.0.1, 0.92, 0.93.1 2014-11-08 15:50:19 +01:00
Peter Simons
e612537df9 haskell-regex-base: drop obsolete versions 0.72.0.2 and 0.93.1 2014-11-08 15:50:18 +01:00
Peter Simons
0271e44d25 haskell-QuickCheck: drop obsolete versions 1.2.0.0 1.2.0.1, 2.1.1.1, 2.4.0.1, 2.4.1.1, 2.4.2, 2.5.1.1, 2.6, and 2.7.5 2014-11-08 15:50:18 +01:00
Peter Simons
c6b48a1486 haskell-test-framework-quickcheck: drop obsolete package 2014-11-08 15:50:18 +01:00
Peter Simons
dc6e0d95ac haskell-primitive: drop obsolete version 0.5.2.1 2014-11-08 15:50:18 +01:00
Peter Simons
d04ebcf64e haskell-parsec: drop obsolete versions 2.1.0.1, 3.1.1, 3.1.2, and 3.1.3 2014-11-08 15:50:18 +01:00
Peter Simons
f19bddedcb haskell-parallel: drop obsolete versions 1.1.0.1, 2.2.0.1, 3.1.0.1, and 3.2.0.2 2014-11-08 15:50:18 +01:00
Peter Simons
d3b2c3f46c haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5 2014-11-08 15:50:17 +01:00
Peter Simons
0ce19e1fd2 haskell-OpenGLRaw: drop obsolete versions 1.3.0.0 and 1.4.0.0 2014-11-08 15:50:17 +01:00
Peter Simons
1bcecaed5d haskell-network: drop obsolete versions 2.2.1.4, 2.3.0.2, 2.3.0.5, 2.3.1.0, and 2.4.1.2 2014-11-08 15:50:17 +01:00
Peter Simons
49d273d548 haskell-mtl: drop obsolete versions 1.1.0.2, 2.0.1.0, 2.1.1, and 2.1.2 2014-11-08 15:50:17 +01:00
Peter Simons
b1aa6efc1a haskell-MonadRandom: drop obsolete version 0.1.13 2014-11-08 15:50:17 +01:00
Peter Simons
e278868975 haskell-libsystemd-journal: re-generate expression with cabal2nix 2014-11-08 15:50:17 +01:00
Peter Simons
82aab38251 haskell-language-java: drop obsolete version 0.2.6 2014-11-08 15:50:16 +01:00
Peter Simons
3f7ccb4114 haskell-HUnit: drop obsolete versions 1.2.0.3, 1.2.2.1, 1.2.2.3, 1.2.4.2, 1.2.4.3, and 1.2.5.1 2014-11-08 15:50:16 +01:00
Peter Simons
a3c4b817a5 haskell-html: rename the expression file from 1.0.1.2.nix to default.nix 2014-11-08 15:50:16 +01:00
Peter Simons
cdaccfbad4 haskell-HTTP: drop obsolete versions 4000.0.6, 4000.0.9, 4000.1.1, 4000.1.2, 4000.2.1, 4000.2.2, 4000.2.3, 4000.2.5, and 4000.2.8 2014-11-08 15:50:16 +01:00
Peter Simons
e1af9e865d haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 2014-11-08 15:50:16 +01:00
Peter Simons
57bdeaa375 alex: drop obsolete versions 2.3.1, 2.3.2, 2.3.3, 3.0.1, 3.0.2, and 3.0.5 2014-11-08 15:50:16 +01:00
Peter Simons
760e981266 haskell-src: drop obsolete versions 1.0.1.3, 1.0.1.4, and 1.0.1.5.nix 2014-11-08 15:50:15 +01:00
Peter Simons
c2e47bbb6d haskell-hashable: drop obsolete version 1.1.2.5 2014-11-08 15:50:15 +01:00
Peter Simons
f7bb952d56 haskell-GLURaw: drop obsolete version 1.3.0.0 2014-11-08 15:50:15 +01:00
Peter Simons
103cf8e78a haskell-GLUT: drop obsolete versions 2.1.1.2, 2.1.2.1, 2.1.2.2, 2.2.2.1, 2.3.1.0, and 2.4.0.0 2014-11-08 15:50:15 +01:00