Commit graph

35575 commits

Author SHA1 Message Date
Jaka Hudoklin 673fc81337 nixos/graphite: fix storage dir for carbon 2013-11-09 17:36:05 +01:00
Cillian de Róiste 0c555809d1 gimp: upgrade to 2.8.8
This also fixes color management support (lcms2)
2013-11-09 16:27:11 +01:00
Cillian de Róiste 1ff90228b2 xsane: add optional gimp plugin support 2013-11-09 15:03:12 +01:00
Cillian de Róiste b5bac4c7a4 sane: tidy-up, wrap expression arguments 2013-11-09 15:03:12 +01:00
Cillian de Róiste 46646feb17 sane: add support for Epson snapscan scanners
The firmware file needs to be downloaded or extracted from the windows
driver file and configured in nixpkgs.config e.g.:

sane.snapscanFirmware = /firmware/esfw41.bin;
2013-11-09 15:03:12 +01:00
Domen Kožar b3ea42462c Merge pull request #1182 from offlinehacker/nixos/mongodb/userfix
nixos/mongodb: set static uid to work with #1076
2013-11-08 12:56:00 -08:00
Moritz Ulrich 698065715a Leiningen: Update to 2.3.3
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-08 21:30:34 +01:00
Domen Kožar a623cc96e3 Merge pull request #1066 from offlinehacker/nixos/logstash/update
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-08 11:44:17 -08:00
Lluís Batlle i Rossell 3e8e635be7 Updating gdb to 7.6.1 2013-11-08 17:27:57 +01:00
Domen Kožar 9b35dac0c0 iperf: 2.0.4 -> 2.0.5 2013-11-08 16:53:19 +01:00
Eelco Dolstra 52ad0eaca5 openssh: Security fix
CVE-2013-4548
2013-11-08 16:42:59 +01:00
Eelco Dolstra 065493284f Update the X11 terminal server module for systemd
Yay, we no longer need inetd!
2013-11-08 16:39:22 +01:00
Eelco Dolstra e62e15b2f9 Only run systemd-inhibit for local X11 sessions 2013-11-08 16:39:22 +01:00
Rob Vermaas 001550d5fe Adapt S3 ami creation script to new nixpkgs structure 2013-11-08 12:49:44 +01:00
Rob Vermaas e9921632ef Updating EC2 EBS HVM creation script.
* Use smaller instances to generate HVM images
* Use HVM base image that has 4 ephemeral disks in device mapping
* As grub is not on the base images anymore, install it first before copying parts of its contents
2013-11-08 12:49:44 +01:00
Rob Vermaas f3eccb26f7 Fix test deployment in EC2 creation script 2013-11-08 12:49:44 +01:00
Michael Raskin 29d981d1bd Oops, merged a double-fix 2013-11-08 13:55:20 +04:00
Michael Raskin d569958894 Merge pull request #1189 from grwlf/qvim
qvim: fix stdenvAdapters issue, disable Darwin builds
2013-11-08 01:30:23 -08:00
Lluís Batlle i Rossell 0aedd883e8 Adding qbittorrent 2013-11-08 09:59:52 +01:00
Sergey Mironov 2b1b4f3d3a qvim: chage platforms from 'unix' to 'linux'
I have no Darwin machine available so lets test qvim on Linux for now
2013-11-08 12:24:51 +04:00
Sergey Mironov 139b10eb93 qvim: fix stdenvAdapters issue 2013-11-08 12:19:28 +04:00
Michael Raskin 73847ca936 Add missing arguments to qvim --- needed to preserve the partial Darwin compatibility fixes inherited from main vim expression 2013-11-08 09:01:28 +04:00
Sander van der Burg 5bc317409f Bump disnixos to latest development version 2013-11-07 17:45:52 +01:00
Eelco Dolstra cc65b1015d vsftpd: Disable seccomp filtering on 64-bit
It worked on Linux 3.4 but fails with "500 OOPS: priv_sock_get_cmd"
since we updated the default kernel to 3.10.

http://hydra.nixos.org/build/6715359

https://bugzilla.redhat.com/show_bug.cgi?id=845980
https://bugzilla.novell.com/show_bug.cgi?id=786024
2013-11-07 16:38:57 +01:00
Eelco Dolstra 000962c3fb vsftpd: Run in the background and log to syslog (i.e. journal) 2013-11-07 16:38:57 +01:00
Eelco Dolstra 10e31f6de7 Clean up the vsftpd module a bit 2013-11-07 16:38:57 +01:00
Eelco Dolstra 8c9c3b628f Drop the new-kernel ISOs 2013-11-07 16:38:57 +01:00
Eelco Dolstra 0d5ec076d2 Use default kernel for EFI-related stuff 2013-11-07 16:38:56 +01:00
Peter Simons 29588edfe1 python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.

After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.

Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:

  pkgs.python27Full.override {
    extraLibs = [pkgs.pylint];
    postBuild = ''
      cd ${pkgs.pylint}/bin
      for i in *; do
        rm $out/bin/$i
        sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
        chmod +x $out/bin/$i
      done;
    '';
  };
2013-11-07 15:13:02 +01:00
Peter Simons b53f71e715 all-packages.nix: strip trailing whitespace 2013-11-07 14:57:34 +01:00
Peter Simons 46419ae454 python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
2013-11-07 14:00:08 +01:00
Peter Simons b66a59bf41 haskell-uu-parsinglib: update to version 2.8.1.1 2013-11-07 14:00:08 +01:00
Sander van der Burg 97ecf74181 disnix: add dysnomia as dependency 2013-11-07 13:58:47 +01:00
Peter Simons dc9efcd02d milkytracker: fix evaluation 2013-11-07 12:59:45 +01:00
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