Peter Simons
4a8712328d
Merge pull request #1186 from wizeman/flashplayer
...
flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabi...
2013-11-07 03:31:31 -08:00
Eelco Dolstra
1e89c720e2
Manual: Port forwarding to VMs
2013-11-07 12:28:45 +01:00
Peter Simons
f92a5cbfc6
pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter
...
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:
(pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };
See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
2013-11-07 12:14:19 +01:00
Peter Simons
89c566fcfd
pkgs/development/compilers/ghc/with-packages.nix: improve recognition of Haskell packages
...
Haskell packages -- i.e. packages built by our Cabal builder -- invariably have
the attributes 'pname' and 'version'. We use the absence of these attributes to
recognize non-Haskell packages and filter them from the closed package set
generated by closePropagation. We do this so that the generated Haskell
environment won't contain paths like "/lib/libz.a", which are part of the
closure but have nothing to do with Haskell.
The previous scheme used the attribute 'ghc' to accomplish the same thing, but
unfortunately other packages to contain a 'ghc' attribute, too, like the
old-style ghc-wrapper. Including the ghc-wrapper in this environment is
pointless, obviously. The new approach filters the ghc-wrapper successfully.
2013-11-07 12:14:19 +01:00
Domen Kožar
a46c71857d
Merge pull request #1172 from zefhemel/patch-1
...
Removed unnecessary mkIf in elasticserach
2013-11-07 03:11:11 -08:00
Michael Raskin
e8b347e6ae
Merge pull request #1167 from grwlf/serverflags
...
Add serverFlagsSection option to the xserver config
2013-11-07 03:00:37 -08:00
Michael Raskin
f8ddc0cbd4
Merge pull request #1099 from offlinehacker/nixos/nginx/package_change_support
...
nixos/nginx: allow to specify which package to use
2013-11-07 02:59:09 -08:00
cillianderoiste
ed67672aac
Merge pull request #1181 from Zoomulator/master
...
New application: Milkytracker v0.90.85
2013-11-07 02:54:32 -08:00
Michael Raskin
2b8cdc8434
Merge pull request #686 from ocharles/postgres92
...
Disable exec symlink resolution for PostgreSQL 9.2
2013-11-07 02:53:37 -08:00
Michael Raskin
b541b702ae
Merge pull request #1159 from bjornfor/fetchsvn
...
fetchsvn: handle redirect(s)
2013-11-07 02:50:15 -08:00
Michael Raskin
0cfc45c3b9
Merge pull request #1164 from kirelagin/master
...
Make touchpad button mapping configurable
2013-11-07 02:49:44 -08:00
Michael Raskin
2d1121c454
Merge pull request #1170 from grwlf/qvim
...
Add qvim - an experimental Qt gui for Vim
2013-11-07 02:48:22 -08:00
Ricardo M. Correia
38f85ac5ae
flashplayer: Update to 11.2.202.310 (fixes 4 critical security vulnerabilities)
...
Fixes CVE-2013-3361, CVE-2013-3362, CVE-2013-3363 and CVE-2013-5324.
2013-11-07 11:44:18 +01:00
Sander van der Burg
890b706df5
Fix sha256 hash of disnix
2013-11-07 11:33:23 +01:00
Jaka Hudoklin
50a2f3fdce
nixos/mongodb: set static uid to work with #1076
2013-11-07 11:25:14 +01:00
Peter Simons
9c1982cd68
Merge pull request #1179 from cpages/sdl2
...
SDL2: some improvements to the expression.
2013-11-07 02:16:00 -08:00
Kim Simmons
db2075b6d8
Added milkytracker: Compiles and runs.
2013-11-07 11:05:13 +01:00
Sander van der Burg
d31b328d0a
Updated Disnix service definition to support new development version and mongo databases
2013-11-07 10:54:53 +01:00
Sander van der Burg
775b1bd4df
Bump version of development Disnix
2013-11-07 10:42:13 +01:00
Kim Simmons
611bada53c
Merge pull request #1 from cillianderoiste/add_milkytracker
...
Add milkytracker
2013-11-07 01:40:46 -08:00
Eric Kow
1be6aae4b4
darwin x11/opengl: only copy subset of files ( close #1165 )
...
Copy only the pc files related to X11 and OpenGL.
This should allow us to build our own version of libraries like
cairo without having the native ones be accidentally dynamically
linked in to things that depend on them.
Before this patch if we `dyldinfo -dylibs libpangocairo` we can
see that it was dynamically linked against the OS X (but seemingly
built against include files from the nix one, as we would get a
runtime complaint about missing symbols)
2013-11-07 10:39:28 +01:00
Vladimír Čunát
0eeee298ef
perl: avoid --no-cpp-precomp on darwin, ( close #1160 )
...
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
Conflicts (trivial):
pkgs/development/interpreters/perl/5.16/default.nix
2013-11-07 10:39:28 +01:00
Carles Pagès
b81caba5fb
SDL2: some improvements to the expression.
...
Based on comments in the pull request from @edolstra and @peti. I also added
missing metadata, setting myself as maintainer.
2013-11-06 23:17:46 +01:00
Sergey Mironov
82dedd9cad
Fix remmina: add Desktop file and icons
2013-11-06 22:57:55 +01:00
Sergey Mironov
ac0019dc18
Fix remmina the FreeRDP GUI frontend
...
The patch fixes [undefined reference to `g_thread_init'] as suggested by
http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html
2013-11-06 22:57:55 +01:00
Vladimír Čunát
feb778507f
xorg-server: remove now-upstreamed patch
...
I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
2013-11-06 20:07:35 +01:00
Sander van der Burg
1a4233d440
Bump dysnomia to latest development version
2013-11-06 14:22:48 +01:00
Eelco Dolstra
58af4fb11e
Update some more platforms
2013-11-06 10:58:20 +01:00
Eelco Dolstra
25ca1c30e2
screen: Only depend on PAM on Linux
2013-11-06 10:47:58 +01:00
Eelco Dolstra
77dc219127
gcc: Support FreeBSD
2013-11-06 10:41:02 +01:00
Eelco Dolstra
5098d53db1
linux: Update to 3.10.18
2013-11-06 10:31:53 +01:00
Eelco Dolstra
07ccfe6af8
linux: Update to 3.4.68
2013-11-06 10:29:27 +01:00
Lluís Batlle i Rossell
cfe5f74e88
Updating poppler to 0.24.3.
2013-11-06 10:09:08 +01:00
Lluís Batlle i Rossell
cadd213230
Making mupdf build in 'release', not 'debug'.
2013-11-06 09:10:51 +01:00
Sergey Mironov
c8bb648f0f
qvim: clean up the code
2013-11-06 11:27:06 +04:00
Jaka Hudoklin
aa0f21e621
pythonPackages: Add ipaddr, Google's IP address manipulation library
2013-11-06 07:51:09 +01:00
Michael Raskin
66c034d03e
Merge pull request #1171 from cpages/sdl2
...
Update SDL2 to v2.0.1
2013-11-05 20:32:07 -08:00
Shea Levy
9817bada91
Update nodePackages to npm2nix-5.2.0
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 18:02:21 -05:00
Lluís Batlle i Rossell
1045df3197
Updating mkvtoolnix, libebml, libmatroska to latest versions.
2013-11-05 23:20:27 +01:00
Vladimír Čunát
834af9c905
xorg-server: bugfix update 1.14.3 -> .4, including CVE
...
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
2013-11-05 23:13:31 +01:00
Vladimír Čunát
0ed07fdeaa
mesa: disable checkPhase for the time being
...
The problem doesn't seem serious and it only occurs on some HW.
However, it would be best to fix this before merging into master.
2013-11-05 21:31:12 +01:00
Sergey Mironov
43ecb12e93
gparted: remove unwanted icon-theme.cache ( close #1176 )
2013-11-05 21:22:44 +01:00
Rickard Nilsson
5af6de819a
Merge pull request #1174 from rickynils/sbt
...
sbt: Update to 0.13.0
2013-11-05 07:10:03 -08:00
Rickard Nilsson
2d44f3e8af
sbt: Update to 0.13.0
...
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
2013-11-05 14:51:14 +01:00
Rickard Nilsson
b5554b3f5c
libvirt: Update to 1.1.4
...
Remove the patch that has been added upstream.
2013-11-05 14:15:42 +01:00
Shea Levy
d2de64cc66
Fix broken meta.platforms for manual-config kernel
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-05 07:19:38 -05:00
Eelco Dolstra
da426c7df5
Fix some meta.platforms attributes to build more stuff on Darwin
2013-11-05 10:46:59 +01:00
Eelco Dolstra
d098a6d926
Add Finance::Quote
2013-11-05 10:46:44 +01:00
Eric Kow
f9094a77b5
darwin x11/opengl: only copy subset of files ( close #1165 )
...
Copy only the pc files related to X11 and OpenGL.
This should allow us to build our own version of libraries like
cairo without having the native ones be accidentally dynamically
linked in to things that depend on them.
Before this patch if we `dyldinfo -dylibs libpangocairo` we can
see that it was dynamically linked against the OS X (but seemingly
built against include files from the nix one, as we would get a
runtime complaint about missing symbols)
2013-11-05 09:05:03 +01:00
Vladimír Čunát
0a2c5ad929
perl: avoid --no-cpp-precomp on darwin, ( close #1160 )
...
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
Conflicts (trivial):
pkgs/development/interpreters/perl/5.16/default.nix
2013-11-05 08:56:15 +01:00