philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

81 commits

Author SHA1 Message Date
Rickard Nilsson 66bbbc205d nixos/nfs: Fix configuration merge 2014-09-16 13:53:18 +02:00
aszlig 141cb70d5c
nixos/networking: Fix typo in ipv6prefixLength. 
Within the module it's referenced with an uppercase "P" and ipv6Address
also begins with an uppercase "A" after the "6", so let's make it
consistent.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-05 02:54:39 +02:00
Michael Raskin ab023cc559 Merge pull request #3843 from wkennington/master.iffix 
nixos/network-interfaces: Sanitize sys-subsystem device names
 2014-09-03 21:15:46 +04:00
Michael Raskin c4d85240e5 Merge pull request #3267 from Mathnerd314/cpufreq_noise 
Remove non-cpufreq_* modules since they are loaded by udev
 2014-09-03 18:46:01 +04:00
William A. Kennington III d48a7a17df nixos/network-interfaces: Sanitize sys-subsystem device names 
Currently, nixos will allow for interface names with special characters
such as the hyphen to be used. This presents a problem when using
systemd device names as the namespace paths are separated using hyphens.
Within systemd, if a device name has a hyphen it should be replaced with
the escape sequence \x2d.

This patch sanitizes all interface names before they are used in a
systemd device string.
 2014-09-03 00:31:38 -07:00
Michael Raskin c3e7588367 Merge pull request #3747 from wkennington/master.explicit 
nixos/network-interfaces: Allow explicit virtual interface type setting
 2014-09-03 11:25:28 +04:00
William A. Kennington III 36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" 
This reverts commit 94205f5f21.

Conflicts:
	nixos/modules/system/boot/loader/grub/install-grub.pl
 2014-09-02 09:16:13 -07:00
Michael Raskin 5bbeba3d97 Merge pull request #3911 from vlstill/nfs-port_pullreq 
nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports.
 2014-09-02 00:53:52 +04:00
Vladimir Still a735c308b6 nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports. 2014-08-31 22:00:16 +02:00
William A. Kennington III 02ecc98e87 nixos/network-interfaces: Fix bug in converting old ipAddresses 2014-08-31 09:47:18 -07:00
William A. Kennington III 3d037ebb94 Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" 
This reverts commit ea8910652f.
 2014-08-31 09:46:16 -07:00
Rob Vermaas ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6" 
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
 2014-08-31 10:58:54 +02:00
Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" 
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
 2014-08-31 12:58:37 +04:00
William A. Kennington III ef92afe0da nixos/network-interfaces: Fix vlan device coming up during switch 2014-08-30 08:20:14 -07:00
William A. Kennington III ed6040fc8d nixos/network-interface: Append -netdev for all device units 
Currently, device units are named directly after the name the user
specifies for the device. A bridge device named lan will be defined
within lan.service. This becomes a problem if you want your interface
named nginx but also want to run the nginx service.

This patch fixes the issue by appending netdev to all virtually created
network device units. Therefore, the lan bridge -> lan-netdev.service.
This naming convention is used for all types of network devices in order
to ensure that all network devices are unique.
 2014-08-30 08:20:14 -07:00
William A. Kennington III 1c08efb8ab nixos/network-interfaces: Allow explicit virtual interface type setting 2014-08-30 08:20:14 -07:00
William A. Kennington III 4d8390be60 nixos/network-interfaces: Support the old ip configuration convention 2014-08-30 08:05:00 -07:00
William A. Kennington III 86c0f8c549 Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes 2014-08-30 07:33:38 -07:00
William A. Kennington III 1ff4b83875 nixos/network-interfaces: Add flush upon interface going down 2014-08-30 07:33:38 -07:00
William A. Kennington III 098c8f4c77 nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses 2014-08-30 07:33:38 -07:00
William A. Kennington III 02ab48d0ee Enable grub zfsSupport if zfs is built into the initrd 2014-08-28 13:35:34 -07:00
Jaka Hudoklin fd52ebd160 Merge pull request #3558 from geerds/trackpoint 
Add "emulateWheel" option for trackpoint configuration
 2014-08-27 13:50:26 +02:00
William A. Kennington III 40d88e9f80 nixos/network-interfaces: Add sit interfaces 
Previously, we had no method for creating 6-to-4 tunneled interfaces.
This patch adds the option networking.sits, which allows the user to
create named 6-to-4 sit devices.
 2014-08-14 14:06:56 -05:00
Jascha Geerds 6aa3888d97 trackpoint: Add emulateWheel option 2014-08-13 12:11:20 +02:00
Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
lethalman c6f9222a22 Merge pull request #3370 from geerds/trackpoint 
Fix trackpoint configuration on some systems
 2014-08-03 20:45:09 +02:00
Eelco Dolstra e68b0c7f5f Mount unionfs-fuse filesystems using the normal fileSystems option 2014-07-30 16:04:15 +02:00
Eelco Dolstra f94f659a31 Don't require a device for tmpfs filesystems 2014-07-30 13:18:33 +02:00
Eelco Dolstra 94ce6ec866 Print a sensible error message if no device is specified for a filesystem 2014-07-30 13:18:33 +02:00
Eelco Dolstra b7c543136a Move CIFS support into a separate module 2014-07-30 12:39:35 +02:00
Jascha Geerds ead06339b8 Add activationScript for TrackPoint configuration 2014-07-28 23:33:05 +02:00
Eelco Dolstra cb7b871bd6 initrd: Include filesystem support for /nix, /var etc. 2014-07-28 22:31:18 +02:00
Jascha Geerds 6fe59796b2 Use a udev rule for trackpoint configuration 2014-07-25 17:40:13 +02:00
Jascha Geerds 49e6ef2a19 Fix trackpoint configuration on some systems 2014-07-25 14:01:06 +02:00
Mathnerd314 87b3e7a93c Remove non-cpufreq_* modules since they are loaded by udev. 2014-07-14 02:35:09 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Shea Levy b3cfb9084b Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Bjørn Forsman 4def9a762f nixos: add some missing '.' in option descriptions 2014-06-24 21:25:11 +02:00
Michael Raskin 8007f32712 Merge pull request #2380 from wkennington/cache.search 
network-interfaces: Add an option for specifying search to resolv.conf
 2014-06-12 12:56:41 +04:00
Florian Friesdorf 0136fcb3df Merge pull request #2726 from pSub/trackpoint 
Added an option to configure sensitivity and speed of trackpoints.
 2014-06-07 13:09:26 +02:00
Michael Raskin 19ce0416f1 Merge pull request #2416 from edwtjo/encdev-module 
Enable encrypted backing devices in fileystem configurations
 2014-05-27 01:45:17 -07:00
Pascal Wittmann 128636ff24 Added an option to configure sensitivity and speed of trackpoints. 2014-05-23 10:18:03 +02:00
Emery Hemingway c96d5fe170 nixos: f2fs filesystem module support (close #2085) 2014-05-11 13:53:26 +02:00
Rickard Nilsson b87b6870f8 When auto-formatting ext devices, use the -F flag to make it work with unpartioned disks 2014-05-09 16:49:03 +02:00
William A. Kennington III 84a94ff006 network-interfaces: Add an option for specifying search to resolv.conf 2014-05-02 12:42:20 -05:00
Eelco Dolstra f5cd4eef11 cpufreq: Don't fail if the CPU doesn't support frequency setting 2014-04-28 19:13:04 +02:00
Edward Tjörnhammar 22f73bfd85 Enable encrypted backing devices in fileystem configurations 2014-04-26 23:26:23 +02:00
Ricardo M. Correia 419a71e1e5 spl, zfs: Add git versions, based on recent commits 
Upstream has not been tagging new versions for a long time, but we need
compatibility with newer kernels. The 0.6.2 versions already have a bunch of
backported compatibility patches, but 3.14 kernels need even more.

Also, the git versions have fixed a bunch of crashes and other bugs, so perhaps
we should just bite the bullet and just use recent git versions (as sometimes
upstream recommends, when people run into bugs).

This adds a new "boot.zfs.useGit" boolean option, so that a user can
easily opt into using the git versions.
 2014-04-23 01:42:52 +02:00