3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

52771 commits

Author SHA1 Message Date
Cray Elliott e47c1c1829 add enableWiimote to bluez5 options 2014-11-08 20:44:12 -08:00
Ricardo M. Correia 12a19684c7 rustcMaster: Fix test failure under grsec kernels 2014-11-09 04:59:31 +01:00
Ricardo M. Correia 4fc73a7873 rustcMaster: Update to newer rev 2014-11-09 04:59:31 +01:00
Vincent Laporte 83e376e4bb ocsigen-deriving: adds dependency to camlp4 2014-11-09 01:49:37 +00:00
Vincent Laporte cac51e4e09 ocaml-optcomp: adds dependency to camlp4 2014-11-09 01:49:37 +00:00
Vincent Laporte ff86c33f1d Fixes camlp4 2014-11-09 01:49:37 +00:00
Ricardo M. Correia 5701e40681 grsecurity: Update stable and test patches
stable: 3.0-3.14.23-201410312212 -> 3.0-3.14.23-201411062033
test:   3.0-3.17.2-201410312213  -> 3.0-3.17.2-201411062034
2014-11-09 02:47:54 +01:00
Jaka Hudoklin 2f66527830 Merge pull request #4905 from ambrop72/conntrack
Add conntrack-tools and missing dependencies.
2014-11-09 01:47:20 +01:00
ambrop7@gmail.com 45aeaf6938 Add conntrack-tools and missing dependencies. 2014-11-09 00:28:21 +01:00
Arseniy Seroka 81c2ce0524 Merge pull request #4903 from NixOS/revert-4900-conntrack
Revert "Add conntrack-tools and missing dependencies."
2014-11-09 02:12:14 +03:00
Arseniy Seroka 417216aa57 Revert "Add conntrack-tools and missing dependencies." 2014-11-09 02:12:04 +03:00
Arseniy Seroka c66a63e45c Merge pull request #4900 from ambrop72/conntrack
Add conntrack-tools and missing dependencies.
2014-11-09 02:10:59 +03:00
Aristid Breitkreuz f10647f1c3 move dockerfile to subdirectory 2014-11-08 23:47:10 +01:00
Jaka Hudoklin 83dc6805ad Add Dockerfile, which builds docker with nix package manager 2014-11-08 23:47:10 +01:00
Aristid Breitkreuz bf39c2e792 Merge pull request #4902 from mstarzyk/ocaml
ocaml: 4.02.0 -> 4.02.1
2014-11-08 23:40:44 +01:00
Emery Hemingway 67a2a58314 cjdns: service tweaks, new NixOS test 2014-11-08 23:39:02 +01:00
Maciek Starzyk f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
ambrop7@gmail.com 085b5ec48c Add conntrack-tools and missing dependencies. 2014-11-08 23:06:09 +01:00
Moritz Ulrich 9b4ba66ac3 Bump poppler to 0.28.1 & remove outdated patches. 2014-11-08 22:48:13 +01:00
Vladimír Čunát 96fd4950f2 crawl: more meta fixes; eval is fine now 2014-11-08 22:16:34 +01:00
Domen Kožar 5e42bcc18d typo 2014-11-08 21:56:51 +01:00
Domen Kožar cac40ad982 doc/contributing.xml: remove lies 2014-11-08 21:56:23 +01:00
Vladimír Čunát 5176fb3bdf crawl: fix evaluation (licenses attribute)
CC: #4822.
2014-11-08 21:55:30 +01:00
Nikolay Amiantov aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Arseniy Seroka bc7b19111b fix sha for a slim's theme 2014-11-08 22:40:36 +03:00
Michael Raskin bf184758a6 Adding Fish-Fillets-NG game 2014-11-08 22:35:06 +03:00
Domen Kožar c1d6a4a8fb remove unused pythonLinkmeWrapper 2014-11-08 20:19:55 +01:00
Aristid Breitkreuz 928177aa91 Merge pull request #4834 from offlinehacker/pkgs/flannel/add
Add flannel, etcd backed network fabric for containers
2014-11-08 19:56:16 +01:00
Vladimir Still 7ade583953 rubber: Disable etex detection.
If etex detection is running it forces LaTeX files using etex package to
be compiled with elatex which is no longer part of current TexLive,
efectivelly making it impossible to simply compile them without hacking
through rubber's commandline option.
I took this fix from fedora .spec for rubber.
2014-11-08 19:53:17 +01:00
Domen Kožar 824879cfd4 tomcat-connectors: 1.2.32 -> 1.2.40 2014-11-08 19:48:54 +01:00
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