Shea Levy
a183563cf0
Revert "Merge branch 'setuid-wrapper-readlink'"
...
Kernel symlinks don't have st_size. Really thought I tested this, guess I ran the
wrong NixOS test :(
This reverts commit 6dab907ebe
, reversing
changes made to eab479a5f0
.
2018-03-07 17:09:05 -05:00
Michael Raskin
5a95fe2939
Merge pull request #36292 from xeji/xen-4-10
...
xen: add v 4.10
2018-03-07 22:07:14 +00:00
xeji
08894b4d8a
xen 4.10: link /etc/xen/oxenstored.conf
...
this is required for oxenstored to start
2018-03-07 22:39:19 +01:00
xeji
fbc0b8282e
xen: fix broken version comparisons
...
string compare breaks with xen 4.10 (because "4.10" < "4.8")
2018-03-07 22:37:40 +01:00
Shea Levy
6dab907ebe
Merge branch 'setuid-wrapper-readlink'
2018-03-07 12:44:21 -05:00
Shea Levy
dffa3d2b1f
nixos: setuid-wrapper: simplify readlink logic
2018-03-07 11:57:43 -05:00
Yegor Timoshenko
5905fe069b
tt-rss: use proper user and package for MySQL
2018-03-06 03:10:24 +00:00
Jörg Thalheim
5fe1be88a5
Merge pull request #36350 from volth/nix-serve
...
nix-serve: nix 2.0 fixes
2018-03-05 23:18:27 +00:00
Matthew Bauer
1e621ff423
demo: autologin through xserver
...
also disable upower on virtualbox
Fixes #36348
2018-03-05 14:48:01 -06:00
volth
30877b1ed8
nix-serve: nix 2.0 fixes
2018-03-05 19:32:42 +00:00
Frederik Rietdijk
8bcdb39a27
Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-by-libvirt
...
nixos/networking-scripted: restore bridge slaves dynamically added by…
2018-03-05 17:31:22 +00:00
Dino Dai Zovi
ddf13e6646
nixos/initrd-network: add udhcpc.extraArgs option ( #36305 )
...
This can be used to fix issues where udhcpc times out before
acquiring a lease. For example of these issues, see:
https://bugs.alpinelinux.org/issues/3105#note-8
Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
2018-03-05 15:53:59 +00:00
Franz Pletz
17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey
...
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
2018-03-05 10:02:39 +00:00
Will Fancher
6b9a99e55d
LightDM: Set default user session when possible.
2018-03-04 23:54:09 +00:00
Vladimír Čunát
498374a8bd
Merge #35554 : nixos/opengl: unhide and document
2018-03-04 17:33:01 +01:00
obadz
9dc62dd915
Merge pull request #36272 from obadz/nixos-lustrate-doc
...
nixos doc: document the installation process from other distros as well as NIXOS_LUSTRATE
2018-03-04 16:21:54 +00:00
obadz
80ea345494
nixos-enter: specify absolute path to bash
...
Not doing so makes it impossible to use nixos-enter from a non-NixOS
distro
2018-03-04 16:19:52 +00:00
Vladimír Čunát
2069a2a002
Merge #35454 : nixos/pump.io: remove
2018-03-04 10:49:25 +01:00
Vladimír Čunát
a2b8d8fbe2
nixos/pump.io: also comment-out the uid
2018-03-04 10:48:29 +01:00
Jörg Thalheim
a5dcde1a6f
Revert "networkd: also load builtin modules"
...
This reverts commit d514dc220e
.
breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
2018-03-04 06:29:08 +00:00
Tuomas Tynkkynen
1e107443ad
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
2018-03-03 22:40:32 +02:00
Jörg Thalheim
6749f6e26e
Merge pull request #36249 from Ekleog/openldap-module-declarative-contents
...
Openldap module declarative contents
2018-03-03 19:00:13 +00:00
aszlig
0811e7f60e
nixos/netboot: Fix evaluation error
...
The function arguments for make-squashfs.nix have changed in
df117acab7
, so we need to change them here
as well.
The boot.netboot NixOS VM test now succeeds again.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
2018-03-03 19:31:19 +01:00
Jörg Thalheim
5d0d140f74
Merge pull request #34070 from lukeadams/prl-improve
...
Improve parallels-tools
2018-03-03 17:34:57 +00:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0
2018-03-03 18:02:35 +01:00
Jörg Thalheim
9936ed4920
Merge pull request #31019 from teto/strongswan_rebased
...
[RFC/RDY] make l2tp work with Strongswan
2018-03-03 15:56:05 +00:00
Léo Gaspard
aeef7c91f1
openldap module: allow defining contents declaratively
2018-03-03 15:33:23 +01:00
Léo Gaspard
cca9ec2a66
openldap module: cleanup
2018-03-03 15:33:01 +01:00
Jan Tojnar
618ac29687
cantarell-fonts: rename from cantarell_fonts
2018-03-03 00:36:38 +01:00
Bjørn Forsman
5de8f99f03
nixos/jenkins: ensure postStart follows redirects
...
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
2018-03-02 08:48:38 +01:00
Shea Levy
2802101e9f
Merge branch 'dropbear-2018-76-fix'
2018-03-01 21:35:06 -05:00
Shea Levy
f2937b7485
initrd-ssh: Fix for new dropbear version.
...
For some reason 2018.76 dropped the -m flag.
2018-03-01 21:21:27 -05:00
Luke Adams
52747120c1
parallels: add package config option
...
allows overriding of package with newer versions
2018-03-01 17:09:13 -06:00
Luke Adams
2c5efdbec4
parallels: add autoMountShares
option
2018-03-01 16:36:37 -06:00
Shea Levy
34487947ce
nixos: Add nixpkgs.crossSystem option for cross-compilation
2018-03-01 14:58:15 -05:00
Shea Levy
95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos
2018-03-01 14:56:58 -05:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell.
2018-03-01 14:38:53 -05:00
Shea Levy
948e290895
stage-2-init: Use the host bash as SHELL
2018-03-01 14:03:41 -05:00
Frederik Rietdijk
810dd0f984
Merge remote-tracking branch 'upstream/master' into HEAD
2018-03-01 20:00:42 +01:00
Shea Levy
897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling.
2018-03-01 13:31:36 -05:00
WilliButz
5ea2c87464
grafana: 4.6.3 -> 5.0.0
2018-03-01 17:50:09 +01:00
Shea Levy
c54730dde8
gobjectIntrospection: Enable building without X11 support.
...
Also disable it when noXlibs in NixOS.
2018-03-01 07:36:36 -05:00
lejonet
565f22d27a
nixos/ceph: init module ( #35299 )
...
All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides.
2018-03-01 11:47:13 +00:00
Jörg Thalheim
12422149a7
Merge pull request #29768 from Mic92/networkd
...
networkd: also load builtin modules
2018-03-01 09:16:18 +00:00
Tuomas Tynkkynen
b8b2225f6b
Merge remote-tracking branch 'upstream/master' into staging
2018-03-01 06:09:20 +02:00
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
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
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
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
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
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
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
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
Jörg Thalheim
c0b652d6cd
Merge pull request #35461 from lheckemann/grub-by-id
...
grub module: suggest by-id paths for devices
2018-02-24 11:30:34 +00:00
Linus Heckemann
fd77a08b34
grub module: suggest by-id paths for devices
...
Since they are more stable, their use should be encouraged over that of
potentially volatile identifiers like /dev/[sh]da.
2018-02-24 10:50:23 +00:00
Timo Kaufmann
5643128ff2
syncthing,qsyncthingtray: remove syncthing-inotify
...
syncthing-inotify is replaced by the new syncthing "fswatcher" feature.
2018-02-24 01:08:44 +01:00
Tuomas Tynkkynen
ae9d4faff9
Merge remote-tracking branch 'upstream/master' into staging
2018-02-24 02:05:30 +02:00
Aristid Breitkreuz
e349ccc77f
nixos/alsa: Do not make sound.enable conditional on stateVersion.
...
Eelco Dolstra wrote:
Hm, this is not really the intended use of stateVersion. From the description:
Every once in a while, a new NixOS release may change
configuration defaults in a way incompatible with stateful
data. For instance, if the default version of PostgreSQL
changes, the new version will probably be unable to read your
existing databases. To prevent such breakage, you can set the
value of this option to the NixOS release with which you want
to be compatible. The effect is that NixOS will option
defaults corresponding to the specified release (such as using
an older version of PostgreSQL).
So this is only intended for options that have some corresponding on-disk state. AFAICT this is not the case for sound. In any case stateVersion is a necessary evil that only exists because we can't just upgrade Postgres databases or change SSH host keys. It's not necessary for things like whether sound is enabled. (If the user discovers that sound is suddenly disabled, they can just enable it.)
I had some vague recollection that we also had a configVersion option setting to control the defaults for non-state-related options, but I can't find it so maybe it was only discussed.
2018-02-23 23:14:42 +01:00
volth
270f99f7bf
nixos/programs.chromium: write policies for google-chrome too
...
Policy configuration files live under /etc/chromium for Chromium, and under /etc/opt/chrome for Google Chrome.
2018-02-23 19:00:26 +00:00
Tom Bereknyei
034d3fae3d
tinc: enable invitations
2018-02-23 11:59:37 -05:00
Jan Tojnar
3b512ca185
Merge pull request #35065 from jtojnar/fwupd-1.0.5
...
fwupd: 1.0.5 update & cleanups
2018-02-23 17:22:47 +01:00
Nikolay Amiantov
9c1c424e52
cups service: fix client sockets
...
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
2018-02-23 18:51:39 +03:00
Nikolay Amiantov
cc52eff6c6
Revert "cups service: fix client sockets"
...
This reverts commit cf4c077343
.
2018-02-23 18:47:43 +03:00
Nikolay Amiantov
cf4c077343
cups service: fix client sockets
...
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.
2018-02-23 18:43:51 +03:00
Jörg Thalheim
df4963daca
Merge pull request #35343 from gnidorah/softether
...
softether module: fix dataDir option
2018-02-23 12:38:11 +00:00
Franz Pletz
6180eda1e4
Merge pull request #35026 from alesguzik/acpid_log_events
...
nixos/acpid: add option to log events
2018-02-23 04:36:33 +00:00
Franz Pletz
278bc22498
Merge pull request #31619 from NeQuissimus/exclude_rtl8723bs
...
rtl8723bs: Only include in enableAllFirmware if valid
2018-02-23 04:10:45 +00:00
volth
985a4bb87c
nixos/tox-bootstrapd: new command line format
2018-02-23 03:26:18 +00:00
Franz Pletz
4e4ae18c19
browserpass module: add firefox support
2018-02-23 00:25:40 +01:00
Franz Pletz
7ea15ef9c6
nixpkgs module: update config example
...
firefox.enableGeckoMediaPlayer does not exist anymore.
2018-02-23 00:21:15 +01:00
Franz Pletz
0dcf5df0ed
Merge pull request #34470 from WilliButz/fix-xautolock
...
nixos/xautolock: fix default defaults/examples, add assertions
2018-02-22 23:10:03 +00:00
Aristid Breitkreuz
a43e33d0e4
nixos: disable sound by default, if stateVersion >= 18.03 ( #35355 )
2018-02-22 22:06:31 +00:00
Florian Jacob
885e762d47
nixos/matomo: improve serverName default
...
when we need to change it anyway for the rename.
2018-02-22 22:03:55 +01:00
Florian Jacob
48e449ee70
nixos/piwik: rename to matomo
2018-02-22 22:03:55 +01:00
volth
eef641aa6d
nixos/label: no prepend '-' if there are no tags
2018-02-22 19:44:21 +00:00
volth
073d3f0869
nixos/programs.chromium: remove unicode char '↪'
2018-02-22 17:55:33 +00:00