NixOS/nixpkgs
NixOS/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Code Activity
64321 commits 216 branches 122 tags 7.8 GiB
Commit graph

2578 commits

Author SHA1 Message Date
Dan Peebles b13cb54614 Bring an importable modulesPath back from the dead, in the only way I know 2015-06-08 01:55:49 +00:00
William A. Kennington III 514a9fdf87 Merge pull request #8173 from dezgeg/pr-kernel-config 
kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
 2015-06-07 10:14:51 -07:00
Peter Simons 42c65fd1c9 Merge pull request #8206 from bjornfor/postfix-var-mail 
nixos/postfix: make symlink /var/mail -> /var/spool/mail
 2015-06-07 18:10:11 +02:00
Domen Kožar 46b05f0e08 Merge pull request #8193 from lostdj/patch-1 
bittorrentsync: fix storage_path.
 2015-06-07 17:53:19 +02:00
Bjørn Forsman 12e84c6378 nixos/postfix: make symlink /var/mail -> /var/spool/mail 
This solves the problem of e.g. mutt not finding mail unless the user
sets MAIL=/var/spool/mail/$USER.

The default MAIL variable seems come from bash. Reasons for adding
symlink instead of changing MAIL default in bash:

- No need to rebuild world
- FHS recommends /var/mail over /var/spool/mail anyway[1]. Better fix
  NixOS mail location than change MAIL in bash to something that doesn't
  work on non-NixOS (however unlikely that users run nixpkgs bash on a
  non-NixOS distro...).

[1] http://www.pathname.com/fhs/pub/fhs-2.3.html#VARMAILUSERMAILBOXFILES
 2015-06-07 10:38:11 +02:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Timofey Lagutin 714377f8dc bittorrentsync: fix storage_path. 
If this path is a symlink, btsync won't be able to read it if it's not ending with "/".

As seen in f02d4ec9ed
Broken in 0539ed4771
 2015-06-05 18:39:01 +03:00
Eelco Dolstra f1d465f429 pulseaudio: Revert to regular style 
Also, the NixOS module uses pulseaudioLight in order to prevent
excessive dependency bloat.
 2015-06-04 14:54:54 +02:00
Eelco Dolstra 7318ff0e38 Add option ‘system.extraDependencies’ for including stuff in the system closure 
Mostly useful for installer tests that don't have network access. This
generalizes virtualisation.pathsInNixDB and isoImage.storeContents.
 2015-06-04 11:06:44 +02:00
Eelco Dolstra 6bf1853387 Don't include 4 editors in the minimal installation CD 
Emphasis on "minimal".
 2015-06-04 11:06:44 +02:00
Tuomas Tynkkynen 9c2f2bc893 kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE 
Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS
systems to start in non-text mode as well. Enable FB_VESA to get a
framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y'
instead of the default 'm' to so the user doesn't need to manually load
the fbcon module anymore.

Other distros have similar defaults, at least on Arch:
    CONFIG_FB_VESA=y
    CONFIG_FRAMEBUFFER_CONSOLE=y
and on Ubuntu (12.04):
    CONFIG_FB_VESA=m
    CONFIG_FRAMEBUFFER_CONSOLE=y

Fixes #8139
 2015-06-04 11:26:20 +03:00
lethalman d144ece04e Merge pull request #8127 from ip1981/mwlib 
Add more dependencies for mwlib
 2015-06-03 12:50:02 +02:00
Wout Mertens 0666ee4739 Merge pull request #6732 from oconnorr/master 
Use mktemp to create temporary files to hold ssh host keys and authorized keys
 2015-06-02 20:34:43 +02:00
Luca Bruno c12e1d7278 minimal-iso: enable nixos-manual 2015-06-02 18:14:45 +02:00
Igor Pashev 95c6b835cb mwlib may use pyfribidi 2015-06-02 06:14:34 +00:00
Igor Pashev 58f6da5cc6 mwlib may use imagemagick (convert) 2015-06-02 06:06:02 +00:00
Bjørn Forsman 70cb6e67c0 nixos/apcupsd: don't evaluate event hooks at build time 
Better replace the double quotes in 'echo "${commands}"' with single
quotes, to prevent the shell from doing command substitution etc. at
configuration build time.
 2015-06-01 22:14:03 +02:00
Eelco Dolstra 64a41b7a90 Use nixUnstable by default 2015-06-01 18:20:28 +02:00
lethalman 3b6dbb1917 Merge pull request #7984 from rushmorem/marathon-module-update 
Make it easy to override the marathon framework user
 2015-06-01 17:06:50 +02:00
Eelco Dolstra 7edb27b7af Hide the option fonts.enableCoreFonts 
We shouldn't have options that simply enable a package.
 2015-06-01 10:43:43 +02:00
William A. Kennington III 3588cd8c4e nixos/pulseaudio: Use libpulseaudio 2015-05-29 20:36:46 -07:00
William A. Kennington III d6cbb061e3 cacert: Build directly from nss instead of our own tarball 2015-05-29 13:52:07 -07:00
William A. Kennington III aa5d6922c5 Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config." 
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.

This reverts commit fd1fb0403c.
 2015-05-29 13:26:51 -07:00
William A. Kennington III 1e98da6d99 nixos/grub: Use nixos artwork 2015-05-29 13:26:32 -07:00
William A. Kennington III 159fed47bc nixos/grub: Fix video display on efi 2015-05-29 13:26:32 -07:00
William A. Kennington III d4f3930201 nixos/grub: Fix defaultConfig 2015-05-29 13:26:32 -07:00
Russell O'Connor 29b7d76ec8 Remove use of && in fetch-ssh-keys service. 
Scripts are run with -e so will abort when a command fails.
 2015-05-29 19:53:58 +00:00
Russell O'Connor 4744e3541a [GCE] Put temp files for fetch-ssh-keys service in /run 2015-05-29 19:53:57 +00:00
Russell O'Connor 1badfabc4d Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server. 2015-05-29 19:53:57 +00:00
Rob Vermaas fd1fb0403c Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config. 2015-05-29 19:36:16 +00:00
rushmorem 9c7fae83ee Make it easy to override the marathon framework user 
Currently the module hardcodes the systemd service user to "marathon".
With this change one would not need to create an extra systemd config to
override the user.

So why would one need to override the Marathon user? Some apps require
root access to run. You can't run those with Marathon unless you
override the default user to root. Marathon also provides a
`--mesos_user` command line flag which allows you to run apps using
arbitrary users. You need to run the framework as root to enable this
functionality.
 2015-05-29 18:07:07 +02:00
lethalman cb02d37c31 Merge pull request #8034 from ragnard/apache-kafka-exit-code 
apache-kafka: Treat exit code 143 as success.
 2015-05-28 11:59:06 +02:00
Ragnar Dahlén 9f25762d29 apache-kafka: Treat exit code 143 as success. 
JVMs exit with exit code 128+signal when receiving a (terminating)
signal. This means graceful termination of a JVM will result in 143, so
add that to `SuccessExitStatus` in systemd service unit.
 2015-05-28 10:52:50 +01:00
Wout Mertens ab0ac154f9 Merge pull request #7302 from ragnard/mesos-slave-without-docker 
mesos-slave: Docker optional & IP address configurable
 2015-05-28 11:43:01 +02:00
Ragnar Dahlén 045e93e0a6 mesos-slave: docker and IP address config options 
- Usage of docker containerizer is currently hardcoded, this PR makes it
  optional. Default is to enable it if docker is enabled.
- Make IP address to listen on part of service configuration.
 2015-05-28 06:58:12 +01:00
Nikolay Amiantov 7355066bfe nixos: add support for exfat filesystem 2015-05-27 18:59:33 +03:00
lethalman 71fc9aac4d Merge pull request #7992 from ip1981/mwlib 
Added mwlib services
 2015-05-27 16:59:57 +02:00
Igor Pashev 7ed1fb30e2 Added mwlib services 
Simple local usage:

    mwlib = {
      nserve = {
        enable = true;
      };

      qserve = {
        enable = true;
      };
    };

For MediaWiki:

      $wgCollectionMWServeURL = 'http://localhost:8899';
      $wgCollectionFormats = array(
        'rl' => 'PDF',
        'odf' => 'ODT',
      );

      $wgCollectionPortletFormats = array (
        'odf', 'rl'
      );
 2015-05-27 14:55:22 +00:00
Arseniy Seroka 43690ae4ee Merge pull request #7987 from magnetophon/das_watchdog-master 
add das_watchdog: a realtime watchdog
 2015-05-27 11:47:15 +03:00
Eelco Dolstra 2a1c342887 Disable the manual in the minimal profile 2015-05-26 20:20:53 +02:00
Bart Brouns c3b7a8b053 add das_watchdog: a realtime watchdog 2015-05-26 15:13:59 +02:00
Mateusz Kowalczyk 1113efec5e Merge pull request #7559 from offlinehacker/openvswitch/ipsec 
openvswitch: ipsec support
 2015-05-26 11:26:02 +01:00
Mateusz Kowalczyk 4fd0f2cf4d Merge pull request #7558 from offlinehacker/nixos/docker/typefix 
nixos/docker: set extraOptions to separatedString type
 2015-05-26 11:22:50 +01:00
Mateusz Kowalczyk a35e1ddfb2 Merge pull request #7566 from offlinehacker/nixos/node-docker-registry/module 
nixos: add node docker registry server
 2015-05-26 11:07:22 +01:00
Mateusz Kowalczyk 002c687edf nova-image: Delete no longer used comment 2015-05-26 11:05:52 +01:00
Mateusz Kowalczyk 0d454d863f Merge pull request #7876 from rzetterberg/issue-7869 
nixos: Fixes eval and build error of nova image builder
 2015-05-26 11:05:06 +01:00
lethalman aff1c293ef Merge pull request #7998 from dezgeg/pr-ddclient-ssl 
ddclient: Set SSL_CERT_FILE environment variable
 2015-05-26 10:25:47 +02:00
William A. Kennington III b07d2a447b nixos/grub: Fix assertion 2015-05-25 23:03:31 -07:00
Tuomas Tynkkynen 2966068968 ddclient: Set SSL_CERT_FILE environment variable 
Otherwise connection to SSL hosts fails like this:

May 26 06:44:05 kbuilder ddclient[17084]: WARNING:  cannot connect to dynamicdns.park-your-domain.com:443 socket:
    IO::Socket::IP configuration failed SSL connect attempt failed with unknown error
    error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
 2015-05-26 06:45:25 +03:00
William A. Kennington III fd5b273e82 nixos/grub: Add the ability to mirror grub to multiple partitions 2015-05-25 20:23:06 -07:00
William A. Kennington III f42d2503d7 Merge pull request #7643 from Shados/fix-grub-efi-only 
grub2: Fix EFI-only installation
 2015-05-25 13:55:20 -07:00
Aristid Breitkreuz 4835763e13 Trackpoint scrolling on T450s et al 2015-05-25 20:00:35 +02:00
Jonathan Glines 847f8297fc Added config options for systemd-coredump functionality. 2015-05-24 18:22:53 -06:00
Peter Simons 50fa9d8eea Merge pull request #7941 from peti/allow-custom-ssh-moduli-file 
nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
 2015-05-22 20:51:42 +02:00
Peter Simons 86d299bc6e nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH 
The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes
how to generate your own moduli file. The following script might also be helpful:

 | #! /usr/bin/env bash
 |
 | moduliFiles=()
 |
 | generateModuli()
 | {
 |   ssh-keygen -G "moduli-$1.candidates" -b "$1"
 |   ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates"
 |   rm "moduli-$1.candidates"
 | }
 |
 | for (( i=0 ; i <= 16 ; ++i )); do
 |   let bitSize="2048 + i * 128"
 |   generateModuli "$bitSize" &
 |   moduliFiles+=( "moduli-$bitSize" )
 | done
 | wait
 |
 | echo >moduli "# Time Type Tests Tries Size Generator Modulus"
 | cat >>moduli "${moduliFiles[@]}"
 | rm "${moduliFiles[@]}"

Note that generating moduli takes a long time, i.e. several hours on a fast
machine!

This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.
 2015-05-22 16:28:45 +02:00
viric bcfa84cae2 Merge pull request #7878 from dezgeg/pr-extlinux 
generic-extlinux-compatible: Add new bootloader for ARM
 2015-05-22 16:02:22 +02:00
William A. Kennington III 31a273cb14 nixos/tinc: users are system users 2015-05-21 20:11:13 -07:00
William A. Kennington III 4f943ef237 nixos/lightdm: More changes 2015-05-21 20:10:52 -07:00
Arseniy Seroka f134150180 Merge pull request #7857 from rushmorem/marathon-module-update 
Update Marathon module
 2015-05-21 16:52:14 +03:00
rushmorem b5820a5ebd Update Marathon module 
The new module makes it possible to pass extra commandline
arguments to Marathon as well as environment variables.
 2015-05-21 15:45:13 +02:00
William A. Kennington III 4ed8cdc3d4 nixos/bird: Fix doc compilation 2015-05-20 18:53:54 -07:00
William A. Kennington III acdc3e6c9a nixos/lightdm: Some fixups 2015-05-20 18:32:12 -07:00
Arseniy Seroka a9171953c6 Merge pull request #7860 from Lassulus/bird 
nixos: add bird module
 2015-05-21 03:24:20 +03:00
Eelco Dolstra e98da673e4 nixos-checkout: Add nixpkgs-channels as a remote 
This way, you can do things like

  git checkout channels/nixos-14.12

to get the latest tested and built version of NixOS.
 2015-05-20 14:16:36 +02:00
Evgeny Egorochkin 8ed3ab50ea azure-image: common: add sg3_utils 2015-05-20 13:25:01 +03:00
Evgeny Egorochkin 2fe9084397 azure-image: fix, split into bootstrap and regular configurations 
Conflicts:
	nixos/modules/virtualisation/azure-image.nix
 2015-05-20 13:24:38 +03:00
Bjørn Forsman db991a4024 nixos/libvirtd: remove --verbose flag 
Because it spams the log:

  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
  .libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
  .libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
  .libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
  .libvirtd-wrapp[1950]: [137B blob data]
 2015-05-20 12:14:18 +02:00
Bjørn Forsman 3d2d78cb39 nixos/libvirtd: add 'extraOptions' option 
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
 2015-05-20 12:14:18 +02:00
Nikolay Amiantov 3e35ea305f postgresql-backup: cleanup 2015-05-19 18:35:22 +03:00
lassulus 9d07c54fa1 nixos: add bird module 
patch bird to look in /var/run for birc.ctl
 2015-05-19 15:42:24 +02:00
Luca Bruno 25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Tuomas Tynkkynen 6d176afe5e generic-extlinux-compatible: Add new bootloader for ARM 
This module generates a /boot/extlinux/extlinux.conf bootloader
configuration file that is supported by e.g. U-Boot:

http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master

With this, all ARM boards supported by U-Boot can be booted in a common
way (a single boot file generator, all boards booting via initrd like
x86) and with same boot menu functionality as GRUB has.

-- sample extlinux.conf file --
# Generated file, all changes will be lost on nixos-rebuild!

# Change this to e.g. nixos-42 to temporarily boot to an older configuration.
DEFAULT nixos-default

TIMEOUT 50

LABEL nixos-default
  MENU LABEL NixOS - Default
  LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
  INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
  FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
  APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf

LABEL nixos-71
  MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M)
  LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage
  INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd
  FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs
  APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
 2015-05-17 23:38:03 +03:00
Richard Zetterberg bd5011fc34 Fixes eval and build error of nova image builder 2015-05-17 20:55:07 +02:00
Arseniy Seroka 0b3e2becca Merge pull request #7829 from joamaki/vmware_guest 
VMWare guest support and open-vm-tools package
 2015-05-15 15:13:30 +03:00
Jussi Maki 6a0d21eb86 VMWare guest support and open-vm-tools package 2015-05-15 12:43:21 +02:00
Arseniy Seroka 946e7dca61 Merge pull request #7842 from dezgeg/pr-nix-serve 
nix-serve: Add nixos module
 2015-05-14 22:44:43 +03:00
lethalman 1103392dd9 Merge pull request #7794 from womfoo/kbdlight 
Add kbdlight package and setuid wrapper
 2015-05-14 17:09:28 +02:00
Tuomas Tynkkynen fd8cb1ff2d nix-serve: Add nixos module 
This allows sharing the Nix store of the machine as a binary cache
simply by setting 'services.nix-serve.enable = true'.
 2015-05-14 12:27:28 +03:00
Eelco Dolstra fc8011ad8d Ensure that nscd, sshd are created as system users 
c0f70b4694 removed the fixed uid
assignment, but then it becomes necessary to set isSystemUser.

http://hydra.nixos.org/build/22182588
 2015-05-13 16:23:36 +02:00
Nikolay Amiantov e9679ce32a postgresql-backup: use system postgresql package 2015-05-13 16:06:50 +03:00
William A. Kennington III 2806491cc4 nixos/consul: Add shell for health checks 2015-05-11 17:44:07 -07:00
William A. Kennington III b6e26aa8df nixos/consul: Support a config directory for health checks 2015-05-11 16:45:04 -07:00
William A. Kennington III 1938dc9b54 nixos/consul: Remove the joinNodes and joinRetries options as they are now built in consul options 2015-05-11 16:27:53 -07:00
Arseniy Seroka 26492cdba3 Merge pull request #7434 from Forkk/plex-media-server 
plex: add support for managing plugins via Nix
 2015-05-11 14:48:30 +03:00
Eelco Dolstra 492471b453 Apply some overrides to upstream systemd units 
This removes the need for the following patches:

9a6cade993
9f7e832c90
 2015-05-11 12:43:35 +02:00
Arseniy Seroka c0727fb751 Merge pull request #7788 from Lassulus/charybdis 
add charybdis nixos module
 2015-05-11 12:57:58 +03:00
lassulus 304cab2b46 add charybdis nixos module 2015-05-11 11:38:53 +02:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging 
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
 2015-05-11 10:05:23 +02:00
Kranium Gikos Mendoza 6f634e3c3a Add kbdlight package and setuid wrapper 
update nixos/modules/programs/kbdlight.nix to use mkEnableOption
 2015-05-11 13:23:01 +08:00
Ricardo M. Correia aa75bb25d8 grsecurity: Update stable and test patches 
stable: 3.1-3.14.41-201505072056 -> 3.1-3.14.41-201505101121
test:   3.1-4.0.2-201505072057   -> 3.1-4.0.2-201505101122
 2015-05-11 02:45:38 +02:00
Charles Strahan ba186ec4b9 mesos service: only pass --zk if quorum > 0 
The ZooKeeper URL is not necessary when using in-memory slave
registration.
 2015-05-10 19:36:20 -04:00
Charles Strahan 760169663e mesos: fix indentation in service definition 2015-05-10 17:23:33 -04:00
Jascha Geerds 19dbe42aeb Revert "cups: Rename "browsing" config option to "advertise"" 
This reverts commit 48e65cec4e.
 2015-05-10 20:47:50 +02:00
Jascha Geerds 652d06207d cups: Rename "browsing" config option to "advertise" 2015-05-10 13:46:32 +02:00
Jascha Geerds 6f69dd46d7 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 13:46:32 +02:00
Jascha Geerds f4d9c9043c cups: Remove deprecated config options from cupsd.conf 2015-05-10 13:46:32 +02:00
Jascha Geerds e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds 48e65cec4e cups: Rename "browsing" config option to "advertise" 2015-05-10 12:41:21 +02:00
Jascha Geerds 2cc8d15653 cups: Add defaultShared, browsing and webInterace config option 2015-05-10 12:41:21 +02:00
Jascha Geerds 3710dbec05 cups: Remove deprecated config options from cupsd.conf 2015-05-10 12:41:20 +02:00