William A. Kennington III
fbfdc139d6
Merge branch 'master.upstream' into staging.upstream
2015-07-05 18:36:16 -07:00
William A. Kennington III
cb343e7be6
nixos/install-grub: Fix symlink installation for boot filesystems which don't support symlinking
...
Some filesystems like fat32 don't support symlinking and need to be
supported on /boot as an efi system partition. Instead of creating the symlink directly in boot, create the symlink in
a temporary directory which has to support symlinking.
2015-07-05 18:34:47 -07:00
William A. Kennington III
c61d048427
nixos/quassel: Temporarily switch back to qt4 since qt5 tls in quassel is broken
2015-07-05 16:53:42 -07:00
William A. Kennington III
06f1e2c61e
quassel: Add dependency on qca for crypto
2015-07-05 16:52:56 -07:00
William A. Kennington III
fe705a664c
gnupg: 2.1.5 -> 2.1.6
2015-07-05 16:51:03 -07:00
William A. Kennington III
799c46e6e7
libvirt: 1.2.12 -> 1.2.17
2015-07-05 16:50:50 -07:00
William A. Kennington III
d605663ae2
Merge branch 'master.upstream' into staging.upstream
2015-07-05 13:06:02 -07:00
William A. Kennington III
2d1aafef55
Merge pull request #8655 from ts468/upstream.grub_module
...
grub installation: fix: simplify code
2015-07-05 13:02:26 -07:00
Mateusz Kowalczyk
2b833d5297
haskell-ghc: update head to 20150705
2015-07-05 21:01:37 +01:00
Thomas Strobel
4ee2d39fbf
grub installation: fix: simplify code
2015-07-05 21:55:56 +02:00
Eelco Dolstra
d14b4741da
Merge pull request #8657 from jb55/fix-double-apply-patch
...
Fix some double applications of callPackage
2015-07-05 21:23:41 +02:00
Pascal Wittmann
beffeedccf
radicale: update from 0.9 to 0.10
...
add myself to maintainers
2015-07-05 21:12:50 +02:00
Peter Simons
b6b13e45f8
haskell-lhs2tex: disable Hydra builds to fix assrtion error
2015-07-05 21:06:04 +02:00
Peter Simons
2f111381e0
haskell-mueval has been fixed upstream.
2015-07-05 21:06:04 +02:00
Peter Simons
26a9fcdfca
haskell-hwsl2-reducers depends on broken build inputs
2015-07-05 21:06:04 +02:00
Peter Simons
9d69ce4237
hackage-packages.nix: drop package "som" to avoid invalid references to "assert"
2015-07-05 21:06:04 +02:00
Peter Simons
7871f2d9b1
haskell-Frames depends on broken singletons library.
2015-07-05 21:06:04 +02:00
Peter Simons
101d0db511
haskell-hid: build is broken
2015-07-05 21:06:03 +02:00
Peter Simons
34f10a82e0
haskell-digitalocean-kzs: can't run its test suite
2015-07-05 21:06:03 +02:00
Peter Simons
63406af616
haskell-acme-one exports no library modules, so we shouldn't run Haddock
2015-07-05 21:06:03 +02:00
Peter Simons
d0f1e6626b
haskell-socket: test suite tries to access the network
2015-07-05 21:06:03 +02:00
Peter Simons
dfea5f25a6
hackage-packages.nix: update to 77076157d1
with hackage2nix revision 4a9eb87332b3005c00d9b695b1365e675b614e65
2015-07-05 21:06:00 +02:00
William Casarin
a87c9af080
fix some double applications of callPackage
2015-07-05 12:01:22 -07:00
Peter Simons
df4fb819be
ghc: add release candidate 2 for compiler version 7.10.2
2015-07-05 20:56:29 +02:00
William A. Kennington III
282e7e6c84
Merge pull request #8647 from ts468/upstream.trusted_grub
...
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:52:13 -07:00
William A. Kennington III
c38a9b607f
Merge pull request #8654 from ts468/upstream.trusted_grub_integration
...
grub installation: integrate trustedGRUB + fix broken equality check
2015-07-05 11:34:00 -07:00
Thomas Strobel
65cbbc75b0
grub installation: integrate trustedGRUB + fix broken equality check
2015-07-05 19:51:53 +02:00
goibhniu
bdc77d2733
Merge pull request #8652 from LnL7/xhyve
...
xhyve: init at version 0.1.0
2015-07-05 19:35:07 +02:00
Daiderd Jordan
d366f5db9a
xhyve: init at version 0.1.0
...
Lightweight Virtualization on OS X Based on bhyve.
2015-07-05 18:54:55 +02:00
aszlig
1a85f9f1f3
Merge pull request #8638 from devhell/mediainfo.
...
Updates libmediainfo, mediainfo and mediainfo-gui from version 0.7.74 to
0.7.75. Build tested on my local machine, however I didn't do runtime
tests.
2015-07-05 18:52:46 +02:00
Pascal Wittmann
55d161427c
Merge pull request #8649 from dezgeg/pr-asymptote
...
asymptote: Fix source URL (ZHF)
2015-07-05 18:48:10 +02:00
Michael Raskin
178014373e
E prover: switch to the new location
2015-07-05 18:52:42 +03:00
aszlig
cb94cce94f
xscreensaver: Fix SHA256 hash of upstream tarball.
...
The upstream tarball has changed, so I checked why this has happened and
found a tarball with the old SHA256 hash here:
http://fossies.org/linux/misc/xscreensaver-5.33.tar.gz/
After checking the contents of this and the new upstream tarball I found
that the old tarball had only .so, .o and .o.d files which now are no
longer existent in the new tarball.
Seems that the upstream author has accidentally put object files in the
source tarball and has now corrected this mistake.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 16:42:07 +02:00
Edward Tjörnhammar
d06fd884dc
Merge pull request #8646 from bobvanderlinden/android-studio-1.2.2.0
...
idea: android-studio: update 1.2.1.1 -> 1.2.2.0
2015-07-05 14:07:56 +02:00
Luca Bruno
6c8e6aaa24
nixos docker: fix service and test
2015-07-05 13:57:23 +02:00
Tuomas Tynkkynen
167cf5c0da
asymptote: Fix source URL
...
The particular mirror (softlayer-ams.dfl.sourceforge.net) seems to be
down (no DNS entry).
2015-07-05 14:31:46 +03:00
Thomas Strobel
2285ad1bfa
trustedGRUB: GRUB 1 based -> GRUB 2 based
2015-07-05 11:48:36 +02:00
Bob van der Linden
542a508c63
idea: android-studio: update 1.2.1.1 -> 1.2.2.0
2015-07-05 11:43:46 +02:00
Michael Raskin
af3d395cfe
sgtpuzzles: update to revision 10286; rewrite completely to avoid reliance on builderDefs features
2015-07-05 11:57:49 +03:00
aszlig
2467c437b7
xdg_utils: Fix wrong substitution of grep command.
...
Fixes regression introduced by 16406e63b3
.
Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:
foo="$(grep xxx)"
The replacement would be something like this:
foo="$/nix/store/.../bin/grep xxx)"
Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:
xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
"^Exec(\[[^]=]*])?=" "$file" |
/nix/store/.../bin/cut -d= -f 2- |
first_word`"'
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 09:25:13 +02:00
Charles Strahan
e199d9e844
urxvt-perl: init at 2015-01-16
...
Includes two extensions for `urxvt`:
* fullscreen: Toggle fullscreen for terminal
* newterm: Open a new terminal in your current working directory
2015-07-05 00:12:50 -04:00
Arseniy Seroka
b986bdf29d
Merge pull request #8641 from jb55/generalize-cuda-patch
...
cudatoolkit: generalize derivations, add cuda7
2015-07-05 03:13:48 +03:00
William Casarin
d1590482cf
cudatoolkit: generalize derivations, add cuda7
...
There is not much different between the cudatoolkit
expressions:
pkgs/development/compilers/cudatoolkit/5.5.nix
pkgs/development/compilers/cudatoolkit/6.0.nix
pkgs/development/compilers/cudatoolkit/6.5.nix
This commit removes those and replaces them with
pkgs/development/compilers/cudatoolkit/generic.nix
and adds cudatoolkit version 7
2015-07-04 17:05:50 -07:00
lethalman
d7869f46ca
Merge pull request #8602 from ts468/upstream.pam
...
Security: integrate pam_mount into PAM of NixOS
2015-07-05 00:40:49 +02:00
Arseniy Seroka
d1bb51798e
Merge pull request #8613 from benley/prometheus
...
updates: prometheus-node-exporter, prometheus-alertmanager
2015-07-05 01:08:41 +03:00
Arseniy Seroka
3ce7eeb270
Merge pull request #8631 from ts468/upstream.tpm_luks
...
tmp-luks: init at version 0.9pre
2015-07-05 01:03:01 +03:00
Thomas Strobel
36f2ec82cc
tmp-luks: init at 0.9pre
2015-07-04 23:57:59 +02:00
Thomas Strobel
7b6f279142
pam_mount module: integrate pam_mount into PAM of NixOS
2015-07-04 23:42:31 +02:00
Pascal Wittmann
0f2f98fbfe
Merge pull request #8610 from datakurre/datakurre-master-emacs
...
emacs: fix to use \${gettext}/share/locale/locale.alias
2015-07-04 23:37:27 +02:00
Michael Raskin
2d99759e51
LibreOffice: update 4.4.3.2 -> 4.4.4.3
2015-07-05 00:32:54 +03:00