Eelco Dolstra
3644f9124a
pam_ssh_agent_auth: Allow multiple authorized keys files
...
We need this because of https://github.com/NixOS/nixos/pull/52 .
2012-12-17 21:11:10 +01:00
Eelco Dolstra
f8cf626b5e
pam_ssh_agent_auth: Update to 0.9.4
2012-12-17 21:11:10 +01:00
Piotr Pietraszkiewicz
45937caa2f
Bumped kadu to v0.12.2 and its dependency libgadu to v1.11.2
2012-12-17 20:44:59 +01:00
Shea Levy
dd131a0c09
Revert "Setting the system utillinux to be utillinuxCurses."
...
This reverts commit cba4d20280 .
2012-12-17 13:09:05 -05:00
Shea Levy
75ec5c609e
Merge remote-tracking branch 'upstream/master' into systemd
...
Conflicts:
maintainers/scripts/ec2/create-ebs-amis.py
2012-12-17 13:03:56 -05:00
Shea Levy
835ee30b32
Merge branch 'no-aufs' into systemd
2012-12-17 13:02:35 -05:00
Rickard Nilsson
59c9f406fd
darktable: Update to 1.1.1
2012-12-17 17:27:13 +01:00
Shea Levy
97389f5b1f
Keep nixpkgs backwards-compatible at least 1 version
2012-12-17 10:21:55 -05:00
Lluís Batlle i Rossell
faf821e501
Adding USB cameras to linux 3.7
...
Details changed since the 3.6 config to get this enabled.
2012-12-17 11:52:47 +01:00
Jack Cummings
d1254fa27e
add Vessel, a fluid physics puzzle game.
2012-12-16 23:24:31 -08:00
Shea Levy
dc7a5e99d5
create-ebs-amis.py: Fix for latest charon
2012-12-16 20:12:39 -05:00
Shea Levy
6a147cfbfa
Add unionfs-fuse meta
2012-12-16 16:42:45 -05:00
Shea Levy
42b061d118
Add unionfs-fuse
2012-12-16 16:25:24 -05:00
Shea Levy
88e43775fd
fuse 2.9.2
2012-12-16 16:25:24 -05:00
Lluís Batlle i Rossell
62fa1b8782
Adding ext4 to vmTools. Otherwise, nixos build-vm fails with 'useBootLoader'.
2012-12-16 21:43:35 +01:00
Lluís Batlle i Rossell
358239348a
making memtest grub entries work again
...
I'm not any good at perl, and I only came up with this after many
slow attempts. Any review welcome.
But until this, memtest was broken, and extraPrepareConfig as well, in grub.
2012-12-16 21:41:47 +01:00
Rob Vermaas
39a6143c66
Add options to control rate limiting behaviour of journald. See 'man journald.conf' for more information.
2012-12-16 20:28:45 +01:00
Shea Levy
dfca6b97f1
Remove last mention of aufs for completeness
2012-12-16 13:33:23 -05:00
Shea Levy
ae4c8e3e0b
nova-image.nix: Replace the commented-out aufs mount with a commented-out unionfs-fuse mount
2012-12-16 13:31:44 -05:00
Shea Levy
ac9002ce18
amazon-image: use unionfs-fuse instead of aufs
2012-12-16 13:16:17 -05:00
Shea Levy
d19c223ba6
Simplify unionfs-chroot bind-mounting
2012-12-16 13:07:42 -05:00
Shea Levy
e34024d998
Refactor common unionfs-fuse initrd prep into a separate module
2012-12-16 12:33:36 -05:00
Lluís Batlle i Rossell
3e734ba695
Qemu says 'boot=on' is deprecated, so I try a half-fix here
...
I change the 'build-vm' to use '-boot menu=on', so a menu displays and allows
choosing the 2nd hd. Otherwise, I don't know how to boot from a 2nd hd.
2012-12-16 18:07:13 +01:00
Shea Levy
3eb0faf317
qemu-vm: Use unionfs-fuse instead of aufs for writableStore
2012-12-16 11:56:49 -05:00
Shea Levy
be4f69519b
iso-image: Use unionfs-fuse instead of aufs
2012-12-16 11:31:52 -05:00
Andres Loeh
0f5976b599
ghc-paths: Fix patch to hopefully work with older GHCs.
2012-12-16 17:25:43 +01:00
Lluís Batlle i Rossell
dacd7d5a58
Setting iso_new_kernel to use linux 3.7.
...
It was using 3.2, the same kernel as the other isos.
2012-12-16 16:05:50 +01:00
Lluís Batlle i Rossell
cba4d20280
Setting the system utillinux to be utillinuxCurses.
...
The live-dvd was set that way already.
I think some utillinux pieces may be nicer, or have more tools. I don't know
the details though.
2012-12-16 16:03:38 +01:00
Lluís Batlle i Rossell
5a475f7250
utillinux: fixing mount/umount, for our case of /etc/mtab symlinking to /proc/mounts
...
In systemd, without this patch, 'mount' for 'user' fstab devices works, but
umount does not; it says to require root.
All gets normal with this patch.
2012-12-16 15:43:47 +01:00
Andres Loeh
d068aa9861
Patch ghc-paths to interact better with ghcWithPackages.
...
When the ghc-paths library is compiled, the paths of the
compiler it is compiled with are being hardcoded in the
library (and can then be queried from other applications
using the library).
But on Nix, packages are compiled with ghc-wrapper, and
subsequently possibly used with a special version of ghc
generated for a particular environment of packages. So
one version of ghc-paths may potentially end up being
used by lots of different instances of ghc. The hardcoding
approach fails.
As a work-around, we now patch ghc-paths so that it allows
setting the paths that can be queried via environment
variables. Specific GHC environments can then set these
environment variables in the wrapper shell script that
invokes GHC.
This should at least partially solve issue #213 .
2012-12-16 14:25:15 +01:00
Aristid Breitkreuz
e89aea5e42
add luite's mirror to cabal/hackage download expression (for when hackage.haskell.org is down)
2012-12-15 23:34:49 +01:00
Shea Levy
90e825481d
Update create-ebs-amis.py to recent charon
2012-12-15 14:25:25 -05:00
Alexander Inyukhin
1ae44e42ed
Use zoneinfo from tzdata
...
This fixes #50
2012-12-15 22:05:32 +04:00
Peter Simons
918b26a59e
git-annex: update to version 3.20121211
2012-12-15 11:44:13 +01:00
Peter Simons
3017d35260
haskell-vault: update to version 0.2.0.3
2012-12-15 11:32:48 +01:00
Peter Simons
fe826eb71d
haskell-unordered-containers: update to version 0.2.3.0
2012-12-15 11:32:47 +01:00
Peter Simons
06669abb0f
haskell-uniplate: update to version 1.6.10
2012-12-15 11:32:47 +01:00
Peter Simons
4b3a48b75f
haskell-lens: update to version 3.7.1
2012-12-15 11:32:47 +01:00
Peter Simons
f7cf103ee8
haskell-iproute: update to version 1.2.10
2012-12-15 11:32:47 +01:00
Peter Simons
5653671646
haskell-heist: update to version 0.10.1
2012-12-15 11:32:47 +01:00
Peter Simons
fc17b6d767
haskell-diagrams-svg: update to version 0.6.0.1
2012-12-15 11:32:47 +01:00
Peter Simons
cc5b72c240
haskell-case-insensitive: update to version 0.4.0.4
2012-12-15 11:32:47 +01:00
Peter Simons
4a1cf1dc95
haskell-attoparsec: update to version 0.10.3.0
2012-12-15 11:32:47 +01:00
Peter Simons
6201716063
haskell-aeson: update to version 0.6.1.0
2012-12-15 11:32:47 +01:00
Lluís Batlle i Rossell
14d87a44b1
Trying to fix avogadro -> kdeedu
...
avogadro also wants eigen2.
2012-12-14 22:23:37 +01:00
Lluís Batlle i Rossell
b956b77423
eigen: adding back eigen 2.0, for kde.
...
Kdeedu wants eigen 2.0.
2012-12-14 22:23:36 +01:00
Florian Friesdorf
93b3d24b96
oauth2 tests still fail
2012-12-14 20:24:53 +01:00
Florian Friesdorf
0fb9688235
python prefix for recursive pth loader and fix typo
2012-12-14 19:47:51 +01:00
Shea Levy
6d928ab684
Don't preserve timestamps when copying sources to the temporary build directory.
...
This should fix issues like "ZIP does not support timestamps before 1980"
2012-12-14 13:36:04 -05:00
Florian Friesdorf
14483c0bf9
update nixos channel path
2012-12-14 18:24:41 +01:00