Commit graph

24636 commits

Author SHA1 Message Date
Shea Levy
b634efe63c ocamlPackages.opam: Fix indentation
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:12:56 -05:00
Shea Levy
66ad165829 Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -05:00
Shea Levy
1670244f80 Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
2013-03-08 17:03:22 -05:00
orbitz
55be059467 Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me 2013-03-08 22:59:54 +01:00
orbitz
98a6759bc7 Delete 0.9.4 2013-03-08 22:48:58 +01:00
orbitz
fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
Shea Levy
1de517844b Whoops, buildNativeInputs is now nativeBuildInputs 2013-03-08 16:39:09 -05:00
Shea Levy
f2c79c4542 Remove some references to non-existent packages 2013-03-08 16:36:59 -05:00
Shea Levy
b938cacbe1 tmux: Update to 1.7 2013-03-08 15:49:22 -05:00
cillianderoiste
e5440d9a83 Merge pull request #362 from jcumming/firmware.130308
linux-firmware.git moved, and so did the intel wireless firmware urls.
2013-03-08 09:45:43 -08:00
Александр Цамутали
63256d0834 games/unvanquished: Update to 0.13.1. 2013-03-08 20:58:48 +04:00
Jack Cummings
1e2e5babf1 XML-LibXML-2.0014, as XML-LibXML-2.0001 doesn't exist upstream anymore 2013-03-08 07:44:30 -08:00
Jack Cummings
e863477995 need to link against -lgcc_s for the testsuite to work 2013-03-08 07:43:30 -08:00
Jack Cummings
7fcfcb2614 linux-firmware.git moved, and so did the intel wireless firmware urls. 2013-03-08 07:40:47 -08:00
Michael Raskin
f80dfee0c5 SBCL: patch for new Glibc no longer needed 2013-03-08 17:55:11 +04:00
Peter Simons
c8ff45b5c7 haskell-doctest: jailbreak to support QuickCheck version 2.6 2013-03-08 13:56:12 +01:00
Peter Simons
7ac086aab7 haskell-test-framework-quickcheck2: jailbreak to support QuickCheck version 2.6 2013-03-08 13:56:00 +01:00
Peter Simons
1f38a4ca66 haskell-cabal2nix: update to version 1.47 2013-03-08 13:44:59 +01:00
Peter Simons
cf53885d84 haskell-syb: update to version 0.4.0 2013-03-08 13:43:35 +01:00
Peter Simons
d7bc87693f haskell-quickcheck: update to version 2.6 2013-03-08 13:43:21 +01:00
Peter Simons
f805ec1e0a happstack-server: disable test suite to fix build error 2013-03-08 13:37:59 +01:00
Peter Simons
7db1b1e085 haskell-zip-archive: disable test suite
The test suite fails because it expects to find /usr/bin/zip.
2013-03-08 13:37:59 +01:00
Peter Simons
8dc669a726 haskell-uulib: update to version 0.9.15 2013-03-08 13:37:58 +01:00
Peter Simons
610f063554 haskell-http-conduit: update to version 1.9.1 2013-03-08 13:37:58 +01:00
Peter Simons
9ff74626f9 haskell-ghc-mod: update to version 1.12.1 2013-03-08 13:37:58 +01:00
Peter Simons
a675c7f245 haskell-data-default: update to version 0.5.1 2013-03-08 13:37:58 +01:00
Peter Simons
e447fcc8dd haskell-cuda: re-generate the expression with recent cabal2nix 2013-03-08 13:37:58 +01:00
Peter Simons
d96af07c9f xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
Peter Simons
b31be07af0 haskell-multiarg: update to version 0.10.0.0 2013-03-08 13:37:58 +01:00
Peter Simons
1090f928c4 haskell-monad-control: update to version 0.3.2 2013-03-08 13:37:58 +01:00
Peter Simons
525342632f haskell-hakyll: disable test suite to fix build error 2013-03-08 13:37:58 +01:00
Peter Simons
1d0e0fd167 haskell-hakyll: update to version 4.2.1.0 2013-03-08 13:37:57 +01:00
Peter Simons
fcd895afb3 pkgs/build-support/cabal: disable the split objects feature on Darwin by default
According to <http://hackage.haskell.org/trac/ghc/ticket/4013>, this
feature won't work with XCode versions older than 3.2.

This means that Mac users will have considerably larger binaries because
some build-time dependencies (such as HTTP) will be mis-detected as
run-time dependencies.
2013-03-08 13:37:57 +01:00
orbitz
6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +01:00
David Guibert
856f6c2aea fix iftop 2013-03-08 09:08:57 +01:00
Song Wenwu
9cbcbc5323 add xchainkeys-0.11 2013-03-08 13:55:32 +08:00
Eelco Dolstra
234c6b74c6 Merge remote-tracking branch 'origin/stdenv-updates' 2013-03-07 23:09:05 +01:00
Lluís Batlle i Rossell
197f6c6c4c idle3-tools can build only on linux, I think. 2013-03-07 22:39:53 +01:00
Lluís Batlle i Rossell
78e71242d7 Adding idle3-tools (for WD Green HDDs) 2013-03-07 21:40:28 +01:00
Eelco Dolstra
262c21ed46 Enable __ignoreNulls globally 2013-03-07 19:42:01 +01:00
Eelco Dolstra
f5052a8679 Fix extraBuildNativeInputs reference 2013-03-07 19:41:40 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Jack Cummings
96f662f746 lsof-4.87 2013-03-07 10:23:43 -08:00
Peter Simons
d742d26b0d haskell-uulib: update to version 0.9.15 2013-03-07 17:07:47 +01:00
Peter Simons
0fd867192d haskell-http-conduit: update to version 1.9.1 2013-03-07 17:07:47 +01:00
Peter Simons
02ed0e6867 haskell-hakyll: update to version 4.2.0.0 2013-03-07 17:07:47 +01:00
Peter Simons
213dcd5843 haskell-ghc-mod: update to version 1.12.1 2013-03-07 17:07:47 +01:00
Peter Simons
2965fb2cb0 haskell-data-default: update to version 0.5.1 2013-03-07 17:07:46 +01:00
Peter Simons
6ff4538b5a haskell-pandoc: jailbreak to support syb 0.4.0 2013-03-07 17:07:33 +01:00
Peter Simons
e459a7514e haskell-doctest: jailbreak to support syb 0.4.0 2013-03-07 17:03:00 +01:00
Peter Simons
4fd407bab5 haskell-QuickCheck: add version 2.6 2013-03-07 16:57:52 +01:00
Peter Simons
95ff746654 haskell-syb: add version 0.4.0 2013-03-07 16:57:33 +01:00
Rob Vermaas
03519851bc Add elasticsearch 0.20.5 2013-03-07 12:36:29 +01:00
Rob Vermaas
415b292afc Update rabbitmq to version 3.0.3 2013-03-07 12:34:45 +01:00
Sander van der Burg
f00dc945d2 The iOS test target can/should only be executed on x86_64-darwin, this change enforces that 2013-03-07 10:44:19 +01:00
aszlig
5ae408b618
chromium: Update all channels to latest versions.
This updates all release channels to the latest versions:

stable: 25.0.1364.97 -> 25.0.1364.152 (builds fine, untested)
beta:   26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)
dev:    26.0.1410.12 -> 26.0.1410.28  (builds fine, tested)

Still, we should have version 27 already for the dev channel, so we might look
about where to find the newest tarball.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
aszlig
7d273f07ea
oracle-xe: Add new package, version 11.2.0.
This is the Oracle Database which they give out for free, therefore it's called
Express Edition.

Well, I pretty much packaged this in vain as I finally found out that i don't
need that Oracle Database stuff at all. And my original purpose was to do SQL
query/constraint testing.

So before I'm going to throw this away (forever, oh no!), maybe someone else
might have a use case for this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
Michael Raskin
536db80abf Add Sodium cryptography library 2013-03-07 10:59:03 +04:00
Michael Raskin
f251f8b91a XBoard: update to version 4.7.0 2013-03-07 10:58:25 +04:00
Michael Raskin
3d28751740 Linux 3.9-rc1: set correct modDirVersion 2013-03-07 09:12:49 +04:00
Cillian de Róiste
e42e498e60 pygobject: update to 2.28.6
This fixes an issue with MyPaint: https://gna.org/bugs/?20400
2013-03-06 23:25:46 +01:00
Cillian de Róiste
43e8e7763b Add MyPaint: A graphics application for digital painters 2013-03-06 23:08:30 +01:00
Cillian de Róiste
151901ac21 drumkv1: add description 2013-03-06 22:26:08 +01:00
Michael Raskin
197af84cc6 SBCL: update to 1.1.5 2013-03-07 00:40:51 +04:00
Michael Raskin
c8acc350b9 Wine: update to 1.5.25 2013-03-07 00:28:59 +04:00
Michael Raskin
b72134dc11 Linux: Add 3.9-rc1 as lowPrio (it has a regression fix 3.8.2 lacks) 2013-03-06 23:59:49 +04:00
Andrew Morsillo
7d4d40e82b Update mysql workbench version 2013-03-06 20:08:30 +01:00
Jack Cummings
a1c4fa8edc recode: attempt to fix Darwin testsuite build problem 2013-03-06 10:12:21 -08:00
Vladimír Čunát
da437144fa webkit(_gtk2): clean, unify and enable parallel building
This should make webkit_gtk2 build.
2013-03-06 18:16:23 +01:00
Eelco Dolstra
85d464a031 Remove some hackery 2013-03-06 16:57:57 +01:00
Eelco Dolstra
5e83e93e97 Add a library function ‘genAttrs’
It generates an attribute set by mapping a function over a list of
attribute names.
2013-03-06 16:33:01 +01:00
Vladimír Čunát
00de01f58b Merge pull request #354 from jcumming/recode.130305
recode: update to 3.7-git
2013-03-06 06:32:03 -08:00
Ludovic Courtès
653ad8ec2f gmp: disable stripping when cross-compiling 2013-03-06 15:20:06 +01:00
Eelco Dolstra
4623d3ff01 glibc: Fix an assertion failure in getaddrinfo.c
For instance, when connected to a VPN, Emacs would randomly crash
at startup:

emacs: ../sysdeps/posix/getaddrinfo.c:1467: rfc3484_sort: Assertion `src->results[i].native == -1 || src->results[i].native == a2_native' failed.
2013-03-06 14:10:54 +01:00
Eelco Dolstra
92656e5f52 coreutils: Update to 8.21
Now "df" finally hides bind mounts and rootfs!
2013-03-06 14:10:54 +01:00
Peter Simons
1fdd780e2c ctags: update to SVN revision 804 2013-03-06 12:38:49 +01:00
Peter Simons
70836d5e64 haskell-cabal2nix: update to version 1.45 2013-03-06 11:06:01 +01:00
Peter Simons
5371f4b5d6 haskell-zip-archive: update to version 0.1.3.4 2013-03-06 11:06:01 +01:00
Peter Simons
272123038e haskell-xdot: update to version 0.2.3 2013-03-06 11:06:01 +01:00
Peter Simons
fc66f4a355 haskell-uu-parsinglib: update to version 2.7.4.2 2013-03-06 11:06:01 +01:00
Peter Simons
d8b62ae485 haskell-shelly: update to version 0.15.4.1 2013-03-06 11:06:01 +01:00
Peter Simons
3c321d0327 haskell-hp2any-graph: update to version 0.5.4 2013-03-06 11:06:01 +01:00
Peter Simons
f5313a6220 haskell-hp2any-core: update to version 0.11.2 2013-03-06 11:06:01 +01:00
Peter Simons
cd54b63791 haskell-highlighting-kate: update to version 0.5.3.8 2013-03-06 11:06:01 +01:00
Peter Simons
3cb80788bf haskell-happstack-server: update to version 7.1.7 2013-03-06 11:06:01 +01:00
Peter Simons
e02fe72dd3 haskell-ghc-vis: update to version 0.6.1 2013-03-06 11:06:01 +01:00
Peter Simons
53ecc95c72 haskell-ghc-mod: update to version 1.12.0 2013-03-06 11:06:00 +01:00
Peter Simons
0395e75175 haskell-flexible-defaults: update to version 0.0.1.1 2013-03-06 11:06:00 +01:00
Peter Simons
3b530dba51 haskell-diagrams-core: update to version 0.6.0.2 2013-03-06 11:06:00 +01:00
Peter Simons
62c29e0755 haskell-blaze-html: update to version 0.6.1.0 2013-03-06 11:06:00 +01:00
Peter Simons
e17ac44037 haskell-HSH: update to version 2.1.0 2013-03-06 11:06:00 +01:00
Jack Cummings
ed99c87a26 get recode testsuite running. 2013-03-06 01:07:54 -08:00
Cillian de Róiste
6254091950 Add rncbc's Vee One suite: sampler, synth and drum kit 2013-03-06 01:06:16 +01:00
Ludovic Courtès
c00225bcae cross-gcc: disable `langCC' when targeting MinGW 2013-03-06 00:01:10 +01:00
Jack Cummings
e61bdcfacd recode-3.7-git 2013-03-05 14:31:51 -08:00
Sander van der Burg
69a13e4e92 We don't need a reference here to titaniumenv, so remove it 2013-03-05 15:57:54 +01:00
Sander van der Burg
ed6529ea44 - Store resulting APK in hydra build artifacts
- Make nixpkgs configurable in the test examples
2013-03-05 15:39:51 +01:00
Sander van der Burg
31b19d39f3 Use correct hydra type and subtype 2013-03-05 14:33:49 +01:00
Florian Friesdorf
b345bca3af pythonDocs: group in subfolders pythonXY/TYPE
I got it now - promised.
2013-03-05 12:41:30 +01:00
Sander van der Burg
ee19854553 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-03-05 12:30:02 +01:00
Sander van der Burg
ad4ed70128 Add resulting APK to the hydra build products 2013-03-05 12:29:48 +01:00
Florian Friesdorf
2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Peter Simons
ad31fcad52 cifs-utils: revert back to version 5.6
The updated version 5.9 couldn't mount any of my shares:

  Status code returned 0xc000006d NT_STATUS_LOGON_FAILURE
  CIFS VFS: Send error in SessSetup = -13
  CIFS VFS: cifs_mount failed w/return code = -13

Apparently, this is a known problem in Windows Vista that needs to be
fixed on the server side. :-(
2013-03-05 12:14:00 +01:00
Peter Simons
7e99044638 cifs-utils: hard-code path '/run/current-system/sw/bin/systemd-ask-password' to fix issue #353 some more
It turns out that mount.cifs is run in a shell environment that doesn't have
$PATH. To find that program, we must commit to some location. The path I used will
work fine on NixOS, but of course it won't work on other Linux distributions. I'm
not sure whether that's an important issue or not.
2013-03-05 11:46:01 +01:00
Peter Simons
8437673c91 cifs-utils: update to version 5.9 2013-03-05 11:26:09 +01:00
Peter Simons
599cc3ec0a cifs-utils: remove hard-coded path to 'systemd-ask-password' to close issue #353 2013-03-05 11:25:53 +01:00
Sander van der Burg
31c198a40e xf86-video-intel: bump to 2.20.19 2013-03-05 10:18:05 +01:00
Mathijs Kwik
6338743942 bbswitch: upgrade to 0.5 - add linux 3.8 compatibility patch 2013-03-04 22:40:33 +01:00
Mathijs Kwik
060ba43e8f linux-3.8: upgrade to 3.8.2 2013-03-04 22:40:33 +01:00
Mathijs Kwik
c7c6592f6f linux-3.7: upgrade to 3.7.10 2013-03-04 22:40:23 +01:00
Mathijs Kwik
01c5d2d702 linux-3.4: upgrade to 3.4.35 2013-03-04 22:40:23 +01:00
Mathijs Kwik
04e883e496 linux-3.0: upgrade to 3.0.68 2013-03-04 22:40:22 +01:00
Mathijs Kwik
45aea0bf52 mkvtoolnix: upgrade to 6.1.0 2013-03-04 22:40:22 +01:00
Mathijs Kwik
91c327fb28 qemu-kvm: string concatenation fix 2013-03-04 22:40:22 +01:00
Mathijs Kwik
ec732e5ec1 Revert "haskell-HSH: update to version 2.1.0"
This reverts commit 4b3cd9711a.
2013-03-04 22:40:22 +01:00
Mathijs Kwik
4d4b045d95 ffmpeg: remove unused 1.0 version 2013-03-04 22:26:13 +01:00
Peter Simons
c150b8c3d2 haskell-yesod: update to version 1.1.9.2 2013-03-04 17:40:00 +01:00
Peter Simons
3bf5b4d930 haskell-yesod-test: update to version 0.3.5 2013-03-04 17:40:00 +01:00
Peter Simons
f058026b11 haskell-yaml: update to version 0.8.2.3 2013-03-04 17:39:59 +01:00
Peter Simons
bd966fa583 haskell-xml-conduit: update to version 1.1.0.3 2013-03-04 17:39:59 +01:00
Peter Simons
39d83523a2 haskell-th-extras: update to version 0.0.0.2 2013-03-04 17:39:59 +01:00
Peter Simons
4121fad56a haskell-shakespeare-js: update to version 1.1.2.1 2013-03-04 17:39:59 +01:00
Peter Simons
d0e81f3d72 haskell-resourcet: update to version 0.4.5 2013-03-04 17:39:59 +01:00
Peter Simons
2d02edaf51 haskell-persistent-sqlite: update to version 1.1.5 2013-03-04 17:39:59 +01:00
Peter Simons
d790e95a91 haskell-conduit: update to version 1.0.2 2013-03-04 17:39:59 +01:00
Peter Simons
0c702f033b haskell-classy-prelude: update to version 0.5.3 2013-03-04 17:39:59 +01:00
Peter Simons
bacce8cd25 haskell-classy-prelude-conduit: update to version 0.5.3 2013-03-04 17:39:59 +01:00
Peter Simons
87293bb052 haskell-binary: update to version 0.7.0.1 2013-03-04 17:39:59 +01:00
Peter Simons
8142c2628c haskell-bifunctors: update to version 3.2.0.1 2013-03-04 17:39:58 +01:00
Peter Simons
34d77b360f haskell-basic-prelude: update to version 0.3.4.0 2013-03-04 17:39:58 +01:00
Peter Simons
4c74dea537 haskell-OpenAL: update to version 1.4.0.2 2013-03-04 17:39:58 +01:00
Shea Levy
ae2b08aeb3 Add some fixes for gem nix.
Ideally these would be picked up upstream. Pull request at https://gitorious.org/ruby-nix/ruby-nix/merge_requests/1
2013-03-04 10:43:20 -05:00
Shea Levy
cddc4c6f63 Update rubygems 2013-03-04 10:23:05 -05:00
Rickard Nilsson
4d181e526e mopidy: Add some more dependencies needed for the HTTP frontend 2013-03-03 20:53:48 +01:00
Rickard Nilsson
14ceed2ddb gob2: Use fetchurl_gnome. Previous URL disappeared. 2013-03-03 20:52:31 +01:00
Cillian de Róiste
133fc8a27c Merge branch 'master' of github.com:NixOS/nixpkgs 2013-03-03 19:40:43 +01:00
Cillian de Róiste
bcc9c80b85 Tidy up: use the web interface for the git repo as the homepage
There have been no important updates to this driver, but it should be
included in X11R7.8
2013-03-03 19:40:17 +01:00
Sander van der Burg
9455f23d22 eduke32: Bumped to rev 3542 - very important 2013-03-03 19:34:59 +01:00
Cillian de Róiste
266e283faf Add jack_oscrolloscope: a waveform viewer for JACK 2013-03-03 17:43:15 +01:00
Vladimír Čunát
e6143c35e2 Merge pull request #344 from ierton/zathura-improve
zathura: fix manpages, include .desktop icon
2013-03-03 05:21:03 -08:00
Vladimír Čunát
bd6165645a Merge pull request #341 from bjornfor/transmission-version-bump
transmission: bump from 2.52 to 2.60
2013-03-03 05:18:54 -08:00
Florian Friesdorf
e9f13b9c3b python-ldap-2.4.10 2013-03-03 13:20:58 +01:00
Florian Friesdorf
930e4d5391 pythonDocs: add meta.maintainers, subgroup attrset by doctype 2013-03-03 06:48:05 +01:00
Vladimír Čunát
d7abc31f5a fix the last master merge, sorry for the problems
Now I carefully re-merged all the conflicts and tested some builds.
Hopefully it's all OK now.
2013-03-02 22:34:37 +01:00
Vladimír Čunát
d9a2b1f520 ardour(2): fix and minor update.
- use fetchurl from Gentoo mirror instead of failing SVN fetch
- minor version update
- use system libraries as much as possible
- fix building
2013-03-02 21:17:30 +01:00
Michael Raskin
3b5b1be3cf Linux 3.8.1 2013-03-02 20:16:08 +04:00
Peter Simons
05dd692662 haskell-github: update to pre-release version 0.5.1 from Github 2013-03-02 17:07:43 +01:00
Peter Simons
4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01:00
Shea Levy
e4d7e87c14 Merge branch 'manual-config-multiple-outputs' into upstream-master
This branch makes the manual config kernel a lot more space efficient by separating out the build and source trees (needed for out-of-tree modules) from the actual bzImage and in-tree modules.

Also some other small improvements along the way.
2013-03-02 10:04:19 -05:00
Florian Friesdorf
06e4059f80 fix pythonDocs install path 2013-03-02 16:01:42 +01:00
Shea Levy
0bdd926a32 linux/manual-config: put build and source trees into a separate 'dev' output.
This makes it possible to still build out-of-tree modules without making a system using this kernel depend on the full source and build tree at runtime.

Note that references to the source tree are removed from kernel modules after build.
Ideally, this would be accomplished by modifying the Makefile that puts the reference there in the first place, but I haven't tracked that down yet.
2013-03-02 09:54:08 -05:00
Vladimír Čunát
face3a8242 librdf: update the libraries 2013-03-02 15:45:13 +01:00
Shea Levy
5d952411c6 Remove duplication in linuxPackagesFor
It's silly to pass in self when we can do let self = whatever; in self.
2013-03-02 09:10:01 -05:00
Vladimír Čunát
da71b6d579 rekonq: update
Note it won't build with kde 4.7 and newer versions even require 4.9
which we don't have yet (4.10 is the current upstream).
2013-03-02 14:44:51 +01:00
Shea Levy
0a7d8a5175 stdenv.mkDerivation: Add meta and passthru to all outputs.
Before, only the first output (and not even that when accessed through 'all' or its corresponding attribtue) had meta information and the relevant passthru attributes.

This doesn't change stdenv's hash and the tarball still builds, I'm pretty sure this is safe for master.
2013-03-02 08:34:53 -05:00
Shea Levy
b90b62e33b linux/manual-config: Move configfile symlinking to configurePhase.
It makes more semantic sense there than in unpackPhase, as that symlink is _how_ we configure the kernel
2013-03-02 07:55:07 -05:00
Shea Levy
8ce1295ad3 linux/manual-config: ignore nulls.
There's no need to set the postFixup env var at all if we're not modular.
2013-03-02 07:51:12 -05:00
Ludovic Courtès
b6452df939 libchop: fix builds with glibc 2.16+ 2013-03-02 11:14:42 +01:00
David Guibert
84d5defb75 update openmpi to 1.6.4 2013-03-02 10:59:17 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Vladimír Čunát
70ac286bf8 Merge pull request #346 from ierton/mplayer-fix-icon
mplayer: install desktop icon when X11 is enabled
2013-03-02 01:22:44 -08:00
Vladimír Čunát
a920c50cfb linux_2_6_32: disable patch which no longer appies 2013-03-02 10:02:36 +01:00
Vladimír Čunát
97b24ed95a linux_2_6_32: disable patch which no longer appies 2013-03-02 10:01:44 +01:00
Vladimír Čunát
c8b940072d koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +01:00
Florian Friesdorf
0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
Patrick Wheeler
8cdfd46d96 Fix xf86vmware fix
Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
2013-03-02 01:08:33 +01:00
Lluís Batlle i Rossell
089fd0a769 fvwm: updating license to gplv2+
I looked at some src, and it mentions "or later".
2013-03-01 20:38:23 +01:00
viric
5097ff2b1a Merge pull request #347 from iyzsong/fvwm
add fvwm-2.6.5
2013-03-01 11:30:17 -08:00
Jordi
cf8d64b458 New wraper for surf 2013-03-01 19:53:42 +01:00
Jordi
0d6f6e6d37 Wraper with glib_network 2013-03-01 19:31:00 +01:00
Shea Levy
0de3ba4e4e Merge pull request #338 from Davorak/master
Fix xorg-server on vmware - was: Fix to make xlibs.xf86videovmware build
2013-03-01 06:13:14 -08:00
Eelco Dolstra
56d197ab0b firefox: Update to 19.0.1
And use --with-system-nss again.
2013-03-01 13:52:10 +01:00
Eelco Dolstra
a1c5d6642b build-support/release: Simplify meta.description
Phrases like "Build of a ..." are redundant because everything is a
build.
2013-03-01 12:50:29 +01:00
Peter Simons
7af6f82d2f haskell-time-compat: update to version 0.1.0.3 2013-03-01 10:41:43 +01:00
Peter Simons
ec514cf429 haskell-iproute: update to version 1.2.11 2013-03-01 10:41:43 +01:00
Peter Simons
a87e40737e haskell-ghc-mod: update to version 1.11.5 2013-03-01 10:41:43 +01:00
Peter Simons
7048f8fd3b haskell-conduit: update to version 1.0.1 2013-03-01 10:41:43 +01:00
Peter Simons
cb72a728d0 haskell-cmdargs: update to version 0.10.2 2013-03-01 10:41:43 +01:00
Peter Simons
8f83550939 haskell-zlib: add version 0.5.4.1 2013-03-01 10:41:43 +01:00
Jack Cummings
58a9875789 missing semicolon, found after push.. 2013-03-01 01:26:19 -08:00
Lluís Batlle i Rossell
097705cd86 virtualgl: fixing and updating to 2.3.2 2013-03-01 10:18:00 +01:00
aszlig
113b15f3a8
virtualbox: Update tarball sha256sum of v4.2.8.
Outrageous! They fixed the tarball by including the missing file.
Well, at least we now don't have that much cruft laying around and can remove
that rather long patch.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 10:14:44 +01:00
aszlig
964621438a nss: Update to version 3.14.3.
This update involves a bunch of fixes on our side:

Update the Gentoo patch to 3.14.1 from http://bit.ly/ZG8OK5 and drop the older
one from http://bit.ly/15mN0X1 (for 3.12.5).

While checking the old patch from Gentoo, I discovered, that the patch added in
revision 06c543b11d wasn't the original one in the
Gentoo repository.

Instead of doing the same again, we now patch up our specific modifications
using sed within the postPatch hook.

In addition to that, we now have another patch from RedHat/Fedora which syncs
the NSS PEM support repository with the latest upstream changes. Patch is coming
from the SRPM at http://koji.fedoraproject.org/koji/rpminfo?rpmID=3772072 and I
just stripped the "0001-" prefix from the filename.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig
fc088ae732 virtualbox: Fix build with kernel 3.9.0.
This patch is cherry-picked from VirtualBox Subversion, revision 44867.

It's rather small and only is in effect if kernel version is >= 3.9.0, so it
won't break existing kernels, so I'm adding it here despite we usually only care
about the latest stable upstream (kernel) versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig
1029ca5767 virtualbox: Support UIDGID_STRICT_TYPE_CHECKS.
This adds a patch to support CONFIG_UIDGID_STRICT_TYPE_CHECKS being activated in
the kernel config (selected by CONFIG_USER_NS for example).

When this kernel option is enabled, current->cred->uid is a structure rather
than a simple integer type (uid_t and gid_t), so we need to check for that and
also pass the current user namespace where needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
aszlig
f26b5fb730 virtualbox+guest: Update to version 4.2.8.
The tarball for this version is missing the file VRDEVideoIn.h, which is added
through the missing_files_4.2.8.patch and extracted from Subversion, revision
44528.

Upstream changelog(s) can be found at the usual place:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-01 09:42:38 +01:00
Song Wenwu
f5bd4f720a add fvwm-2.6.5 2013-03-01 13:48:33 +08:00
Eelco Dolstra
1166b82fca nix: Update to 1.5.1 2013-03-01 02:03:09 +01:00
Cillian de Róiste
bb5f60fec1 Add Jalv: an LV2 host for Jack
This allows LV2 audio plugins to be connected to Jack applications
2013-03-01 01:33:08 +01:00
Sergey Mironov
bd49c22ea1 mplayer: install desktop icon when X11 is enabled 2013-03-01 00:20:52 +04:00
aszlig
94fe64b3eb
manual-kernel: Add bc to buildNativeInputs.
As timeconst.pl was replaced by a bc script in the merge window for kernel 3.9,
we also need bc during build time, for more information about the reasons,
please have a look at the following commit:

torvalds/linux@70730bca13

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 18:57:03 +01:00
Vladimír Čunát
d505b8c490 freedink: update and fix 2013-02-28 16:34:19 +01:00
Vladimír Čunát
fc82aa049b hddtemp: try to fix by Gentoo patches 2013-02-28 16:00:49 +01:00
Vladimír Čunát
bd4c0e7cd1 graphicsmagick137: fix by using older libpng
ToDo: is this still needed by someone?
2013-02-28 15:54:15 +01:00
Vladimír Čunát
c0f6910758 fuse_zip: fix with new libzip 2013-02-28 15:43:06 +01:00
Vladimír Čunát
4cf8fa5f8a centerim: fix from debian 2013-02-28 15:11:03 +01:00
Vladimír Čunát
16ba3d388a glibmm: fix buildNativeInputs 2013-02-28 14:23:20 +01:00
Vladimír Čunát
a606eab76e tangogps: fix bad includes 2013-02-28 14:07:50 +01:00
Vladimír Čunát
958caa7108 webkit: finally fix (hopefully, but it builds for me) 2013-02-28 14:06:23 +01:00
Peter Simons
329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00