1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

8281 commits

Author SHA1 Message Date
Carles Pagès ceacc508dc mesa: append version of mesa_noglu to mesa buildEnv name. 2013-03-26 13:01:18 +01:00
Carles Pagès 68be54c8e2 mesa: create a buildEnv that joins mesa (without glu) and glu
Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using
buildEnv to create a mesa environment that acts like old mesa, which is what
this commit does.
2013-03-24 12:36:33 +01:00
Michael Raskin 8e5dc9b5df Fix K3D gtlglext handling 2013-03-21 13:45:12 +04:00
Michael Raskin 3c1ce85692 Fix ZBar build by passing it gtk2 2013-03-21 11:59:07 +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 516133a4fd Merge pull request #378 from cpages/wayland
wayland: add weston and dependencies
2013-03-16 11:38:34 -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
Lluís Batlle i Rossell 4dbdbda37f Adding storebrowse, a tool to browse the nix store with a web browser.
The build script is a bit long due to the upstream go style of things.
2013-03-16 00:59:25 +01:00
Lluís Batlle i Rossell 9db9af4fa6 opencascade: Adding ode version
(Open Community version)
2013-03-15 14:34:53 +01:00
Peter Simons e0b0be9fb3 pkgs/top-level/release.nix: enable Hydra builds of GHC versions 6.10.4, 6.12.3, 7.0.4, 7.4.2, and 7.6.2
Ensure that binary packages of the compiler itself are available from Hydra.
2013-03-14 19:25:27 +01:00
Eelco Dolstra 3bf249cb12 Module::Find: Update to 0.11 2013-03-14 16:37:18 +01:00
Rob Vermaas 4619675011 Add rsyslog 7.2.6 and its dependencies 2013-03-14 14:13:55 +01:00
Peter Simons a8a6fd4063 texinfo: update to version 5.1 2013-03-13 15:13:40 +01:00
Shea Levy 0a52bc5d8e Add Catalyst::Action::REST perlPackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-13 09:02:27 -04: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
Lluís Batlle i Rossell 90bca24b38 Adding mktorrent 1.0 2013-03-12 19:43:57 +01:00
Shea Levy aeb00df015 Merge branch 'deluge136' of git://github.com/iElectric/nixpkgs
Trivial upgrade, deluged still starts fine.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 21:00:00 -04:00
Domen Kožar a69d56a807 upgrade deluge to 1.3.6 2013-03-12 01:13:52 +01:00
Shea Levy 3e61084006 eclipses: use older cairo
In #167, Marc Weber reported that eclipse crashes after selecting a
workspace with the current nixpkgs cairo. This has the same functional
change as #167, but IMO the implementation is cleaner.

Fixes #167

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 19:29:39 -04:00
Shea Levy 897840f76f Add cairo-1.12.2
Needed for an upcoming fix to eclipse.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 19:19:48 -04:00
Shea Levy ef82ab3fca Merge branch 'sdcc' of git://github.com/bjornfor/nixpkgs
New package, it builds, I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-11 18:51:17 -04:00
Bjørn Forsman 859a227595 sdcc: new nixpkg (SDCC -> Small Device C Compiler)
SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.),
Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola)
HC08 based (hc08, s08) and Zilog Z80 based MCUs (z80, z180, gbz80,
Rabbit 2000/3000, Rabbit 3000A). Work is in progress on supporting the
Microchip PIC16 and PIC18 targets. It can be retargeted for other
microprocessors.
2013-03-11 21:59:40 +01:00
Sander van der Burg 3d55f1d222 nijs: Bump to 0.0.4 2013-03-11 17:43:59 +01:00
Andres Loeh db104a8c3f haskell-constraints: add package 2013-03-11 12:47:01 +01:00
Peter Simons e1f633bdae all-packages.nix: strip trailing whitespace 2013-03-11 11:36:15 +01:00
Peter Simons e45d55964b alex: update to version 3.0.5 2013-03-11 11:26:14 +01:00
Sander van der Burg 53ee192dc5 perl-Error: bump to 0.17019 2013-03-11 11:10:10 +01:00
Lluís Batlle i Rossell 5e3e07293f Updating glibc locales and info to 2.17 too. 2013-03-10 23:59:08 +01:00
Vladimír Čunát dc5c4917a5 vala: update to 0.19 2013-03-10 19:53:43 +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
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
Michael Raskin f5195531ae Adding reference to ZPAQ in all-packages 2013-03-09 17:31:01 +04:00
Peter Simons acd06b6ea0 haskell-shake: add version 0.9.1 2013-03-09 13:11:48 +01:00
Peter Simons edfcb485a8 jailbreak-cabal: build jailbreak-cabal with a version of Cabal that has its unit tests disabled
Cabal's unit test suite depends on testFrameworkQuickcheck2, which
depends on jailbreakCabal, which depends on Cabal: *BOOM*
2013-03-09 13:04:19 +01:00
Peter Simons 63cd00856e haskell-defaults.nix: don't pass inconsistent Cabal versions to cabal2nix 2013-03-09 13:04:19 +01:00
Peter Simons 78140c3acd haskell-packages.nix: add 'disableTests' convenience function 2013-03-09 13:04:19 +01:00
Peter Simons 3704855f78 pkgs/top-level/haskell-defaults.nix: cosmetic 2013-03-09 13:04:19 +01:00
Florian Friesdorf a49bd047c0 add older buildout152 2013-03-09 10:41:27 +01:00
Florian Friesdorf de36ddf7e7 add older pycrypto25 2013-03-09 10:24:38 +01:00
Shea Levy 08d076d6fc Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs
Trivial update to XML-LibXML perlPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:17:40 -05:00
Shea Levy 9158ad45f1 Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs
This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 19:08:56 -05:00
Shea Levy 5e434ef318 Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -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
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 fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
Shea Levy f2c79c4542 Remove some references to non-existent packages 2013-03-08 16:36:59 -05:00