Domen Kožar
d03e88b865
Merge pull request #5560 from rycee/package/radeontop
...
Add package 'radeontop'.
2015-01-03 21:37:57 +01:00
Robert Helgesson
f9afb8e6cb
Add package 'radeontop'.
2015-01-03 21:18:54 +01:00
Vladimír Čunát
6671aff83e
linux kernel determinism: unify timestamp style
...
Testing showed the linux build is sensitive to /usr/include/ncursesw
unless chrooted (on non-nixos).
On a single chrooted nixos machine, -A linux is binary reproducible.
CC #2281 & @alexanderkjeldaas.
2015-01-03 13:54:32 +01:00
William A. Kennington III
6ffde6cd15
cifs-utils: Add more useful dependencies
2015-01-02 17:22:37 -08:00
William A. Kennington III
e0a5b75d9c
zfs: Update git version
2015-01-02 12:46:36 -08:00
William A. Kennington III
a47b064595
spl: Update git
2015-01-02 11:38:31 -08:00
Peter Simons
68ab9b7958
Merge pull request #5523 from nckx/util-linux-path
...
util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
2015-01-02 18:10:51 +01:00
Nikolay Amiantov
c0d95c2f80
linux-firmware: add ibt-hw firmware
2015-01-02 18:26:31 +03:00
Domen Kožar
c510f3da49
fix eval /cc @vcunat
2015-01-02 13:55:19 +01:00
Domen Kožar
512fbb280f
Introduce patchShebangsPhase ran in preConfigurePhases
...
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-02 02:58:32 +01:00
Tobias Geerinckx-Rice
14eff8f7fa
util-linux: fix rtcwake(8) to search $PATH for shutdown(8)
...
This makes "rtcwake -m off" actually work on NixOS without breaking it
on other platforms.
2015-01-01 22:23:22 +01:00
Peter Simons
37ae6de95d
s6: don't depend on GNU Make 4.0
...
The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
2015-01-01 20:36:58 +01:00
Michael Raskin
fdb785f4d1
Merge pull request #5453 from pmahoney/skarnet-2.0
...
Update skarnet.org software for 2.0 release.
2015-01-01 16:14:17 +03:00
Vladimír Čunát
d8c5d95330
determinism: change some fixed timestamp to != (time_t)0
...
vcunat removed the unrelated glib change.
Conflicts:
pkgs/development/libraries/glib/default.nix
pkgs/os-specific/linux/kernel/generic.nix
pkgs/os-specific/linux/kernel/manual-config.nix
2014-12-30 17:03:39 +01:00
Vladimír Čunát
88fd7f4527
Re-Revert merge #5505 : util-linux: use /run/current-system/sw/bin/*
...
This reverts commit 6222093eec
.
2014-12-30 10:53:41 +01:00
Vladimír Čunát
6222093eec
Revert "merge #5505 : use /run/current-system/sw/bin/*"
...
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.
This reverts commit 8cf4ef7ab7
.
2014-12-30 10:51:36 +01:00
Tobias Geerinckx-Rice
8cf4ef7ab7
merge #5505 : use /run/current-system/sw/bin/*
...
A working /sbin/shutdown (usually provided by systemd) is required by
"rtcwake -m off". Creating a circular dependency on systemd for this
just isn't worth the trouble, so take the straightforward way out.
One could easily make the argument that rtcwake wants to shut down the
*currently running system*, and that the correct API for that *is* in
fact /run/current-system. And it makes a very tempting sort of sense.
@vcunat moved to postPatch and added #FIXME.
2014-12-30 10:31:20 +01:00
William A. Kennington III
afeef240dc
kerberos: Use default kerberos instead of krb5
2014-12-30 00:05:12 -08:00
William A. Kennington III
18892629c2
pam_krb5: Keep kerberos instead of krb5
2014-12-29 23:25:35 -08:00
William A. Kennington III
315c53bbd3
pam_krb5: 2.3.11 -> 2.4.9
2014-12-29 22:32:23 -08:00
Ricardo M. Correia
1d44322d53
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.27-201412211908 -> 3.0-3.14.27-201412280859
test: 3.0-3.17.7-201412211910 -> 3.0-3.18.1-201412281149
2014-12-29 03:00:47 +01:00
Eelco Dolstra
a30869a525
Typo
2014-12-28 19:41:06 +01:00
Alexander Kjeldaas
da1f8578b0
Eradicate gzip -9 without -n
2014-12-28 13:45:27 +01:00
William A. Kennington III
c17fda769a
ipset: Add derivation
2014-12-28 00:03:54 -08:00
Marco Maggesi
30f621944b
Bumb BLCR
2014-12-27 14:56:21 +01:00
Vladimír Čunát
becf038336
Merge branch 'staging'
2014-12-26 22:41:19 +01:00
Shea Levy
05edd656f6
Missed gcc refs
2014-12-26 12:28:15 -05:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát
7671875b25
upower_99: port commit bf3fd50e14
2014-12-25 18:29:08 +01:00
Vladimír Čunát
38ee8859e8
upower_99: update
...
It doesn't depend on polkit anymore (upstream change in 0.99.1).
2014-12-25 18:17:00 +01:00
Vladimír Čunát
1aec647906
udisks2: update
...
Also depend on systemd instead of udev, as some libsystemd* is used.
2014-12-25 18:17:00 +01:00
Vladimír Čunát
3a2478605d
Merge 'master' into staging
2014-12-24 16:06:12 +01:00
William A. Kennington III
f6622403c8
zfs: 0.6.3 -> 0.6.3-1.2
2014-12-23 17:05:02 -08:00
William A. Kennington III
7e8eea59ee
spl: 0.6.3 -> 0.6.3-1.2
2014-12-23 17:05:02 -08:00
Vladimír Čunát
3d9bbdb794
nvidia_x11: document the updating policy
...
CC #5070 .
2014-12-24 00:49:59 +01:00
Vladimír Čunát
fd9d8edc51
nvidia_x11: add 343 branch as the default ( close #5070 )
...
It's just a plain copy of the 340 expressions (only hash and version changed).
2014-12-24 00:06:46 +01:00
Vladimír Čunát
5a4feadd58
nvidia_x11: maintenance+security updates
...
It's supposed to fix GLX problems CVE-2014-8298, see:
http://nvidia.custhelp.com/app/answers/detail/a_id/3610
Tested building all atop 14.12, and running 340.* there.
2014-12-23 23:37:24 +01:00
Patrick Mahoney
26e74d8a3e
Update skarnet.org software for 2.0 release.
...
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:
execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2014-12-23 15:24:30 -06:00
Ricardo M. Correia
a8e33da2dd
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.27-201412170659 -> 3.0-3.14.27-201412211908
test: 3.0-3.17.7-201412170700 -> 3.0-3.17.7-201412211910
2014-12-22 20:33:00 +01:00
Michael Raskin
edadde69b1
sysdig: 0.1.91 → 0.1.93
2014-12-21 11:14:25 +03:00
Michael Raskin
16a4882d71
LVM2: 2.02.111 → 2.02.114
2014-12-21 11:14:25 +03:00
Michael Raskin
5997e7edfa
Firejail: 0.9.16 → 0.9.18
2014-12-21 11:14:25 +03:00
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
Pascal Wittmann
f55545c0c9
fix maintainer information
...
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
Eelco Dolstra
e47ed98f9b
systemd: Apply upstream fixes
...
In particular, upstream commit 3072eecf3c714e3ed88c882623c40aca15445f64
fixes 15-character network interface names (as generated by ID_NET_NAME_MAC).
2014-12-19 15:07:37 +01:00
lethalman
5ff1f17248
Merge pull request #5393 from abbradar/ocz-toolbox
...
ocz-toolbox: new package
2014-12-19 10:21:32 +01:00
Nikolay Amiantov
b62a2b07f4
ocz-toolbox: new package
2014-12-19 05:04:31 +03:00
Shea Levy
e3825b47ec
systemd: read units from /etc/systemd-mutable
...
This allows for persistent units managed outside of configuration.nix
2014-12-18 17:08:04 -05:00
Rob Vermaas
d05bb6c8c2
Fix sysstat build.
...
(cherry picked from commit 597007f8b7cf60d4571b859adb3972292e2fa0ff)
2014-12-18 14:47:22 +01:00
Eelco Dolstra
9ef74187bb
sysstat: Update to 11.0.2
2014-12-18 14:11:11 +01:00
William A. Kennington III
1ef5533426
nftables: 0.3 -> 0.4
2014-12-17 14:44:30 -08:00
William A. Kennington III
7e8c5b578a
kernel: 3.14.26 -> 3.14.27
2014-12-17 14:36:38 -08:00
William A. Kennington III
eea5383b48
kernel: 3.17.6 -> 3.17.7
2014-12-17 14:36:29 -08:00
Eelco Dolstra
8d66a51a87
Merge branch 'fix_bootstrap_tools' of https://github.com/offlinehacker/nixpkgs into staging
2014-12-17 13:51:51 +01:00
Eelco Dolstra
e7ad8af28e
util-linux: Update to 2.25.2
2014-12-17 13:47:27 +01:00
William A. Kennington III
be96c7e283
Revert "kernel: 3.14.26 -> 3.14.27"
...
This reverts commit 4eaecca7b1
.
2014-12-16 14:15:55 -08:00
William A. Kennington III
66332cdee1
Revert "kernel: 3.17.6 -> 3.17.7"
...
This reverts commit d3a61d88aa
.
2014-12-16 14:15:47 -08:00
William A. Kennington III
d3a61d88aa
kernel: 3.17.6 -> 3.17.7
2014-12-16 14:13:03 -08:00
William A. Kennington III
4eaecca7b1
kernel: 3.14.26 -> 3.14.27
2014-12-16 14:12:57 -08:00
William A. Kennington III
8643578aa5
kernel: 3.2.64 -> 3.2.65
2014-12-16 14:12:21 -08:00
William A. Kennington III
980c702342
kernel: 3.18 -> 3.18.1
2014-12-16 14:12:21 -08:00
William A. Kennington III
6ea3763f22
kernel: 3.12.34 -> 3.12.35
2014-12-16 14:11:13 -08:00
William A. Kennington III
7c2b8b333f
kernel: 3.10.62 -> 3.10.63
2014-12-16 14:11:07 -08:00
Jaka Hudoklin
7021f1e25c
uclibc: fix url, update
2014-12-15 03:32:08 +01:00
Domen Kožar
de88551eef
libsepol: fix download url
...
(cherry picked from commit 24cba87e7f8247eb4e68ad8c850c1b404a277f13)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 19:05:59 +01:00
Vladimír Čunát
274a9419c1
broadcom_sta: fix build with kernel 3.18 ( close #5315 )
...
I couldn't find any source that looked reliable, but I guess it's better
than nothing: it's fairly simple patch that fixes the build.
2014-12-14 10:51:31 +01:00
Michael Raskin
34b0d860d5
Try harder to use out-of-store udev rule location
2014-12-13 12:55:24 +03:00
Michael Raskin
efd51accc4
Trying to update iptables - apparently, already latest
2014-12-13 12:55:24 +03:00
Michael Raskin
59ec0f0e0d
Improve eudev paths in the same way as they are set in the original package
2014-12-12 14:49:20 +03:00
Vladimír Čunát
80e3018bc0
Merge #5286 : ati-driver: Update to 4.12
2014-12-11 22:12:20 +01:00
Domen Kožar
27281f660c
fix builds for rest of kernel modules on 3.18
2014-12-11 02:03:43 +01:00
Jascha Geerds
b15311027f
ati-driver: Fix support for linux kernel 3.17
2014-12-10 21:30:31 +01:00
Jascha Geerds
3525f7135f
ati-driver: Bump version to 14.12
2014-12-10 21:12:54 +01:00
Vladimír Čunát
62e5e2a880
apparmor: fix build by using older perl
...
This is work around #5270 .
Also bogus path in wrapper got fixed.
CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.
2014-12-10 16:11:29 +01:00
Domen Kožar
ac80e36e4a
lttng-modules: fix build on kernel 3.18
2014-12-10 12:55:05 +01:00
Domen Kožar
024a28e5e8
v4l2loopback: fix build in kernel 3.18
2014-12-10 12:55:04 +01:00
Tobias Geerinckx-Rice
2e7d552122
Add ftop: show progress of open files and file systems
2014-12-10 05:34:57 +01:00
Bjørn Forsman
507e78fb94
lttng-modules: fix build on linux 3.14.x
...
By applying patch from upstream mailing list[1] (should be in the next
release).
[1]: http://lists.lttng.org/pipermail/lttng-dev/2014-December/023914.html
2014-12-09 19:34:41 +01:00
William A. Kennington III
042f266e10
kernel: 3.14.25 -> 3.14.26
2014-12-08 23:24:50 -08:00
William A. Kennington III
c8abfe37ab
kernel: 3.17.4 -> 3.17.6
2014-12-08 23:23:42 -08:00
William A. Kennington III
20e2d94089
kernel: 3.4.104 -> 3.4.105
2014-12-08 23:21:40 -08:00
William A. Kennington III
845f647b86
kernel: 3.12.33 -> 3.12.34
2014-12-08 23:21:07 -08:00
William A. Kennington III
98791f57c8
kernel: 3.10.61 -> 3.10.62
2014-12-08 23:21:04 -08:00
William A. Kennington III
a6f4c3624e
kernel: Add 3.18
2014-12-08 23:18:04 -08:00
Domen Kožar
de99c9c955
Merge branch 'staging'
2014-12-08 16:28:45 +01:00
Michael Raskin
5da22f6d0c
Don't trust sinit snapshots to be stable
2014-12-08 14:49:34 +03:00
Michael Raskin
06f4ddf962
Add suckless.org sinit for experiments
2014-12-08 09:12:14 +03:00
lethalman
eb94c70dc8
Merge pull request #5251 from ts468/powertop
...
Update Powertop: 2.6.1 -> 2.7
2014-12-07 17:41:34 +01:00
Thomas Strobel
8fce0d3360
Update Powertop: 2.6.1 -> 2.7
2014-12-07 17:20:21 +01:00
Michael Raskin
71ef2b5d2d
Allow eudev to find blkid
2014-12-07 19:04:07 +03:00
Domen Kožar
4aa3eec330
Merge branch 'master' into staging
...
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Ricardo M. Correia
7ce1cbed93
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.25-201411260106 -> 3.0-3.14.25-201412040016
test: 3.0-3.17.4-201411260107 -> 3.0-3.17.4-201412040017
2014-12-05 18:26:21 +01:00
Eelco Dolstra
bf3fd50e14
upower: Fix lib/systemd/system-sleep/system-sleep
2014-12-05 12:57:00 +01:00
Domen Kožar
b7a504ea6b
x86info: ignore warnings
2014-12-03 22:22:30 +01:00
Thomas Tuegel
f7c27885d0
Add iwlegacy firmware for old Intel wireless cards
2014-12-03 10:10:00 -06:00
William A. Kennington III
1716c12b54
iwlwifi: Split into separate package with more up to date firmware
2014-12-01 16:25:20 -08:00
William A. Kennington III
fe21ac3903
linux: 3.18.0-rc6 -> 3.18.0-rc7
2014-12-01 01:49:05 -08:00
Patrick Mahoney
cf5f282940
Consolidate conf-compile steps for skarnet.org pkgs.
2014-11-28 13:10:37 -06:00
Vladimír Čunát
cbd2305d4d
Merge branch 'master' into staging
2014-11-28 18:59:07 +01:00
Vladimír Čunát
06c6d4696d
*: fix builds by disregarding warning from new glibc
...
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.
In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Ricardo M. Correia
6f31905563
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.25-201411231452 -> 3.0-3.14.25-201411260106
test: 3.0-3.17.4-201411231452 -> 3.0-3.17.4-201411260107
2014-11-27 18:36:01 +01:00
Vladimír Čunát
a68c1adc35
*: fix builds by disregarding warning from new glibc
...
Says: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
CC: #4803 . There will likely appear more of these errors on Hydra in time.
2014-11-26 23:40:03 +01:00
Vladimír Čunát
acbdaf2f27
Merge branch 'master' into staging
...
This is to get the systemd fix to avoid yet another rebuild.
2014-11-24 23:56:48 +01:00
Aristid Breitkreuz
b216e2b8e6
systemd-nspawn: Ignore existing directories when trying to create mount-points ( #4989 )
2014-11-24 22:43:54 +01:00
Vladimír Čunát
d39c6ceffc
nvidia_x11: current long-lived becomes a new legacy
...
CC: #5070 .
2014-11-24 22:39:00 +01:00
Eduard Bachmakov
bba575ff7a
nvidia_x11: update to 340.58
...
Picked from #5070 .
2014-11-24 22:39:00 +01:00
Vladimír Čunát
a9bad25ffe
Merge branch 'master' into staging
2014-11-24 22:14:25 +01:00
Tobias Geerinckx-Rice
a39ecc27f8
Add fatrace: reports system-wide file access events
2014-11-24 11:58:24 +01:00
Ricardo M. Correia
c07f81ce89
grsecurity: Update stable and test patches
...
stable: 3.0-3.14.25-201411220954 -> 3.0-3.14.25-201411231452
test: 3.0-3.17.4-201411220955 -> 3.0-3.17.4-201411231452
2014-11-24 03:53:28 +01:00
Ricardo M. Correia
9b67027422
pax-utils: Update from 0.9.1 -> 0.9.2
2014-11-24 03:52:06 +01:00
William A. Kennington III
acefc22209
kernel: 3.18.0-rc5 -> 3.18.0-rc6
2014-11-23 16:49:25 -08:00
Jaka Hudoklin
4159d37e5a
Merge pull request #5081 from joachifm/macchanger
...
macchanger: new expression
2014-11-23 15:29:13 +01:00
William A. Kennington III
d1493bc1ee
kernel: 3.14.24 -> 3.14.25
2014-11-23 02:47:36 -08:00
Jonathan Rudenberg
30578e30d8
kernel: 3.17.3 -> 3.17.4
2014-11-22 16:50:16 -05:00
Joachim Fasting
4fdb98f540
macchanger: new expression
...
GNU macchanger is a tool for viewing/changing the MAC
address of a network device, with support for address
randomisation.
2014-11-22 16:20:52 +01:00
William A. Kennington III
30597a9c7a
kernel: 3.12.32 -> 3.12.33
2014-11-21 14:39:15 -08:00
William A. Kennington III
f1b9f88e5b
kernel: 3.10.60 -> 3.10.61
2014-11-21 14:38:48 -08:00
William A. Kennington III
745c2e9d73
systemd: Enable networking features
2014-11-19 13:26:25 -08:00
Mateusz Kowalczyk
3f8ff5b5ba
b43FirmwareCutter: update from 018 to 019
2014-11-17 18:06:55 +00:00
Mateusz Kowalczyk
99439dc4ee
bluez5: update from 5.24 to 5.25
2014-11-17 18:06:36 +00:00
William A. Kennington III
eac8fcff1a
kernel: 3.18-rc4 -> 3.18-rc5
2014-11-17 00:13:04 -08:00
Michael Raskin
4dd7bf116b
Adding eudev
2014-11-17 09:44:44 +03:00
Eelco Dolstra
a0f3faf34e
Merge remote-tracking branch 'origin/glibc-2.20' into staging
2014-11-16 22:17:36 +01:00
William A. Kennington III
1d30b4aabd
systemd: Patch systemd-journald.service to be Type=notify
...
https://bugs.freedesktop.org/show_bug.cgi?id=85871
https://bugzilla.redhat.com/show_bug.cgi?id=1159641
2014-11-16 02:01:43 -08:00
Michael Raskin
ee9e181ac6
Add a working module-init-tools manual Gentoo mirror
2014-11-16 11:10:31 +03:00
William A. Kennington III
44b1600be6
bridge-utils: Add missing patch
2014-11-15 14:21:32 -08:00
William A. Kennington III
c4ea8be9fa
bridge-utils: Cleanup and add patch to correct for broken headers
2014-11-15 14:18:19 -08:00
William A. Kennington III
ec453f984e
bridge-utils: Fail if brctl is not built
2014-11-15 13:23:57 -08:00
Aristid Breitkreuz
2885cf525a
fix bluez4 build
2014-11-15 22:22:49 +01:00
Eelco Dolstra
cef0bcefc6
linux-headers: Update to 3.12.32
...
We can do this because bootstrap-tools contains an unxz program now
(via busybox).
2014-11-15 21:49:57 +01:00
Evgeny Egorochkin
d4b190cc4c
apparmor: update from 2.8.3 to 2.8.4
2014-11-15 22:20:16 +02:00
William A. Kennington III
9f8804f664
libnl: Remove old 3.2.19 version
2014-11-14 23:18:09 -08:00
William A. Kennington III
e68bf778a5
libnl: 3.2.23 -> 3.2.25
2014-11-14 23:15:06 -08:00
William A. Kennington III
f4a27311b7
kernel: 3.14.23 -> 3.14.24
2014-11-14 23:03:54 -08:00
William A. Kennington III
0ef4ee5d06
kernel: 3.17.2 -> 3.17.3
2014-11-14 23:03:47 -08:00
William A. Kennington III
1a405c999e
kernel: Remove 3.15
2014-11-14 11:05:51 -08:00
William A. Kennington III
256669cf41
kernel: Remove 3.17 buildfix
2014-11-14 10:59:46 -08:00
William A. Kennington III
642a161112
kernel: 3.2.63 -> 3.2.64
2014-11-14 10:59:46 -08:00
William A. Kennington III
2fab8d1198
kernel: 3.10.59 -> 3.10.60
2014-11-14 10:49:29 -08:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
William A. Kennington III
557a3c92e3
kernel: Don't enable the iommu by default as this breaks for some hardware
2014-11-13 16:23:49 -08:00
Ricardo M. Correia
12e77fdc3f
nixos/zfs: Improve the ZFS boot process
...
It turns out that the upstream systemd services that import ZFS pools contain
serious bugs. The first major problem is that importing pools fails if there
are no pools to import. The second major problem is that if a pool ends up in
/etc/zfs/zpool.cache but it disappears from the system (e.g. if you
reboot but during the reboot you unplug your ZFS-formatted USB pen drive),
then the import service will always fail and it will be impossible to get rid
of the pool from the cache (unless you manually delete the cache).
Also, the upstream service would always import all available ZFS pools every
boot, which may not be what is desired in some cases.
This commit will solve these problems in the following ways:
1. Ignore /etc/zfs/zpool.cache. This seems to be a major source of
issues, and also does not play well with NixOS's philosophy of
reproducible configurations. Instead, on every boot NixOS will try to import
the set of pools that are specified in its configuration. This is also the
direction that upstream is moving towards.
2. Instead of trying to import all ZFS pools, only import those that are
actually necessary. NixOS will automatically determine these from the
config.fileSystems.* option. Also, the user can import any additional
pools every boot by adding them to the config.boot.zfs.extraPools
option, but this is only necessary if their filesystems are not
specified in config.fileSystems.*.
3. Added options to configure if ZFS should force-import ZFS pools. This may
currently be necessary, especially if your pools have not been correctly
imported with a proper host id configuration (which is probably true for 99% of
current NixOS ZFS users). Once host id configuration becomes mandatory when
using ZFS in NixOS and we are sure that most users have updated their
configurations and rebooted at least once, we should disable force-import by
default. Probably, this shouldn't be done before the next stable release.
WARNING: This commit may change the order in which your non-ZFS vs ZFS
filesystems are mounted. To avoid this problem (now or in the future)
it is recommended that you set the 'mountpoint' property of your ZFS
filesystems to 'legacy', and that you manage them using
config.fileSystems, just like any other non-ZFS filesystem is usually
managed in NixOS.
2014-11-12 22:31:49 +01:00
Ricardo M. Correia
3b0fa60a98
zfs: Enable systemd
...
Also remove custom zfs services from NixOS. This makes NixOS more aligned with
upstream.
More importantly, it prepares the way for NixOS to use ZED (the ZFS event
daemon). This service will automatically be enabled but it is not possible to
configure it via configuration.nix yet.
2014-11-12 22:31:49 +01:00
Michael Raskin
232f6bb4d2
Merge pull request #4929 from abbradar/prl-tools
...
Add packages and support for Parallel Guest Tools
2014-11-13 00:22:42 +03:00
Michael Raskin
efe5eb4709
Merge pull request #4573 from fpletz/feature/lxc-configuration
...
Add support for global LXC config files
2014-11-13 00:14:46 +03:00
Ricardo M. Correia
2c038410ea
Merge pull request #4932 from wkennington/master.zfs
...
zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds
2014-11-12 21:56:02 +01:00
Cillian de Róiste
471b532a90
xf86_input_wacom: update from 0.26.99.1 to 0.27.0
2014-11-12 20:56:38 +01:00
Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Nikolay Amiantov
3c8fe179f6
prl-tools: add package
2014-11-12 01:26:23 +03:00
Eelco Dolstra
5cf4905f3b
Merge remote-tracking branch 'origin/systemd-217' into staging
2014-11-11 19:32:48 +01:00