10013 Commits

Author SHA1 Message Date
Shea Levy
4d5be58a8f
Merge remote-tracking branch 'origin/master' into cross-nixos 2018-02-28 17:07:13 -05:00
Shea Levy
5ff15fbf7d
Merge branch 'nix-ssh-ng' 2018-02-28 17:04:19 -05:00
Shea Levy
4de72b90f3
nixos: nix.sshServe: Support ssh-ng. 2018-02-28 16:55:00 -05:00
Jörg Thalheim
47ce3021a9
Merge pull request #36136 from hedning/nix-bash-completions-on-enableCompletion
programs/bash: install nix-bash-completions if completion is enabled
2018-02-28 21:23:53 +00:00
Frederik Rietdijk
cf0c20e0de
Merge pull request #35892 from Nadrieril/update-usbguard
usbguard: 0.7.0 -> 0.7.2
2018-02-28 20:30:30 +00:00
Sander van der Burg
8fbfd67f1f disnix module: make dbus service configurable 2018-02-28 21:29:24 +01:00
Shea Levy
fe406d66b2
nixos: sudo: Use build-time visudo for syntax check. 2018-02-28 15:01:33 -05:00
Shea Levy
8e6520540e
nixos: keymap: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy
cc81202293
nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation. 2018-02-28 15:01:32 -05:00
Shea Levy
b28cb72908
nixos: stage-1: Don't try to test binaries when cross-compiling. 2018-02-28 15:01:32 -05:00
Shea Levy
aebb024b2f
nixos: Take glibcLocales from buildPackages.
No need to cross-compile pure data...
2018-02-28 15:01:32 -05:00
Shea Levy
c0e814a434
nixos: udev: Generate hwdb with build-native udevadm. 2018-02-28 15:01:31 -05:00
Shea Levy
a929301281
nixos: kexec: Disable on non-keexecable systems. 2018-02-28 15:01:31 -05:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Tor Hedin Brønner
c58072309c programs/bash: install nix-bash-completions if completion is enabled 2018-02-28 19:13:02 +01:00
Bas van Dijk
85abad9e1c strongswan-swanctl: fixed type of 'file' options 2018-02-28 12:01:31 +01:00
Bas van Dijk
018f66020f strongswan-swanctl: disable the structured strongswan config for now in favour of a literal config
This reduces the number of option by over 600.
2018-02-28 11:44:22 +01:00
Bas van Dijk
ee95cb8169 strongswan-swanctl: fix test 2018-02-28 11:44:00 +01:00
Bas van Dijk
592a89befc strongswan-swanctl: support strongswan-5.6.2 configuration options 2018-02-28 11:04:41 +01:00
Bas van Dijk
7c94804680 strongswan-swanctl: don't generate options for charon
This reduces the number of options from 1152 to 756.
2018-02-28 10:41:54 +01:00
Bas van Dijk
7cc5ee2354 strongswan-swanctl: support strongswan-5.6.1 configuration options
I determined which options got changed by executing the following
commands in the strongswan repository:

  git diff -U20 5.6.0..5.6.1 src/swanctl/swanctl.opt
  git diff -U20 5.6.0..5.6.1 conf
2018-02-28 10:41:54 +01:00
Bas van Dijk
bd24b3addd nixos: add the strongswan-swanctl service
The strongswan-swanctl systemd service starts charon-systemd. This implements a IKE daemon
very similar to charon, but it's specifically designed for use with systemd. It uses the
systemd libraries for a native integration.

Instead of using starter and an ipsec.conf based configuration, the daemon is directly
managed by systemd and configured with the swanctl configuration backend.

See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd

Note that the strongswan.conf and swantctl.conf configuration files are automatically
generated based on NixOS options under services.strongswan-swanctl.strongswan and
services.strongswan-swanctl.swanctl respectively.
2018-02-28 10:41:54 +01:00
David Asabina
e41ca3b347 digitalbitbox: init at 2.2.2 (#33787)
* digitalbitbox: init at 2.2.2

The commits that lead to this have been squashed from independent
commits see branch @vidbina/add/digitalbitbox-wip that did the
following:
 - 0a3030fa0ec digitalbitbox: init at 2.2.2
 - c18ffa3ffd4 digitalbitbox: moved meta to EOF
 - 0c5f3d6972a digitalbitbox: using preConfigure + configureFlags
 - a85b1dfc3fd digitalbitbox: nativeBuildInputs
 - 90bdd35ef0f digitalbitbox: autoreconfHook
 - 91810eea055 digitalbitbox: default installPhase & makeWrapper
 - 90e43fb7e2a digitalbitbox: doc rm $PWD hack & printf-tee deal
 - fd033b2fe5a digitalbitbox: cleanup, alphabetically sort attrs
 - c5907982db3 digitalbitbox: added hardware module
 - 88e46bc9ae0 digitalbitbox: added program module
 - amend to change name: dbb-app -> digitalbitbox
 - amend to add install instructions based on feedback
 (https://github.com/NixOS/nixpkgs/pull/33787#issuecomment-362813149)
 - amend to add longDescription
 - moved program to its own dir
 - overridable udev rules handling
 - added docs to manual
 - added package attr to program module
 - added package attr to hardware module

* digitalbitbox: use libsForQt5.callPackage
2018-02-27 22:40:22 +00:00
Eelco Dolstra
ceb0a28e8c
Don't try hashed mirrors in the installer test 2018-02-27 20:30:06 +01:00
Eelco Dolstra
9fc786c3a4
Create /home with the right permissions
Without this, it will be created with 700 permissions.
2018-02-27 20:28:49 +01:00
Eelco Dolstra
9e8cf40c7e
nixos/tests/installer.nix: Don't use a writable store
This is no longer needed.
2018-02-27 20:22:14 +01:00
Eelco Dolstra
84f93dd07a
nixos-install: Create /root/.nix-defexpr
This was previously done by nixos-prepare-root.
2018-02-27 20:21:23 +01:00
Eelco Dolstra
b14d9e1568
Add jq to the installation media
This is required by closureInfo.
2018-02-27 20:20:37 +01:00
Eelco Dolstra
0867f303bd
Add the boot test to release-small.nix 2018-02-27 20:09:07 +01:00
Eelco Dolstra
212dd84dd2
Cleanup 2018-02-27 20:03:12 +01:00
Eelco Dolstra
cc2eeef4ab
Fix installing the Nixpkgs channel on the installation media
And test that it got installed correctly.
2018-02-27 19:58:23 +01:00
Nadrieril
297fac40ca nixos/usbguard: Do not check permissions on rules file (using undocumented -P flag) 2018-02-27 18:34:02 +00:00
Frederik Rietdijk
d10c201252 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 16:22:37 +01:00
Rodney Lorrimar
c95ef47c51
Release notes: mention removal of pump.io module 2018-02-27 12:52:52 +00:00
Rodney Lorrimar
21dcead5f0
nixos/pump.io: remove
This would probably be better maintained in a separate repo as an
external NixOS module which gets imported into user's configuration.
2018-02-27 12:52:51 +00:00
adisbladis
b7ec621e91
jquery & jquery-ui: Move to nixos/lib/testing/
These (outdated) derivations are only used by nixos/lib/testing.nix.

If we want to provide jquery & jquery-ui packages this is better done
in nodePackages.
2018-02-27 20:07:35 +08:00
adisbladis
4f59f26faf nodejs: Add release note about dropped 4_x packages 2018-02-27 10:19:23 +01:00
Frederik Rietdijk
ad5127c417 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 09:18:49 +01:00
Frederik Rietdijk
05623d202c
Merge pull request #35061 from lopsided98/buildbot-update
buildbot: 0.9.15.post1 -> 1.0.0
2018-02-27 07:43:46 +00:00
Will Dietz
ec6ce86266
Merge pull request #35682 from volth/patch-110
nixos/tests: add forgotten xrdp.nix
2018-02-26 21:46:22 -06:00
Vladimír Čunát
6168c2e45f
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
Aristid Breitkreuz
b8f4df9d9e attempt to fix #30940 more robustly 2018-02-26 22:19:12 +01:00
volth
7e4c8db475
nixos/tests: add forgotten xrdp.nix 2018-02-26 19:55:07 +00:00
Frederik Rietdijk
4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
Franz Pletz
37c009ca74
Merge pull request #34028 from florianjacob/matomo
piwik is now matomo
2018-02-26 06:53:58 +00:00
Peter Hoeg
095260a1c9 nixos udevil: set up wrapper for udevil 2018-02-26 14:30:22 +08:00
Peter Hoeg
f9cc3c08e2
Merge pull request #35432 from timokau/syncthing-deprecate-inotify
syncthing,qsyncthingtray: remove syncthing-inotify
2018-02-26 11:04:33 +08:00
Jan Tojnar
a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Linus Heckemann
c255b10818 nixos/opengl: unhide and document enable option 2018-02-25 16:34:34 +00:00
Sarah Brofeldt
2ea8f8acdf nixos/mysql: Unbreak initial database creation 2018-02-24 20:07:55 +01:00