3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

42841 commits

Author SHA1 Message Date
Shea Levy 8e9de81857 Merge remote-tracking branch 'origin/modernize_nixos_generate_config'
modernize nixos-generate-config
2014-04-30 10:23:52 -04:00
Shea Levy 26d03000c2 Actually use services.mysql.port
Fixes #1315
2014-04-30 10:21:29 -04:00
Eelco Dolstra 05decd49ff Handle Zabbix agent and server both being enabled
This gave an error about the zabbix user uid being defined multiple
times.
2014-04-30 16:18:03 +02:00
Domen Kozar 88a8ec37d3 modernize nixos-generate-config 2014-04-30 16:14:53 +02:00
Eelco Dolstra 0ac20f0726 flashplayer: Update to 11.2.202.356
CVE-2014-0515
2014-04-30 15:52:43 +02:00
Eelco Dolstra 27d47f3983 Fix the simple installer test
http://hydra.nixos.org/build/10712818
2014-04-30 15:07:34 +02:00
Eelco Dolstra 437962ebb2 Installer test: Unmount filesystems after installation
Hopefully fixes failures like:

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

This shouldn't be necessary, but it might be that the use of unionfs
is interfering with a clean shutdown.
2014-04-30 15:07:34 +02:00
Eelco Dolstra 728d3476ba systemd: Require some more kernel features 2014-04-30 13:53:12 +02:00
Eelco Dolstra 9bb209a3bd gummiboot: Automatically disable GRUB 2014-04-30 11:47:18 +02:00
Eelco Dolstra e9be441b62 Merge the EFI test into tests/installer.nix 2014-04-30 11:26:39 +02:00
Eelco Dolstra 8c75ae3838 nixos-generate-config: Use systemd-detect-virt instead of dmidecode
Dmidecode fails in our EFI test with the error "SMBIOS entry point
missing". But we don't need dmidecode because we have already have
systemd-detect-virt.
2014-04-30 11:26:39 +02:00
Eelco Dolstra 956f464fff Remove obsolete zsh help text 2014-04-30 11:26:39 +02:00
Eelco Dolstra 077ecf43e5 Installer test: Remove fileSystems argument
The config function unintentionally ignored its fileSystems
argument. However, things still worked thanks to the magic of
nixos-generate-config. Yay!
2014-04-30 11:26:39 +02:00
Rob Vermaas fed7a43020 Update nixops 1.1.1 to 1.2. 2014-04-30 11:15:36 +02:00
Austin Seipp 3c3256e4a8 nixpkgs: clang-analyzer 3.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 19:36:43 -05:00
Austin Seipp 52514efb16 cryptol: Replace URLs with something meaningful
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 17:54:37 -05:00
Austin Seipp d9d76f1a3a cryptol: add 1.8.x expression
This also includes support for the verification tools I'm using. Cryptol
2 is still the default obviously.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 17:50:55 -05:00
Austin Seipp 1d3b5874ad nixpkgs: cov-build 7.0.2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 16:00:34 -05:00
Jaka Hudoklin cbfbd01cd7 nodejs: fix on i686-linux
Fixes this:

  creating  ./config.gypi
  creating  ./config.mk
  building
  make flags: SHELL=/nix/store/fp0nwhj932kscakw1gbnlmmk8pdfv9sq-bash-4.2-p45/bin/bash
  building out/Makefile
  /nix/store/vh2zy8l2797yl3mri35y8jnhc81w9hm1-python-2.7.6/bin/python tools/gyp_node.py -f make
  /bin/sh: which: command not found
  gyp: Call to '(echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true' returned exit status 0.
  make: *** [out/Makefile] Error 1

[Bjørn: add build error to commit message.]
2014-04-29 22:29:24 +02:00
Thomas Tuegel 7896a84849 qvim: add lua support 2014-04-29 22:19:58 +02:00
Jaka Hudoklin ca3c2b7b2a rabbitmq_server: enable builds on darwin 2014-04-29 22:06:54 +02:00
Jaka Hudoklin ab53d469f8 erlang: enable and fix builds on darwin 2014-04-29 22:06:53 +02:00
Eelco Dolstra fe4bc3cc80 Fix evaluation error
http://hydra.nixos.org/build/10697257
2014-04-29 20:40:28 +02:00
Bjørn Forsman b802924af1 xfce: fix typo introduced in recent commit (s/gtk/gtk3/)
Fix typo introduced in commit 0b2dd3a12f
(Xfce: Don't depend on GTK+ 3 by default).
2014-04-29 19:13:43 +02:00
Eelco Dolstra 90dac235bb Remove the option ‘programs.bash.enable’
NixOS has a pervasive dependency on bash. For instance, the X11
session script sources /etc/profile to get a reasonable
environment. Thus we should not provide an option to disable bash.

Also, enabling zsh no longer sets ‘users.defaultUserShell’ to zsh, to
prevent a collision with bash's definition of the same
option. (Changing the default shell is also something that should be
left to the user.)
2014-04-29 19:00:39 +02:00
Eelco Dolstra 1235f693ee firefox: Update to 29.0 2014-04-29 18:46:06 +02:00
Austin Seipp c8f82b4ee8 spark: 0.9.0 -> 0.9.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-29 10:34:28 -05:00
Mihaly Barasz 1f2228cdc1 tzdata: use symlinks instead of hardlinks
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
2014-04-29 16:25:10 +02:00
Eelco Dolstra dc224baba1 tzdata: Update to 2014b 2014-04-29 16:13:15 +02:00
Mihaly Barasz c2c90bf2bb tzdata: fix 'posix' symlink 2014-04-29 16:08:19 +02:00
Eelco Dolstra bfc524664a Disable autofs module
It appears to be unmaintained and untested. Also, systemd provides
automount functionality so it's probably not needed anymore.
2014-04-29 15:34:55 +02:00
Eelco Dolstra 501d532188 Add a test for automounting 2014-04-29 15:34:55 +02:00
Oliver Charles 7fb22dd5a0 Merge pull request #2444 from sol/update-http-kit
Update haskell-http-kit to version 0.2.2
2014-04-29 14:10:06 +01:00
Eelco Dolstra 0b2dd3a12f Xfce: Don't depend on GTK+ 3 by default
Given that Xfce is intended as a light-weight desktop environment,
pulling in two versions of GTK+ by default is not ideal.
2014-04-29 14:42:36 +02:00
Eelco Dolstra 02cef04c81 Move the NVIDIA support into its own module
Previously all card-specific stuff was scattered across xserver.nix
and opengl.nix, which is ugly. Now it can be kept together in a single
card-specific module. This required the addition of a few internal
options:

- services.xserver.drivers: A list of { name, driverName, modules,
  libPath } sets.

- hardware.opengl.package: The OpenGL implementation. Note that there
  can be only one OpenGL implementation at a time in a system
  configuration (i.e. no dynamic detection).

- hardware.opengl.package32: The 32-bit OpenGL implementation.
2014-04-29 14:42:36 +02:00
Eelco Dolstra 3fe96bcca1 Rename hardware.opengl.videoDrivers back to services.xserver.videoDrivers
Fixes #2379.
The new name was a misnomer because the values really are X11 video
drivers (e.g. ‘cirrus’ or ‘nvidia’), not OpenGL implementations. That
it's also used to set an OpenGL implementation for kmscon is just
confusing overloading.
2014-04-29 14:42:36 +02:00
Simon Hengel 6cb6694f8b Update haskell-http-kit to version 0.2.2 2014-04-29 20:24:14 +08:00
Eelco Dolstra e6b5c0121f Obsolete fonts.extraFonts
You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
2014-04-29 12:34:57 +02:00
Eelco Dolstra 5ae8ed381c Shut up warning about missing fonts.dtd 2014-04-29 12:27:03 +02:00
Eelco Dolstra d6c2dcd98c Remove redundant ~/.fonts element from the font search path 2014-04-29 12:27:03 +02:00
Kirill Elagin 8dc287b88c Let users install fonts to their HOME directory 2014-04-29 12:27:03 +02:00
William A. Kennington III 936481a12e nixos: Add support for changing supported systems
release.nix and release-combined.nix current hardcode the systems which
they are built for. This change introduces an argument to the
expressions called supportedSystems, which allows the builder to choose
which architectures he wants to build. By default, this uses the same
linux x86_64 and i686 architectures.
2014-04-29 10:53:36 +02:00
Eelco Dolstra a142d68b43 Fix some uid/gid attributes to match the actual user/group name 2014-04-29 10:51:42 +02:00
Eelco Dolstra 0e23a175de Allocate system uids/gids between 400 and 500
Previously it was between 100 and 500, but this can already collide
with the static uids/guid in misc/ids.nix.
2014-04-29 10:45:06 +02:00
Eelco Dolstra 05468f9b78 Bring back the isSystemUser option 2014-04-29 10:43:38 +02:00
Eelco Dolstra 2dfbe55421 Remove use of obsolete flags 2014-04-29 10:13:21 +02:00
Vladimír Čunát 920a734a15 qt48: bugfix update 4.8.5 -> .6
Some patches dropped, as they seemed included.
2014-04-29 09:29:11 +02:00
Peter Simons 50d5d8b33f The hamlet and shakespeare-* packages are deprecated and no longer
export any code. This means that we cannot run the Haddock phase.
2014-04-29 01:35:50 +02:00
Peter Simons 1a06bcc109 haskell-packunused: update to version 0.1.1.2 2014-04-29 01:35:50 +02:00
Peter Simons d163de3bdb haskell-zip-archive: update to version 0.2.2.1 2014-04-29 01:35:49 +02:00