Commit graph

62437 commits

Author SHA1 Message Date
Pascal Wittmann
a16cd707bd Merge pull request #7804 from codyopel/global
global: refactor
2015-05-11 21:15:38 +02:00
Peter Simons
6a95cd085f Merge pull request #7805 from codyopel/ctags
ctags: 804 -> 816
2015-05-11 19:18:56 +02:00
Eelco Dolstra
5cbf69564b pulseaudio: Combat dependency bloat
In particular, don't depend on GTK+ 3.
2015-05-11 18:17:59 +02:00
Pascal Wittmann
d9383746e6 bgs: update from 0.6 to 0.7 2015-05-11 18:16:12 +02:00
Peter Simons
4ead7bc0b7 hackage-packages.nix: update to 65d3f6a305 with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-11 17:01:56 +02:00
Wout Mertens
c7893e960d efibootmgr/var: upgrade 2015-05-11 14:25:17 +00:00
Eelco Dolstra
c206c9cd95 libmicrohttpd: Don't enable some expensive features by default
Commit c5d13d4fe9 caused libmicrohttpd
to be not so micro anymore, increasing its closure size from 40 MiB to
283 MiB, which is annoying for packages like systemd that use it. So
don't enable httpd/spdy support by default.
2015-05-11 14:46:27 +02:00
Arseniy Seroka
26492cdba3 Merge pull request #7434 from Forkk/plex-media-server
plex: add support for managing plugins via Nix
2015-05-11 14:48:30 +03:00
Eelco Dolstra
492471b453 Apply some overrides to upstream systemd units
This removes the need for the following patches:

9a6cade993
9f7e832c90
2015-05-11 12:43:35 +02:00
Shea Levy
c13f189b19 ats-extsolve: bump 2015-05-11 06:41:53 -04:00
Arseniy Seroka
c0727fb751 Merge pull request #7788 from Lassulus/charybdis
add charybdis nixos module
2015-05-11 12:57:58 +03:00
Eelco Dolstra
748be0b5d0 thunderbird: Update to 31.6.0
Fixes various critical vulnerabilities.
2015-05-11 11:46:57 +02:00
lassulus
304cab2b46 add charybdis nixos module 2015-05-11 11:38:53 +02:00
lassulus
caf62e8bfb add charybdis to nixpkgs 2015-05-11 11:38:43 +02:00
codyopel
4cba460737 ctags: 804 -> 816 2015-05-11 05:27:53 -04:00
Eelco Dolstra
2e953d1bdc Merge pull request #7796 from puffnfresh/package/eventstore
Fix Hydra build of EventStore
2015-05-11 11:15:17 +02:00
William A. Kennington III
1199d23a39 ceph: 0.94.1 -> 0.94.1.1 2015-05-11 01:29:17 -07:00
codyopel
b8f1d6c9db global: refactor 2015-05-11 04:22:26 -04:00
Domen Kožar
07338d13c9 Merge branch 'staging' 2015-05-11 10:05:33 +02:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
William A. Kennington III
c3bdabca73 Merge pull request #7803 from codyopel/intltool
intltool: refactor
2015-05-11 00:35:06 -07:00
codyopel
4b07d16827 intltool: refactor 2015-05-11 03:11:30 -04:00
Pascal Wittmann
cf87977268 Merge pull request #7802 from codyopel/smtube
smtube: 15.1.0 -> 15.5.10
2015-05-11 08:58:28 +02:00
William A. Kennington III
5a117814b8 pam: 1.1.8 -> 1.2.0 2015-05-10 22:39:31 -07:00
William A. Kennington III
df3d2010ae libinput: 0.14.1 -> 0.15.0 2015-05-10 22:35:05 -07:00
William A. Kennington III
f8caa8f940 vlc: 2.2.0 -> 2.2.1 2015-05-10 22:34:53 -07:00
codyopel
54de18c4aa smtube: 15.1.0 -> 15.5.10 2015-05-11 01:19:24 -04:00
Charles Strahan
e3696ed37f ghcjs: bump ghcjs-prim
closes #7768
2015-05-11 00:52:52 -04:00
William A. Kennington III
142b48688c edac-utils: Add derivation 2015-05-10 18:18:31 -07:00
Shea Levy
d983875362 gcc-5: Fix build on darwin 2015-05-10 18:06:29 -07:00
Ricardo M. Correia
aa75bb25d8 grsecurity: Update stable and test patches
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
2015-05-11 02:45:38 +02:00
Charles Strahan
7493d6f1f6 marathon: 0.8.0 -> 0.8.1 2015-05-10 19:56:46 -04:00
Arseniy Seroka
8462e9ec64 Merge pull request #7799 from listx/for-upstream
doc: language-support: fix typo
2015-05-11 02:53:07 +03:00
Charles Strahan
26cf4a6684 Merge pull request #7722 from cstrahan/mesos-0.22.0
mesos: 0.21.0 -> 0.22.0
2015-05-10 19:40:43 -04:00
Charles Strahan
ba186ec4b9 mesos service: only pass --zk if quorum > 0
The ZooKeeper URL is not necessary when using in-memory slave
registration.
2015-05-10 19:36:20 -04:00
Linus Arver
62ad22b8ae doc: language-support: fix typo 2015-05-10 15:28:58 -07:00
Charles Strahan
760169663e mesos: fix indentation in service definition 2015-05-10 17:23:33 -04:00
Charles Strahan
9d9e21c7fd mesos: 0.21.0 -> 0.22.0
This also enables the network isolation feature that was introduced in
Mesos 0.20.0.
2015-05-10 17:23:20 -04:00
Tobias Geerinckx-Rice
029db1fdf4 Merge pull request #7401 from bendlas/geoip-database
geoip: Install geolite database by default
2015-05-10 22:20:44 +02:00
Peter Simons
eafd67b45e haskell-wreq has been fixed upstream 2015-05-10 22:14:46 +02:00
Peter Simons
e9e07667b2 haskell-cryptol: override is no longer necessary 2015-05-10 22:14:46 +02:00
Peter Simons
c2c724bcaf haskell-stm-queue-extras: override is no longer necessary 2015-05-10 22:14:46 +02:00
Peter Simons
7f76150662 haskell-call: build should be fixed, but the dependency audiovisual is still broken 2015-05-10 22:14:46 +02:00
Peter Simons
7b49289c74 hackage-packages.nix: update to 4f492cbdcc with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-10 22:14:42 +02:00
Jascha Geerds
19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise""
This reverts commit 48e65cec4e.
2015-05-10 20:47:50 +02:00
Brian McKenna
6305e506b3 Fix Hydra build of EventStore
Need to patch the build.sh shebang to make it pure.
2015-05-10 12:46:54 -06:00
Benno Fünfstück
2818017347 Merge pull request #7791 from vandenoever/elm
Fix compilation of language-glsl.
2015-05-10 19:02:30 +02:00
Jos van den Oever
d8b93eb1cd Fix compilation of language-glsl.
The issue / patch https://github.com/noteed/language-glsl/pull/10 fixes
a compilation problem with language-glsl.
The packages pretty and prettyclass conflicted when compiled with GHC 7.10.
2015-05-10 18:50:07 +02:00
Arseniy Seroka
87b4f9286d Merge pull request #7604 from bendlas/wine64
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka
f6016b9a7b Merge pull request #7784 from seppeljordan/emulationstation
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03:00