Michael Raskin
7a47d21aec
Merge pull request #3943 from wkennington/master.grub
...
Fix grub zfs build and typo
2014-09-03 11:39:35 +04:00
Michael Raskin
18c5119f18
Fix maintainers entry
2014-09-03 11:36:44 +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
Michael Raskin
df3061295e
Specify correct version for Symbola
2014-09-03 11:31:52 +04:00
Nathan Bijnens
33a3f76ee4
Copy.com: client #3617
2014-09-03 11:31:51 +04:00
Michael Raskin
07e9016f35
Merge pull request #3195 from ederoyd46/add-sphinx-search
...
Added Sphinx Search package
2014-09-03 11:22:47 +04:00
Michael Raskin
9976dd3c4f
Merge pull request #3644 from AndersonTorres/xiphos
...
Xiphos: New Package
2014-09-03 11:19:02 +04:00
Michael Raskin
2b7e30b674
Merge pull request #3741 from wkennington/master.tinc
...
tinc_pre: Add derivation
2014-09-03 11:18:25 +04:00
Michael Raskin
3ee4ba46cd
Merge pull request #3733 from bjornfor/qt-full-names
...
qt: make package names of "full" variants appear as such
2014-09-03 11:16:40 +04:00
Michael Raskin
6bfc32f376
Merge pull request #3729 from vandenoever/k3b
...
Install runtime executables for k3b.
2014-09-03 11:12:22 +04:00
Michael Raskin
8e968b18e4
Merge pull request #2952 from edwtjo/cups-syswide-clientconf
...
CUPS system wide client side remote printing.
2014-09-03 10:51:49 +04:00
Michael Raskin
a82c623c26
Merge pull request #3940 from wkennington/master.dnsmasq
...
nixos/dnsmasq: Fix regressions during the systemd update
2014-09-03 10:06:26 +04:00
Michael Raskin
74343ca3ab
Fix handling of paths with multuple mounts — for example rootfs first mount for /
2014-09-03 10:11:41 +04:00
Justin Bedo
28af151e1a
Added missing curl dependency to RCurl package
2014-09-03 15:48:33 +10:00
Josh Cartwright
626a666da5
gummiboot/builder: fix timeout setting when unset
...
The gummiboot-builder.py script is expecting the @timeout@ metavar to be
substituted for either an empty string (in the case where a user has
left the timeout unset) or the actual value set in the system
configuration.
However, the config.boot.loader.gummiboot.timeout option defaults to
'null', and due to the way pkgs.substituteAll works, the substitution
for '@timeout@' is _never_ set to the empty string. This causes the
builder script to put a bogus line into /boot/loader/loader.conf:
timeout @timeout@
Fix this by explicitly setting 'timeout' to the empty string when it's
unset in the system configuration.
Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
2014-09-03 05:36:45 +02:00
William A. Kennington III
c369c4afbd
grub2: Fix zfs support
2014-09-02 19:38:52 -07:00
William A. Kennington III
ccc758f414
nixos/install-grub: Fix typo
2014-09-02 18:56:53 -07:00
lethalman
9f37c14974
Merge pull request #3941 from manveru/diod
...
diod: add systemd service and config
2014-09-03 03:25:16 +02:00
Michael Fellinger
e805c78ed3
diod: remove redundant default doc
2014-09-03 02:55:00 +02:00
Michael Fellinger
0bf05a02f4
diod: add systemd service and config
2014-09-03 02:30:04 +02:00
William A. Kennington III
9659d0f4fb
nixos/dnsmasq: Fix regressions during the systemd update
2014-09-02 17:23:55 -07:00
Michael Raskin
e39b1f4ec8
Add a few meta-attribute descriptions; rewrite the meta-attribure list description to mean that it is expected that all used meta-attributes are described in the manual.
2014-09-03 02:10:00 +04:00
Aristid Breitkreuz
3a33731e54
Merge pull request #3903 from wkennington/master.grub
...
Bring back grub update with fixes
2014-09-02 20:59:27 +02:00
Sander van der Burg
7b7fd5044f
androidsdk: remove obsolete workaround
2014-09-02 19:19:03 +02:00
Sander van der Burg
800beea5f9
androidsdk: Bump to version 23.02 and update all its plugins and conversion scripts
2014-09-02 19:18:30 +02:00
Cray Elliott
02f5f25b2d
merge in ewemoa's zipalign fix with my updated build-tools
...
now passes Android tests found at https://github.com/svanderburg/nix-androidenvtests !
2014-09-02 19:17:47 +02:00
Michael Raskin
0ede64bfcb
Override postFixup for urlwatch so it works somehwo
2014-09-02 21:17:52 +04:00
Michael Raskin
76f4eb5f93
Revert "python-wrapper: fix wrapped argv[0] w/o sed, maybe"
...
This reverts commit a6dd9bd0cb
.
2014-09-02 20:45:41 +04:00
Michael Raskin
af4c369d0a
Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"
...
This reverts commit 9deb7f8aae
.
2014-09-02 20:17:55 +04:00
William A. Kennington III
d13423c74f
tinc_pre: Experimental Patches
2014-09-02 09:16:15 -07:00
William A. Kennington III
ac502d28ff
tinc_pre: Add derivation
...
The tinc developer has made significant developments to the next version
of tinc including many protocol security fixes. This patch adds the
prerelease of the next major tinc release.
2014-09-02 09:16:15 -07:00
William A. Kennington III
961e9867b3
nixos/generate-config: Only add store search path when kernels are not copied
2014-09-02 09:16:13 -07:00
William A. Kennington III
9467937639
nixos/install-grub: Only check for /nix to be the mountPoint for the store
2014-09-02 09:16:13 -07:00
William A. Kennington III
61908bdd80
nixos/install-grub: Always copy kernels for different devices
2014-09-02 09:16:13 -07:00
William A. Kennington III
4eff4afa3c
nixos/installer-test: Use nested subvolumes for root to test detection
2014-09-02 09:16:13 -07:00
William A. Kennington III
87b6232f3a
nixos/generate-config: Don't interpret btrfs subvols as bind mounts
2014-09-02 09:16:13 -07:00
William A. Kennington III
3944239362
nixos/tests-installer: Add a test for btrfs default volumes and bind mounts
2014-09-02 09:16:13 -07:00
William A. Kennington III
01ab1d57a3
nixos/install-grub: Detect nested btrfs subvolumes
2014-09-02 09:16:13 -07:00
William A. Kennington III
7fae423522
nixos/generate-config: Support detecting nested subvolumes
2014-09-02 09:16:13 -07:00
William A. Kennington III
0b66483c9a
nixos/install-grub: Store path should be /nix/store not /nix
2014-09-02 09:16:13 -07: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
Pascal Wittmann
d812281674
zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux
2014-09-02 17:57:09 +02:00
Peter Simons
7847276598
Merge pull request #3927 from ts468/haste
...
Update: Haste-Compiler: 0.4.1 -> 0.4.2
2014-09-02 17:27:44 +02:00
Michel Kuhlmann
6a0b39b0af
haskell-hindent: initial expression
2014-09-02 16:02:00 +01:00
Jaka Hudoklin
217cda9c54
pythonPackages: add websocket_client, fix pythonPackages.docker
2014-09-02 16:37:13 +02:00
Sander van der Burg
ef8220d1bf
Expose Android NDK in the top level expression
2014-09-02 14:11:09 +02:00
Cray Elliott
c8871e0b65
ewemoa : add the Android Support repository
2014-09-02 14:09:01 +02:00
Sander van der Burg
3b0c725255
Add attributes for all relevant Android SDK API levels and their capabilities
2014-09-02 14:05:09 +02:00
Andreas Herrmann
728793ef0b
h5py: New package, version 2.3.1
2014-09-02 13:56:54 +02:00