1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

4537 commits

Author SHA1 Message Date
Michael Raskin d5288c7e3a TPTP had a bugfix without version change 2013-03-09 14:24:45 +04:00
Shea Levy e07a7e6156 Merge branch 'master' of git://github.com/fignuts/nixpkgs
This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:01:04 -05:00
Shea Levy e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Peter Simons d96af07c9f xmobar: patch to support <freeratio> variable in memory monitor 2013-03-08 13:37:58 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +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
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
Andrew Morsillo 7d4d40e82b Update mysql workbench version 2013-03-06 20:08:30 +01: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
Mathijs Kwik 45aea0bf52 mkvtoolnix: upgrade to 6.1.0 2013-03-04 22:40:22 +01:00
Rickard Nilsson 4d181e526e mopidy: Add some more dependencies needed for the HTTP frontend 2013-03-03 20:53:48 +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
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
Peter Simons 4f697db7dd haskell-github-backup: update to version 1.20120314 2013-03-02 17:07:43 +01: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
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 c8b940072d koffice, kbluetooth: remove from hydra 2013-03-02 09:21:11 +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
Eelco Dolstra 56d197ab0b firefox: Update to 19.0.1
And use --with-system-nss again.
2013-03-01 13:52:10 +01:00
Jack Cummings 58a9875789 missing semicolon, found after push.. 2013-03-01 01:26:19 -08: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 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
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
Vladimír Čunát 4cf8fa5f8a centerim: fix from debian 2013-02-28 15:11:03 +01:00
Vladimír Čunát a606eab76e tangogps: fix bad includes 2013-02-28 14:07:50 +01:00
Peter Simons 329b33c59c git-annex: clean up build expression 2013-02-28 13:04:15 +01:00
Peter Simons e23be1b2ef git-annex: update to version 4.20130227 2013-02-28 11:31:44 +01:00
Sergey Mironov 061627feed zathura: fix man pages; include .desktop icon 2013-02-28 12:08:36 +04:00
Sergey Mironov 7cd4a5b0a1 zathura: set myself as a maintainer
Conflicts:
	pkgs/applications/misc/zathura/default.nix
2013-02-28 12:07:46 +04:00
aszlig 4f4dc40099
flashplayer-11: Add missing rpath to libnss.
This was missing in the previous update as well, and no one seemed to notice it,
including myself? Anyway, it's now fixed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:24:41 +01:00
aszlig 3423ea9e7b
chromium: Remove version 24 specific stuff.
This gets rid of the patch for newer pulseaudio library versions.

In addition, we now have protobuf and pciutils in default dependencies, as those
are required (or better: optional, but recommended and thus activated by the
default gyp options) by versions >= 25.

Also, we now no longer depend on libpng, but I'm not dropping this, as we want
to get back to libpng from nixpkgs again 'real soon'.

The stack-protector flag is now disabled by default accross all versions, and
probably didn't hurt back in version 24, but at least we're now no longer add it
dependant on a particular version.

And those pesky post/onlyXX version booleans are now pre/postXX, to ensure
better clarity.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig b3c3579172
chromium: Update stable channel to v25.0.1364.97.
So, after searching for days in the wrong spot, eventually discovering that
postPatch isn't run on Hydra, we're now set to move forward to version 25, YAY!

Build has been tested locally (not that this would mean anything for Hydra, as
we've seen) and the output has been actively used for browsing by me :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig 3254c0ac29
chromium: Add /dev/null to patches list.
This is needed in order to ensure that the postPatch hook is executed, which is
not when the patches list is empty.

It is fixed by 82f94df719 in stdenv-updates.
So as soon as the branch gets merged, we can get rid of this hack as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:50 +01:00
aszlig 80af8871de
flashplayer-11: Update to version 11.2.202.273.
This version contains another set of security fixes, details are described here:

http://www.adobe.com/support/security/bulletins/apsb13-08.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig 28eff71465
Revert "chromium: Force -fno-stack-protector..."
This reverts commit b7cbb4da11.

The main reason behind this - apart from looking ugly - is that it didn't really
solve anything, see:

http://hydra.nixos.org/build/4198299

So, we need a different and less hacky approach...

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
aszlig 0a43ce41de
chromium: Update dev and beta channels.
So, chromium 25 is now stable, so we really need to get the build fixed on Hydra
as soon as possible. And let's hope without nasty workarounds.

This commits updates dev and beta channels to version 26.0.1410.12, because
version 27.0.1423.0 seems to be unavailable right now. Build is running
successfully on my machine, and the browser works as well on the sites I usually
visit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 01:16:49 +01:00
Eelco Dolstra 5509f3beec wireshark: Update to 1.8.5
CVE-2013-1582, CVE-2013-1586, CVE-2013-1588, CVE-2013-1590
2013-02-27 15:07:28 +01:00
Bjørn Forsman 586a93178e transmission: bump from 2.52 to 2.60
2.60 is the newest of the gtk2-compatible versions. (Transmission >=
2.61 requires gtk3.)

* Add inotify as input to not have transmission-daemon poll the torrent
  auto-load directory.
* Add file as input to fix a small build time issue (non-fatal).
* Remove unneeded gtk configure flags (support is auto-detected).
* icon-theme.cache is only generated when building with gtk, so use
  rm -f to not error out when building without gtk.
* Use gtk ? null instead of gtkClient flag because it is simpler.

Build and runtime tested with and without gtk support.
2013-02-27 13:45:41 +01:00
Peter Simons 80dc8df25d haskell-github-backup: update to version 1.20120314 2013-02-27 12:00:52 +01:00
Rickard Nilsson 566d5d3fb5 Add mopidy, a music server supporting spotify and the mpd protocol 2013-02-26 19:42:57 +01:00
Lluís Batlle i Rossell a5192222e9 surf: updating to 0.6
it didn't work since the libsoup update, and now it doesn't work either.
Let's see after fixing libsoup.
2013-02-25 21:08:16 +01:00
Lluís Batlle i Rossell e431ec94ad Making vimprobable2 use the default nixos ca bundle by default 2013-02-25 20:56:49 +01:00
Peter Simons 8f1c029e33 haskell-github-backup: add version 1.20120627 2013-02-25 15:25:54 +01:00
Peter Simons 8f1756e2d4 git: update to version 1.8.1.3 2013-02-25 02:12:42 +01:00
Peter Simons 1420012eca darcs: disable test suite to avoid 127 exit code 2013-02-25 00:37:11 +01:00
Peter Simons a30df95691 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-25 00:32:40 +01:00
Peter Simons dd9ff9adb7 darcs: disable test suite to avoid 127 exit code 2013-02-25 00:03:34 +01:00
Peter Simons 7165babaf1 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-24 22:09:07 +01:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát 7421ee673c qucs: minor update and fix for new gcc 2013-02-24 15:11:19 +01:00
Cillian de Róiste 51c54301a6 Add mda-lv2 audio plugins 2013-02-24 11:26:32 +01:00
Jack Cummings ae35f74dbe Add makemkv descriptions 2013-02-24 02:17:24 -08:00
Cillian de Róiste d062be36e6 Calf: upgrade to the final release 0.0.19 2013-02-24 11:03:51 +01:00
Jack Cummings dbc343c49a makemkv-1.8.0 2013-02-23 19:37:16 -08:00
Cillian de Róiste 626cdf1cb6 Ardour3 fix gtk theme engine 2013-02-24 02:27:18 +01:00
Vladimír Čunát 37bae3193d monotone: fix 2013-02-24 00:31:20 +01:00
Vladimír Čunát c9d3702c97 telepathy-related: fix via update
Some updates were restricted by gstreamer being <1.0
2013-02-23 22:20:42 +01:00
Vladimír Čunát e02153a3c0 lash: fix for new gcc 2013-02-23 21:12:24 +01:00
Peter Simons ce9500ea1d grip: update to version 3.3.1 2013-02-23 20:44:23 +01:00
Cillian de Róiste def9a6c06b Ardour3: update to RC2 2013-02-23 17:22:47 +01:00
Vladimír Čunát aacc9a6d0d etherape: fix build 2013-02-23 15:23:18 +01:00
Vladimír Čunát 4ebcc87f6b compiz: fix build and update 2013-02-23 15:10:01 +01:00
Vladimír Čunát 0de7b2dfd8 baresip: a minor update 2013-02-23 13:00:09 +01:00
Rok Garbas 5077600d9a zathura: update to 0.2.2 (also plugins), added correct license and myself as maintainer 2013-02-23 11:39:32 +01:00
Rok Garbas e4236f1ade girara: update to 0.1.5, correct license and add myself as maintainer 2013-02-23 11:38:30 +01:00
Peter Simons eb5ebb6063 network-protocol-xmpp: fix spelling of the attribute name 2013-02-22 16:14:27 +01:00
Eelco Dolstra 95ca031be9 firefox: Update to 19.0 2013-02-21 17:45:42 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
aszlig b7cbb4da11
chromium: Force -fno-stack-protector for v25.
So, this is our sledgehammer, forcing -fno-stack-protector for every gcc/g++ in
the univ... Chromium build. Of course this is a somewhat nasty fix and there
should be a real fix somewhere in Chromium 26. But instead of wandering around
and picking cherries, we now go out for the slaughter until someone brings us
the damn cherries because we are FUURRRIII... no well... time for sleep :-)

May the mighty Hydra be with us!

Thanks to our great fellow @cillianderoiste, for joining the battle with his
almighty battle axe, crushing and burning some CPUs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Tested-by: Cillian de Róiste <cillian.deroiste@gmail.com>
2013-02-21 15:23:03 +01:00
aszlig 857135c59a
chromium: Use system protobuf for versien 25.
This should at least mitigate our build error to only occur in v8 anymore.
Unfortunately we can't use v8 from nixpkgs right now, so we're going to put out
our sledgehammer in the next commit. Meanwhile, it doesn't hurt to get rid of
the bundled protobuf library, so let's do it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 15:23:03 +01:00
Vladimír Čunát 91f559b7b5 Merge pull request #326 from bjornfor/evtest
Add evtest, a simple tool for input event debugging
2013-02-21 00:51:49 -08:00
aszlig 3a23e63dbf
chromium: Use system libvpx for version 25.
Unfortunately, we have build errors for version 25 in the bundled libvpx:

http://hydra.nixos.org/build/4173075
http://hydra.nixos.org/build/4173066

As I can't reproduce this on my local system (I've disabled the option
CONFIG_CC_STACKPROTECTOR here), let's just hope that libvpx is the only part
that fails during build because of this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-21 08:51:38 +01:00
aszlig 7e5109a541
chromium: Update dev channel to v26.0.1410.5.
The upgrade currently doesn't involve the -lite package, as we need to use a few
more dependencies from nixpkgs first before we can finally fully switch over to
the lite package, even though the update script will try to fetch it anyway.

In this update, one particular problem that arises in conjuction with the
seccomp BPF sandbox is caused by this commit:

https://chromiumcodereview.appspot.com/12209029

Which particularily filters flags to the clone() syscall. I've spent (wasted?) a
few hours figuring out the troublesome flag, eventually figuring it out and -
just by curiousity ("Do other distributions have the same problem?") - searched
the web for "chromium CLONE_DETACHED" and BEHOLD...

A post from our OWN mailinglist pops up with the same patch I intended to do:

http://article.gmane.org/gmane.linux.distributions.nixos/10356

So shame on me for not being subscribed to the mailing list, and big thanks to
Ian Farmer for the patch.

As a consequence I'm now subscribed.

So, back to chromium itself, version 26 builds fine and works so far without
much (more to come in later commits) trouble.

We also had to introduce three more dependencies:

 * protobuf: This one is because we don't need to use the bundled one anymore,
             so we can use the version in nixpkgs.
 * speechd: Not sure whether this was bundled or not, but let's use nixpkgs
            version as well to keep down build time.
 * libXdamage: Needed for screen capturing support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
aszlig 073c797444
chromium: Update stable and beta channels.
stable: 24.0.1312.69 -> 24.0.1312.70 (builds fine, tested)
beta: 25.0.1364.68 -> 25.0.1364.84 (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-20 23:40:45 +01:00
Bjørn Forsman 224a5ea9da Add evtest, a simple tool for input event debugging 2013-02-20 21:17:32 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Eelco Dolstra 2b5aff10b9 psimedia: Fix building against current kernel headers
http://hydra.nixos.org/build/4127993
2013-02-19 12:46:52 +01:00
Rok Garbas 13fcbc7baf notmuch: update from 0.14 to 0.15 2013-02-19 04:46:47 +01:00
Song Wenwu 679150157b emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async) 2013-02-18 21:06:29 +08:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Peter Simons b076ab94d6 git-annex: update to version 3.20130216 2013-02-18 11:20:46 +01:00
Peter Simons 33b130ee69 ikiwiki: update to version 3.20130212 2013-02-18 11:11:34 +01:00
Rok Garbas 614e9b65a0 Merge pull request #318 from iElectric/xbmc-nasm
add nasm to xbmc dependencies
2013-02-17 15:46:17 -08:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát 9885d04033 Revert "WIP", sorry, I got confused, somehow
This reverts commit 524d9b656e.
2013-02-17 11:02:25 +01:00
Vladimír Čunát 524d9b656e WIP 2013-02-17 11:01:20 +01:00
Domen Kozar 6506f9b070 add nasm to xbmc dependencies 2013-02-16 23:23:15 +01:00
Vladimír Čunát aaf607c5dc linphone: minor update and fix 2013-02-16 21:48:47 +01:00