1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Commit graph

4540 commits

Author SHA1 Message Date
Michael Raskin 8e5dc9b5df Fix K3D gtlglext handling 2013-03-21 13:45:12 +04:00
Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Vladimír Čunát 192bdc79ae Merge pull request #380 from oxij/random-updates
cmus: update to 2.5.0
2013-03-16 11:40:06 -07:00
Vladimír Čunát d898a207b9 Merge pull request #375 from ierton/viewnior
viewnior: Add viewnior, GTK image viewer program
2013-03-16 11:33:53 -07:00
Cillian de Róiste 1f000ba427 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-03-16 16:33:43 +01:00
Cillian de Róiste 2b07e1bf4c Ardour3: update to the release of Ardour 3.0
A tarball is only available to subscribers or people who pay
to download it on the site. This project is GPL licensed but
users are strongly encouraged to support it financially
2013-03-16 16:33:16 +01:00
Lluis Batlle 8d76cf51bb elinks: allow building without guile
Guile doesn't build on armv5tel now (failing an important test),
so better if I can disable it for elinks.
2013-03-16 13:39:30 +01:00
Eelco Dolstra 098190c9dd firefox: Update to 19.0.2 2013-03-15 14:31:25 +01:00
Vladimír Čunát 9ac8a16277 vimprobable2, surf: fix the settings-schemas problem
Note that they still segfault.
2013-03-14 16:01:53 +01:00
Sander van der Burg 23c78e41db git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform 2013-03-14 14:57:40 +01:00
Jan Malakhovski 33379ae58a cmus: update to 2.5.0
This version builds with current ffmpeg.
CUE support is nice too.
2013-03-14 13:50:29 +00:00
Peter Simons ea804dfb1a Merge pull request #376 from pcapriotti/master
Fix bip build
2013-03-13 02:55:00 -07:00
Rob Vermaas 784d2b2d16 Update to latest spotify 2013-03-12 22:13:29 +01:00
Rob Vermaas b512e3e934 Initial try to update spotify to version 0.8.4.103. Still need to get rid
of LD_LIBRARY_PATH wrapper, and properly patchelf any libs in the spotify
prefix.
2013-03-12 22:13:29 +01:00
Sergey Mironov c52bd0c8d8 viewnior: Add viewnior, GTK image viewer program 2013-03-12 23:45:50 +04:00
Paolo Capriotti 03e6a6f85f Add patch to fix build for bip. 2013-03-12 18:23:55 +00:00
Domen Kozar acf4697a5f upgrade xbmc to 12.0 2013-03-12 01:35:16 +01:00
Shea Levy 931df3e91d Merge branch 'xbmc-hydra' of git://github.com/iElectric/nixpkgs
Trivial meta information update.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 14:25:23 -04:00
Peter Simons 5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Domen Kozar 65a4f741fd Set platform and maintainer for xbmc pkg 2013-03-11 18:12:46 +01:00
Rok Garbas 859c7dfae8 msmtp: Update to 1.4.30, added optional libraries as dependency and point to correct license 2013-03-10 21:17:17 +01:00
Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
2013-03-10 18:19:49 +01:00
Peter Simons 4c9ebb62d4 git: link binaries with libgcc_s.so to ensure pthread_cancel() works 2013-03-09 23:57:57 +01:00
Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Александр Цамутали a39f05f46a applications/audio/jack-rack: New nixpkg. 2013-03-09 18:03:12 +04:00
Александр Цамутали 241f94f59f applications/audio/caps: New nixpkg. 2013-03-09 17:54:59 +04:00
Vladimír Čunát cf3ff172cd panotools: disabling tests due to strange failures 2013-03-09 13:16:41 +01:00
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
Carles Pagès 728116ec3e weston: don't depend on pixman explicitly.
Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
2013-03-06 22:59:59 +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
Carles Pagès 8de5d77e3c Merge branch 'master' into wayland
Conflicts:
	pkgs/top-level/all-packages.nix
2013-03-03 11:58:28 +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
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