Vladimír Čunát
1575bc652e
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/os-specific/linux/util-linux/default.nix
It seems this merge creates a new stdenv hash,
because we had changes on both branches :-/
2015-01-13 18:07:11 +01:00
Vladimír Čunát
1c0477c08c
dbus: a security-hardening update
2015-01-13 18:01:27 +01:00
Vladimír Čunát
e85c899f8d
harfbuzz: small update
2015-01-13 17:59:41 +01:00
Vladimír Čunát
7637e71cee
merge #5521 : give fetchgit outputs nicer names
2015-01-13 17:46:44 +01:00
Vladimír Čunát
3dfd87d7af
fixup "git-export" directory names
...
All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.
FIXME: it might be suitable to adapt nix-prefetch-git.
2015-01-13 17:46:09 +01:00
Vladimír Čunát
51fdc6e238
libjpeg-turbo: major update, and populate meta
...
TODO: also some darwin packaging improvements were in the news.
Maybe it would be suitable to have this as the default libjpeg in there.
2015-01-13 16:57:18 +01:00
Vladimír Čunát
309b956215
lib/licenses: add IJG (Independent JPEG...)
2015-01-13 16:55:11 +01:00
Vladimír Čunát
995c9db5e6
openjdk: add platforms on darwin to fix #5634
2015-01-13 16:42:32 +01:00
Jaka Hudoklin
2d586477dd
Merge pull request #5745 from matejc/ragegstreamervideo
...
rage: fix video for gstreamer engine
2015-01-13 16:12:11 +01:00
Peter Simons
51b9c9b262
idris: fix build with GHC 7.8.x
2015-01-13 15:21:51 +01:00
Matej Cotman
d4635ce968
rage: fix video for gstreamer engine
2015-01-13 14:59:53 +01:00
Shea Levy
2ba3653ef6
Update hackage-packages
...
Includes NixOS/cabal2nix#127
2015-01-13 08:55:02 -05:00
Shea Levy
8921a8f53b
Revert "Revert "mkOverridable: Use functors to allow overridable functions""
...
Original commit was reverted due to using features from a newer nix than
hydra had, hydra has since been updated
This reverts commit 07e726c85c
.
2015-01-13 08:39:54 -05:00
Oliver Charles
20b1fd3fa4
Merge pull request #5710 from alpmestan/update-haskell-taggy
...
update the haskell taggy package to 0.1.3
2015-01-13 13:36:12 +00:00
Oliver Charles
9669b4a0e8
Merge pull request #5740 from alpmestan/add-haskell-sitemap
...
add the 'sitemap' haskell package
2015-01-13 13:35:56 +00:00
Oliver Charles
304819b3a3
haskellPackages.exhaustive: New expression
2015-01-13 13:25:37 +00:00
Vincent Laporte
b094768e99
Adds ocaml-gtktop
...
Gtktop is a small OCaml library to ease the creation of graphical
toplevels.
Homepage: http://zoggy.github.io/gtktop/
2015-01-13 14:17:56 +01:00
lethalman
01cf6fa04d
Merge pull request #5722 from nckx/coan
...
coan: don't double-gzip man page
2015-01-13 14:14:07 +01:00
lethalman
19d6d436dc
Merge pull request #5699 from pmahoney/fswatch
...
Fswatch
2015-01-13 14:12:43 +01:00
Rob Vermaas
07e726c85c
Revert "mkOverridable: Use functors to allow overridable functions"
...
This reverts commit 4ee556cfe9
.
2015-01-13 13:53:11 +01:00
Peter Simons
e4a68f0b98
haskell-ng: add more tools to our help function library
2015-01-13 12:44:53 +01:00
Peter Simons
9489dac1d3
r-modules: update list of broken packages
2015-01-13 12:44:11 +01:00
Peter Simons
844828afad
r-caret: update hash
2015-01-13 12:44:11 +01:00
Peter Simons
6b47d8c610
gdal: the build is broken on (at least) Linux
...
http://hydra.nixos.org/build/18650326/nixlog/1/raw
2015-01-13 12:44:11 +01:00
Peter Simons
f09fec34e9
r-skmeans: update hash
2015-01-13 12:44:11 +01:00
Peter Simons
d2d868534f
r-OceanView: update hash
2015-01-13 12:44:11 +01:00
Eelco Dolstra
8a04ca52cd
Merge pull request #5729 from mokasin/containers
...
Add auto-start option to containers.
2015-01-13 12:43:56 +01:00
Alp Mestanogullari
126955d050
add the 'sitemap' haskell package
2015-01-13 12:04:21 +01:00
Vincent Laporte
7169b87664
Adds ocaml-lablgtk-extras
...
Lablgtk-extras is a collection of libraries and modules useful when
developing OCaml/LablGtk2 applications.
Homepage: http://gtk-extras.forge.ocamlcore.org/
2015-01-13 11:14:28 +01:00
Vincent Laporte
81b57bb8ef
Adds ocaml-config-file
...
config-file is an OCaml library used to manage the configuration
file(s) of an application.
Homepage: http://config-file.forge.ocamlcore.org/
2015-01-13 09:46:48 +01:00
devhell
b7a5027547
libmediainfo: 0.7.71 -> 0.7.72
2015-01-13 00:42:55 -08:00
devhell
5bda3e1b95
mediainfo-gui: 0.7.71 -> 0.7.72
2015-01-13 00:42:55 -08:00
devhell
c7c196de6e
mediainfo: 0.7.71 -> 0.7.72
2015-01-13 00:42:55 -08:00
Matti Niemenmaa
85e405c1eb
wicd: fix wicd-curses with new urwid
...
See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=894646 — without
this patch, wicd-curses throws an AttributeError on startup. The patch
is a cut-down version of the one added there by Pavel Zhukov.
2015-01-13 00:40:51 -08:00
devhell
29b3353a9e
enhanced-ctorrent: Add package
...
This adds enhanced-ctorrent (ctorrent) which is a CLI-based bittorrent
client written in C++. It is very fast for those times when one wants to
simply add a torrent quick'n'dirty-style.
2015-01-13 00:38:06 -08:00
devhell
13b3fb2aca
top-level: Add enhanced-ctorrent
2015-01-13 00:38:06 -08:00
aszlig
c5354fafce
lighttpd: Fix building with magnet support.
...
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 08:37:56 +01:00
William A. Kennington III
6aaa655e9a
Merge pull request #5719 from ehmry/qtbitcointrader
...
qtbitcointrader 1.08.02 -> 1.08.03
2015-01-12 23:07:28 -08:00
aszlig
536feffc68
chromium: Fix userns patch for kernel 3.18.2.
...
Writing the gid_map is already non-fatal, but the actual sandbox process
still tries to setresgid() to nogroup (usually 65534). This however
fails, because if user namespace sandboxing is present, the namespace
doesn't have CAP_SETGID at this point.
Fortunately, the effective GID is already 65534, so we just need to
check whether the target gid matches and only(!) setresgid() if it
doesn't.
So if someone would run a SUID version of the sandbox, it would still
work nonetheless without a negative impact on security.
Fixes #5730 , thanks to @wizeman for reporting and initial debugging.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 06:18:10 +01:00
William A. Kennington III
37bb586452
tinc-pre: Update to ae5b56c
2015-01-12 15:25:53 -08:00
Shea Levy
9e114ccd26
haskellng: Make amazonka env externally visible
2015-01-12 18:13:40 -05:00
Domen Kožar
005508a96d
Merge pull request #5733 from brendanlong/syncthing-0.10.19
...
syncthing: Update to version 0.10.19.
2015-01-12 23:13:59 +01:00
Domen Kožar
f5445f2660
Merge pull request #5687 from nckx/ipv6calc
...
Add ipv6calc: calculate/manipulate (not only) IPv6 addresses
2015-01-12 23:13:31 +01:00
Shea Levy
3dc5be9ec5
More amazonka packages on 7.8
2015-01-12 20:58:57 +00:00
Shea Levy
67460ea19f
haskellng: Fix amazonka-core on 7.8
...
Required adding a flag to the generic builder to build Setup.hs with
core packages even if there is an override in buildInputs, to break
circular dependencies.
2015-01-12 15:41:03 -05:00
Tobias Geerinckx-Rice
9b7a58e1f9
coan: don't double-gzip man page
...
`make install` gzips coan.1 with the wrong extension (.1). So Nix re-
compresses it. Result: coan.1.1.gz, and a screen full of gobbledygook.
2015-01-12 21:38:31 +01:00
Brendan Long
2b597f3857
syncthing: Update to version 0.10.19.
2015-01-12 13:23:18 -06:00
mokasin
dd6dfde575
Add auto-start option to containers.
2015-01-12 18:26:22 +01:00
Ricardo M. Correia
757071af5b
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.28-201501111421 -> 3.0-3.14.28-201501120819
test: 3.0-3.18.2-201501111422 -> 3.0-3.18.2-201501120821
2015-01-12 18:21:22 +01:00
Shea Levy
d30e9082bb
D'oh
2015-01-12 12:20:42 -05:00