public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk.

Browse Source 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
This commit is contained in:
Lluís Batlle i Rossell
2010-08-02 15:48:19 +00:00
parent 9724fb271b fd268b4852
commit 5417c720fd
674 changed files with 10063 additions and 117749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/default.nix
+2 -9
View File
@@ -1,23 +1,16 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
, dbus, libusb }:
let version = "1.4.1"; in
let version = "1.4.4"; in
stdenv.mkDerivation {
name = "cups-${version}";
src = fetchurl {
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng";
md5 = "8776403ad60fea9e85eab9c04d88560d";
};
patches =
[ (fetchurl {
url = http://www.cups.org/strfiles/3332/0001-Fixed-side_cb-function-declaration-in-usb-unix.c.patch;
sha256 = "0h8fhhpzp7xngnc428040jv09yvpz5dxb9hw6sv67lnvb03fncnw";
})
];
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ];
propagatedBuildInputs = [ openssl ];
pkgs/misc/drivers/gutenprint/bin.nix
+3 -2
View File
@@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, rpm, cpio, zlib }:
assert stdenv.system == "x86_64-linux";
@@ -25,6 +25,7 @@ then. I've tried that.
TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc
*/
stdenv.mkDerivation {
name = "cups-gutenprint-binary-5.0.1";
@@ -58,6 +59,6 @@ stdenv.mkDerivation {
'';
meta = {
description = "some additional drivers including canon printer drivers";
description = "Some additional CUPS drivers including Canon drivers";
};
}
pkgs/misc/drivers/gutenprint/default.nix
+9 -6
View File
@@ -1,12 +1,13 @@
# this package was called gimp-print in the past
{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups
, libtiff, libpng, openssl, git, gimp }@args :
{ fetchurl, stdenv, pkgconfig, composableDerivation, cups
, libtiff, libpng, openssl, gimp }:
let
version = "5.2.4";
inherit (args.composableDerivation) composableDerivation edf wwf;
inherit (composableDerivation) edf wwf;
in
composableDerivation {} {
composableDerivation.composableDerivation {} {
name = "gutenprint-${version}";
src = fetchurl {
@@ -15,12 +16,14 @@ composableDerivation {} {
};
# gimp, gui is still not working (TODO)
buildInputs = [ openssl pkgconfig];
buildInputs = [ openssl pkgconfig ];
configureFlags = ["--enable-static-genppd"];
#preConfigure = ''
# configureFlags="--with-cups=$out/usr-cups $configureFlags"
#'';
/*
is this recommended? without it this warning is printed:
@@ -41,7 +44,7 @@ composableDerivation {} {
license = "GPL";
};
mergeAttrBy = { installArgs = lib.concat; };
mergeAttrBy = { installArgs = stdenv.lib.concat; };
# most interpreters aren't tested yet.. (see python for example how to do it)
flags =
pkgs/misc/drivers/hplip/default.nix
+47
View File
@@ -0,0 +1,47 @@
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus, pkgconfig
, qtSupport ? false, qt4
}:
stdenv.mkDerivation {
name = "hplip-3.10.5";
src = fetchurl {
url = "http://prdownloads.sourceforge.net/hplip/hplip-3.10.5.tar.gz";
sha256 = "1lyl9nrdaih64cqw6fa7ivjf7a74bq8zn0gkj1gap47b04my608p";
};
#preBuild=''
# makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
#'';
prePatch = ''
sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
'';
preConfigure = ''
export configureFlags="$configureFlags
--with-cupsfilterdir=$out/lib/cups/filter
--with-cupsbackenddir=$out/lib/cups/backend
--with-icondir=$out/share/applications
--with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups
# Until we have snmp
--disable-network-build"
export makeFlags="
halpredir=$out/share/hal/fdi/preprobe/10osvendor
hplip_statedir=$out/var
rulesdir=$out/etc/udev/rules.d
hplip_confdir=$out/etc/hp
";
'';
buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
stdenv.lib.optional qtSupport qt4;
meta = {
description = "Print, scan and fax HP drivers for Linux";
homepage = http://hplipopensource.com/;
license = "free"; # MIT/BSD/GPL
};
}
pkgs/misc/emulators/wine/src-for-default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
rec {
version="1.2-rc1";
name="wine-1.2-rc1";
hash="0d5gn85c277vasm9rsmjdn8x9a8dllbzphf6yhyq1agdc84g291b";
version="1.3.0";
name="wine-1.3.0";
hash="042mmkq55zgdz7617z7ihqvi9riqv0qc6c7z2f8f6nr5iavfviml";
url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.tar.bz2";
advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2";
}
pkgs/misc/freestyle/default.nix
+12 -9
View File
@@ -1,14 +1,17 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
, swig, python }:
stdenv.mkDerivation {
name = "freestyle-2.2.0";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2;
sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
};
buildInputs =(with args; [qt4 libpng lib3ds freeglut libXi libQGLViewer swig]);
inherit (args) python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri
buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri
buildPhase = ''
export PYTHON_VERSION=2.5
@@ -36,15 +39,15 @@ args.stdenv.mkDerivation {
$hide/Freestyle
EOF
chmod +x $out/bin/Freestyle
'';
'';
patches = ./patch;
installPhase = ":";
meta = {
description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
homepage = http://freestyle.sourceforge.net;
license = "GPL2";
description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
homepage = http://freestyle.sourceforge.net;
license = "GPL2";
};
}
pkgs/misc/gxemul/default.nix
+12 -9
View File
@@ -1,13 +1,16 @@
args: with args;
let edf = composableDerivation.edf;
name = "gxemul-0.4.6"; in
composableDerivation.composableDerivation {} {
{ composableDerivation, fetchurl }:
let edf = composableDerivation.edf;
name = "gxemul-0.4.6";
in
composableDerivation.composableDerivation {} {
inherit name;
flags = {
doc = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
man = { installPhase = "cp -r ./man \$out/;";};
doc = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
man = { installPhase = "cp -r ./man \$out/;";};
};
cfg = {
@@ -23,11 +26,11 @@ composableDerivation.composableDerivation {} {
sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
};
configurePhase="./configure";
configurePhase = "./configure";
meta = {
license = "BSD";
description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types";
homepage = http://gavare.se/gxemul/;
};
pkgs/misc/jackaudio/default.nix
+23 -32
View File
@@ -1,9 +1,20 @@
# Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack
# still much to test but it compiles now
args:
let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {} {
buildInputs = [ args.pkgconfig ];
{ composableDerivation, fetchurl, pkgconfig, alsaLib }:
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
name = "jack-0.103.0";
src = fetchurl {
url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
};
buildInputs = [ pkgconfig ];
flags =
# FIXME: tidy up
edf { name = "posix-shm"; } #use POSIX shm API
@@ -15,43 +26,23 @@ composableDerivation {} {
// edf { name = "coreaudio"; } #ignore CoreAudio driver
// edf { name = "oss"; } #ignore OSS driver
// edf { name = "freebob"; } #ignore FreeBob driver
// edf { name = "alsa"; enable = { buildInputs=[args.alsaLib]; }; };
// edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; };
# altivec seems to be for mac only ?
# altivec = { configureFlags = ["--enable-altivec"]; }; #enable Altivec support (default=auto)
# keeping default values by now:
# optimization_by_compiler = { configureFlags = ["--enable-optimization-by-compiler"]; }; [>use compiler (NOT processor) capabilities to determine optimization flags
# optimization_by_cpu = { configureFlags = ["--enable-optimization-by-cpu"]; }; [>use processor capabilities to determine optimization flags
# I think the default is ok
# mmx = edf { name = "mmx"; }; #enable MMX support (default=auto)
#sse = edf { name = "sse"; }; #enable SSE support (default=auto)
#dynsimd = edf { name = "dynsimd"; }; #enable dynamic SIMD selection (default=no)
#optimize = edf { name = "optimize"; }; #ask the compiler for its best optimizations
#resize = edf { name = "resize"; }; #enable buffer resizing feature
#ensure_mlock = edf { name = "ensure-mlock"; }; #fail if unable to lock memory
#debug = edf { name = "debug"; }; #enable debugging messages in jackd and libjack
#preemption_check = edf { name = "preemption-check"; }; #
cfg = {
posix_shmSupport = true;
timestampsSupport = true;
alsaSupport = true;
};
name = "jack-0.103.0";
src = args.fetchurl {
url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
};
meta = {
description = "jack audio connection kit";
homepage = "http://jackaudio.org";
license = "GPL";
};
# make sure the jackaudio is found by symlinking lib64 to lib
postInstall = ''
ensureDir $out/lib
ln -s $out/lib{64,}/pkgconfig
'';
meta = {
description = "JACK audio connection kit";
homepage = "http://jackaudio.org";
license = "GPL";
};
}
pkgs/misc/lilypond/default.nix
+11 -20
View File
@@ -1,38 +1,29 @@
# note: there is a jedit plugin
args: with args;
{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
, python, gettext, flex, perl, bison, pkgconfig, texLive
, fontconfig, freetype, pango, fontforge, help2man }:
stdenv.mkDerivation {
name = "lilypond-2.13.9";
/*
# REGION AUTO UPDATE: { name="lilypond"; type = "git"; url = "git://git.sv.gnu.org/lilypond.git"; }
src= sourceFromHead "lilypond-7d065cae414aac445a40c0c6646c3baf6f358cb3.tar.gz"
(throw "source not not published yet: lilypond");
# END
#preConfigure = "./autogen.sh";
*/
src = fetchurl {
url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.9.tar.gz;
sha256 = "1x3jz0zbhly4rc07nry3ia3ydd6vislz81gg0ivwfm6f6q0ssk57";
};
configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"];
# configureFlags = "--disable-documentation";
buildInputs = [
automake autoconf
ghostscript texinfo imagemagick texi2html guile texinfo
python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
fontforge help2man];
buildInputs =
[ ghostscript texinfo imagemagick texi2html guile
python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
fontforge help2man
];
meta = {
description = "music typesetting system";
description = "Music typesetting system";
homepage = http://lilypond.org/;
license = "GPL";
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
patches = [ ./findlib.patch ];
pkgs/misc/sane-backends/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{stdenv, fetchurl, hotplugSupport ? false, libusb ? null,
gt68xxFirmware ? null}:
{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
, gt68xxFirmware ? null }:
assert hotplugSupport -> stdenv.system == "i686-linux";
pkgs/misc/xosd/default.nix
+5 -4
View File
@@ -1,5 +1,6 @@
args: with args;
stdenv.mkDerivation (rec {
{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }:
stdenv.mkDerivation rec {
pname = "xosd";
version = "2.2.12";
@@ -10,9 +11,9 @@ stdenv.mkDerivation (rec {
sha256 = "7d4ae8e1a6dbd7743af3b1cdc85144e2de26abe6daec25f4bd74bf311774df08";
};
buildInputs = [libX11 libXext libXt xextproto xproto];
buildInputs = [ libX11 libXext libXt xextproto xproto ];
meta = {
description = "XOSD displays text on your screen";
};
})
}