3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2027 commits

Author SHA1 Message Date
Eelco Dolstra 84cc6a14a9 Fix using Apache httpd 2.2
(cherry picked from commit cfe26e4438)
2014-12-15 14:50:15 +01:00
Eelco Dolstra f82ab5981c Fix ANSI escape in warning messages
Seems to have been broken by accident in 7d1ddae58e.
2014-12-15 12:08:31 +01:00
Jaka Hudoklin ec2a51519d nixos/gitlab: enable tests in release 2014-12-15 00:39:04 +01:00
Domen Kožar fa4e45f20c add chromium test to the tested job 2014-12-14 13:46:48 +01:00
Domen Kožar fde7e1286e fix quake3 test 2014-12-14 13:34:04 +01:00
Sebastián Bernardo Galkin a8510482d9 Fix networkmanager resumeCommands
Small typo prevented the post resume script to restart network manager

(cherry picked from commit aba0d8a73d)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 13:09:59 +01:00
Domen Kožar ad4e371acf typo 2014-12-14 11:28:58 +01:00
Domen Kožar 0e37a9fa41 http://nixos.org -> https://nixos.org 2014-12-14 11:26:21 +01:00
Jaka Hudoklin 97ec11c43b nixos/gitlab: imporove tests 2014-12-14 09:49:50 +01:00
Jaka Hudoklin 5e41ab79f7 gitlab: fix i686-linux build and module
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 09:49:50 +01:00
Jaka Hudoklin e048d38d4e nixos/kubernetes: fix test, make more deterministic by having more ram 2014-12-14 02:44:10 +01:00
aszlig 2460b40331
nixos/virtualbox: Fix setuid wrappers.
We only need to have setuid-root wrappers for VBox{Headless,SDL} and
VirtualBox, otherwise VBoxManage will run as root and NOT drop
privileges!

Fixes #5283.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0d71ec8a6e)
2014-12-13 07:52:59 +01:00
Domen Kožar b1140ab80c Merge pull request #5314 from offlinehacker/teh-gitlab-release-14.12
[14.12] nixos: Add gitlab and gitlab-shell
2014-12-12 19:56:46 +01:00
Jaka Hudoklin b82803983b nixos/gitlab: fixes
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:09:08 +01:00
Thomas Hunger 0c95c87758 nixos: Add gitlab and gitlab-shell
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
2014-12-12 18:09:06 +01:00
Jaka Hudoklin d88567ed08 nixos: move kubernetes & fleet to services/cluster 2014-12-12 14:39:51 +01:00
Domen Kožar a9590e474d Merge pull request #5280 from vcunat/p/hibernation
nixos: check resumeDevice is absolute path and document
2014-12-12 11:11:15 +01:00
ambrop7@gmail.com c19ca69ac8 virtualbox: Unbreak the nixos module.
(cherry picked from commit 65393ca8d3)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:47:35 +01:00
ambrop7@gmail.com 268f3f4cc7 virtualbox: Allow disabling the network interface.
The current nixos module for VirtualBox unconditionally configures a vboxnet0
network interface at boot. This may be undesired, especially when the user wants
to manage network interfaces in a centralized manner.

(cherry picked from commit 9fa2c35ec8)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:46 +01:00
aszlig 4504b12bc1 nixos-install: Pass CA cert bundle to chroot.
Since we're using HTTPS for the binary cache (introduced in faf0797) by
default, the binary cache should also be available during installation.

The file that is defined in SSL_CERT_FILE outside of the chroot is
copied over to /tmp/ca-cert.crt inside the chroot, so we have an
absolute path we can reference during nixos-install. However, this might
end up with the file not being cleaned up properly from outside of the
store, but neither would be /tmp/root so the cleanup issue needs to be
solved in another place (or commit to be more exact).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit cf7f15c92c)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:11 +01:00
Bjørn Forsman d410622cdf nixos/gnome: enable MTP support in gvfs
To support browsing files on Android phones in Nautilus (and other GVFS
based file browsers).

(cherry picked from commit f3a46c3858)
2014-12-12 07:58:37 +01:00
Eelco Dolstra 6b63c46167 Update version delta for 14.12 2014-12-10 15:50:19 +01:00
Eelco Dolstra f7410b4119 Shorten the version string
As suggested by Bjørn Forsman, use the number of commits in the
release branch.

(cherry picked from commit 21e8cfac80)
2014-12-10 15:50:19 +01:00
Eelco Dolstra 4497f1e7f0 Set the channel for this release 2014-12-10 15:50:18 +01:00
Vladimír Čunát 0681d61c37 nixos: check resumeDevice is absolute path and document
Fixes #5219 after merging #4995.
2014-12-10 11:49:25 +01:00
Domen Kožar 5b8544337f tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service 2014-12-10 10:23:28 +01:00
Eelco Dolstra eb7e458d2a Use https://cache.nixos.org
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-09 15:18:57 +01:00
Domen Kožar 7a396ad522 nixos.tests.bittorrent: mark torrent as private
Hopefully that resolves transient errors with DHT
such as http://hydra.nixos.org/build/17784957
2014-12-09 12:08:13 +01:00
Thomas Tuegel 9707ffd973 nixos: let fontconfig default fonts be lists of fonts 2014-12-08 10:55:24 -06:00
Thomas Tuegel 57ba2093bf Replace Bitstream Vera fonts by DejaVu in defaults
The default configuration installed the Bitstream Vera fonts, but DejaVu
is a superior replacement, and the default Fontconfig settings need it
now for the generic faces monospace, sans-serif, and serif.
2014-12-08 10:55:24 -06:00
Thomas Tuegel c00c563c66 Add NixOS module for fontconfig-ultimate
Details:
* The option `fonts.fontconfig.ultimate.enable` can be used to disable
  the fontconfig-ultimate configuration.
* The user-configurable options provided by fontconfig-ultimate are
  exposed in the NixOS module: `allowBitmaps` (default: true),
  `allowType1` (default: false), `useEmbeddedBitmaps` (default: false),
  `forceAutohint` (default: false), `renderMonoTTFAsBitmap` (default:
  false).
* Upstream provides three substitution modes for substituting TrueType
  fonts for Type 1 fonts (which do not render well). The default,
  "free", substitutes free fonts for Type 1 fonts. The option "ms"
  substitutions Microsoft fonts for Type 1 fonts. The option "combi"
  uses a combination of Microsoft and free fonts. Substitutions can also
  be disabled.
* All 21 of the Infinality rendering modes supported by fontconfig-ultimate
  or by the original Infinality distribution can be selected through
  `fonts.fontconfig.ultimate.rendering`. The default is the medium style
  provided by fontconfig-ultimate. Any of the modes may be customized,
  or Infinality rendering can be disabled entirely.
2014-12-08 10:55:24 -06:00
Thomas Tuegel 8991ff7ceb Load default Fontconfig settings into Xresources for Xft 2014-12-08 10:55:24 -06:00
Thomas Tuegel 1df1305a8a Rewrite Fontconfig NixOS module
Details:
* The option `fonts.enableFontConfig` has (finally) been renamed
  `fonts.fontconfig.enable`.
* Configurations are loaded in this order: first the Fontconfig-upstream
  configuration is loaded, then the NixOS-specific font directories are
  set, the system-wide default configuration is loaded, and finally the
  user configuration is loaded (if enabled).
* The NixOS options `fonts.fontconfig.defaultFonts.monospace`,
  `fonts.fontconfig.defaultFonts.sansSerif` and
  `fonts.fontconfig.defaultFonts.serif` are added to allow setting the
  default system-wide font used for these generic faces. The defaults
  are the appropriate faces from the DejaVu collection because of their
  comprehensive Unicode coverage, clean rendering, and excellent
  legibility.
* The NixOS option `fonts.fontconfig.antialias` can be used to disable
  antialiasing (it is enabled by default).
* The options `fonts.fontconfig.subpixel.rgba` and
  `fonts.fontconfig.subpixel.lcdfilter` control the system-wide default
  settings for subpixel order and LCD filtering algorithm,
  respectively.
* `fonts.fontconfig.hinting.enable` can be used to disable TrueType font
  hinting (it is enabled by default).
  `fonts.fontconfig.hinting.autohint` controls the FreeType autohinter.
  `fonts.fontconfig.hinting.style` controls the hint style; it is "full"
  by default.
* User configurations can be disabled system-wide by setting
  `fonts.fontconfig.includeUserConf = false`. They are enabled by
  default so users can set Fontconfig options in the desktop environment
  of their choice.
2014-12-08 10:55:23 -06:00
Jaka Hudoklin c821f239a3 nixos/fleet: fix typo 2014-12-08 13:30:45 +01:00
Jaka Hudoklin 743b47579b nixos/fleet: enable etcd and docker by default 2014-12-08 13:07:12 +01:00
Domen Kožar ee8e15fe76 enable bash autocomplete by default 2014-12-08 12:06:02 +01:00
Jaka Hudoklin 4a993dc409 Merge pull request #5255 from offlinehacker/nixos/fleet
nixos: add fleet module
2014-12-08 02:49:42 +01:00
Jaka Hudoklin b7092dc95c nixos: add fleet module 2014-12-07 21:52:52 +01:00
Jaka Hudoklin 8bb6fdc4f9 nixos/systemd: ignore null environment options 2014-12-07 21:44:20 +01:00
Domen Kožar 07ce825a4e installer tests: don't rely on swap.target until systemd bug is fixed 2014-12-07 20:58:48 +01:00
cillianderoiste 9c90498b1f Update obtaining.xml
Avoid pointing to the wiki for the default installation method (which points back to the manual anyway). Use more words.
2014-12-07 14:38:54 +01:00
Jaka Hudoklin 1b8516b498 nixos/kubernetes: fix tests 2014-12-07 12:49:06 +01:00
Bjørn Forsman f85ad2d378 nfs-utils: align attrname with pkgname
nfsUtils => nfs-utils. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +01:00
Austin Seipp bc10c92377 nixos: overhaul Tor module
This overhauls the Tor module in a few ways:

  - Uses systemd service files, including hardening/config checks
  - Removed old privoxy support; users should use the Tor Browser
    instead.
  - Remove 'fast' circuit/SOCKS port; most users don't care (and it adds
    added complexity and confusion)
  - Added support for bandwidth accounting
  - Removed old relay listenAddress option; taken over by portSpec
  - Formatting, description, code cleanups.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:01:08 -06:00
Austin Seipp e5e8efc1f4 nixos: rewrite torsocks module
Rather than trying to override the 'torsocks' executable in $PATH, the
new module instead properly configures `/etc/tor/torsocks.conf` and puts
the normal `torsocks` executable in $PATH so it can work out of the box.

As a bonus, I think this module actually works now, because the torsocks
configuration has changed a lot from when this was written, it seems...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:27 -06:00
Austin Seipp 1b26faeb69 nixos: Remove torify module
'torify' now ships with the tor bundle itself; and using torsocks is
recommended over tsocks (torify will use torsocks automatically.)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-06 05:00:26 -06:00
William A. Kennington III 8297e09d78 nixos/synergy: Don't generate units unecessarily 2014-12-05 12:12:17 -08:00
William A. Kennington III 159af942d5 nixos/unifi: Ensure stateDir is mounted before proceeding 2014-12-05 12:12:17 -08:00
Domen Kožar 226d209d97 fix installer tests 2014-12-05 18:31:30 +01:00
Luca Bruno cbd30b2bde Merge PR #5235, fix predictable network interfaces 2014-12-05 17:33:23 +01:00