3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

52505 commits

Author SHA1 Message Date
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
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
Vincent Laporte aa2fd47e9d Fixes ocamlscript 2014-11-08 14:28:38 +00:00
Pascal Wittmann d6e87f1749 Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670 2014-11-08 15:25:40 +01:00
Aristid Breitkreuz cf4a976ced quassel: make a proper systemd unit (also properly works in containers now) 2014-11-08 14:59:25 +01:00
Luca Bruno 7885c2ed12 Revert "nixos: iso-image: use syslinux bootloader for USB booting support"
This reverts commit 455db168b3.
2014-11-08 14:33:27 +01:00
Luca Bruno e3611709d6 Revert "nixos: installation: make installation ISOs USB bootable"
This reverts commit b7f6a138b1.
2014-11-08 14:33:27 +01:00
Domen Kožar 555a094326 fix libreoffice build 2014-11-08 14:24:32 +01:00
Jaka Hudoklin 53667c7b1a Merge pull request #4870 from bosu/docker-proxy
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +01:00
Domen Kožar ba8e8ec8cf fix ccnx build 2014-11-08 13:02:05 +01:00
lethalman 27b79a0469 Merge pull request #4780 from ambrop72/kernel-ppp-filter
kernel: Enable PPP_FILTER by default.
2014-11-08 12:41:13 +01:00
Nikolay Amiantov cf4398cfde distributed-process-platform: add haskell package 2014-11-08 11:47:05 +01:00
Nikolay Amiantov a909a12c2d rematch: add haskell package 2014-11-08 11:47:05 +01:00
William A. Kennington III d88c5eed1d kernel: Add more supported features 2014-11-08 02:44:19 -08:00
vbgl f1061e3911 Merge pull request #4887 from vbgl/ocamlnet
Updates ocamlnet and ocaml-http
2014-11-08 09:29:51 +00:00
Vincent Laporte f895d68c90 ocaml-http: update from 0.1.3 to 0.1.5 2014-11-08 07:26:03 +00:00