1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 07:04:28 +00:00
Commit graph

8832 commits

Author SHA1 Message Date
zimbatm 3807408c38
Merge pull request #32212 from ryantrinkle/nat-port-forwarding-ranges
Nat port forwarding ranges
2017-12-04 12:05:05 +00:00
Daiderd Jordan 852fe55822
Merge pull request #32304 from LnL7/vault-test
vault: add nixos test
2017-12-04 13:04:13 +01:00
Daiderd Jordan 6a20b88cec
vault: add nixos test 2017-12-04 12:59:52 +01:00
Ryan Trinkle 4f8a65a163 nixos/nat: add dmzHost option (#32257) 2017-12-04 09:21:58 +00:00
Jaka Hudoklin bc557912a1
Merge pull request #28939 from xtruder/nixos/tor/trans_proxy
tor module: add support for transparent proxy and dns
2017-12-03 21:47:11 +01:00
Domen Kožar d64ba1c060
Add localtime package and nixos module
Simple daemon for keeping system timezone up-to-date via geoclue2.

Sadly i3 status needs to be restarted for timezone changes.
2017-12-03 11:42:51 +01:00
Joachim F 58e4f8a14b
Merge pull request #32186 from jbboehr/patch-1
nixos/i2pd: tunnel configuration fixes
2017-12-03 07:58:36 +00:00
Bert Moens a5398a7663 nixos/doc/x-windows: update touchpad to libinput 2017-12-03 05:05:21 +02:00
Tuomas Tynkkynen 574526d510 make-squashfs: Hack to avoid building images where nixos-install won't run
https://github.com/NixOS/nixpkgs/issues/32242
2017-12-03 03:37:45 +02:00
Ryan Trinkle a8f1ebf52c nat: support port ranges in networking.nat.forwardPorts 2017-12-02 13:28:01 -05:00
Ryan Trinkle 83048c4fe0 nixpkgs.lib: Add types.strMatching 2017-12-02 13:28:00 -05:00
John Boehr 67c3f7f65f nixos/i2pd: tunnel config fixes
Tunnel configuration has no member named "host" - i2pd does but it's called "address" in the options. As a result, no tunnel configuration is generated.

* Fix attribute check in inTunnels
* Fix integer to string coercion in inTunnels
* Add destinationPort option for outTunnels
2017-11-30 17:13:42 -08:00
Orivej Desh dd7738d13f
Merge pull request #32203 from jtojnar/xorg-localectl
nixos/xserver: Move the keyboard configuration to 00-keyboard.conf
2017-12-01 00:29:47 +00:00
Jan Tojnar 1d868aa8de
nixos/xserver: Move the keyboard configuration to 00-keyboard.conf
localectl looks for keyboard settings in /X11/xorg.conf.d/00-keyboard.conf

Closes: #29959, #14318
2017-11-30 14:10:34 +01:00
Eelco Dolstra 949a6e3ec5
Merge pull request #32188 from NixOS/copumpkin-aws-ntp
amazon-image: use NTP provided by the hypervisor
2017-11-30 13:06:25 +01:00
Orivej Desh 905672f524 nixos/pulseaudio: document audio group for system wide access 2017-11-30 06:37:01 +00:00
Daniel Peebles 5fd528d043
amazon-image: use NTP provided by the hypervisor
See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/set-time.html for more information.

Fixes #32187
2017-11-29 22:48:00 -05:00
James Earl Douglas 00cda0d18d nixos/nexus: fix typo
Nexus is produced by [Sonatype][1], not SonarType.

[1]: https://www.sonatype.org/
2017-11-29 22:39:37 +01:00
Philipp Hausmann 5f59913c74 FusionInventory: 3.18 -> 3.21 2017-11-29 14:58:36 +00:00
Vladimír Čunát 5f020d5627
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Orivej Desh 0e6ca9e85d
Merge pull request #31970 from The-M1k3y/master
nixos/factorio: add stateDir and requireUserVerification option
2017-11-29 08:36:52 +00:00
Orivej Desh b8ddde411c
Merge pull request #32060 from elitak/ipfs
ipfs: add swarmAddress option
2017-11-29 01:59:08 +00:00
Orivej Desh 7d69f11293
Merge pull request #32141 from yellowgh0st/compton
compton: adding missing xr_glx_hybrid backend
2017-11-28 23:28:56 +00:00
Vladimír Čunát addd20e6f9
Merge branch 'master' into staging 2017-11-28 18:19:34 +01:00
Yell0w Ghost 57475d12ad
compton: adding missing xr_glx_hybrid backend
Compton can run with xr_glx_hybrid backend too.
Adding this missing option.
2017-11-28 14:02:48 +01:00
Léo Gaspard 652842d82e clamav module: make services.clamav.daemon.enable actually work 2017-11-28 13:45:13 +01:00
Ollie Charles 6ece306812 nixos/grafana: Fix type of database.type option
If you want to use grafana with PostgreSQL, the type is `postgres`,
not `postgresql`.
2017-11-28 11:57:35 +00:00
Vladimír Čunát 6705f30e2c
Merge branch 'master' into staging 2017-11-27 15:09:53 +01:00
Vladimír Čunát 6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
rnhmjoj 13bb5ff402
nixos/xserver: fix X.org session script logging 2017-11-27 11:29:37 +01:00
Tuomas Tynkkynen dc5cd7800a tests/initrd-network-ssh: Don't build during evaluation
Issue #29774
2017-11-27 12:08:57 +02:00
Tuomas Tynkkynen cb008da167 owncloud: Don't build during evaluation
Issue #29774
2017-11-27 12:08:57 +02:00
Vladimír Čunát 337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
Peter Hoeg 80c5cf80f2
pulseaudio/nixos: set it as default for openal/libao if enabled (#32078)
- /var/run -> /run as the former is deprecated
- configure openal to use pulseaudio if pulseaudio is enabled
- configure libao to use pulseaudio if pulseaudio is enabled
2017-11-27 15:49:38 +08:00
Tuomas Tynkkynen f3794bb8cb nixos/qemu-guest: Ensure virtio_mmio is available in initrd
ARM and AArch64 might use virtio_mmio in some cases.
2017-11-26 11:22:39 +02:00
Tuomas Tynkkynen 8762490337 nixos/qemu: Add virtio-rng-pci to test-driver
Otherwise AArch64 KVM guests don't have enough entropy at boot.
2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen e56da6a464 nixos/qemu-vm: Use different serial port on ARM/AArch64 2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen 0a2eda7a7e nixos/qemu-vm: Don't try enabling graphics/mouse on non-x86
Needs to be figured out some day, just disable them for now.
2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen 43cb964e17 nixos/qemu-vm: Set QEMU command line depending on architecture 2017-11-26 11:13:21 +02:00
Eric Litak d0b9d13618 ipfs: add swarmAddress option 2017-11-25 22:56:07 -08:00
Jan Tojnar 1566de20c7
nixos/gnome3: override schemas using env variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-26 03:11:00 +01:00
Jan Tojnar 6e0fc275d6
nixos/tracker-miners: init 2017-11-26 03:10:56 +01:00
Kosyrev Serge 3fa4e1e3ee buildkite-agent: secrecy improvements: non-store, non-Nix provisioning of secrets 2017-11-25 17:52:19 +00:00
Jörg Thalheim 3ea493430a
Merge pull request #31283 from michalrus/per-user-profiles-buildEnv
users-groups module: use `buildEnv` in per-user profiles
2017-11-25 15:28:58 +00:00
Joachim F 822342ffdf
Merge pull request #31048 from LumiGuide/fix-owncloud
Fix some but not all errors in owncloud
2017-11-25 12:43:29 +00:00
Orivej Desh 6d9ad27103
Merge pull request #31995 from jtojnar/xserver-libinput
Use libinput for all input devices when enabled
2017-11-25 10:33:39 +00:00
Jan Tojnar c177b838df nixos/xserver: let X choose the xkb rules
With libinput used for keyboard, base rules produce incorrect keyboard
layouts. We are removing the option as recommended in the XKB configuration
guide [1] to let X server choose the ruleset. It looks like it chooses
evdev rules which seem to work for some reason

[1]: https://www.x.org/releases/X11R7.6/doc/xorg-docs/input/XKB-Config.html#id2521360
2017-11-25 10:27:31 +00:00
Kjetil Orbekk bd3e49a80e nixos/munin: fix broken plugin wrappers
The munin-node service used wrapProgram to inject environment variables.
This doesn't work because munin plugins depend on argv[0], which is
overwritten when the executable is a script with a shebang line (example
below).

This commit removes the wrappers and instead passes the required
environment variables to munin-node.

Eliminating the wrappers resulted in some broken plugins, e.g., meminfo
and hddtemp_smartctl. That was fixed with the per-plugin configuration.

Example:

  The plugin if_eth0 is a symlink to /.../plugins/if_, which uses $0
  to determine that it should monitor traffic on the eth0 interface.

  if_ is a wrapped program, and runs `exec -a "$0" .if_-wrapped`

  .if_-wrapped has a "#!/nix/.../bash" line, which results in bash
  changing $0, and as a result the plugin thinks my interface
  is called "-wrapped".
2017-11-25 11:23:56 +01:00
Orivej Desh 2f1a818d00 nixos/fwupd: disable by default
It causes building during evaluation when enabled, and it is hardly useful
without GNOME or the awareness of the system operator.
2017-11-25 06:49:38 +00:00
Vladimír Čunát 474c1ce799
nixos.tests.installer.swraid: increase drive size
The latest staging caused this test not to fit anymore.
I'm all for keeping closure sizes under control,
but I don't think *this* is a good place.
2017-11-25 07:46:28 +01:00