Peter Simons
258bc13966
haskell-ng: update Cabal and deepseq to latest versions
2015-03-25 14:37:14 +01:00
Peter Simons
3f0097fc4b
hackage-packages.nix: re-generate from Hackage 2015-03-24T13:42:07+0100
2015-03-25 14:37:14 +01:00
lethalman
a07395a035
Merge pull request #6975 from magnetophon/mutt-kz-rebase
...
rebase mutt-kz on master, as requested in:
2015-03-25 14:03:17 +01:00
Bart Brouns
bd3e18d60f
rebase mutt-kz on master, as requested in:
...
https://github.com/NixOS/nixpkgs/pull/6836
2015-03-25 13:37:19 +01:00
Jascha Geerds
164dbfff80
nixos/tests/printing: Fix CUPS service name ( #6767 )
2015-03-25 13:26:37 +01:00
Domen Kožar
58b4f11242
Revert "RStudio: initial commit at version 0.98.110"
...
This reverts commit 56e21d05e874a29ad0d51aea18e8c982c7c826f3.
It's missing a file, see https://github.com/NixOS/nixpkgs/pull/6957
2015-03-25 10:02:08 +01:00
Eric Seidel
13dae62ec2
libxkbfile: patch for clang36
2015-03-24 20:54:47 -07:00
Eric Seidel
0bfce5bb4a
pixman: patch for clang36
2015-03-24 20:54:05 -07:00
Eric Seidel
69d02b71a0
clang: add isClang passthru attribute to mirror isGNU
2015-03-24 20:37:01 -07:00
William A. Kennington III
6f025832b5
Merge pull request #6971 from joachifm/remove-redundant-clppcre
...
Delete redundant clppcre expression
2015-03-24 19:19:50 -07:00
William A. Kennington III
740089d2e3
Merge pull request #6972 from doublec/tor
...
Update Tor and Tor Browser
2015-03-24 19:19:30 -07:00
Shea Levy
6e3c9d5ce4
Fix fallout of recent cc-wrapper changes
...
Fixes tarball except for 56e21d05e874a29ad0d51aea18e8c982c7c826f3
2015-03-24 22:13:43 -04:00
Mateusz Kowalczyk
e104a7870f
sxiv: update to latest git
2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
69e9d228cb
youtube-dl: update from 2015.03.09 to 2015.03.24
2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
105c06ae4e
snd: update from 15.2 to 15.4
2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
25eee1c865
gtkspell3: update from 3.0.6 to 3.0.7
2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
0a6eb7f8d5
gloox: update from 1.0.12 to 1.0.13
2015-03-25 00:46:58 +00:00
Mateusz Kowalczyk
66b72cf5d6
glm: update from 0.9.6.0 to 0.9.6.1
2015-03-25 00:46:58 +00:00
Chris Double
9369daf134
Update tor-browser to 4.0.5
2015-03-25 13:39:23 +13:00
Chris Double
9549f1c88f
Update tor to 0.2.5.11
2015-03-25 13:39:23 +13:00
Eric Seidel
7f5367c69d
darwin: add apple cli-tools to initialPath so we can handle overrideCC
...
fixes #6934
2015-03-24 17:33:27 -07:00
Arseniy Seroka
b50848b64c
Merge pull request #6966 from ftrvxmtrx/spotify-0.9.17.1
...
spotify: 0.9.11.27 -> 0.9.17.1
2015-03-25 03:10:22 +03:00
Thomas Tuegel
e1700c856c
kf58: fix another inherited typo
2015-03-24 18:21:12 -05:00
Joachim Fasting
b71865b1bb
libev: bump to 4.19
2015-03-25 00:07:22 +01:00
Thomas Tuegel
6eeaef55e5
kf58: fix inherited typo
2015-03-24 17:50:46 -05:00
Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Thomas Tuegel
2e0775e3a8
Revert "cc-wrapper: fix missing attribute"
...
This reverts commit 6454b8f9ef71ba6d595d318cc149cb3a63b346e4.
2015-03-24 17:48:53 -05:00
Joachim Fasting
2284a1ab8e
libev: set license and description
...
Use upstream's description
2015-03-24 23:47:17 +01:00
Thomas Tuegel
1c3c6e7dbb
plasma5_latest: build with kf58
2015-03-24 17:16:11 -05:00
Thomas Tuegel
77fb55d1f0
plasma52: update to plasma-5.2.2
2015-03-24 17:16:02 -05:00
Thomas Tuegel
6632b151b8
add kf58
2015-03-24 17:15:51 -05:00
Thomas Tuegel
5d1f6ad57c
qt5: make qt-5.4.1 default
2015-03-24 17:14:56 -05:00
Thomas Tuegel
ad49ea230a
qt54: update to qt-5.4.1
2015-03-24 17:14:56 -05:00
Thomas Tuegel
6454b8f9ef
cc-wrapper: fix missing attribute
2015-03-24 17:14:55 -05:00
Bob van der Linden
58112832a7
nixos: iso-image: use label "EFIBOOT" for efi.img
2015-03-24 22:15:32 +01:00
Bob van der Linden
f0fd1c9bcf
nixos: iso-image: use memtest86 params in syslinux
...
See also #6593 .
2015-03-24 22:15:11 +01:00
Bob van der Linden
c57a912016
nixos: test: add tests for booting installation iso in various ways
2015-03-24 22:09:07 +01:00
Bob van der Linden
9ff9949896
nixos: iso-image: removed com32 entries from syslinux menu
...
These entries result in incorrect entries when UNetbootin writes
the image to an USB disk.
2015-03-24 22:09:06 +01:00
Bob van der Linden
af68f24003
nixos: iso-image: solve UNetbootin compatiblity
...
There are a number of hidden restrictions on the syslinux
configuration file that come into play when UNetbootin
compatiblity is desired. With this commit these are documented.
2015-03-24 22:08:52 +01:00
Bob van der Linden
a12ddc1964
nixos: iso-image: use generic boot-loader timeout
...
Syslinux uses different values than grub for timeout.
It uses 1/10 seconds as its unit and it uses 0 to disable timeouts.
In response to PR #5772 .
2015-03-24 22:03:30 +01:00
Bob van der Linden
16a936be90
nixos: iso-image: filename escaping in xorriso
2015-03-24 22:01:51 +01:00
Bob van der Linden
8d092270d2
nixos: iso-image: use syslinux bootloader for USB booting support
...
This changes the bootloader for iso generation from Grub to
syslinux. In addition this adds USB booting support, so that
"dd" can be used to burn the generated ISO to USB thumbdrives
instead of needing applications like UnetBootin.
2015-03-24 22:01:04 +01:00
Vladimír Čunát
9a75c1d7c8
lensfun: fix build by using older make
2015-03-24 21:15:46 +01:00
Peter Simons
2b8328a111
Merge pull request #6926 from wjlroe/haskell-llvm-general-pin-version
...
Haskell llvm-general 3.4.4.0 requires LLVM==3.4.*
2015-03-24 20:48:47 +01:00
Luis G. Torres
f7e4be5011
flann: make it build on Darwin ( close #6946 )
2015-03-24 20:48:10 +01:00
Joachim Fasting
a64d43b96d
Delete redundant clppcre expression
...
The top-level name clppcre has no reverse dependencies, is out-of-date, and
appears to have been superceded by lispPackages.cl-ppcre.
2015-03-24 20:39:25 +01:00
Thomas Tuegel
60c123560e
Merge branch 'kde4-override'
2015-03-24 13:53:00 -05:00
Thomas Tuegel
d3500f67c9
kde4: fix override
2015-03-24 13:52:47 -05:00
Joachim Fasting
be7ef555f2
libev: port to mkDerivation
2015-03-24 19:44:26 +01:00
Siarhei Zirukin
f4cd5a68f7
pcalc: 20120812 -> 20141224
2015-03-24 18:27:42 +01:00
