Commit Graph

3796 Commits

Author SHA1 Message Date
Shea Levy
aecc8b64ed Merge pull request #23 from cillianderoiste/sonic-visualiser-fix
Sonic visualiser fix

SL: Didn't build before, builds now.
2012-06-26 20:40:01 -07:00
Eelco Dolstra
2ead90a36b pan: Updated to 0.138 2012-06-25 15:41:19 -04:00
Lluís Batlle
fc8fb52341 Merge branch 'master' of https://github.com/viric/nixpkgs 2012-06-24 19:12:50 +02:00
Lluís Batlle
7ab7120964 Merge remote-tracking branch 'central/master' 2012-06-24 19:03:50 +02:00
Cillian de Róiste
1afe86a7b7 Tidy up 2012-06-24 16:54:51 +02:00
Cillian de Róiste
c6457c322b Upgrading sonic-visualiser to 1.9 and adding pkgconfig so that it finds rasqal.h successfully 2012-06-24 16:51:42 +02:00
aszlig
d23dcbb9a5 chromium: Enable parallel building.
Always did this manually by putting -j8 into make flags, which i didn't commit,
as it obviously doesn't make sense to hardcode. However, this flag makes more
sense and obviously we need to avoid overriding buildPhase.
2012-06-22 15:53:30 -04:00
aszlig
59f8de864f chromium: Add support for pulseaudio.
Which is enabled by default if neither pulseaudio or chromium.pulseaudio is
explicitly set. The reason is that chromium falls back to ALSA in case no
pulseaudio is available.

In addition it was necessary to patch media.gyp to ignore the array-out-of-
bounds warning.
2012-06-22 15:53:30 -04:00
aszlig
a2984e3d82 chromium: Simplify names of getConfig options.
This makes it easier to remember, as so far the naming wasn't quite consistent,
sometimes "use*", sometimes "enable*". So in using just use the feature name
itself, it should be pretty clear.
2012-06-22 15:53:30 -04:00
aszlig
fc24f460f1 chromium: Use bundled versions of some libraries.
These libraries are heavily patched by the chromium project itself, so let's use
the bundled versions as those won't build anyway and also don't break functional
purity.
2012-06-22 15:53:30 -04:00
aszlig
d8e9536498 chromium: Cleanup dependencies.
This mostly is a code structure change, but also involves deleting some unused
dependencies and adding a few constraints on existing ones.
2012-06-22 15:53:30 -04:00
aszlig
c7db5ff34d chromium: Add dependency for libselinux.
This doesn't really work at the current state of NixOS and SELinux support, but
will make it easier in case we someday support SELinux altogether.
2012-06-22 15:53:30 -04:00
aszlig
a88eb35ff1 chromium: Enable proprietary codecs by default.
We now switch to using bundled ffmpeg, as this adds stuff such as support for
the H.264 codec.
2012-06-22 15:53:30 -04:00
aszlig
04ae9f288d chromium: Implement handling of enableCUPS.
We also need to patch the compilation process, so it allows deprecated
declarations when building support for the cups backend. In addition, we also
need to add libgcrypt to dependencies as it's needed by the cups implementation.
2012-06-22 15:53:29 -04:00
aszlig
8371d50836 chromium: Update source to version 21.0.1179.1. 2012-06-22 15:53:29 -04:00
aszlig
70c0af9a37 chromium: Add mesa to build dependencies.
This finally enables support for WebGL and accelerated rendering.
2012-06-22 15:53:29 -04:00
aszlig
57e127099b chromium: Add flag to disable Gnome support.
This also separates gcrypt and gconf from the basic dependencies.
Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to
work on a patch to get rid of it? On the other hand it seems to be a TODO of the
chromium project itself, so let's wait and see.
2012-06-22 15:53:29 -04:00
aszlig
c2b145c32f chromium: Allow to switch off openssl support.
Currently building fails with NSS, so we're using OpenSSL by default. And that's
why we want to make this configurable so if we manage to fix that build failure,
we could switch to using NSS by default.
2012-06-22 15:53:29 -04:00
aszlig
f0cdea2e99 chromium: Use patches from system OpenSSL.
This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to
specify the CA bundle. A browser which isn't able to verify SSL certificates
might be somewhat useless.
2012-06-22 15:53:29 -04:00
aszlig
b1fdecc460 chromium: Rename "chrome" binary to "chromium".
This is to make it more consistent with the naming of the package file and also
consistent with the build, as we're not using the Google branded version.

In addition the derivation attribute set now has a packageName value which can
be used to easily switch the binary names and paths, just in case we want to
switch to using "chrome" (or something entirely different) again.
2012-06-22 15:53:29 -04:00
aszlig
22f5045bde chromium: Use system libraries whenever possible.
There are still some libraries left, which we either need to patch or provide
more recent versions. Plus we're going to use openssl, as libnss doesn't want to
do proper SSL (let's debug this later).
2012-06-22 15:53:28 -04:00
aszlig
6350706c0d chromium: Add "which" to build dependencies.
This is needed by a lot of scripts within chromium, so we're not going to patch
them using type, which is shell-specific anyway.
2012-06-22 15:53:28 -04:00
aszlig
ef45195126 chromium: Enable seccomp by default.
If useSELinux is not set, enable seccomp mode by default and avoid building the
SUID helper sandbox at all. This involves a small patch which causes the
commandline arguments to be swapped: --disable-seccomp-sandbox to disable it,
while the option is active by default.
2012-06-22 15:53:28 -04:00
aszlig
2571488e6a chromium: Clean up build flags.
This also includes setting compiler architectures and paths.
2012-06-22 15:53:28 -04:00
aszlig
dc32b4caef chromium: Generate the latest source.nix. 2012-06-22 15:53:28 -04:00
aszlig
d342672f5a chromium: Add an update script.
It fetches the latest version based on the bucketlist XML from
commondatastorage and generates a "source.nix" which contains an attribute set
about where to fetch the latest version.

The XML is parsed in a somewhat hackish way using sed, but as this is just an
updater, its okay and we don't want to break a fly on the wheel by employing a
full XML parser.
2012-06-22 15:53:28 -04:00
aszlig
b5956ec179 chromium: Add an install phase.
This tries to put pathes unte the same directory as the previous prebuilt
version of Chromium.
2012-06-22 15:53:28 -04:00
aszlig
a31301dab4 chromium: Minimal build (no install) from source.
This only gets chromium to build so far, installation is missing by upstream, so
we need to manually copy the corresponding files. And I guess with nix, we also
need to patch a few paths on installation.

Another issue is that at the moment, a lot of dependencies are used from the
source tree, rather than from the system.

Also, it would be nice to build using LLVM, as it really speeds up compilation a
*LOT* and also has the side effect of resulting in smaller binaries.

Working unit tests would be nice, too. Unfortunately they're quite heavyweight
and take hours to run, so I guess "someday" would be the most appropriate time
to integrate.

Further todo's:

- Allow to disable GConf, GIO and CUPS.
- Option to disable the sandbox (for whatever reason the user might have).
- Integrate gold binutils.
- Pulseaudio support.
- Clearly separate Linux specific stuff.
2012-06-22 15:53:27 -04:00
aszlig
b06fb762b4 Add tkabber plugins v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig
74b408e151 Add tkabber v0.11.1. 2012-06-22 14:47:34 -04:00
Lluís Batlle i Rossell
18ac2b9ebc Making links2 cross-build again
The bzip2 target binary was breaking the unpackPhase.
2012-06-22 16:04:02 +02:00
Lluís Batlle
743cf1ec50 Removing the old unstable taskwarrior; the stable version is on 2.x already. 2012-06-22 15:53:42 +02:00
Lluís Batlle
9f1c069d3f Merge commit 'd13e6824910584201ccfd4c701894a9caf201782' 2012-06-22 15:53:05 +02:00
Lluís Batlle
d13e682491 Updating taskwarrior. 2012-06-22 14:51:41 +02:00
Eelco Dolstra
94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra
9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons
4490fe934e Updated Haskell packages.
- base64-bytestring: updated to version 0.1.2.0
 - binary-shared: updated to version 0.8.2
 - bson: updated to version 0.2.1
 - leksah-server: updated to version 0.12.1.2
 - leksah: updated to version 0.12.1.2
 - MonadRandom: updated to version 0.1.7
 - random-shuffle: updated to version 0.0.4

svn path=/nixpkgs/trunk/; revision=34569
2012-06-20 10:56:24 +00:00
Vladimír Čunát
cf2a383bc7 Hot-fixing kile's nl handbook compilation problem on KDE-4.7 by removing it.
svn path=/nixpkgs/trunk/; revision=34568
2012-06-20 09:11:58 +00:00
Lluís Batlle i Rossell
7de1a6a074 Updating digikam to 2.6.0. It builds.
svn path=/nixpkgs/trunk/; revision=34564
2012-06-19 17:42:08 +00:00
Vladimír Čunát
fc6ce9f799 Minor kile update.
svn path=/nixpkgs/trunk/; revision=34554
2012-06-18 20:18:09 +00:00
Peter Simons
a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Vladimír Čunát
ef188787a0 A minor LyX update.
svn path=/nixpkgs/trunk/; revision=34550
2012-06-18 15:41:18 +00:00
Vladimír Čunát
1a33b4b654 Fixing stardict broken by my mistake.
svn path=/nixpkgs/trunk/; revision=34549
2012-06-18 15:37:35 +00:00
Vladimír Čunát
1a856c200d Updated transmission to 2.52.
svn path=/nixpkgs/trunk/; revision=34545
2012-06-18 15:18:45 +00:00
Lluís Batlle i Rossell
19be0c1f27 Updating skype from 2.2 to 4.0
svn path=/nixpkgs/trunk/; revision=34544
2012-06-18 12:39:44 +00:00
Lluís Batlle i Rossell
8a79b20781 Fixing the firefox 13 crash of plugin-container, using wrapProgram instead of patchelf.
svn path=/nixpkgs/trunk/; revision=34543
2012-06-18 11:10:43 +00:00
Lluís Batlle i Rossell
71882eb193 Fixing bad version in xulrunner for firefox 13.
svn path=/nixpkgs/trunk/; revision=34532
2012-06-17 20:44:49 +00:00
Joachim Schiele
0de49e8c04 StarDict is a Cross-Platform and international dictionary Software. Now it is available on NixOS. See https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications if you want to get it running.
svn path=/nixpkgs/trunk/; revision=34531
2012-06-17 18:41:00 +00:00
Lluís Batlle i Rossell
d3ffbea9d6 Updating firefox 13.0 to 13.0.1. Maybe this improves the flash issue.
svn path=/nixpkgs/trunk/; revision=34530
2012-06-17 17:12:31 +00:00
Peter Simons
2a60c221d1 git-annex: updated to version 3.20120614
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Yury G. Kudryashov
5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
2012-06-13 07:09:23 +00:00
Yury G. Kudryashov
316222e2e1 Mass telepathy update, add telepathy-haze
svn path=/nixpkgs/trunk/; revision=34494
2012-06-13 07:09:19 +00:00
Yury G. Kudryashov
28aabd6311 kde-telepathy-0.4.0, tweak update script etc.
svn path=/nixpkgs/trunk/; revision=34493
2012-06-13 07:09:15 +00:00
Yury G. Kudryashov
7ad2658f83 zanshin-0.2.1, fix advertised version
svn path=/nixpkgs/trunk/; revision=34491
2012-06-13 07:09:07 +00:00
Karn Kallio
c89f37078d Make ProofGeneral build with Emacs 24.
svn path=/nixpkgs/trunk/; revision=34485
2012-06-12 21:51:53 +00:00
Florian Friesdorf
20db3374cf js2-mode-0-20120601
svn path=/nixpkgs/trunk/; revision=34484
2012-06-12 21:18:22 +00:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description
svn path=/nixpkgs/trunk/; revision=34477
2012-06-12 12:18:12 +00:00
Peter Simons
7a626565df Updated Haskell packages.
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
2012-06-12 08:39:32 +00:00
Lluís Batlle i Rossell
fece483f5e Updating vimprobable2.
svn path=/nixpkgs/trunk/; revision=34472
2012-06-11 20:24:55 +00:00
Mathijs Kwik
25b199771d google-talk-plugin: upgraded to 2.9.10.0
svn path=/nixpkgs/trunk/; revision=34467
2012-06-11 17:41:03 +00:00
Mathijs Kwik
b40092010c mkvtoolnix: upgraded to 5.6.0
svn path=/nixpkgs/trunk/; revision=34465
2012-06-11 17:40:55 +00:00
Peter Simons
edb10988b3 xmonad: fixed build with GHC 7.4.1
svn path=/nixpkgs/trunk/; revision=34457
2012-06-11 14:55:56 +00:00
Florian Friesdorf
892947cd93 tesseract-3.0.1
svn path=/nixpkgs/trunk/; revision=34453
2012-06-11 10:28:28 +00:00
Peter Simons
b4ebc3bb42 emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
2012-06-11 07:44:12 +00:00
Peter Simons
6db9c6f241 update i3status and i3lock
svn path=/nixpkgs/trunk/; revision=34446
2012-06-11 07:18:52 +00:00
Peter Simons
a7949741f6 gimp 2.8
- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708

svn path=/nixpkgs/trunk/; revision=34444
2012-06-11 07:17:39 +00:00
Peter Simons
84547c5307 Fix xfontsel to find the app defaults file.
svn path=/nixpkgs/trunk/; revision=34443
2012-06-11 07:16:51 +00:00
Peter Simons
3ecf94ae27 Update VirtualBox and guest additions to v4.1.16.
This includes fixes for kernels up to v3.4, so we shouldn't get build failures
with kernel 3.4 anymore.

svn path=/nixpkgs/trunk/; revision=34438
2012-06-11 07:15:03 +00:00
Yury G. Kudryashov
63deb1d30a skrooge-1.3.0
svn path=/nixpkgs/trunk/; revision=34406
2012-06-09 13:09:53 +00:00
Yury G. Kudryashov
baff5fc9f3 calligra-2.4.2
svn path=/nixpkgs/trunk/; revision=34405
2012-06-09 13:09:50 +00:00
Yury G. Kudryashov
f6e6e4287d Add kbibtex
svn path=/nixpkgs/trunk/; revision=34404
2012-06-09 13:09:45 +00:00
Yury G. Kudryashov
3640b0c1e9 Add GiNaC
svn path=/nixpkgs/trunk/; revision=34403
2012-06-09 13:09:41 +00:00
Yury G. Kudryashov
6b6dba1bce kde-telepathy-0.3.1
Drop upstream patches already included in this version

svn path=/nixpkgs/trunk/; revision=34402
2012-06-09 13:09:37 +00:00
Peter Simons
330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons
87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
Arie Middelkoop
3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore.
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
2012-06-08 10:16:46 +00:00
Eelco Dolstra
f677edf57f * Firefox 13.0. It's not stable yet though - it seems to hang the
first time a Flash control is loaded, with the following message on
  stderr:

    /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message

  Need to investigate where malloc_message is defined.

svn path=/nixpkgs/trunk/; revision=34368
2012-06-06 14:35:56 +00:00
Cillian de Roiste
da4c1e38fd Removed patch, no longer necessary
svn path=/nixpkgs/trunk/; revision=34363
2012-06-05 17:50:22 +00:00
Cillian de Roiste
1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency
svn path=/nixpkgs/trunk/; revision=34362
2012-06-05 16:52:11 +00:00
Peter Simons
7d15ad90b9 Updated Haskell packages.
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
2012-06-05 08:31:42 +00:00
Andres Löh
8cf7f46ea0 Patching xmobar-0.15 to accept mtl-2.1.
svn path=/nixpkgs/trunk/; revision=34354
2012-06-05 08:09:06 +00:00
Cillian de Roiste
27bef25b17 Applying the patch from Rok Garbas to add GIMP 2.8.0
svn path=/nixpkgs/trunk/; revision=34352
2012-06-04 17:38:47 +00:00
Eelco Dolstra
104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Eelco Dolstra
ce10ebebac * Subversion 1.7.5.
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +00:00
Peter Simons
4fdbd75e4f Updated Haskell packages.
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
2012-06-04 09:24:14 +00:00
Peter Simons
678c30c050 xmobar: re-generated expression with the latest version of Cabal2Nix
This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327
2012-06-03 18:52:38 +00:00
Cillian de Roiste
b5d937ce33 Updating the bitcoin client to 0.6.2
svn path=/nixpkgs/trunk/; revision=34323
2012-06-02 18:00:39 +00:00
Cillian de Roiste
2d85463e7d Applying patch from Rok Garbas to update weechat to 0.3.7, also taking the opportunity to tidy up the style a bit.
svn path=/nixpkgs/trunk/; revision=34318
2012-06-01 22:04:08 +00:00
Marco Maggesi
5ca0b381e0 Update HOL Light to rev 141
svn path=/nixpkgs/trunk/; revision=34290
2012-05-30 20:53:13 +00:00
Peter Simons
272753809c haskell-hledger-interest: updated to version 1.4.1
svn path=/nixpkgs/trunk/; revision=34285
2012-05-29 20:47:29 +00:00
Andres Löh
854ebba387 Whitespace.
svn path=/nixpkgs/trunk/; revision=34274
2012-05-29 14:02:31 +00:00
Andres Löh
4e10015cab Added gnumeric.
svn path=/nixpkgs/trunk/; revision=34272
2012-05-29 12:21:33 +00:00
Mathijs Kwik
b82a8f6319 xmobar: enable optional wireless support
svn path=/nixpkgs/trunk/; revision=34268
2012-05-29 07:44:01 +00:00
Russell O'Connor
dace27b4c4 Revert accidentaly patch of ssreflect.
svn path=/nixpkgs/trunk/; revision=34264
2012-05-28 20:57:54 +00:00
Russell O'Connor
417a07a0e9 Updatings ssreflect to depend on camlp5 version 6.
svn path=/nixpkgs/trunk/; revision=34263
2012-05-28 20:53:17 +00:00
Russell O'Connor
f02a71103a add support to make building coqide optional.
svn path=/nixpkgs/trunk/; revision=34262
2012-05-28 19:45:14 +00:00
Cillian de Roiste
9b0cf4ca5d Updating Ardour 3 to beta 4a
svn path=/nixpkgs/trunk/; revision=34250
2012-05-26 17:29:31 +00:00
Peter Simons
ac64ba04bd git-annex: updated to version 3.20120522
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Peter Simons
d628fd3d34 ikiwiki: updated to version 3.20120516
svn path=/nixpkgs/trunk/; revision=34212
2012-05-22 19:46:33 +00:00
Rickard Nilsson
3724758a96 Fixed stupid syntax error in gnome-terminator's default.nix.
svn path=/nixpkgs/trunk/; revision=34196
2012-05-21 15:45:03 +00:00