1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Commit graph

57526 commits

Author SHA1 Message Date
aszlig 07edb2483d
Merge branch 'vboxguest-sbin-removal'.
This removes all references to .../sbin for the guest additions and also
installs all binaries to .../bin instead (so no more .../sbin).

The main motivation for doing this is commit 98cedb3 (which
unfortunately had to be reverted in a9f2e10) and pull request #9063,
where the latter is an initial effort to move mount.vboxsf to .../bin
instead of .../sbin.

The commit I made afterwards is finishing the removal of .../sbin
entirely.
2015-08-04 04:00:09 +02:00
Charles Strahan 878e69c67c riak2: use sensible default paths
Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.
2015-08-03 21:48:29 -04:00
aszlig 86b695a18e
vbox-guest: Remove all references to sbin/.
Using $storepath/sbin is deprecated according to commit 98cedb3, so
let's avoid putting anything in .../sbin for the guest additions.

This is a continuation of the initial commit done by @ctheune at
1fb1360, which unfortunately broke VM tests and only changed the path of
the mount.vboxsf helper.

With this commit, the VM test is fixed and I've also verified on my
machine that it is indeed working again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-08-04 03:03:24 +02:00
ts468 5ef9a427cf Merge pull request #9107 from ts468/upstream.ima
ima-evm-utils: init at 1.0.0
2015-08-04 01:38:46 +02:00
aszlig a26edf0f77
vbox-guest: Merge pull request #9063 from ctheune.
This places mount.vboxsf in $out/bin instead of sbin, because as
reported in #9063 it seems that the the mount tools are no longer
looking into $storepath/sbin/mount.$what but into
$storepath/bin/mount.$what instead.

However, I haven't found any commit which changes this behavior and
couldn't reproduce it. Also, merging this will break the VirtualBox
tests, but I'm merging it anyway in an effort to remove $storepath/sbin
from virtualboxGuestAdditions entirely.

Tested against virtualbox NixOS VM test, which of course failed as said
before.
2015-08-04 01:16:35 +02:00
Thomas Strobel c31dc22aa2 ima-evm-utils: init at 1.0.0 2015-08-04 01:10:13 +02:00
William A. Kennington III f2d3b5ead9 grub2: 2015-07-05 -> 2015-07-27 2015-08-03 14:12:14 -07:00
William A. Kennington III 1f103d8efc libnice: 0.1.4 -> 0.1.13 2015-08-03 14:11:43 -07:00
William A. Kennington III 43bd15b9b5 gupnp: 0.20.9 -> 0.20.14 2015-08-03 14:11:43 -07:00
William A. Kennington III 0392e9c8c6 gupnp-av: 0.12.4 -> 0.12.7 2015-08-03 14:11:43 -07:00
William A. Kennington III 68ba5ae1ef gupnp-igd: 0.2.1 -> 0.2.4 2015-08-03 14:11:42 -07:00
William A. Kennington III 29fb4c4dc0 gssdp: 0.14.6 -> 0.14.11 2015-08-03 14:11:42 -07:00
Nikolay Amiantov 4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov 52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
William A. Kennington III ce6b96db6e kernel-testing: 4.2.0-rc2 -> 4.2.0-rc5 2015-08-03 13:06:22 -07:00
William A. Kennington III 102cfc53bc kernel: 4.1.3 -> 4.1.4 2015-08-03 12:58:12 -07:00
William A. Kennington III 678efd6df0 kernel: 3.12.44 -> 3.12.45 2015-08-03 12:58:12 -07:00
William A. Kennington III 1684ec0bfc kernel: 3.10.84 -> 3.10.85 2015-08-03 12:58:12 -07:00
William A. Kennington III 8c244bc21c dnsmasq: 2.73 -> 2.75 2015-08-03 12:52:22 -07:00
ts468 c6159b2614 Merge pull request #9101 from ts468/upstream.strongswan
strongswan: add TNC build option
2015-08-03 17:53:01 +02:00
Tobias Geerinckx-Rice 1b0e82659c perl-packages: DateTime-Format-Natural 1.02 -> 1.03 2015-08-03 17:24:02 +02:00
Thomas Strobel 6f727a8a83 strongswan: add TNC build option 2015-08-03 17:07:12 +02:00
Nikolay Amiantov fcc6716680 openbox: propagate some dependencies 2015-08-03 17:16:07 +03:00
Arseniy Seroka c68f9cfc9e Merge pull request #9097 from lancelotsix/upgrade_poezio
Upgrade poezio
2015-08-03 15:53:44 +03:00
Tobias Geerinckx-Rice bae1e6a0e9 geolite-legacy: 2015-07-30 -> 2015-08-03 2015-08-03 14:33:55 +02:00
Ricardo M. Correia 45bdde5505 rustRegistry: 2015-07-07 -> 2015-08-03 2015-08-03 13:34:30 +02:00
ts468 1857db1bc9 Merge pull request #9100 from ts468/upstream.omapd
omapd: init at 0.9.2
2015-08-03 13:12:28 +02:00
Thomas Strobel 89e78b5211 omapd: init at 0.9.2 2015-08-03 13:04:59 +02:00
Bjørn Forsman c2aadb38a7 ntopng: add extra download URL
It seems upstream have moved the ntopng-1.2.1.tgz into an "old/"
subdirectory.
2015-08-03 12:19:34 +02:00
Jascha Geerds 4493ca0094 ldns: Add myself as a maintainer 2015-08-03 11:38:00 +02:00
Jascha Geerds 8c6a2e3b5d ldns: Add linux to platforms 2015-08-03 11:38:00 +02:00
Lancelot SIX b867cc62a7 poezio: 0.8.1 -> 0.9 2015-08-03 09:31:21 +00:00
Lancelot SIX eda7843cab python34Packages.slixmpp: init at 1.0.post5 2015-08-03 09:30:27 +00:00
Lancelot SIX 44be36869f pythonPackages.aiodns: init at 0.3.2 2015-08-03 09:29:34 +00:00
Lancelot SIX f3a0fa9d96 pythonPackages.pycares: init at 0.7.0 2015-08-03 09:28:52 +00:00
Lancelot SIX 61ec424cd4 python33Packages.asyncio: init at 3.4.3 2015-08-03 09:28:11 +00:00
Sander van der Burg dc2a6e3d3d dd-agent: Add support for MongoDB monitoring 2015-08-03 09:09:52 +00:00
Jascha Geerds c6f5bb5785 gnome-tweak-tool: Add patches to work nicely on NixOS
- Search for themes and icon in system data dirs
- Don't show multiple entries for a single theme
- Create config dir if it doesn't exist
2015-08-03 10:14:14 +02:00
Michael Raskin 5210b4c7a8 ECL: Strip manual configure patching and regeneration as it doesn't work anyway 2015-08-03 08:38:00 +03:00
Arseniy Seroka 9771ff51f3 Merge pull request #9062 from odi/mps-youtube
python-packages: mps-youtube init version 0.2.5
2015-08-03 04:48:21 +03:00
Tobias Geerinckx-Rice 9cd4763e9c ipad_charge: init at 2015-02-03 2015-08-03 01:45:13 +02:00
Tobias Geerinckx-Rice 87853e7753 clipgrab: add 1080p (ffmpeg) support
Support is optional (pass ffmpeg = null), but enabled by default.
2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice dad99aae8e clipgrab: 3.4.11 -> 3.5.1 2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice a9a0fedb94 stress-ng: 0.04.13 -> 0.04.14 2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice 249b25698e xdelta: tidy up 2015-08-03 01:41:55 +02:00
ts468 e7e7564c62 Merge pull request #9091 from ts468/upstream.trustedGRUB2
trustedGRUB2: git -> 1.2.0
2015-08-03 01:25:38 +02:00
Michael Raskin b49fc96617 Use GNOME-enabled libsoup in Midori as the build fails otherwise 2015-08-03 00:31:07 +03:00
Thomas Strobel 192091dc06 trustedGRUB2: git -> 1.2.0 2015-08-02 23:03:45 +02:00
Arseniy Seroka 372e5a7dcf Merge pull request #9072 from benley/shout
Shout: new package and nixos module
2015-08-02 16:07:36 +03:00
Arseniy Seroka 0fb7dafb68 Merge pull request #9078 from joachifm/minisign
minisign: init at 0.4
2015-08-02 15:28:48 +03:00