JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,010 Commits 2 Branches 0 Tags 13 GiB
516133a4fd
Commit Graph

8252 Commits

Author SHA1 Message Date
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
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
Александр Цамутали
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
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
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
orbitz
6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +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
78e71242d7 Adding idle3-tools (for WD Green HDDs) 2013-03-07 21:40:28 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +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
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
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
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
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
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
Florian Friesdorf
2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Mathijs Kwik
4d4b045d95 ffmpeg: remove unused 1.0 version 2013-03-04 22:26:13 +01:00
Carles Pagès
323d7e2ab5 weston: use pixman_cairo. 
We have to use the same variant of pixman as cairo, otherwise compilation fails
with unresolved symbols.
 2013-03-03 23:01:51 +01:00
Rickard Nilsson
4d181e526e mopidy: Add some more dependencies needed for the HTTP frontend 2013-03-03 20:53:48 +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
Florian Friesdorf
e9f13b9c3b python-ldap-2.4.10 2013-03-03 13:20:58 +01: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
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