Commit Graph

45345 Commits

Author SHA1 Message Date
Peter Simons
2af20dbacf Merge pull request #3088 from aycanirican/master
jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which i...
2014-06-30 15:55:33 +02:00
Michael Raskin
7caec74142 Merge pull request #3118 from NixOS/libreoffice-update-4.2.5
Libreoffice update 4.2.5
2014-06-30 17:39:12 +04:00
Peter Simons
0b1b4e5870 Merge pull request #3133 from deepfire/haskell-yampa
haskellPackages.Yampa:  new expression
2014-06-30 15:35:35 +02:00
Cillian de Róiste
336f1f9d88 chromedriver 2.9 -> 2.10 2014-06-30 12:48:38 +02:00
Jaka Hudoklin
16f801cba9 nixos/pam: make pam_loginuid optional if in container 2014-06-30 11:08:39 +02:00
Michael Raskin
77314b7eb2 Merge pull request #2888 from nilcons/no-random-arch-downgrades
Fix nixos-rebuild.sh to depend on Nix
2014-06-30 12:47:17 +04:00
Michael Raskin
d61129a117 Downgrade gnu-efi back: this fixes build of gummiboot without breaking syslinux build 2014-06-30 11:17:19 +04:00
Michael Raskin
127175d27f Update gummiboot to the latest 2014-06-30 11:05:40 +04:00
Michael Raskin
efb0c56db4 Update linux_testing and enable parallel build of Linux kernel 2014-06-30 10:52:33 +04:00
Michael Raskin
3a197214f9 Merge pull request #3068 from taku0/firefox-bin-30.0
add firefox-bin: the binary package for Firefox web browser
2014-06-30 10:31:43 +04:00
Michael Raskin
89a7cc92a2 Merge pull request #3020 from ambrop72/0ad
Add 0 A.D.
2014-06-30 10:30:41 +04:00
Michael Raskin
5a8a92c01a Merge pull request #3007 from wkennington/master.syslinux
syslinux: Update 4.07 -> 6.02
2014-06-30 10:29:28 +04:00
Michael Raskin
d001de0100 Merge pull request #3102 from auntieNeo/ipafont
Added package for Japanese IPAFonts.
2014-06-30 10:19:48 +04:00
Michael Raskin
02266194ea Merge pull request #2894 from kirelagin/fixusergroup
Fix conditional handling of users and groups in some services
2014-06-30 10:16:20 +04:00
Michael Raskin
d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute
Added Kochi substitute Japanese font package
2014-06-30 10:14:14 +04:00
Michael Raskin
b403893aa2 Merge pull request #2778 from edwtjo/radicale
Adding Radicale package and service
2014-06-30 10:11:23 +04:00
Michael Raskin
a2dacf72d3 Scala: update to 2.9.3 and fix URL
Fixes #2613

It is a pull request by taku0 with a long story…
2014-06-30 09:37:19 +04:00
Michael Raskin
12e0c22e80 Merge pull request #2610 from taku0/oraclejdk8
add oraclejdk8
2014-06-30 09:26:58 +04:00
Michael Raskin
dcf5e85c2f Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
2014-06-30 09:26:24 +04:00
Michael Raskin
d2d969f08a Merge pull request #2354 from hrdinka/fix_glibc_multi
glibc_multi: fix ldd on x86_64
2014-06-30 09:20:22 +04:00
Michael Raskin
f2e9ebbd46 Merge pull request #2283 from wizeman/u/sysctl-merge
nixos: Fix sysctl option merging
2014-06-30 09:03:33 +04:00
Michael Raskin
0ecfc6cb49 Merge pull request #2213 from thoughtpolice/kernel-config
nixos: make several kernel common-config options optional
2014-06-30 09:01:08 +04:00
Oliver Charles
f8e984b9b2 haskellPackages.compdata: Require GHC >= 7.8 2014-06-30 00:15:02 +01:00
Michael Raskin
54586a77e7 Adding a minimal script set to serve store as a dynamical binary cache 2014-06-30 00:39:54 +04:00
Kosyrev Serge
3ee00efbab haskellPackages.Yampa: new expression 2014-06-29 23:38:54 +04:00
Michael Raskin
a278c3dfa8 Fix tarball by adding the missing maintainer entry; email copied from commit metadata 2014-06-29 10:18:39 +04:00
John Wiegley
af5f5ec84d ceph: default atomicops dependency to null
I have no such dependency on my system, so this prevent nix-env from
working.
2014-06-28 21:38:16 -07:00
Alexander Kjeldaas
81172a77e6 Document paths-from-graph.pl somewhat. 2014-06-28 20:44:22 -05:00
Alexander Kjeldaas
d80ded0e7d Added the ceph filesystem. 2014-06-28 20:43:58 -05:00
Alexander Kjeldaas
f1b7cb7ceb Added lib output to xfsprogs.
This only contains static archives since xfsprogs is compiled
with dynamic libraries disabled.
2014-06-28 20:43:51 -05:00
Austin Seipp
2245580812 Merge pull request #3077 from vbgl/cppo
Adds cppo
2014-06-28 20:37:46 -05:00
Austin Seipp
b71d425f78 Merge pull request #3109 from nslqqq/master
OpenSpades: Initial 0.0.12
2014-06-28 20:35:35 -05:00
Austin Seipp
18617d66cc Merge pull request #3110 from bennofs/update-cabal-bounds
haskell-cabal-bounds: update Cabal version
2014-06-28 20:35:24 -05:00
Austin Seipp
4f933af158 Merge pull request #3116 from bennofs/cabal-hackage-mirror
cabal-builder: Use hackage mirror
2014-06-28 20:35:12 -05:00
Austin Seipp
4931b261f9 Merge pull request #3117 from bennofs/haskell-deepseq-generics
haskell-deepseq-generics: new expression
2014-06-28 20:34:55 -05:00
Austin Seipp
7dfb3b17c6 Merge pull request #3121 from deepfire/haskell-sha2
SHA2:  new expression
2014-06-28 20:34:31 -05:00
Austin Seipp
64bb2cf003 Merge pull request #3123 from jagajaga/add_haskell_pkgs
haskell-command-qq: add pkg
2014-06-28 20:34:19 -05:00
Arseniy Seroka
9802165f7a haskel-command-qq: add pkg 2014-06-29 04:25:23 +04:00
Kosyrev Serge
962011de36 SHA2: new expression 2014-06-29 04:13:20 +04:00
John Wiegley
79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
2014-06-28 17:04:04 -07:00
Michael Raskin
a72bb396a2 Do not create unneeded local-scope packages; disable a failing test
The test in question tries to fit a table into one page; I cannot find
what dependency update is needed to fix it and there are a few
depedendencies better updated on x-updates.
2014-06-28 23:33:42 +04:00
Benno Fünfstück
cd48bbfaec haskell-deepseq-generics: new expression 2014-06-28 21:30:14 +02:00
Cillian de Róiste
009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Benno Fünfstück
c052d7297b cabal-builder: Use hackage mirror
It's now possible to use the mirror system for the cabal builder.
2014-06-28 20:01:40 +02:00
John Wiegley
bf610b79ff structured-haskell-mode: 1.0.2 > 1.0.3 2014-06-28 09:23:22 -07:00
Benno Fünfstück
164c578c96 haskell-cabal-bounds: GHC 7.8 has only Cabal 1.18 2014-06-28 16:50:35 +02:00
Benno Fünfstück
4c2a206d53 haskell-cabal-bounds: update Cabal version 2014-06-28 16:48:07 +02:00
Aycan iRiCAN
83e224cacb Merge remote-tracking branch 'upstream/master' 2014-06-28 17:32:15 +03:00
Florian Friesdorf
9b7dbcc83e name nixos tests, close #3078 2014-06-28 16:05:47 +02:00