diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix new file mode 100644 index 00000000000..e86177bb53c --- /dev/null +++ b/pkgs/applications/audio/espeak/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, unzip, portaudio }: + +stdenv.mkDerivation { + name = "espeak-1.44.03"; + src = fetchurl { + url = mirror://sourceforge/espeak/espeak-1.44.03-source.zip; + sha256 = "0lnv89xmsq3bax0qpabd0z2adaag7mdl973bkw3gdszidafmfyx4"; + }; + + buildInputs = [ unzip portaudio ]; + + patchPhase = '' + sed -e s,/bin/ln,ln,g -i src/Makefile + sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile + '' + (if portaudio.api_version == 19 then '' + cp src/portaudio19.h src/portaudio.h + '' else ""); + + configurePhase = '' + cd src + makeFlags="PREFIX=$out" + ''; + + meta = { + description = "Compact open source software speech synthesizer"; + homepage = http://espeak.sourceforge.net/; + license = "GPLv3+"; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/htmlize/builder.sh b/pkgs/applications/editors/emacs-modes/htmlize/builder.sh new file mode 100644 index 00000000000..ccbd9d8e8a7 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/htmlize/builder.sh @@ -0,0 +1,4 @@ +source $stdenv/setup + +mkdir -p $out/share/emacs/site-lisp +cp $src $out/share/emacs/site-lisp/htmlize.el diff --git a/pkgs/applications/editors/emacs-modes/htmlize/default.nix b/pkgs/applications/editors/emacs-modes/htmlize/default.nix new file mode 100644 index 00000000000..e749dfa4486 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/htmlize/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "htmlize-1.37"; + + builder = ./builder.sh; + + src = fetchurl { + url = http://fly.srk.fer.hr/~hniksic/emacs/htmlize.el; + sha256 = "17sbhf4r6jh4610x8qb2y0y3hww7w33vfsjqg4vrz99pr29xffry"; + }; + + meta = { + description = "Convert buffer text and decorations to HTML."; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 6ffb32696d7..b6b043fb7b8 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -1,13 +1,20 @@ {stdenv, fetchurl, emacs}: -stdenv.mkDerivation -{ - name = "maude-mode-0.1"; - src = fetchurl - { - url = "mirror://sourceforge/maude-mode/maude-mode.tar.gz"; - sha256 = "12555j01mar48da2jy3ay93xfn7ybl23bpvhp0srzg8858gisx5g"; +stdenv.mkDerivation { + name = "maude-mode-0.2"; + + src = fetchurl { + url = "mirror://sourceforge/maude-mode/maude-mode-0.2.tar.gz"; + sha256 = "19jdd7la0bxxxnnq4ryckf63jykg0r3v92z126x6djaigi3xn1yx"; }; + buildInputs = [emacs]; configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; + + meta = { + description = "Emacs mode for the programming language Maude"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix new file mode 100644 index 00000000000..e308ebe0477 --- /dev/null +++ b/pkgs/applications/misc/navipowm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, qt4 }: +stdenv.mkDerivation rec { + name = "navipowm-0.2.4"; + + src = fetchurl { + url = mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz; + sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; + }; + + configurePhase = '' + cd Qt/KDevelop + qmake + ''; + + installPhase = '' + ensureDir $out/bin $out/share/${name}/Icons + cp bin/NaviPOWM $out/bin + cp ../../common/Config/navipowm.ini $out/share/${name} + cp ../../common/Images/* $out/share/${name} + ''; + + buildInputs = [ qt4 ]; + + meta = { + homepage = http://navipowm.sourceforge.net/; + description = "Car navigation system"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix new file mode 100644 index 00000000000..576647555ab --- /dev/null +++ b/pkgs/applications/misc/navit/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, autoconf, automake, libtool, cvs }: +stdenv.mkDerivation rec { + name = "navit-svn-3537"; + + src = fetchsvn { + url = https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit; + rev = 3537; + sha256 = "1ajd439i7z8xm16kqh20qalvafy9miyy4accc8j7w30c4qgc2bb7"; + }; + + # 'cvs' is only for the autogen + buildInputs = [ pkgconfig gtk SDL fontconfig freetype imlib2 SDL_image mesa + libXmu freeglut python gettext quesoglc gd postgresql + autoconf automake libtool cvs ]; + + preConfigure = '' + sh ./autogen.sh + ''; + + configureFlags = [ "--disable-samplemap" ]; + + meta = { + homepage = http://www.navit-project.org/; + description = "Car navigation system with routing engine using OSM maps"; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix new file mode 100644 index 00000000000..589fbf49786 --- /dev/null +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl +}: + +stdenv.mkDerivation { + name = "libxpdf-3.02pl4"; + + src = fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; + sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; + }; + + patches = [ + (fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch; + sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; + }) + (fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch; + sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; + }) + (fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch; + sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; + }) + (fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch; + sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; + }) + ./xpdf-3.02-protection.patch + ./libxpdf.patch + ]; + + installPhase = '' + ensureDir $out/lib/goo + ensureDir $out/lib/fofi + ensureDir $out/lib/xpdf + ensureDir $out/include + + cp -v goo/libGoo.a $out/lib/goo + cp -v fofi/libfofi.a $out/lib/fofi + cp -v xpdf/libxpdf.a $out/lib/xpdf + + cp -v *.h $out/include + cp -v goo/*.h $out/include + cp -v fofi/*.h $out/include + cp -v xpdf/*.h $out/include + ''; + +} diff --git a/pkgs/applications/misc/xpdf/libxpdf.patch b/pkgs/applications/misc/xpdf/libxpdf.patch new file mode 100644 index 00000000000..606da76c729 --- /dev/null +++ b/pkgs/applications/misc/xpdf/libxpdf.patch @@ -0,0 +1,45 @@ +diff -rc xpdf-3.02/xpdf/Makefile.in xpdf-3.02-new/xpdf/Makefile.in +*** xpdf-3.02/xpdf/Makefile.in 2007-02-27 23:05:52.000000000 +0100 +--- xpdf-3.02-new/xpdf/Makefile.in 2010-08-25 14:54:14.000000000 +0200 +*************** +*** 110,116 **** + pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) + + all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ +! pdfimages$(EXE) + + #------------------------------------------------------------------------ + +--- 110,116 ---- + pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) + + all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ +! pdfimages$(EXE) libxpdf.a + + #------------------------------------------------------------------------ + +*************** +*** 248,253 **** +--- 248,269 ---- + + #------------------------------------------------------------------------ + ++ PDFTOEPDF_OBJS = \ ++ Array.o BuiltinFont.o BuiltinFontTables.o CMap.o \ ++ Catalog.o CharCodeToUnicode.o Decrypt.o Dict.o Error.o \ ++ FontEncodingTables.o Gfx.o GfxFont.o GfxState.o \ ++ GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o Lexer.o Link.o \ ++ NameToCharCode.o Object.o OutputDev.o Outline.o PDFDoc.o Page.o \ ++ Parser.o PDFDocEncoding.o Stream.o UnicodeMap.o XRef.o Function.o \ ++ PSTokenizer.o UnicodeTypeTable.o ++ ++ libxpdf.a: $(PDFTOEPDF_OBJS) ++ rm -f $@ ++ $(AR) $(ARFLAGS) $@ *.o ++ ranlib $@ ++ ++ #------------------------------------------------------------------------ ++ + depend: + $(CXX) $(CXXFLAGS) -MM $(CXX_SRC) >Makefile.dep + diff --git a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix similarity index 78% rename from pkgs/desktops/kde-4.4/extragear/yakuake/default.nix rename to pkgs/applications/misc/yakuake/default.nix index c149491d3e8..263bc09ff32 100644 --- a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd"; }; - buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon stdenv.gcc.libc ]; + buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon ]; - meta = with stdenv.lib; { + meta = { homepage = http://yakuake.kde.org; description = "Quad-style terminal emulator for KDE"; - maintainers = [ maintainers.urkud ]; - platforms = platforms.linux; + inherit (kdelibs.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 6e637aec846..1f4d224e435 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,19 +5,19 @@ let doPatchShebangs = args.doPatchShebangs; makeManyWrappers = args.makeManyWrappers; - version = lib.attrByPath ["version"] "0.1.7" args; + version = "0.2"; + release = "7"; buildInputs = with args; [ intltool python imagemagick gtk glib webkit libxml2 gtksourceview pkgconfig which gettext makeWrapper - file libidn sqlite docutils libnotify libsoup + file libidn sqlite docutils libnotify libsoup vala + kbproto xproto scrnsaverproto libXScrnSaver dbus_glib ]; in rec { src = fetchurl { - url = "http://goodies.xfce.org/releases/midori/midori-${version}.tar.bz2"; - sha256 = if version == "0.1.7" then - "1bxs4nlwvhzwiq73lf1gvx7qqdm1hm4x1hym1b0q0dhwhdvafx4v" - else null; + url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2"; + sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c"; }; inherit buildInputs; @@ -32,7 +32,7 @@ rec { shebangsInstalled = (doPatchShebangs "$out/bin"); wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1"); - name = "midori-" + version; + name = "midori-${version}.${release}"; meta = { description = "Light WebKit-based web browser with GTK GUI."; maintainers = [args.lib.maintainers.raskin]; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix new file mode 100644 index 00000000000..938a26fd785 --- /dev/null +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver +, kdelibs, kdepimlibs, automoc4, phonon, qca2}: + +let + pn = "konversation"; + v = "1.3.1"; +in + +stdenv.mkDerivation rec { + name = "${pn}-${v}"; + + src = fetchurl { + url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2"; + sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl"; + }; + + buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs + automoc4 phonon qca2 ]; + + meta = with stdenv.lib; { + description = "Integrated IRC client for KDE"; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix index f6b08ebeb65..863f5a4aab9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix @@ -11,14 +11,14 @@ }: -let version = "3.1.1"; in +let version = "3.1.2"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "8e25fd786fbe094c3f4d9bc4e18285701bd42279"; + sha1 = "645cb75a0e0b0ea38e25d54f970052bc02e7afe5"; }; buildInputs = diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 6789eb4fda5..87a18c20e99 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} : stdenv.mkDerivation rec { - name = "gtkwave-3.3.6"; + name = "gtkwave-3.3.11"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "0vlayjvhmijcg4pbjix9lm1d5n2wxzcn16lkm2ysgpc8q6987df8"; + sha256 = "1krhxdpzj2ma3xisbk0d9yzhlk1i60hgkkfycc2nsqqirqrvdpbr"; }; buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix new file mode 100644 index 00000000000..8ce0b363264 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, unzip, cmake, mesa, wxGTK, zlib, libX11}: + +stdenv.mkDerivation rec { + name = "kicad-2010-05-05"; + + src = fetchurl { + url = http://iut-tice.ujf-grenoble.fr/cao/sources/kicad-sources-2010-05-05-BZR2356-stable.zip; + sha256 = "05w2d7gpafs5xz532agyym5wnf5lw3lawpgncar7clgk1czcha7m"; + }; + + buildInputs = [ unzip cmake mesa wxGTK zlib libX11]; + + meta = { + description = "Free Software EDA Suite"; + homepage = http://kicad.sourceforge.net; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/applications/science/logic/eProver/default.nix similarity index 75% rename from pkgs/tools/misc/eProver/default.nix rename to pkgs/applications/science/logic/eProver/default.nix index ff92b235e09..138995036a6 100644 --- a/pkgs/tools/misc/eProver/default.nix +++ b/pkgs/applications/science/logic/eProver/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, texLive }: stdenv.mkDerivation { - name = "EProver-0.999"; + name = "EProver-1.2"; src = fetchurl { - name = "E-0.999.tar.gz"; - url = http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_0.999/E.tgz; - sha256 = "1zm1xip840hlam60kqk6xf0ikvyk7ch3ql1ac6wb68dx2l6hyhxv"; + name = "E-1.2.tar.gz"; + url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.2/E.tgz"; + sha256 = "14sbpmh8vg376lrrq7i364aa8g5aacq344ihivxn6w4ydh9138nq"; }; buildInputs = [which texLive]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { # HOME=. allows to build missing TeX formats installPhase = '' mkdir -p $out/bin - make install-exec + make install HOME=. make documentation mkdir -p $out/share/doc cp -r DOC $out/share/doc/EProver diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix new file mode 100644 index 00000000000..63040b7fdd5 --- /dev/null +++ b/pkgs/applications/science/logic/hol/default.nix @@ -0,0 +1,55 @@ +{stdenv, fetchurl, polyml}: + +stdenv.mkDerivation { + name = "hol"; + + src = fetchurl { + #url = "http://downloads.sourceforge.net/project/hol/hol/kananaskis-5/kananaskis-5.tar.gz"; + url = mirror://sourceforge/hol/hol/kananaskis-5/kananaskis-5.tar.gz; + sha256 = "1qjfx5ii80v17yr04hz70n8aa46892fjc4qcxs9gs7nh3hw7rvmx"; + }; + + buildInputs = [polyml]; + + buildCommand = '' + ensureDir "$out/src" + cd "$out/src" + + tar -xzf "$src" + cd hol + + substituteInPlace tools-poly/Holmake/Holmake.sml --replace \ + "\"/bin/mv\"" \ + "\"mv\"" + + #sed -ie "/compute/,999 d" tools/build-sequence # for testing + + poly < tools/smart-configure.sml + + bin/build -expk -symlink + + ensureDir "$out/bin" + ln -st $out/bin $out/src/hol/bin/* + # ln -s $out/src/hol/bin $out/bin + ''; + + meta = { + description = "HOL4, an interactive theorem prover based on Higher-Order Logic."; + longDescription = '' + + HOL4 is the latest version of the HOL interactive proof + assistant for higher order logic: a programming environment in + which theorems can be proved and proof tools + implemented. Built-in decision procedures and theorem provers + can automatically establish many simple theorems (users may have + to prove the hard theorems themselves!) An oracle mechanism + gives access to external programs such as SMT and BDD + engines. HOL4 is particularly suitable as a platform for + implementing combinations of deduction, execution and property + checking. + + ''; + homepage = "http://hol.sourceforge.net/"; + license = "BSD"; + }; +} diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix new file mode 100644 index 00000000000..129abef0b3d --- /dev/null +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "prover9"; + + src = fetchurl { + url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; + sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3"; + }; + + phases = "unpackPhase patchPhase buildPhase installPhase"; + + patchPhase = '' + RM=$(type -tp rm) + MV=$(type -tp mv) + CP=$(type -tp cp) + for f in Makefile */Makefile; do + substituteInPlace $f --replace "/bin/rm" "$RM" \ + --replace "/bin/mv" "$MV" \ + --replace "/bin/cp" "$CP"; + done + ''; + + buildFlags = "all"; + + installPhase = '' + ensureDir $out/bin + cp bin/* $out/bin + ''; + + meta = { + homepage = "http://www.cs.unm.edu/~mccune/mace4/"; + license = "GPL"; + description = "Prover9 is an automated theorem prover for first-order and equational logic."; + + longDescription = '' + Prover9 is a resolution/paramodulation automated theorem prover + for first-order and equational logic. Prover9 is a successor of + the Otter Prover. This is the LADR command-line version. + ''; + + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; +} diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index a06d3805209..48386c719bd 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,22 +2,31 @@ let name = "maxima"; - version = "5.21.1"; + version = "5.22.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b"; + sha256 = "0sdrv3lra6j3ylaqsblnd3x7rq4ybafyj7rb114ycadpx2qf06lq"; }; buildInputs = [clisp]; meta = { description = "Maxima computer algebra system"; - homepage = http://maxima.sourceforge.net; - platforms = stdenv.lib.platforms.all; + homepage = "http://maxima.sourceforge.net"; + license = "GPLv2"; + + longDescription = '' + Maxima is a fairly complete computer algebra system written in + lisp with an emphasis on symbolic computation. It is based on + DOE-MACSYMA and licensed under the GPL. Its abilities include + symbolic integration, 3D plotting, and an ODE solver. + ''; + + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 2bd50b7707b..ece6eb98517 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,20 +6,23 @@ let name = "wxmaxima"; - version = "0.8.5"; + version = "0.8.6"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "794317fa2a8d0c2e88c3e5d238c5b81a3e11783ec4a692468b51f15bf5d294f2"; + sha256 = "09w6gai0jfhl959yrdcdikz5l9kdjshasjk404vl19nfnivdbj9f"; }; buildInputs = [maxima wxGTK]; meta = { - description = "wxWidgets GUI for the computer algebra system Maxima"; + description = "Cross platform GUI for the computer algebra system Maxima."; + license = "GPL2"; homepage = http://wxmaxima.sourceforge.net; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index e9334db2ee2..9e2d434b294 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl}: let - version = "20100703153359"; + version = "20100823222416"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; - sha256 = "1n4jl2xcwd8gfp0c897id13myk8z2h0yvs7g7z4s6bywx5wbkx0r"; + sha256 = "16wxg27pyzrv7p5qmaf0gkxpydjxplck5s933aqcwp6xkpx0ys8v"; }; buildInputs = [ zlib openssl ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a899c8e5c56..c9bc06ec2e6 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -90,10 +90,10 @@ rec { }; tig = stdenv.mkDerivation { - name = "tig-0.14.1"; + name = "tig-0.16"; src = fetchurl { - url = "http://jonas.nitro.dk/tig/releases/tig-0.14.1.tar.gz"; - sha256 = "1a8mi1pv36v67n31vs95gcibkifnqq5s1x69lz1cz0218yv9s73r"; + url = "http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz"; + sha256 = "167kak44n66wqjj6jrv8q4ijjac07cw22rlpqjqz3brlhx4cb3ix"; }; buildInputs = [ncurses asciidoc xmlto docbook_xsl]; installPhase = '' diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index e65ba86200b..879845793e2 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -1,7 +1,7 @@ -{ alsaSupport ? false, xvSupport ? true, theoraSupport ? false, cacaSupport ? false -, xineramaSupport ? false, randrSupport ? false, dvdnavSupport ? true +{ alsaSupport ? true, xvSupport ? true, theoraSupport ? true, cacaSupport ? true +, xineramaSupport ? true, randrSupport ? true, dvdnavSupport ? true , stdenv, fetchurl, x11, freetype, fontconfig, zlib -, alsa ? null, libXv ? null, libtheora ? null, libcaca ? null +, alsaLib ? null, libXv ? null, libtheora ? null, libcaca ? null , libXinerama ? null, libXrandr ? null, libdvdnav ? null , cdparanoia ? null, cddaSupport ? true , amrnb ? null, amrwb ? null, amrSupport ? false @@ -10,10 +10,12 @@ , x264Support ? false, x264 ? null , xvidSupport ? false, xvidcore ? null , lameSupport ? true, lame ? null +, screenSaverSupport ? true, libXScrnSaver +, pulseSupport ? false, pulseaudio , mesa, pkgconfig, unzip, yasm }: -assert alsaSupport -> alsa != null; +assert alsaSupport -> alsaLib != null; assert x11Support -> libX11 != null; assert xvSupport -> (libXv != null && x11Support); assert theoraSupport -> libtheora != null; @@ -24,16 +26,29 @@ assert dvdnavSupport -> libdvdnav != null; assert cddaSupport -> cdparanoia != null; assert jackaudioSupport -> jackaudio != null; assert amrSupport -> (amrnb != null && amrwb != null); +assert screenSaverSupport -> libXScrnSaver != null; let - codecs = stdenv.mkDerivation { + codecs_src = + let + dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + in + if stdenv.system == "i686-linux" then fetchurl { + url = "${dir}/essential-20071007.tar.bz2"; + sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; + } else if stdenv.system == "x86_64-linux" then fetchurl { + url = "${dir}/essential-amd64-20071007.tar.bz2"; + sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x"; + } else if stdenv.system == "powerpc-linux" then fetchurl { + url = "${dir}/essential-ppc-20071007.tar.bz2"; + sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z"; + } else null; + + codecs = if codecs_src != null then stdenv.mkDerivation { name = "MPlayer-codecs-essential-20071007"; - src = fetchurl { - url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2; - sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic"; - }; + src = codecs_src; installPhase = '' mkdir $out @@ -43,22 +58,22 @@ let meta = { license = "unfree"; }; - }; + } else null; in -stdenv.mkDerivation { - name = "MPlayer-1.0-pre-rc4-20100506"; +stdenv.mkDerivation rec { + name = "MPlayer-1.0-pre31984"; src = fetchurl { - url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100506.tar.bz2; - sha256 = "0rhs0mv216iir8cz13xdq0rs88lc48ciiyn0wqzxjrnjb17yajy6"; + url = "http://www.loegria.net/misc/${name}.tar.bz2"; + sha256 = "0mg6kggja113rsvvsk05gk50xl5qwzsms6pmb4ylc99mflh7m9km"; }; buildInputs = [ freetype zlib pkgconfig ] ++ stdenv.lib.optional x11Support [ libX11 mesa ] - ++ stdenv.lib.optional alsaSupport alsa + ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional cacaSupport libcaca @@ -70,6 +85,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] ++ stdenv.lib.optional x264Support x264 ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional pulseSupport pulseaudio + ++ stdenv.lib.optional screenSaverSupport libXScrnSaver ++ stdenv.lib.optional lameSupport lame; buildNativeInputs = [ yasm ]; @@ -78,7 +95,7 @@ stdenv.mkDerivation { ${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""} - --codecsdir=${codecs} + ${if codecs != null then "--codecsdir=${codecs}" else ""} --enable-runtime-cpudetection ${if x11Support then "--enable-x11" else ""} --disable-xanim @@ -103,6 +120,6 @@ stdenv.mkDerivation { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/applications/video/gnash/builder.sh b/pkgs/applications/video/gnash/builder.sh deleted file mode 100644 index 411b86d68a1..00000000000 --- a/pkgs/applications/video/gnash/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source "$stdenv/setup" - -configureFlags=" \ - --with-sdl-incl=$SDL/include/SDL \ - --with-npapi-plugindir=$out/plugins \ - --enable-media=gst \ - --enable-gui=gtk" - -# In `libmedia', Gnash compiles with "-I$gstPluginsBase/include", -# whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10". -# Work around this using GCC's $CPATH variable. -export CPATH="$gstPluginsBase/include/gstreamer-0.10" - -genericBuild diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 8b6ac0c451b..00369be6c99 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchurl -, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstFfmpeg +, SDL, SDL_mixer, gstreamer, gstPluginsBase, gstPluginsGood +, gstFfmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, x11, ming, dejagnu, python +, glib, gtk, gtkglext, x11, ming, dejagnu, python , lib, makeWrapper }: assert stdenv ? glibc; -let version = "0.8.6"; in +let version = "0.8.8"; in stdenv.mkDerivation rec { name = "gnash-${version}"; src = fetchurl { url = "mirror://gnu/gnash/${version}/${name}.tar.bz2"; - sha256 = "1sijafl5c5a005p8jxgn1cdmxkj7a6142dklrlzm9g55n9gbgx05"; + sha256 = "0872qrgzpy76lxq5b2xigyzaghn53xrpqba2qp3nrk8yz20lpb6w"; }; - builder = ./builder.sh; - patchPhase = '' # Add all libs to `macros/libslist', a list of library search paths. for lib in ${lib.concatStringsSep " " @@ -35,24 +34,36 @@ stdenv.mkDerivation rec { done ''; - # XXX: KDE is supported as well so we could make it available optionally. buildInputs = [ - gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstFfmpeg libtool + gettext x11 SDL SDL_mixer gstreamer gstPluginsBase gstPluginsGood + gstFfmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk + dbus curl pkgconfig glib gtk gtkglext makeWrapper # For the test suite ming dejagnu python ]; - inherit SDL_mixer SDL gstPluginsBase; + preConfigure = + '' configureFlags=" \ + --with-sdl-incl=${SDL}/include/SDL \ + --with-npapi-plugindir=$out/plugins \ + --enable-media=gst \ + --enable-gui=gtk" + + # In `libmedia', Gnash compiles with "-I$gstPluginsBase/include", + # whereas it really needs "-I$gstPluginsBase/include/gstreamer-0.10". + # Work around this using GCC's $CPATH variable. + export CPATH="${gstPluginsBase}/include/gstreamer-0.10:${gstPluginsGood}/include/gstreamer-0.10" + echo "\$CPATH set to \`$CPATH'" + ''; # Make sure `gtk-gnash' gets `libXext' in its `RPATH'. NIX_LDFLAGS="-lX11 -lXext"; - #doCheck = true; + doCheck = true; preInstall = ''ensureDir $out/plugins''; postInstall = '' @@ -64,7 +75,7 @@ stdenv.mkDerivation rec { do wrapProgram "$prog" --prefix \ GST_PLUGIN_PATH ":" \ - "${gstPluginsBase}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10" + "${gstPluginsBase}/lib/gstreamer-0.10:${gstPluginsGood}/lib/gstreamer-0.10:${gstFfmpeg}/lib/gstreamer-0.10" done ''; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3369c6ea6c6..47ad4ec7aaf 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -6,14 +6,14 @@ let fullDepEntry = args.fullDepEntry; buildInputs = lib.attrVals ["clisp" "texinfo"] args; - version = lib.attrByPath ["version"] "0.9.6" args; + version = lib.attrByPath ["version"] "0.9.7" args; pkgName = "stumpwm"; in rec { src = fetchurl { url = "http://download.savannah.gnu.org/releases/stumpwm/${pkgName}-${version}.tgz"; - sha256 = "0xzyd1ii2lfsadvyk7992xbzc7j6smnvjlsabr1fkgwb2ihm7xsz"; + sha256 = "a0793d22ef90731d34f84e51deafb4bc2095a357c70b9505dc57516f481cdf78"; }; inherit buildInputs; diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix index 4801e425302..d0e6e7e7492 100644 --- a/pkgs/build-support/builder-defs/template-auto-callable.nix +++ b/pkgs/build-support/builder-defs/template-auto-callable.nix @@ -4,16 +4,21 @@ x@{builderDefsPackage builderDefsPackage (a : let - s = import ./src-for-default.nix; helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ [(abort "Specify helper argument names")]; + buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = { + }; in rec { - src = a.fetchUrlFromSrcInfo s; + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; - inherit (s) name; + inherit (sourceInfo) name version; inherit buildInputs; /* doConfigure should be removed if not needed */ @@ -28,5 +33,10 @@ rec { platforms = with a.lib.platforms; (abort "Specify platforms"); }; + passthru = { + updateInfo = { + downloadPage = "${abort ''Specify download page''}"; + }; + }; }) x diff --git a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix index 2f9e268afbe..4eab4b8213c 100644 --- a/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gtkglext/default.nix @@ -1,11 +1,34 @@ -{stdenv, fetchurl, pkgconfig, gtk, mesa, pango}: +{ stdenv, fetchurl, pkgconfig, gtk, mesa, pango }: + +stdenv.mkDerivation rec { + name = "gtkglext-1.2.0"; -stdenv.mkDerivation { - name = "gtkglext-1.0.6"; src = fetchurl { - url = mirror://gnome/sources/gtkglext/1.0/gtkglext-1.0.6.tar.bz2; - sha256 = "1a9kpw1jx6d0dyljgv6f8kj2xdmyvrkyfds879wxk8x6n60gpcdj"; + url = "mirror://gnome/sources/gtkglext/1.2/${name}.tar.bz2"; + sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; }; - NIX_LDFLAGS="-lpango-1.0 -lpangox-1.0"; + buildInputs = [ pkgconfig gtk mesa pango ]; + + # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and + # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; + + meta = { + homepage = http://projects.gnome.org/gtkglext/; + + description = "GtkGLExt, an OpenGL extension to GTK+"; + + longDescription = + '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK + objects which support OpenGL rendering in GTK+ and GtkWidget API + add-ons to make GTK+ widgets OpenGL-capable. In contrast to Janne + Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables + OpenGL drawing for standard and custom GTK+ widgets. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; } diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 24db09632e1..59238f5e700 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -296,12 +296,7 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon qca2; }; - konversation = import ./extragear/konversation { - inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext; - inherit (pkgs.xlibs) libXScrnSaver; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qca2; - }; + inherit (pkgs) konversation yakuake; gtk_qt_engine = import ./extragear/gtk-qt-engine { inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; @@ -312,11 +307,6 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; - yakuake = import ./extragear/yakuake { - inherit (pkgs) stdenv fetchurl cmake perl gettext; - inherit kdelibs automoc4 qt4 phonon; - }; - k3b = import ./extragear/k3b { inherit (pkgs) stdenv fetchurl cmake qt4 perl shared_mime_info libvorbis taglib gettext; inherit (pkgs) ffmpeg flac libsamplerate libdvdread lame libsndfile libmad; diff --git a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix deleted file mode 100644 index b8902933308..00000000000 --- a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, libXScrnSaver -, kdelibs, kdepimlibs, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "konversation-1.3"; - src = fetchurl { - url = mirror://kde/stable/konversation/1.3/src/konversation-1.3.tar.bz2; - sha256 = "05gs75j4qza7i7yydy7rcqhp70r6zblbai5k1fygyhsd23ryqq9n"; - }; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ]; - meta = { - description = "Integrated IRC client for KDE"; - license = "GPL"; - maintainers = [ lib.maintainers.sander ]; - }; -} diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 609c4755b33..abe4dfd143a 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { }; buildInputs = [ - cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt + cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver enchant automoc4 phonon strigi soprano qca2 attica polkit_qt ]; - propagatedBuildInputs = [ shared_desktop_ontologies ]; + propagatedBuildInputs = [ stdenv.gcc.libc shared_desktop_ontologies ]; # cmake fails to find acl.h because of C++-style comment cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ]; diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix index 7abac4aa594..c4a3b9bd6f7 100644 --- a/pkgs/desktops/kde-4.5/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix @@ -12,6 +12,7 @@ kdePackage { patches = [ ./freeze.diff ]; +# TODO: OpenSLP, OpenEXR postInstall = '' rm -v $out/share/icons/default.kde4 ln -s ${oxygen_icons}/share/icons/oxygen $out/share/icons/default.kde4 diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index d80d78ed933..d861d8f1ea8 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -3,17 +3,19 @@ , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, strigi, soprano, qimageblitz, akonadi -, libdbusmenu_qt +, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez }: kdePackage { pn = "kdebase-workspace"; v = "4.5.0"; +# TODO: qedje, qzion, ggadgets, libgps buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst - kdepimlibs kdebindings boost libusb libXi libXau libXdmcp + kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 - strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt ]; + strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate + pciutils bluez ]; meta = { description = "KDE Workspace"; diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index 2628d115cd4..232dcaa2b12 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -23,7 +23,7 @@ kdePackage rec { ) ''; - # Okular seems also an optional depenedency which I left out + # TODO: okular, qimageblitz, qwt5, qscintilla2, c# buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ]; diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index b7bb4573a94..959a0eddd66 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -21,6 +21,7 @@ kdePackage { patches = [ ./polkit-install.patch ]; # cmake fails to find acl.h because of C++-style comment + # TODO: OpenEXR, hspell cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix index 39f67fdaa8e..b6a2182c2e2 100644 --- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.5/plasma-addons/default.nix @@ -1,7 +1,7 @@ { kdePackage, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu , boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz , shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }: -# , qwt, scim, kdeedu +# TODO: qwt, scim, MARBLE!! kdePackage { pn = "kdeplasma-addons"; diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix index 0d6e4dc3e65..9e516947e83 100644 --- a/pkgs/desktops/kde-4.5/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.5/support/akonadi/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; patches = [ ./fix-broken-datadir-parameter.patch ]; + postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp"; meta = with stdenv.lib; { description = "KDE PIM Storage Service"; license = "LGPL"; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix new file mode 100644 index 00000000000..c7217f820a7 --- /dev/null +++ b/pkgs/development/compilers/mlton/default.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "mlton-20100608"; + + binSrc = + if stdenv.system == "i686-linux" then (fetchurl { + url = "http://mlton.org/pages/Download/attachments/${name}-1.x86-linux.static.tgz"; + sha256 = "16qg8df9hg2pmnsblkgxp6bgm7334rsqkxqzskv5fl21wivmnwfw"; + }) + else if stdenv.system == "x86_64-linux" then (fetchurl { + url = "http://mlton.org/pages/Download/attachments/${name}-1.amd64-linux.static.tgz"; + sha256 = "0i6ic8f6prl0cigrmf6bj9kqz3plzappxn17lz1rg2v832nfbw9r"; + }) + else throw "Architecture not supported"; + + codeSrc = + fetchurl { + url = "http://mlton.org/pages/Download/attachments/${name}.src.tgz"; + sha256 = "0cqb3k6ld9965hyyfyayi510f205vqzd5qqm3crh13nasvq2rjzj"; + }; + + srcs = [ binSrc codeSrc ]; + + sourceRoot = name; + + buildInputs = [ gmp ]; + + makeFlags = [ "all-no-docs" ]; + + configurePhase = '' + # Fix paths in the source. + for f in $(find $(pwd) -type f ) ; do + substituteInPlace $f --replace '/usr/bin/env bash' $(type -p bash) + done + + substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp) + + # Fix paths in the binary distribution. + BIN_DIST_DIR="$(pwd)/../usr" + for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do + substituteInPlace "$BIN_DIST_DIR/$f" --replace '/usr/bin/env bash' $(type -p bash) + done + + substituteInPlace $(pwd)/../usr/bin/mlton --replace '/usr/lib/mlton' $(pwd)/../usr/lib/mlton + ''; + + preBuild = '' + # To build the source we have to put the binary distribution in the $PATH. + export PATH="$PATH:$(pwd)/../usr/bin/" + + # Let the builder execute the binary distribution. + chmod u+x $(pwd)/../usr/bin/mllex + chmod u+x $(pwd)/../usr/bin/mlyacc + chmod u+x $(pwd)/../usr/bin/mlton + ''; + + doCheck = true; + + installTargets = [ "install-no-docs" ]; + + postInstall = '' + # Fix path to mlton libraries. + substituteInPlace $(pwd)/install/usr/bin/mlton --replace '/usr/lib/mlton' $out/lib/mlton + + # Path to libgmp. + substituteInPlace $(pwd)/install/usr/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'" + + # Path to gmp.h. + substituteInPlace $(pwd)/install/usr/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'" + + # Path to the same gcc used in the build; needed at runtime. + substituteInPlace $(pwd)/install/usr/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p gcc)"'" + + # Copy files to final positions. + cp -r $(pwd)/install/usr/bin $out + cp -r $(pwd)/install/usr/lib $out + cp -r $(pwd)/install/usr/man $out + ''; + + meta = { + description = "MLton is an open-source, whole-program, optimizing Standard ML compiler."; + longDescription = '' + MLton is an open source, whole-program optimizing compiler for the Standard ML programming language. + MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming + by eliminating performance penalties often associated with the use of high-level language features. + MLton development began in 1997, and continues to this day with a growing worldwide community of + developers and users, who have helped to port MLton to a number of platforms. + Description taken from http://en.wikipedia.org/wiki/Mlton . + ''; + + homepage = http://mlton.org/; + license = "bsd"; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix new file mode 100644 index 00000000000..449e5ccdb47 --- /dev/null +++ b/pkgs/development/compilers/urweb/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, file, libmhash, mlton, mysql, postgresql, sqlite }: + +stdenv.mkDerivation rec { + name = "urweb"; + version = "20100603"; + pname = "${name}-${version}"; + + src = fetchurl { + url = "http://www.impredicative.com/ur/${pname}.tgz"; + sha256 = "1f2l09g3586w0fyd7i7wkfnqlqwrk7c1q9pngmd8jz69g5ysl808"; + }; + + buildInputs = [ stdenv.gcc file libmhash mlton mysql postgresql sqlite ]; + + patches = [ ./remove-header-include-directory-prefix.patch ]; + + postPatch = '' + sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure + sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml + ''; + + preConfigure = + '' + export GCCARGS="-I${mysql}/include/mysql -I${postgresql}/include -I${sqlite}/include -L${libmhash}/lib -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib" + ''; + + meta = { + description = "Ur/Web supports construction of dynamic web applications backed by SQL databases."; + longDescription = '' + Ur is a programming language in the tradition of ML and Haskell, but + featuring a significantly richer type system. Ur is functional, pure, + statically-typed, and strict. Ur supports a powerful kind of + metaprogramming based on row types. + + Ur/Web is Ur plus a special standard library and associated rules for + parsing and optimization. Ur/Web supports construction of dynamic web + applications backed by SQL databases. The signature of the standard + library is such that well-typed Ur/Web programs "don't go wrong" in a + very broad sense. Not only do they not crash during particular page + generations, but they also may not: + + * Suffer from any kinds of code-injection attacks + * Return invalid HTML + * Contain dead intra-application links + * Have mismatches between HTML forms and the fields expected by their handlers + * Include client-side code that makes incorrect assumptions about the "AJAX"-style services that the remote web server provides + * Attempt invalid SQL queries + * Use improper marshaling or unmarshaling in communication with SQL databases or between browsers and web servers + + This type safety is just the foundation of the Ur/Web methodology. It is + also possible to use metaprogramming to build significant application pieces + by analysis of type structure. For instance, the demo includes an ML-style + functor for building an admin interface for an arbitrary SQL table. The + type system guarantees that the admin interface sub-application that comes + out will always be free of the above-listed bugs, no matter which well-typed + table description is given as input. + + The Ur/Web compiler also produces very efficient object code that does not use + garbage collection. These compiled programs will often be even more efficient + than what most programmers would bother to write in C. For example, the + standalone web server generated for the demo uses less RAM than the bash shell. + The compiler also generates JavaScript versions of client-side code, with no need + to write those parts of applications in a different language. + ''; + + homepage = http://www.impredicative.com/ur/; + license = "bsd"; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch b/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch new file mode 100644 index 00000000000..a7c7c2da9c5 --- /dev/null +++ b/pkgs/development/compilers/urweb/remove-header-include-directory-prefix.patch @@ -0,0 +1,24 @@ +diff -Naur urweb-orig/src/mysql.sml urweb-patched/src/mysql.sml +--- urweb-orig/src/mysql.sml 2010-08-23 15:36:58.665234434 -0430 ++++ urweb-patched/src/mysql.sml 2010-08-23 15:44:10.765238334 -0430 +@@ -1521,7 +1521,7 @@ + fun p_blank _ = "?" + + val () = addDbms {name = "mysql", +- header = "mysql/mysql.h", ++ header = "mysql.h", + link = "-lmysqlclient", + init = init, + p_sql_type = p_sql_type, +diff -Naur urweb-orig/src/postgres.sml urweb-patched/src/postgres.sml +--- urweb-orig/src/postgres.sml 2010-08-23 15:36:58.666253464 -0430 ++++ urweb-patched/src/postgres.sml 2010-08-23 15:43:26.216251221 -0430 +@@ -928,7 +928,7 @@ + fun p_blank (n, t) = p_cast ("$" ^ Int.toString n, t) + + val () = addDbms {name = "postgres", +- header = "postgresql/libpq-fe.h", ++ header = "libpq-fe.h", + link = "-lpq", + p_sql_type = p_sql_type, + init = init, diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index b639a07ad9d..c1651e806b2 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -1,18 +1,48 @@ -{stdenv, fetchurl, ncurses, readline}: +{stdenv, fetchurl, ncurses, readline}: stdenv.mkDerivation { name = "lua-5.1.4"; + src = fetchurl { - url = http://www.lua.org/ftp/lua-5.1.4.tar.gz; + url = "http://www.lua.org/ftp/lua-5.1.4.tar.gz"; sha256 = "0fmgk100ficm1jbm4ga9xy484v4cm89wsdfckdybb9gjx8jy4f5h"; }; - makeFlags = [ "CFLAGS=-fPIC" ]; - buildFlags = "linux"; # TODO: support for non-linux systems + + # Disabled: -fPIC cannot be passed this way, because setting CFLAGS + # breaks lua's internal mechanism for passing flags from the + # top-level Makefile to src/Makefile. The desired effect + # could probably be achieved by modifying the Makefile with + # sed(1), etc. I didn't add that, though, because it's not + # clear to me why -fPIC is required in the first place. + # + # makeFlags = "CFLAGS=-fPIC"; + buildFlags = if stdenv.isLinux then "linux" else + if stdenv.isDarwin then "macosx" else + if stdenv.isFreeBSD then "freebsd" else + if stdenv.isBSD then "bsd" else + "posix"; installFlags = "install INSTALL_TOP=\${out}"; postInstall = '' sed -i -e "s@/usr/local@$out@" etc/lua.pc sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc - install -D -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc + ensureDir "$out/lib/pkgconfig" + install -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc ''; buildInputs = [ ncurses readline ]; + + meta = { + homepage = "http://www.lua.org"; + description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + longDescription = '' + Lua combines simple procedural syntax with powerful data + description constructs based on associative arrays and extensible + semantics. Lua is dynamically typed, runs by interpreting bytecode + for a register-based virtual machine, and has automatic memory + management with incremental garbage collection, making it ideal + for configuration, scripting, and rapid prototyping. + ''; + license = "MIT"; + platforms = stdenv.lib.platforms.unix; + maintainers = []; + }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 4dc64fc15a9..c9330a50670 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -1,21 +1,16 @@ { stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }: stdenv.mkDerivation rec { - name = "maude-2.4"; + name = "maude-2.5"; src = fetchurl { - url = "http://maude.cs.uiuc.edu/download/current/Maude-2.4.tar.gz"; - sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2"; + url = "http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz"; + sha256 = "16bvnbyi257z87crzkw9gx2kz13482hnjnik22c2p2ml4rj4lpfw"; }; fullMaude = fetchurl { - url = "http://maude.cs.uiuc.edu/download/current/FM2.4/full-maude24.maude"; - sha256 = "9e4ebdc717dc968d0b6c1179f360e60b3a39ea8cecc1a7fa49f2105bbddc48c4"; - }; - - docs = fetchurl { - url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2"; - sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d"; + url = "http://maude.cs.uiuc.edu/download/current/FM2.5/full-maude25.maude"; + sha256 = "1d0izdbmhpifb2plnkk3cp7li2z60r8a8ppxhifmfpzi6x6pfvrd"; }; buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper]; @@ -29,18 +24,23 @@ stdenv.mkDerivation rec { for n in $out/bin/*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done ensureDir $out/share/maude cp ${fullMaude} $out/share/maude/full-maude.maude - - ensureDir $out/share/doc/maude - tar xf ${docs} - rm -f maude-2.3.0-extras/full-maude.maude - mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf - mv maude-2.3.0-extras/* $out/share/doc/maude/ ''; meta = { homepage = "http://maude.cs.uiuc.edu/"; description = "Maude -- a high-level specification language"; license = "GPLv2"; + + longDescription = '' + Maude is a high-performance reflective language and system + supporting both equational and rewriting logic specification and + programming for a wide range of applications. Maude has been + influenced in important ways by the OBJ3 language, which can be + regarded as an equational logic sublanguage. Besides supporting + equational specification and programming, Maude also supports + rewriting logic computation. + ''; + platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix deleted file mode 100644 index d1cb7703b9f..00000000000 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, gdbmSupport ? true, gdbm ? null -, sqlite ? null -, db4 ? null -, readline ? null -, openssl ? null -, tk ? null -, tcl ? null -, libX11 ? null -, xproto ? null -, ncurses ? null -}: - -assert zlibSupport -> zlib != null; -assert gdbmSupport -> gdbm != null; - -with stdenv.lib; - -let - - buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [bzip2] - ++ optional zlibSupport zlib - ++ optional gdbmSupport gdbm - ++ optional (sqlite != null) sqlite - ++ optional (db4 != null) db4 - ++ optional (readline != null) readline - ++ optional (openssl != null) openssl - ++ optional (tk != null) tk - ++ optional (tcl != null) tcl - ++ optional (libX11 != null) libX11 - ++ optional (xproto != null) xproto - ++ optional (xproto != null) xproto - ++ optional (ncurses != null) ncurses - ; - -in - -stdenv.mkDerivation ( { - name = "python-2.5.4"; - majorVersion = "2.5"; - version = "2.5.4"; - - src = fetchurl { - url = http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2; - sha256 = "0401g346ixng1im6gp11rgkfhx3v05qrpn5qjfx26mgy5dm8k3dw"; - }; - - patches = [ - # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - ./search-path.patch - ]; - - inherit buildInputs; - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configureFlags = "--enable-shared --with-wctype-functions"; - - preConfigure = '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + (if readline != null then '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lncurses" - '' else ""); - - setupHook = ./setup-hook.sh; - - postInstall = '' - rm -rf $out/lib/python2.5/test - ''; - - passthru = { - inherit zlibSupport; - sqliteSupport = sqlite != null; - db4Support = db4 != null; - readlineSupport = readline != null; - opensslSupport = openssl != null; - tkSupport = (tk != null) && (tcl != null); - libPrefix = "python2.5"; - }; - - meta = { - # List of supported platforms. - # - On Darwin, `python.exe' fails with "Bus Error". - platforms = stdenv.lib.platforms.allBut "i686-darwin"; - }; -} // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch ./nolongdouble.patch]; } else {} ) ) diff --git a/pkgs/development/interpreters/python/2.5/nolongdouble.patch b/pkgs/development/interpreters/python/2.5/nolongdouble.patch deleted file mode 100644 index 8fb53da3d49..00000000000 --- a/pkgs/development/interpreters/python/2.5/nolongdouble.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rc Python-2.5.4/configure Python-2.5.4-new/configure -*** Python-2.5.4/configure Sat Dec 13 15:13:52 2008 ---- Python-2.5.4-new/configure Fri Jul 24 16:38:05 2009 -*************** -*** 4534,4540 **** - ;; - # is there any other compiler on Darwin besides gcc? - Darwin*) -! BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" - if test "${enable_universalsdk}"; then - BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - fi ---- 4534,4540 ---- - ;; - # is there any other compiler on Darwin besides gcc? - Darwin*) -! BASECFLAGS="$BASECFLAGS -no-cpp-precomp -mno-fused-madd" - if test "${enable_universalsdk}"; then - BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" - fi diff --git a/pkgs/development/interpreters/python/2.5/search-path.patch b/pkgs/development/interpreters/python/2.5/search-path.patch deleted file mode 100644 index 2e7b7526c0c..00000000000 --- a/pkgs/development/interpreters/python/2.5/search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py -*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 ---- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 -*************** -*** 279,288 **** - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] -- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) - inc_dirs += ['/system/include', '/atheos/autolnk/include'] -- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) - - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] ---- 279,289 ---- - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] - inc_dirs += ['/system/include', '/atheos/autolnk/include'] - -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) -+ - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] diff --git a/pkgs/development/interpreters/python/2.5/setup-hook.sh b/pkgs/development/interpreters/python/2.5/setup-hook.sh deleted file mode 100644 index ffcb862a3de..00000000000 --- a/pkgs/development/interpreters/python/2.5/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.5/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python2.5/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks=(${envHooks[@]} addPythonPath) diff --git a/pkgs/development/libraries/asc-support/default.nix b/pkgs/development/libraries/asc-support/default.nix new file mode 100644 index 00000000000..a078faaceb1 --- /dev/null +++ b/pkgs/development/libraries/asc-support/default.nix @@ -0,0 +1,34 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, asfSupport +, errorSupport +, ptSupport +, sglr +, tideSupport +, cLibrary +, configSupport +, ptableSupport +, rstoreSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "asc-support-2.6"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc"; + }; + + patches = if isMingw then [./mingw.patch] else []; + + buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/asc-support/mingw.patch b/pkgs/development/libraries/asc-support/mingw.patch new file mode 100644 index 00000000000..8a421a99dae --- /dev/null +++ b/pkgs/development/libraries/asc-support/mingw.patch @@ -0,0 +1,48 @@ +diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c +*** asc-support-2.6/lib/asc-main.c 2008-11-10 14:12:47.000000000 +0100 +--- asc-support-2.6-new/lib/asc-main.c 2010-08-24 11:02:04.000000000 +0200 +*************** +*** 7,13 **** + #include + #include + #include +- #include + #include + #include + #include +--- 7,12 ---- +*************** +*** 46,52 **** + } + + static void printStats() { +- struct rusage usage; + FILE *file; + char buf[BUFSIZ]; + int size, resident, shared, trs, lrs, drs, dt; +--- 45,50 ---- +*************** +*** 61,74 **** + fprintf(stderr, "could not open %s\n", buf); + perror(""); + } +! if (getrusage(RUSAGE_SELF, &usage) == -1) { +! perror("rusage"); +! } else { +! fprintf(stderr, "utime : %ld.%06d sec.\n", +! (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec); +! fprintf(stderr, "stime : %ld.%06d sec.\n", +! (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec); +! } + } + + static ATbool toolbusMode(int argc, char* argv[]) { +--- 59,66 ---- + fprintf(stderr, "could not open %s\n", buf); + perror(""); + } +! fprintf(stderr, "utime : %ld.%06d sec.\n", 0, 0); +! fprintf(stderr, "stime : %ld.%06d sec.\n", 0, 0); + } + + static ATbool toolbusMode(int argc, char* argv[]) { diff --git a/pkgs/development/libraries/asf-support/default.nix b/pkgs/development/libraries/asf-support/default.nix new file mode 100644 index 00000000000..e2b7a14e819 --- /dev/null +++ b/pkgs/development/libraries/asf-support/default.nix @@ -0,0 +1,24 @@ + +{ stdenv +, fetchurl +, aterm +, errorSupport +, ptSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "asf-support-1.8"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "04f7grfadq0si24rs9vlcknlahfa7nb3d6n6pjl1qbxi8m1gwhnc"; + }; + + buildInputs = [aterm errorSupport ptSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix index ab92d019f56..05fb6704d3b 100644 --- a/pkgs/development/libraries/aterm/2.8.nix +++ b/pkgs/development/libraries/aterm/2.8.nix @@ -1,6 +1,9 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation ( { name = "aterm-2.8"; src = fetchurl { @@ -11,7 +14,7 @@ stdenv.mkDerivation { patches = [ # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841 ./max-long.patch - ]; + ] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] ); doCheck = true; @@ -20,4 +23,4 @@ stdenv.mkDerivation { license = "LGPL"; description = "Library for manipulation of term data structures in C"; }; -} +} // ( if isMingw then { dontStrip = true; } else {}) ) diff --git a/pkgs/development/libraries/aterm/aterm-mingw-asm.patch b/pkgs/development/libraries/aterm/aterm-mingw-asm.patch new file mode 100644 index 00000000000..ce09ead9042 --- /dev/null +++ b/pkgs/development/libraries/aterm/aterm-mingw-asm.patch @@ -0,0 +1,498 @@ +diff -rc aterm-2.8/aterm/gc.c aterm-2.8-new/aterm/gc.c +*** aterm-2.8/aterm/gc.c 2008-11-10 13:54:22.000000000 +0100 +--- aterm-2.8-new/aterm/gc.c 2010-08-23 17:04:56.000000000 +0200 +*************** +*** 260,317 **** + AFun oddSym; + #endif + +- #ifdef WIN32 +- +- unsigned int r_eax, r_ebx, r_ecx, r_edx, \ +- r_esi, r_edi, r_esp, r_ebp; +- ATerm reg[8], real_term; +- +- __asm { +- /* Get the registers into local variables to check them +- for aterms later. */ +- mov r_eax, eax +- mov r_ebx, ebx +- mov r_ecx, ecx +- mov r_edx, edx +- mov r_esi, esi +- mov r_edi, edi +- mov r_esp, esp +- mov r_ebp, ebp +- } +- /* Put the register-values into an array */ +- reg[0] = (ATerm) r_eax; +- reg[1] = (ATerm) r_ebx; +- reg[2] = (ATerm) r_ecx; +- reg[3] = (ATerm) r_edx; +- reg[4] = (ATerm) r_esi; +- reg[5] = (ATerm) r_edi; +- reg[6] = (ATerm) r_esp; +- reg[7] = (ATerm) r_ebp; +- +- for(i=0; i<8; i++) { +- real_term = AT_isInsideValidTerm(reg[i]); +- if (real_term != NULL) { +- AT_markTerm(real_term); +- } +- if (AT_isValidSymbol((Symbol)reg[i])) { +- AT_markSymbol((Symbol)reg[i]); +- } +- } +- +- /* The register variables are on the stack aswell +- I set them to zero so they won't be processed again when +- the stack is traversed. The reg-array is also in the stack +- but that will be adjusted later */ +- r_eax = 0; +- r_ebx = 0; +- r_ecx = 0; +- r_edx = 0; +- r_esi = 0; +- r_edi = 0; +- r_esp = 0; +- r_ebp = 0; +- +- #else + jmp_buf env; + + /* Traverse possible register variables */ +--- 260,265 ---- +*************** +*** 320,326 **** + start = (ATerm *)((char *)env); + stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf))); + mark_memory(start, stop); +- #endif + + stackTop = stack_top(); + +--- 268,273 ---- +*************** +*** 385,442 **** + AFun oddSym; + #endif + +- #ifdef WIN32 +- +- unsigned int r_eax, r_ebx, r_ecx, r_edx, \ +- r_esi, r_edi, r_esp, r_ebp; +- ATerm reg[8], real_term; +- +- __asm { +- /* Get the registers into local variables to check them +- for aterms later. */ +- mov r_eax, eax +- mov r_ebx, ebx +- mov r_ecx, ecx +- mov r_edx, edx +- mov r_esi, esi +- mov r_edi, edi +- mov r_esp, esp +- mov r_ebp, ebp +- } +- /* Put the register-values into an array */ +- reg[0] = (ATerm) r_eax; +- reg[1] = (ATerm) r_ebx; +- reg[2] = (ATerm) r_ecx; +- reg[3] = (ATerm) r_edx; +- reg[4] = (ATerm) r_esi; +- reg[5] = (ATerm) r_edi; +- reg[6] = (ATerm) r_esp; +- reg[7] = (ATerm) r_ebp; +- +- for(i=0; i<8; i++) { +- real_term = AT_isInsideValidTerm(reg[i]); +- if (real_term != NULL) { +- AT_markTerm_young(real_term); +- } +- if (AT_isValidSymbol((Symbol)reg[i])) { +- AT_markSymbol_young((Symbol)reg[i]); +- } +- } +- +- /* The register variables are on the stack aswell +- I set them to zero so they won't be processed again when +- the stack is traversed. The reg-array is also in the stack +- but that will be adjusted later */ +- r_eax = 0; +- r_ebx = 0; +- r_ecx = 0; +- r_edx = 0; +- r_esi = 0; +- r_edi = 0; +- r_esp = 0; +- r_ebp = 0; +- +- #else + jmp_buf env; + + /* Traverse possible register variables */ +--- 332,337 ---- +*************** +*** 445,451 **** + start = (ATerm *)((char *)env); + stop = ((ATerm *)(((char *)env) + sizeof(jmp_buf))); + mark_memory_young(start, stop); +- #endif + + stackTop = stack_top(); + start = MIN(stackTop, stackBot); +--- 340,345 ---- +Only in aterm-2.8-new/aterm: gc.c.orig +diff -rc aterm-2.8/configure aterm-2.8-new/configure +*** aterm-2.8/configure 2008-11-10 13:54:27.000000000 +0100 +--- aterm-2.8-new/configure 2010-08-23 17:08:10.000000000 +0200 +*************** +*** 19970,20295 **** + CURDATE=`date` + + +- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +- if test "${ac_cv_c_bigendian+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- # See if sys/param.h defines the BYTE_ORDER macro. +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- #include +- +- int +- main () +- { +- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN +- bogus endian macros +- #endif +- +- ; +- return 0; +- } +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- # It does; now see whether it defined to BIG_ENDIAN or not. +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- #include +- +- int +- main () +- { +- #if BYTE_ORDER != BIG_ENDIAN +- not big endian +- #endif +- +- ; +- return 0; +- } +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_c_bigendian=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_c_bigendian=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- # It does not; compile a test program. +- if test "$cross_compiling" = yes; then +- # try to guess the endianness by grepping values into an object file +- ac_cv_c_bigendian=unknown +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +- short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +- short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +- short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +- int +- main () +- { +- _ascii (); _ebcdic (); +- ; +- return 0; +- } +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then +- ac_cv_c_bigendian=yes +- fi +- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then +- if test "$ac_cv_c_bigendian" = unknown; then +- ac_cv_c_bigendian=no +- else +- # finding both strings is unlikely to happen, but who knows? +- ac_cv_c_bigendian=unknown +- fi +- fi +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- else +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- int +- main () +- { +- /* Are we little or big endian? From Harbison&Steele. */ +- union +- { +- long l; +- char c[sizeof (long)]; +- } u; +- u.l = 1; +- exit (u.c[sizeof (long) - 1] == 1); +- } +- _ACEOF +- rm -f conftest$ac_exeext +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_c_bigendian=no +- else +- echo "$as_me: program exited with status $ac_status" >&5 +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ( exit $ac_status ) +- ac_cv_c_bigendian=yes +- fi +- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +- fi +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- fi +- echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +- echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +- case $ac_cv_c_bigendian in +- yes) +- +- cat >>confdefs.h <<\_ACEOF +- #define WORDS_BIGENDIAN 1 +- _ACEOF +- ;; +- no) +- ;; +- *) +- { { echo "$as_me:$LINENO: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +- echo "$as_me: error: unknown endianness +- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} +- { (exit 1); exit 1; }; } ;; +- esac +- +- +- echo "$as_me:$LINENO: checking whether float word ordering is big endian" >&5 +- echo $ECHO_N "checking whether float word ordering is big endian... $ECHO_C" >&6 +- if test "${ax_cv_c_float_word_order_big+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- +- if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +- See \`config.log' for more details." >&5 +- echo "$as_me: error: cannot run test program while cross compiling +- See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } +- else +- cat >conftest.$ac_ext <<_ACEOF +- +- /* This code returns 0 if the float word order is big endian and >= 1 if it is little endian. */ +- main(){ +- #ifdef WORDS_BIGENDIAN +- return 0; /* If the system's encoding is big endian, so is the float word order. NOTE: If the encoding is big endian and WORDS_BIGENDIAN isn't defined, the code below will still return the correct float word order (big). */ +- #else +- union +- { +- double d; +- /* IEEE754 little endian encoded floating point number structure with little endian float word order. */ +- struct{ +- unsigned int mantissa1:32; +- unsigned int mantissa0:20; +- unsigned int exponent:11; +- unsigned int negative:1; +- } ieee; +- } u; +- u.d = -1; +- return (u.ieee.negative == 1); +- #endif +- } +- +- _ACEOF +- rm -f conftest$ac_exeext +- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ax_cv_c_float_word_order_big=yes +- else +- echo "$as_me: program exited with status $ac_status" >&5 +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ( exit $ac_status ) +- ax_cv_c_float_word_order_big=no +- fi +- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +- fi +- +- +- fi +- echo "$as_me:$LINENO: result: $ax_cv_c_float_word_order_big" >&5 +- echo "${ECHO_T}$ax_cv_c_float_word_order_big" >&6 +- +- case $ax_cv_c_float_word_order_big in +- yes) +- +- +- cat >>confdefs.h <<\_ACEOF +- #define FLOAT_WORD_ORDER_BIG 1 +- _ACEOF +- +- +- ;; +- no) +- ;; +- *) +- +- { { echo "$as_me:$LINENO: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no). +- " >&5 +- echo "$as_me: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no). +- " >&2;} +- { (exit 1); exit 1; }; } +- +- ;; +- esac +- +- + + + for ac_func in strdup +--- 19970,19975 ---- +diff -rc aterm-2.8/Makefile.in aterm-2.8-new/Makefile.in +*** aterm-2.8/Makefile.in 2008-11-10 13:54:28.000000000 +0100 +--- aterm-2.8-new/Makefile.in 2010-08-23 17:05:27.000000000 +0200 +*************** +*** 217,223 **** + + pkgconfig_DATA = ${PACKAGE}.pc + +! SUBDIRS = aterm utils test + + ACLOCAL_AMFLAGS = -I . + subdir = . +--- 217,223 ---- + + pkgconfig_DATA = ${PACKAGE}.pc + +! SUBDIRS = aterm utils + + ACLOCAL_AMFLAGS = -I . + subdir = . diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 0b0a937bc18..7e10f967a66 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -17,5 +17,8 @@ stdenv.mkDerivation rec { homepage = "http://sourceforge.net/projects/buddy/"; description = "binary decision diagram package"; license = "as-is"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/c-library/default.nix b/pkgs/development/libraries/c-library/default.nix new file mode 100644 index 00000000000..96bb82f54be --- /dev/null +++ b/pkgs/development/libraries/c-library/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, fetchurl +, aterm +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "c-library-1.2"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0rmhag2653nq76n1n49blii9zx0ph58szv1xzw1i551wmw7yrz88"; + }; + + patches = if isMingw then [./mingw.patch] else []; + + buildInputs = [aterm]; + buildNativeInputs = [pkgconfig]; + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/c-library/mingw.patch b/pkgs/development/libraries/c-library/mingw.patch new file mode 100644 index 00000000000..8b5ca31e20d --- /dev/null +++ b/pkgs/development/libraries/c-library/mingw.patch @@ -0,0 +1,114 @@ +diff -rc c-library-1.2/statistics/rsrc-usage.c c-library-1.2-new/statistics/rsrc-usage.c +*** c-library-1.2/statistics/rsrc-usage.c 2008-11-10 14:09:47.000000000 +0100 +--- c-library-1.2-new/statistics/rsrc-usage.c 2010-08-24 09:09:13.000000000 +0200 +*************** +*** 2,81 **** + + #include + #include +- #include +- #include + #include "rsrc-usage.h" + + /*static int AT_calcAllocatedSize();*/ +- static struct rusage rsrc_usage; +- static struct rusage flt_rsrc_usage; + + void printrusage(struct rusage *rusage) { +- fprintf(stderr, "maxrss %ld\n", rusage->ru_maxrss); +- fprintf(stderr, "ixrss %ld\n", rusage->ru_ixrss); +- fprintf(stderr, "idrss %ld\n", rusage->ru_idrss); +- fprintf(stderr, "isrss %ld\n", rusage->ru_isrss); +- fprintf(stderr, "minflt %ld\n", rusage->ru_minflt); +- fprintf(stderr, "majflt %ld\n", rusage->ru_majflt); +- fprintf(stderr, "nswap %ld\n", rusage->ru_nswap); +- fprintf(stderr, "inblock %ld\n", rusage->ru_inblock); +- fprintf(stderr, "oublock %ld\n", rusage->ru_oublock); +- fprintf(stderr, "msgsnd %ld\n", rusage->ru_msgsnd); +- fprintf(stderr, "msgrcv %ld\n", rusage->ru_msgrcv); +- fprintf(stderr, "nsignals %ld\n", rusage->ru_nsignals); +- fprintf(stderr, "nvcsw %ld\n", rusage->ru_nvcsw); +- fprintf(stderr, "nivcsw %ld\n", rusage->ru_nivcsw); + } + + double STATS_Timer(void) { +! static double cur = 0; +! double prev; +! +! prev = cur; +! if (getrusage(RUSAGE_SELF, &rsrc_usage) == -1) { +! perror("getrusage"); +! return (double)0; +! } +! +! cur = (double) (rsrc_usage.ru_utime.tv_sec) + +! (double) ((rsrc_usage.ru_utime.tv_usec) * 1.0e-06); +! +! prev = cur - prev; +! return prev > 0 ? prev: 0; + } + + void STATS_PageFlt(long *maj, long *min) { +! static long ma, mi, ma_prev, mi_prev; +! +! +! ma_prev = ma; +! mi_prev = mi; +! getrusage(RUSAGE_SELF, &flt_rsrc_usage); +! +! /* printrusage(&flt_rsrc_usage); */ +! +! mi = flt_rsrc_usage.ru_minflt - mi_prev; +! ma = flt_rsrc_usage.ru_majflt - ma_prev; +! +! *maj = ma; +! *min = mi; + } + + long STATS_Allocated(void) { +! static long allocated = 0L; +! long tmp; +! +! tmp = allocated; +! /** \todo: AT_calcAllocatedSize() is unreachable. Fix. */ +! /*allocated = AT_calcAllocatedSize();*/ +! +! return allocated - tmp; + } + + long STATS_ResidentSetSize(void) { +! getrusage(RUSAGE_SELF, &rsrc_usage); +! +! return rsrc_usage.ru_maxrss; + } + + +--- 2,29 ---- + + #include + #include + #include "rsrc-usage.h" + + /*static int AT_calcAllocatedSize();*/ + + void printrusage(struct rusage *rusage) { + } + + double STATS_Timer(void) { +! return 0; + } + + void STATS_PageFlt(long *maj, long *min) { +! *maj = 0; +! *min = 0; + } + + long STATS_Allocated(void) { +! return 0; + } + + long STATS_ResidentSetSize(void) { +! return 0; + } + + diff --git a/pkgs/development/libraries/config-support/default.nix b/pkgs/development/libraries/config-support/default.nix new file mode 100644 index 00000000000..72b1bea7b20 --- /dev/null +++ b/pkgs/development/libraries/config-support/default.nix @@ -0,0 +1,22 @@ + +{ stdenv +, fetchurl +, aterm +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "config-support-1.4"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0klhc7v760aklsy73pwn87snhgalkfxisac8srn8qcd3ljbfdrmi"; + }; + + buildInputs = [aterm]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix new file mode 100644 index 00000000000..c8c612fe94e --- /dev/null +++ b/pkgs/development/libraries/enet/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "enet-1.3.0"; + + src = fetchurl { + url = "http://enet.bespin.org/download/${name}.tar.gz"; + sha256 = "0b6nv3q546mr1vr74jccd4nsad9zkmjn17kdrqxxnyc944djf310"; + }; + + meta = { + homepage = http://enet.bespin.org/; + description = "Simple and robust network communication layer on top of UDP"; + license = "BSD"; + }; +} diff --git a/pkgs/development/libraries/error-support/default.nix b/pkgs/development/libraries/error-support/default.nix new file mode 100644 index 00000000000..da59c3bb9b4 --- /dev/null +++ b/pkgs/development/libraries/error-support/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, fetchurl +, aterm +, toolbuslib +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "error-support-1.6"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0sdw3mrh90k76w2pvpdfg7d2cxfxb3s5spbqglkkpvx8bldhlk33"; + }; + + buildInputs = [aterm toolbuslib]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix new file mode 100644 index 00000000000..4babd837fa3 --- /dev/null +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "fingertree"; + version = "0.0.1.0"; + sha256 = "e80bf256506290c8f4fb44222920ae7d8405fd22e453c7a08dba49297d49328b"; + meta = { + description = "Generic finger-tree structure, with example instances"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index ead4205b289..f048e5043de 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt47, automoc4, +{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4, perl }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # TODO: xfs.h - buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt47 automoc4 perl ]; + buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt4 automoc4 perl ]; meta = { description = "A bittorrent library used in ktorrent"; diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch new file mode 100644 index 00000000000..1e3a5d680df --- /dev/null +++ b/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch @@ -0,0 +1,78 @@ +Patch fixing #DEFINE redefinitions for generic PACKAGE_* attributes which +cause collisions when using libmhash in another package also using autotools. + +Debian Bug report #473204 + +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in +--- mhash-0.9.9.orig/configure.in 2007-04-04 19:22:28.000000000 -0700 ++++ mhash-0.9.9/configure.in 2008-03-29 00:21:24.000000000 -0800 +@@ -6,6 +6,7 @@ + AM_INIT_AUTOMAKE + + AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version") ++AC_CONFIG_HEADER([include/mutils/config.h]) + AC_CONFIG_HEADER([include/mutils/mhash_config.h]) + + +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/include/mutils/config.h.in +mhash-0.9.9/include/mutils/config.h.in +--- mhash-0.9.9.orig/include/mutils/config.h.in 1969-12-31 16:00:00.000000000 +-0800 ++++ mhash-0.9.9/include/mutils/config.h.in 2008-03-29 00:48:22.000000000 +-0800 +@@ -0,0 +1,22 @@ ++/* Name of package */ ++#undef PACKAGE ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Version number of package */ ++#undef VERSION ++ ++ +diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru +mhash-0.9.9.orig/include/mutils/mhash_config.h.in +mhash-0.9.9/include/mutils/mhash_config.h.in +--- mhash-0.9.9.orig/include/mutils/mhash_config.h.in 2008-03-29 +00:23:29.000000000 -0800 ++++ mhash-0.9.9/include/mutils/mhash_config.h.in 2008-03-29 +00:06:41.000000000 -0800 +@@ -181,24 +181,6 @@ + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ + #undef NO_MINUS_C_MINUS_O + +-/* Name of package */ +-#undef PACKAGE +- +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT +- +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME +- +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING +- +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME +- +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION +- + /* Define to 1 if the C compiler supports function prototypes. */ + #undef PROTOTYPES diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix new file mode 100644 index 00000000000..cd026298011 --- /dev/null +++ b/pkgs/development/libraries/libmhash/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + meta = { + description = "Hash algorithms library"; + longDescription = '' + Libmhash is a library that provides a uniform interface to several hash + algorithms. It supports the basics for message authentication by + following rfc2104 (HMAC). It also includes some key generation algorithms + which are based on hash algorithms. + ''; + homepage = http://mhash.sourceforge.net; + license = "LGPL"; + }; + + pname = "mhash"; + version = "0.9.9.9"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn"; + }; + + patches = [ ./autotools-define-conflict-debian-fix.patch ]; +} diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix new file mode 100644 index 00000000000..6436a88bdc8 --- /dev/null +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, m4}: + +stdenv.mkDerivation rec { + name = "libsigc++-1.2.7"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/${name}.tar.bz2"; + sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; + }; + + buildInputs = [pkgconfig m4]; + + meta = { + homepage = http://libsigc.sourceforge.net/; + description = "A typesafe callback system for standard C++"; + }; +} diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index a5da965f757..4f0c4731723 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, gmp, gnum4 }: stdenv.mkDerivation rec { - name = "nettle-2.0"; + name = "nettle-2.1"; src = fetchurl { # Eventually use `mirror://gnu/'. url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz"; - sha256 = "1mnb2zx6yxfzkkv8hnrjzhjviybd45z92wq4y5sv1gskp4qf5fb5"; + sha256 = "0knp778738dpgbcj1yz54a7jsvmarfiafzl05z086bc470z6plmp"; }; buildInputs = [ gmp gnum4 ]; @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = http://www.lysator.liu.se/~nisse/nettle/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix new file mode 100644 index 00000000000..6179742b42f --- /dev/null +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libxpdf, libxml2}: + +stdenv.mkDerivation { + name = "pdf2xml"; + + src = fetchurl { + url = http://nixos.org/tarballs/pdf2xml.tar.gz; + sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; + }; + sourceRoot = "pdf2xml/pdf2xml"; + + buildInputs = [libxml2 libxpdf]; + + patches = [./pdf2xml.patch]; + + preBuild = '' + cp Makefile.linux Makefile + + sed -i 's|/usr/include/libxml2|${libxml2}/include/libxml2|' Makefile + sed -i 's|-lxml2|-lxml2 -L${libxml2}/lib|' Makefile + sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile + + mkdir exe + ''; + + installPhase = '' + ensureDir $out/bin + cp exe/* $out/bin + ''; +} diff --git a/pkgs/development/libraries/pdf2xml/pdf2xml.patch b/pkgs/development/libraries/pdf2xml/pdf2xml.patch new file mode 100644 index 00000000000..596a3aea674 --- /dev/null +++ b/pkgs/development/libraries/pdf2xml/pdf2xml.patch @@ -0,0 +1,48 @@ +diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux +*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100 +--- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200 +*************** +*** 30,36 **** + + + # Executable name +! PDFTOXMLEXE=pdftoxml.exe + + # Main target + all: pdftoxmlEXE +--- 30,36 ---- + + + # Executable name +! PDFTOXMLEXE=pdftoxml + + # Main target + all: pdftoxmlEXE +diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc +*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200 +--- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200 +*************** +*** 11,21 **** + // + //=========================================================================== + + #include +- #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" +--- 11,21 ---- + // + //=========================================================================== + ++ #include + #include + #include + #include +! #include + #include "parseargs.h" + #include "GString.h" + #include "gmem.h" diff --git a/pkgs/development/libraries/pgen/default.nix b/pkgs/development/libraries/pgen/default.nix new file mode 100644 index 00000000000..91c9f16f5c8 --- /dev/null +++ b/pkgs/development/libraries/pgen/default.nix @@ -0,0 +1,33 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, cLibrary +, configSupport +, ptSupport +, ptableSupport +, errorSupport +, tideSupport +, ascSupport +, asfSupport +, sdfSupport +, sglr +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation ( rec { + name = "pgen-2.8.1"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0z5x6rnsp732jdszcgm22bfw3v6ai9zl49b3s5iyk9qjfmyx0h41"; + }; + + buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport tideSupport sdfSupport sglr ascSupport asfSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 37cbaf59ce5..3763c474e73 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, qt47, vlc, automoc4, cmake }: +a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }: let pn = "phonon-backend-vlc"; v = "0.2.0"; + vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version in stdenv.mkDerivation { @@ -13,11 +14,11 @@ stdenv.mkDerivation { sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv"; }; - buildInputs = [ qt47 vlc cmake automoc4 ]; + buildInputs = [ qt4 vlc cmake automoc4 phonon ]; meta = { description = "VideoLAN backend for Phonon multimedia framework"; - inherit (qt47.meta) platforms; + inherit (qt4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 33b940f7718..679db72802c 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, mesa, freeglut, SDL -, libXi, libSM, libXmu, libXext, libX11 }: +, libXi, libSM, libXmu, libXext, libX11, +enablePIC ? false }: stdenv.mkDerivation rec { name = "plib-1.8.5"; @@ -10,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; + NIX_CFLAGS_COMPILE = if (enablePIC) then "-fPIC" else ""; + propagatedBuildInputs = [ mesa freeglut SDL diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix new file mode 100644 index 00000000000..5941c55ee55 --- /dev/null +++ b/pkgs/development/libraries/portaudio/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, alsaLib, pkgconfig }: + +stdenv.mkDerivation rec { + name = "portaudio-19-20071207"; + + src = fetchurl { + url = http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz; + sha256 = "0axz8xzkb6ynzj65p6cv6b0cl5csxsdfvqkd0dljlf3dslkpg886"; + }; + + buildInputs = [ alsaLib pkgconfig ]; + + meta = { + description = "Portable cross-platform Audio API"; + homepage = http://www.portaudio.com/; + # Not exactly a bsd license, but alike + license = "BSD"; + }; + + passthru = { + api_version = 19; + }; +} diff --git a/pkgs/development/libraries/pt-support/default.nix b/pkgs/development/libraries/pt-support/default.nix new file mode 100644 index 00000000000..c2264eebddc --- /dev/null +++ b/pkgs/development/libraries/pt-support/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, fetchurl +, aterm +, toolbuslib +, errorSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation ( rec { + name = "pt-support-2.4"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "14krhhhmrg7605ppglzd1k08n7x61g7vdkh11qcz8hb9r4n71j45"; + }; + + buildInputs = [aterm toolbuslib errorSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) + diff --git a/pkgs/development/libraries/ptable-support/default.nix b/pkgs/development/libraries/ptable-support/default.nix new file mode 100644 index 00000000000..c95a82d4287 --- /dev/null +++ b/pkgs/development/libraries/ptable-support/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, fetchurl +, aterm +, ptSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "ptable-support-1.2"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0bqx1xsimf9vq6q2qnsy3565rzlha4cm2blcn3kqwbirfyj1kln9"; + }; + + buildInputs = [aterm ptSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/rstore-support/default.nix b/pkgs/development/libraries/rstore-support/default.nix new file mode 100644 index 00000000000..95c6d0a0b52 --- /dev/null +++ b/pkgs/development/libraries/rstore-support/default.nix @@ -0,0 +1,23 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "rstore-support-1.0"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0fahq947bdaiymfz08fb2kvbnggpc8ybhh3sbxgja61pp2jizg46"; + }; + + buildInputs = [aterm toolbuslib]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/sdf-library/default.nix b/pkgs/development/libraries/sdf-library/default.nix new file mode 100644 index 00000000000..76c1782fbc5 --- /dev/null +++ b/pkgs/development/libraries/sdf-library/default.nix @@ -0,0 +1,14 @@ +{ stdenv +, fetchurl +, aterm +}: +stdenv.mkDerivation { + name = "sdf-library-1.1"; + + src = fetchurl { + url = http://www.meta-environment.org/releases/sdf-library-1.1.tar.gz; + sha256 = "0dnv2f690s4q60bssavivganyalh7n966grcsb5hlb6z57gbaqp1"; + }; + + buildInputs = [aterm]; +} diff --git a/pkgs/development/libraries/sdf-support/default.nix b/pkgs/development/libraries/sdf-support/default.nix new file mode 100644 index 00000000000..0604a099d3c --- /dev/null +++ b/pkgs/development/libraries/sdf-support/default.nix @@ -0,0 +1,27 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, errorSupport +, ptSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "sdf-support-2.5"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0zazks2yvm8gqdx0389b1b8hf8ss284q1ywk4d7cqc8glba29cs0"; + }; + + patches = if isMingw then [./mingw.patch] else []; + + buildInputs = [aterm toolbuslib errorSupport ptSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/sdf-support/mingw.patch b/pkgs/development/libraries/sdf-support/mingw.patch new file mode 100644 index 00000000000..59e57065b7d --- /dev/null +++ b/pkgs/development/libraries/sdf-support/mingw.patch @@ -0,0 +1,20 @@ +diff -rc sdf-support-2.5/utils/sdf-modules/src/main.c sdf-support-2.5-new/utils/sdf-modules/src/main.c +*** sdf-support-2.5/utils/sdf-modules/src/main.c 2008-11-10 14:20:07.000000000 +0100 +--- sdf-support-2.5-new/utils/sdf-modules/src/main.c 2010-08-24 10:53:04.000000000 +0200 +*************** +*** 19,25 **** + /*{{{ defines */ + + #define SEP '/' +! #define PATH_LEN (_POSIX_PATH_MAX) + + /*}}} */ + /*{{{ variables */ +--- 19,25 ---- + /*{{{ defines */ + + #define SEP '/' +! #define PATH_LEN (256) + + /*}}} */ + /*{{{ variables */ diff --git a/pkgs/development/libraries/sglr/default.nix b/pkgs/development/libraries/sglr/default.nix new file mode 100644 index 00000000000..449667c6b52 --- /dev/null +++ b/pkgs/development/libraries/sglr/default.nix @@ -0,0 +1,28 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, cLibrary +, configSupport +, ptSupport +, ptableSupport +, errorSupport +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "sglr-4.5.3"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "1k3q9k32r6i2wh3k6b000fs11n0vhy6yr8kr0bd58ybwp5dnjj77"; + }; + + buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index c708866cfc1..015c449cd03 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.0.1"; + name = "sqlite-3.7.2"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.7.0.1.tar.gz"; - sha256 = "0nx506wmp32l6sh2p82bd2fscak1b402fp86cxl3r9pfs1yvychj"; + url = "http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz"; + sha256 = "12i50bypcq7havphrilzi0hnwgv01drxsc36kyby76hpk417zsvl"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 53989bcefb5..bf420be3d38 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "tecla-1.6.1"; - meta = - { - homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; - description = "Tecla command-line editing library"; - license = "as-is"; - }; - src = fetchurl - { + + src = fetchurl { url = "http://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz"; sha256 = "18crv6q5f9g0cg6ry5h9dsa10inhpslklrv20h70f58lpm3jknr1"; }; + configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; + + meta = { + homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; + description = "Tecla command-line editing library"; + license = "as-is"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/development/libraries/tide-support/default.nix b/pkgs/development/libraries/tide-support/default.nix new file mode 100644 index 00000000000..a778535f362 --- /dev/null +++ b/pkgs/development/libraries/tide-support/default.nix @@ -0,0 +1,23 @@ + +{ stdenv +, fetchurl +, aterm +, toolbuslib +, pkgconfig +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "tide-support-1.3.1"; + + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "06n80rihcj2dhrvx8969jbgxqvg2vb3jqpkdmcr47y08xs7j5n2b"; + }; + + buildInputs = [aterm toolbuslib]; + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix index 0f187db8b20..4d184b11abd 100644 --- a/pkgs/development/libraries/toolbuslib/default.nix +++ b/pkgs/development/libraries/toolbuslib/default.nix @@ -1,11 +1,24 @@ -{stdenv, fetchurl, aterm} : +{ stdenv +, fetchurl +, aterm +, pkgconfig +, w32api +}: +let + isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ; +in +stdenv.mkDerivation rec { + name = "toolbuslib-1.1"; -stdenv.mkDerivation { -name = "toolbuslib-0.7.2"; -src = fetchurl { - url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.7.2.tar.gz; - md5 = "6619a155c6326d728d53c6901558e350"; - }; -inherit aterm; -buildinputs = [aterm]; -} + src = fetchurl { + url = "http://www.meta-environment.org/releases/${name}.tar.gz"; + sha256 = "0f4q0r177lih23ypypc8ckkyv5vhvnkhbrv25gswrqdif5dxbwr0"; + }; + + patches = if isMingw then [./mingw.patch] else []; + + buildInputs = [aterm] ++ (if isMingw then [w32api] else []); + buildNativeInputs = [pkgconfig]; + + dontStrip = isMingw; +} diff --git a/pkgs/development/libraries/toolbuslib/mingw.patch b/pkgs/development/libraries/toolbuslib/mingw.patch new file mode 100644 index 00000000000..04484aaee92 --- /dev/null +++ b/pkgs/development/libraries/toolbuslib/mingw.patch @@ -0,0 +1,888 @@ +diff -rc toolbuslib-1.1/configure toolbuslib-1.1-new/configure +*** toolbuslib-1.1/configure 2008-11-10 13:59:46.000000000 +0100 +--- toolbuslib-1.1-new/configure 2010-08-23 16:53:39.000000000 +0200 +*************** +*** 20719,21162 **** + fi + + +- if test "${ac_cv_header_netdb_h+set}" = set; then +- echo "$as_me:$LINENO: checking for netdb.h" >&5 +- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netdb_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 +- else +- # Is the header compilable? +- echo "$as_me:$LINENO: checking netdb.h usability" >&5 +- echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- $ac_includes_default +- #include +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +- echo "${ECHO_T}$ac_header_compiler" >&6 +- +- # Is the header present? +- echo "$as_me:$LINENO: checking netdb.h presence" >&5 +- echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- _ACEOF +- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +- else +- ac_cpp_err=yes +- fi +- if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +- fi +- rm -f conftest.err conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +- echo "${ECHO_T}$ac_header_preproc" >&6 +- +- # So? What about this header? +- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +- echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5 +- echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5 +- echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: check for missing prerequisite headers?" >&5 +- echo "$as_me: WARNING: netdb.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5 +- echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&5 +- echo "$as_me: WARNING: netdb.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5 +- echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5 +- echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +- ## ------------------------------------------ ## +- ## Report this to the AC_PACKAGE_NAME lists. ## +- ## ------------------------------------------ ## +- _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- esac +- echo "$as_me:$LINENO: checking for netdb.h" >&5 +- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netdb_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- ac_cv_header_netdb_h=$ac_header_preproc +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6 +- +- fi +- if test $ac_cv_header_netdb_h = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: \"*** no netdb.h\"" >&5 +- echo "$as_me: error: \"*** no netdb.h\"" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- if test "${ac_cv_header_netinet_in_h+set}" = set; then +- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 +- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netinet_in_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 +- else +- # Is the header compilable? +- echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 +- echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- $ac_includes_default +- #include +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +- echo "${ECHO_T}$ac_header_compiler" >&6 +- +- # Is the header present? +- echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 +- echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- _ACEOF +- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +- else +- ac_cpp_err=yes +- fi +- if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +- fi +- rm -f conftest.err conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +- echo "${ECHO_T}$ac_header_preproc" >&6 +- +- # So? What about this header? +- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 +- echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 +- echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 +- echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 +- echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 +- echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 +- echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 +- echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 +- echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +- ## ------------------------------------------ ## +- ## Report this to the AC_PACKAGE_NAME lists. ## +- ## ------------------------------------------ ## +- _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- esac +- echo "$as_me:$LINENO: checking for netinet/in.h" >&5 +- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netinet_in_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- ac_cv_header_netinet_in_h=$ac_header_preproc +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 +- +- fi +- if test $ac_cv_header_netinet_in_h = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: \"*** no netinet/in.h\"" >&5 +- echo "$as_me: error: \"*** no netinet/in.h\"" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then +- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 +- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 +- else +- # Is the header compilable? +- echo "$as_me:$LINENO: checking netinet/tcp.h usability" >&5 +- echo $ECHO_N "checking netinet/tcp.h usability... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- $ac_includes_default +- #include +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +- echo "${ECHO_T}$ac_header_compiler" >&6 +- +- # Is the header present? +- echo "$as_me:$LINENO: checking netinet/tcp.h presence" >&5 +- echo $ECHO_N "checking netinet/tcp.h presence... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- _ACEOF +- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +- else +- ac_cpp_err=yes +- fi +- if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +- fi +- rm -f conftest.err conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +- echo "${ECHO_T}$ac_header_preproc" >&6 +- +- # So? What about this header? +- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: present but cannot be compiled" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: see the Autoconf documentation" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&5 +- echo "$as_me: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +- ## ------------------------------------------ ## +- ## Report this to the AC_PACKAGE_NAME lists. ## +- ## ------------------------------------------ ## +- _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- esac +- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5 +- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6 +- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- ac_cv_header_netinet_tcp_h=$ac_header_preproc +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5 +- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6 +- +- fi +- if test $ac_cv_header_netinet_tcp_h = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: \"*** no netinet/tcp.h\"" >&5 +- echo "$as_me: error: \"*** no netinet/tcp.h\"" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- + if test "${ac_cv_header_sys_param_h+set}" = set; then + echo "$as_me:$LINENO: checking for sys/param.h" >&5 + echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6 +--- 20719,20724 ---- +*************** +*** 21303,21454 **** + fi + + +- if test "${ac_cv_header_sys_socket_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 +- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 +- if test "${ac_cv_header_sys_socket_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 +- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 +- else +- # Is the header compilable? +- echo "$as_me:$LINENO: checking sys/socket.h usability" >&5 +- echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- $ac_includes_default +- #include +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +- echo "${ECHO_T}$ac_header_compiler" >&6 +- +- # Is the header present? +- echo "$as_me:$LINENO: checking sys/socket.h presence" >&5 +- echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- _ACEOF +- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +- else +- ac_cpp_err=yes +- fi +- if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +- fi +- rm -f conftest.err conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +- echo "${ECHO_T}$ac_header_preproc" >&6 +- +- # So? What about this header? +- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5 +- echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5 +- echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5 +- echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: check for missing prerequisite headers?" >&5 +- echo "$as_me: WARNING: sys/socket.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5 +- echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&5 +- echo "$as_me: WARNING: sys/socket.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5 +- echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5 +- echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +- ## ------------------------------------------ ## +- ## Report this to the AC_PACKAGE_NAME lists. ## +- ## ------------------------------------------ ## +- _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- esac +- echo "$as_me:$LINENO: checking for sys/socket.h" >&5 +- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6 +- if test "${ac_cv_header_sys_socket_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- ac_cv_header_sys_socket_h=$ac_header_preproc +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5 +- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6 +- +- fi +- if test $ac_cv_header_sys_socket_h = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: \"*** no sys/socket.h\"" >&5 +- echo "$as_me: error: \"*** no sys/socket.h\"" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- + if test "${ac_cv_header_sys_time_h+set}" = set; then + echo "$as_me:$LINENO: checking for sys/time.h" >&5 + echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6 +--- 20865,20870 ---- +*************** +*** 21595,21746 **** + fi + + +- if test "${ac_cv_header_sys_un_h+set}" = set; then +- echo "$as_me:$LINENO: checking for sys/un.h" >&5 +- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 +- if test "${ac_cv_header_sys_un_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 +- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 +- else +- # Is the header compilable? +- echo "$as_me:$LINENO: checking sys/un.h usability" >&5 +- echo $ECHO_N "checking sys/un.h usability... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- $ac_includes_default +- #include +- _ACEOF +- rm -f conftest.$ac_objext +- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_header_compiler=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no +- fi +- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +- echo "${ECHO_T}$ac_header_compiler" >&6 +- +- # Is the header present? +- echo "$as_me:$LINENO: checking sys/un.h presence" >&5 +- echo $ECHO_N "checking sys/un.h presence... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +- /* confdefs.h. */ +- _ACEOF +- cat confdefs.h >>conftest.$ac_ext +- cat >>conftest.$ac_ext <<_ACEOF +- /* end confdefs.h. */ +- #include +- _ACEOF +- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +- else +- ac_cpp_err=yes +- fi +- if test -z "$ac_cpp_err"; then +- ac_header_preproc=yes +- else +- echo "$as_me: failed program was:" >&5 +- sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no +- fi +- rm -f conftest.err conftest.$ac_ext +- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +- echo "${ECHO_T}$ac_header_preproc" >&6 +- +- # So? What about this header? +- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { echo "$as_me:$LINENO: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&5 +- echo "$as_me: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the compiler's result" >&5 +- echo "$as_me: WARNING: sys/un.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: sys/un.h: present but cannot be compiled" >&5 +- echo "$as_me: WARNING: sys/un.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: check for missing prerequisite headers?" >&5 +- echo "$as_me: WARNING: sys/un.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: see the Autoconf documentation" >&5 +- echo "$as_me: WARNING: sys/un.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&5 +- echo "$as_me: WARNING: sys/un.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the preprocessor's result" >&5 +- echo "$as_me: WARNING: sys/un.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: sys/un.h: in the future, the compiler will take precedence" >&5 +- echo "$as_me: WARNING: sys/un.h: in the future, the compiler will take precedence" >&2;} +- ( +- cat <<\_ASBOX +- ## ------------------------------------------ ## +- ## Report this to the AC_PACKAGE_NAME lists. ## +- ## ------------------------------------------ ## +- _ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 +- ;; +- esac +- echo "$as_me:$LINENO: checking for sys/un.h" >&5 +- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6 +- if test "${ac_cv_header_sys_un_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +- else +- ac_cv_header_sys_un_h=$ac_header_preproc +- fi +- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5 +- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6 +- +- fi +- if test $ac_cv_header_sys_un_h = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: \"*** no sys/un.h\"" >&5 +- echo "$as_me: error: \"*** no sys/un.h\"" >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- + if test "${ac_cv_header_unistd_h+set}" = set; then + echo "$as_me:$LINENO: checking for unistd.h" >&5 + echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6 +--- 21011,21016 ---- +diff -rc toolbuslib-1.1/src/atb-tool.c toolbuslib-1.1-new/src/atb-tool.c +*** toolbuslib-1.1/src/atb-tool.c 2008-11-10 13:59:41.000000000 +0100 +--- toolbuslib-1.1-new/src/atb-tool.c 2010-08-23 16:58:11.000000000 +0200 +*************** +*** 6,22 **** + #include + #include + #include +- #include +- #include + #include +- #include + #include +- #include +- #include + #include + #include +! +! #include + + #include + #include "safio.h" +--- 6,16 ---- + #include + #include + #include + #include + #include + #include + #include +! #include + + #include + #include "safio.h" +*************** +*** 39,44 **** +--- 33,40 ---- + #define MAX_NR_QUEUES 64 + #define MAX_QUEUE_LEN 128 + ++ #define MAXHOSTNAMELEN 256 ++ + /* Operation codes. */ + /* From Tool to ToolBus. */ + #define CONNECT 1 +*************** +*** 144,151 **** + * Gathers performance stats. + */ + static ATerm getPerformanceStats(){ +- struct rusage resourceUsage; +- + // Type stuff + ATerm remote = (ATerm) ATmakeAppl0(ATmakeAFun("remote", 0, ATtrue)); + ATerm toolType = (ATerm) ATmakeAppl1(ATmakeAFun("type", 1, ATfalse), remote); +--- 140,145 ---- +*************** +*** 161,171 **** + // Thread stuff + ATerm threads; + +- getrusage(RUSAGE_SELF, &resourceUsage); +- + { +! int userTime = (int) (resourceUsage.ru_utime.tv_sec * 1000) + (resourceUsage.ru_utime.tv_usec / 1000); +! int systemTime = (int) (resourceUsage.ru_stime.tv_sec * 1000) + (resourceUsage.ru_stime.tv_usec / 1000); + + ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); + ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); +--- 155,163 ---- + // Thread stuff + ATerm threads; + + { +! int userTime = 0; +! int systemTime = 0; + + ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime)); + ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime)); +*************** +*** 349,364 **** + + otp = (OperationTermPair) malloc(sizeof(struct _OperationTermPair)); + +- /* Initialize handlers for OS signals */ +- { +- struct sigaction disconnect; +- disconnect.sa_handler = disconnectHandler; +- sigemptyset(&disconnect.sa_mask); +- +- sigaction(SIGTERM, &disconnect, NULL); +- sigaction(SIGQUIT, &disconnect, NULL); +- } +- + /* Get hostname of machine that runs this particular tool */ + return gethostname(this_host, MAXHOSTNAMELEN); + } +--- 341,346 ---- +diff -rc toolbuslib-1.1/src/Makefile.in toolbuslib-1.1-new/src/Makefile.in +*** toolbuslib-1.1/src/Makefile.in 2008-11-10 13:59:47.000000000 +0100 +--- toolbuslib-1.1-new/src/Makefile.in 2010-08-24 10:28:10.000000000 +0200 +*************** +*** 223,234 **** + libATB_la_SOURCES = atb-tool.c + libATB_la_CPPFLAGS = $(ATERM_CFLAGS) + libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) +! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) + + bin_PROGRAMS = tbunpack + + tbunpack_SOURCES = tbunpack.c atb-tool.c +! tbunpack_LDADD = $(ATERM_LIBS) + subdir = ./src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +--- 223,234 ---- + libATB_la_SOURCES = atb-tool.c + libATB_la_CPPFLAGS = $(ATERM_CFLAGS) + libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS) +! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) -lwsock32 + + bin_PROGRAMS = tbunpack + + tbunpack_SOURCES = tbunpack.c atb-tool.c +! tbunpack_LDADD = $(ATERM_LIBS) -lwsock32 + subdir = ./src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index ce00771e61a..78bb31055cb 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -35,7 +35,7 @@ rec { # https://bugs.webkit.org/show_bug.cgi?id=43863 # "--enable-indexed-database" - "--enable-xhtmlmp" + # "--enable-xhtmlmp" # "--enable-input-speech" diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 3e549fe7bbe..fc9e4e2497d 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl, python, makeWrapper}: -stdenv.mkDerivation rec { - version = "1.3.0"; - name = "scons-" + version; +let + name = "scons"; + version = "2.0.1"; +in + +stdenv.mkDerivation { + name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/scons/${name}.tar.gz"; - sha256 = "4bde47b9a40fe767f089f5996d56b6e85a2d4929309b9c07a2dff363a78b0002"; + url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + sha256 = "0qk74nrnm9qlijrq6gmy8cyhjgp0gis4zx44divnr8n487d5308a"; }; propagatedBuildInputs = [python makeWrapper]; @@ -16,6 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://scons.org/"; description = "An improved, cross-platform substitute for Make"; + license = "MIT"; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 829dd89147f..899343d12ff 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, graphviz, perl, flex, bison, gnumake, libX11, libXext, qt}: stdenv.mkDerivation rec { - name = "doxygen-1.6.2"; + name = "doxygen-1.7.1"; src = fetchurl { url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz"; - sha256 = "0pqypiw8l8ajd3jy5nypb43zaf2vkyvkw4j0qr20xnjjhnliqbiv"; + sha256 = "0cfs96iqsddqwkimlzrkpzksm8dhi5fjai49fvhdfw2934xnz1jb"; }; patches = [ ./tmake.patch ]; @@ -24,11 +24,13 @@ stdenv.mkDerivation rec { else '' echo "using QTDIR=${qt}..." export QTDIR=${qt} - ''); + ''); # export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH" # export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH" meta = { + license = "GPLv2+"; + homepage = "http://doxygen.org/"; description = "Doxygen, a source code documentation generator tool"; longDescription = '' @@ -39,8 +41,7 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - homepage = http://doxygen.org/; - - license = "GPLv2+"; + maintainers = [stdenv.lib.maintainers.simons]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix new file mode 100644 index 00000000000..86cf929aede --- /dev/null +++ b/pkgs/games/asc/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs +, boost, expat, freetype, libjpeg, wxGTK, lua, perl, pkgconfig, zlib, zip, bzip2, +libpng }: + +stdenv.mkDerivation rec { + name = "asc-2.4.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/asc-hq/${name}.tar.bz2"; + sha256 = "1r011l4gsliky6szjvda8xzyhkkc50ahrr7p14911v5ydar0w3hh"; + }; + + buildInputs = [ + SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat freetype + libjpeg wxGTK lua perl pkgconfig zlib zip bzip2 libpng + ]; + + meta = { + description = "Turn based strategy game"; + + longDescription = '' + Advanced Strategic Command is a free, turn based strategy game. It is + designed in the tradition of the Battle Isle series from Bluebyte and is + currently available for Windows and Linux. + ''; + + homepage = http://www.asc-hq.org/; + + license = "GPLv2+"; + + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix new file mode 100644 index 00000000000..a1b7262f3b9 --- /dev/null +++ b/pkgs/games/egoboo/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, mesa, SDL, SDL_mixer, SDL_image, SDL_ttf }: + +stdenv.mkDerivation rec { + # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until + # they fix more, because it even has at least one bugs less than 2.7.4. + # 2.8.0 does not start properly on linux + # They just starting making that 2.8.0 work on linux. + name = "egoboo-2.7.3"; + + src = fetchurl { + url = "mirror://sourceforge/egoboo/${name}.tar.gz"; + sha256 = "18cjgp9kakrsa90jcb4cl8hhh9k57mi5d1sy5ijjpd3p7zl647hd"; + }; + + buildPhase = '' + cd source + make -C enet all + # The target 'all' has trouble + make -C game -f Makefile.unix egoboo + ''; + + # The user will need to have all the files in '.' to run egoboo, with + # writeable controls.txt and setup.txt + installPhase = '' + ensureDir $out/share/${name} + cp -v game/egoboo $out/share/${name} + cd .. + cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} + ''; + + buildInputs = [ mesa SDL SDL_mixer SDL_image SDL_ttf ]; + + /* + This big commented thing may be needed for versions 2.8.0 or beyond + I keep it here for future updates. + + # Some files have to go to $HOME, but we put them in the 'shared'. + patchPhase = '' + sed -i -e 's,''${HOME}/.''${PROJ_NAME},''${PREFIX}/share/games/''${PROJ_NAME},g' Makefile + ''; + + preBuild = '' + makeFlags=PREFIX=$out + ''; + */ + + meta = { + description = "3D dungeon crawling adventure"; + + homepage = http://www.freedink.org/; + license = "GPLv2+"; + + # I take it out of hydra as it does not work as well as I'd like + # maintainers = [ stdenv.lib.maintainers.bjg ]; + # platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix new file mode 100644 index 00000000000..7f7c95d3cd1 --- /dev/null +++ b/pkgs/games/torcs/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, +libpng, zlib, bash }: + +stdenv.mkDerivation rec { + name = "torcs-1.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/torcs/${name}.tar.bz2"; + sha256 = "1zai7nrx93pcv24r3fkr08831szj7vz3a6xy8fihlv6wvfnpn6wh"; + }; + + patchPhase = '' + sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in + ''; + + buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib bash ]; + + installTargets = "install datainstall"; + + meta = { + description = "Car racing game"; + homepage = http://torcs.sourceforge.net/; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix new file mode 100644 index 00000000000..80f527e26e1 --- /dev/null +++ b/pkgs/games/ufoai/default.nix @@ -0,0 +1,52 @@ +{stdenv, fetchurl, SDL, mesa, SDL_image, SDL_ttf, SDL_mixer, libpng, libjpeg, zlib +, curl, libvorbis, libtheora, xvidcore, pkgconfig, gtk, glib, libxml2, gtksourceview +, gtkglext, openal, gettext, p7zip }: + +stdenv.mkDerivation rec { + name = "ufoai-2.3"; + src = fetchurl { + url = mirror://sourceforge/ufoai/ufoai-2.3-source.tar.bz2; + sha256 = "1pb41q5wx180l6xv8gm1sw8b7cji42znnb6qpjaap6vpgc8k3hp9"; + }; + + srcData = fetchurl { + url = mirror://sourceforge/ufoai/ufoai-2.3-data.tar; + sha256 = "0952kx6cbi4y89fbz1ig32rvsmfhzqpvdf79rq4axag9d3i5qlqf"; + }; + + srcI18n = fetchurl { + url = mirror://sourceforge/ufoai/ufoai-2.3-i18n.tar.bz2; + sha256 = "14fzv8a4xng6kfl6aw8yzz6vl2j5vryxija5b2yz75jbfpa94i09"; + }; + + # for the xvidcore static lib + NIX_CFLAGS_COMPILE = "-pthread -lm"; + + buildInputs = [ SDL mesa SDL_image SDL_ttf SDL_mixer libpng libjpeg zlib curl libvorbis + libtheora xvidcore pkgconfig glib gtk gtkglext gtksourceview libxml2 openal gettext + p7zip ]; + + enableParallelBuilding = true; + + preConfigure = '' + tar xvf $srcI18n + ''; + + configureFlags = "--enable-release"; + + postInstall = '' + pushd $out/share/ufoai + tar xvf $srcData + popd + ''; + + installTargets = "install_exec"; + + meta = { + homepage = http://www.ultimatestunts.nl/; + description = "Squad-based tactical strategy game in the tradition of X-Com"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 43708306ce7..656ff756a29 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { pname = "warzone2100"; - version = "2.3.0"; + version = "2.3.4"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "10iisg6lixs8bnd57qzyf3bqhispcylxvkyqwyfagg7r2qr159zj"; + sha256 = "0s7yf73yq8pihpn9777pj1fy1m1cc3cxfs7v0c916wifslpm3x3h"; }; buildInputs = [ bison flex gettext pkgconfig SDL libpng libtheora openal popt physfs mesa quesoglc zip unzip diff --git a/pkgs/games/xmoto/64bit-ftbs.patch b/pkgs/games/xmoto/64bit-ftbs.patch deleted file mode 100644 index 037c026e4e6..00000000000 --- a/pkgs/games/xmoto/64bit-ftbs.patch +++ /dev/null @@ -1,12 +0,0 @@ -From debian: https://launchpad.net/ubuntu/karmic/+source/xmoto/0.5.2-2 ---- a/src/Replay.cpp -+++ b/src/Replay.cpp -@@ -156,7 +156,7 @@ - v_replay.writeBuf(pcData, nDataSize); - - /* Chunks */ -- v_replay << m_Chunks.size(); -+ v_replay << (unsigned int)m_Chunks.size(); - for(unsigned int i=0;inNumStates; - v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize * m_Chunks[i]->nNumStates); diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 971d29584c1..7ddbcc7de0f 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -4,7 +4,7 @@ let buildInputs = with a; [ chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode + lua5 ode libxdg_basedir ]; in rec { @@ -17,8 +17,6 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"]; - patches = [ ./64bit-ftbs.patch ]; - meta = { description = "X-Moto - obstacled race game"; maintainers = [ diff --git a/pkgs/games/xmoto/src-for-default.nix b/pkgs/games/xmoto/src-for-default.nix index bc024263c22..4250450617a 100644 --- a/pkgs/games/xmoto/src-for-default.nix +++ b/pkgs/games/xmoto/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="0.5.2"; - name="xmoto-0.5.2"; - hash="13q5b0a1ha5am3p2b7a399ca7vnw4fs82y96aw0n96s3xmw17jd8"; + version="0.5.3"; + name="xmoto-0.5.3"; + hash="1xqz1x4q75469s1m6qqy5akbh62327p30267ca5ivjff59wpcfyf"; url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; - advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.2/xmoto-0.5.2-src.tar.gz"; + advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.3/xmoto-0.5.3-src.tar.gz"; } diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix new file mode 100644 index 00000000000..53c55de9a37 --- /dev/null +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gtkLibs, SDL, nasm, zlib, libpng, mesa }: + +stdenv.mkDerivation { + name = "gens-gs-7"; + + src = fetchurl { + url = http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz; + sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; + }; + + buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; + + meta = { + homepage = http://segaretro.org/Gens/GS; + description = "A Genesis/Mega Drive emulator"; + platforms = [ "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix index f8e19b0994a..f60e466930d 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/pkgs/misc/tex/texlive/aggregate.nix @@ -30,7 +30,9 @@ rec { ensureDir $out/bin for i in $out/libexec/*/*; do - echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i) + test -f "$i" && \ + test -x "$i" && \ + echo -ne "#! /bin/sh\\n$i \"\$@\"" >$out/bin/$(basename $i) && \ chmod a+x $out/bin/$(basename $i) done diff --git a/pkgs/os-specific/linux/kernel/aufs2-35.patch b/pkgs/os-specific/linux/kernel/aufs2-35.patch new file mode 100644 index 00000000000..57e1889e2bb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/aufs2-35.patch @@ -0,0 +1,359 @@ +From: +http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-base.patch;h=d90958dc45a6beb48836e9bf37847abbabed6854;hb=aufs2-35 +http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-standalone.patch;h=e1ae93d5f2073505e15739cf195d016880b064e6;hb=aufs2-35 + +aufs2 base patch for linux-2.6.35 + +diff --git a/fs/namei.c b/fs/namei.c +index 868d0cb..6e92c81 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -1178,7 +1178,7 @@ out: + * needs parent already locked. Doesn't follow mounts. + * SMP-safe. + */ +-static struct dentry *lookup_hash(struct nameidata *nd) ++struct dentry *lookup_hash(struct nameidata *nd) + { + int err; + +@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } + +-static int __lookup_one_len(const char *name, struct qstr *this, ++int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) + { + unsigned long hash; +diff --git a/fs/splice.c b/fs/splice.c +index efdbfec..e01a51e 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); + /* + * Attempt to initiate a splice from pipe to file. + */ +-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +- loff_t *ppos, size_t len, unsigned int flags) ++long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) + { + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, + loff_t *, size_t, unsigned int); +@@ -1132,9 +1132,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + /* + * Attempt to initiate a splice from a file to a pipe. + */ +-static long do_splice_to(struct file *in, loff_t *ppos, +- struct pipe_inode_info *pipe, size_t len, +- unsigned int flags) ++long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) + { + ssize_t (*splice_read)(struct file *, loff_t *, + struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/namei.h b/include/linux/namei.h +index 05b441d..91bc74e 100644 +--- a/include/linux/namei.h ++++ b/include/linux/namei.h +@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, + extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, + int (*open)(struct inode *, struct file *)); + ++extern struct dentry *lookup_hash(struct nameidata *nd); ++extern int __lookup_one_len(const char *name, struct qstr *this, ++ struct dentry *base, int len); + extern struct dentry *lookup_one_len(const char *, struct dentry *, int); + + extern int follow_down(struct path *); +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 997c3b4..be9a153 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); + extern void splice_shrink_spd(struct pipe_inode_info *, + struct splice_pipe_desc *); + ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); ++ + #endif + +aufs2 standalone patch for linux-2.6.35 + +diff --git a/fs/namei.c b/fs/namei.c +index 6e92c81..334130e 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -348,6 +348,7 @@ int deny_write_access(struct file * file) + + return 0; + } ++EXPORT_SYMBOL(deny_write_access); + + /** + * path_get - get a reference to a path +@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd) + return ERR_PTR(err); + return __lookup_hash(&nd->last, nd->path.dentry, nd); + } ++EXPORT_SYMBOL(lookup_hash); + + int __lookup_one_len(const char *name, struct qstr *this, + struct dentry *base, int len) +@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this, + this->hash = end_name_hash(hash); + return 0; + } ++EXPORT_SYMBOL(__lookup_one_len); + + /** + * lookup_one_len - filesystem helper to lookup single pathname component +diff --git a/fs/namespace.c b/fs/namespace.c +index 88058de..397afcc 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, + } + return 0; + } ++EXPORT_SYMBOL(iterate_mounts); + + static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) + { +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 0e16771..3fab10a 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include "fsnotify.h" +@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + fsnotify_recalc_global_mask(); + fsnotify_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_put_group); + + /* + * Simply run the fsnotify_groups list and find a group which matches +@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + + return group; + } ++EXPORT_SYMBOL(fsnotify_obtain_group); +diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c +index 0399bcb..74cdc13 100644 +--- a/fs/notify/inode_mark.c ++++ b/fs/notify/inode_mark.c +@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) + if (atomic_dec_and_test(&entry->refcnt)) + entry->free_mark(entry); + } ++EXPORT_SYMBOL(fsnotify_put_mark); + + /* + * Recalculate the mask of events relevant to a given inode locked. +@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + if (unlikely(atomic_dec_and_test(&group->num_marks))) + fsnotify_final_destroy_group(group); + } ++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); + + /* + * Given a group, destroy all of the marks associated with that group. +@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou + } + return NULL; + } ++EXPORT_SYMBOL(fsnotify_find_mark_entry); + + /* + * Nothing fancy, just initialize lists and locks and counters. +@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, + entry->inode = NULL; + entry->free_mark = free_mark; + } ++EXPORT_SYMBOL(fsnotify_init_mark); + + /* + * Attach an initialized mark entry to a given group and inode. +@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, + + return ret; + } ++EXPORT_SYMBOL(fsnotify_add_mark); + + /** + * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. +diff --git a/fs/open.c b/fs/open.c +index 5463266..d248ead 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, + mutex_unlock(&dentry->d_inode->i_mutex); + return ret; + } ++EXPORT_SYMBOL(do_truncate); + + static long do_sys_truncate(const char __user *pathname, loff_t length) + { +diff --git a/fs/splice.c b/fs/splice.c +index e01a51e..4806358 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + + return splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL(do_splice_from); + + /* + * Attempt to initiate a splice from a file to a pipe. +@@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos, + + return splice_read(in, ppos, pipe, len, flags); + } ++EXPORT_SYMBOL(do_splice_to); + + /** + * splice_direct_to_actor - splices data directly between two non-pipes +diff --git a/security/commoncap.c b/security/commoncap.c +index 4e01599..3611e1b 100644 +--- a/security/commoncap.c ++++ b/security/commoncap.c +@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, + } + return ret; + } ++EXPORT_SYMBOL(cap_file_mmap); +diff --git a/security/device_cgroup.c b/security/device_cgroup.c +index 8d9c48f..29108aa 100644 +--- a/security/device_cgroup.c ++++ b/security/device_cgroup.c +@@ -515,6 +515,7 @@ found: + + return -EPERM; + } ++EXPORT_SYMBOL(devcgroup_inode_permission); + + int devcgroup_inode_mknod(int mode, dev_t dev) + { +diff --git a/security/security.c b/security/security.c +index 351942a..6ba84a8 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) + return 0; + return security_ops->path_mkdir(dir, dentry, mode); + } ++EXPORT_SYMBOL(security_path_mkdir); + + int security_path_rmdir(struct path *dir, struct dentry *dentry) + { +@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_rmdir(dir, dentry); + } ++EXPORT_SYMBOL(security_path_rmdir); + + int security_path_unlink(struct path *dir, struct dentry *dentry) + { +@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry) + return 0; + return security_ops->path_unlink(dir, dentry); + } ++EXPORT_SYMBOL(security_path_unlink); + + int security_path_symlink(struct path *dir, struct dentry *dentry, + const char *old_name) +@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, + return 0; + return security_ops->path_symlink(dir, dentry, old_name); + } ++EXPORT_SYMBOL(security_path_symlink); + + int security_path_link(struct dentry *old_dentry, struct path *new_dir, + struct dentry *new_dentry) +@@ -406,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, + return 0; + return security_ops->path_link(old_dentry, new_dir, new_dentry); + } ++EXPORT_SYMBOL(security_path_link); + + int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + struct path *new_dir, struct dentry *new_dentry) +@@ -416,6 +421,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry, + return security_ops->path_rename(old_dir, old_dentry, new_dir, + new_dentry); + } ++EXPORT_SYMBOL(security_path_rename); + + int security_path_truncate(struct path *path, loff_t length, + unsigned int time_attrs) +@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length, + return 0; + return security_ops->path_truncate(path, length, time_attrs); + } ++EXPORT_SYMBOL(security_path_truncate); + + int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + mode_t mode) +@@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, + return 0; + return security_ops->path_chmod(dentry, mnt, mode); + } ++EXPORT_SYMBOL(security_path_chmod); + + int security_path_chown(struct path *path, uid_t uid, gid_t gid) + { +@@ -439,6 +447,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) + return 0; + return security_ops->path_chown(path, uid, gid); + } ++EXPORT_SYMBOL(security_path_chown); + + int security_path_chroot(struct path *path) + { +@@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry) + return 0; + return security_ops->inode_readlink(dentry); + } ++EXPORT_SYMBOL(security_inode_readlink); + + int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) + { +@@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return security_ops->inode_permission(inode, mask); + } ++EXPORT_SYMBOL(security_inode_permission); + + int security_inode_setattr(struct dentry *dentry, struct iattr *attr) + { +@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask) + { + return security_ops->file_permission(file, mask); + } ++EXPORT_SYMBOL(security_file_permission); + + int security_file_alloc(struct file *file) + { +@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, + return ret; + return ima_file_mmap(file, prot); + } ++EXPORT_SYMBOL(security_file_mmap); + + int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, + unsigned long prot) + diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix index dfbe507fd8f..4404edcd77c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.27.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.27.nix @@ -3,11 +3,11 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "", ... }: import ./generic.nix ( rec { - version = "2.6.27.51"; + version = "2.6.27.53"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "092x3ribl63i1kj27kg4qmvr20sys0wl58qsf1wjiy33pw5j63lk"; + sha256 = "05acrmlrsz9cd60002kwvwwsk2wvg0pf11j4s1wx8n9jsil3xxic"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index bb7a218f555..5ba06e98727 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -206,11 +206,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.18"; + version = "2.6.32.21"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1z35clz0176blqk3ygfim0a6y7b4ndbjpc1pkz7pxnscsj1kl9k7"; + sha256 = "14hc1ky8ww95qq7c9w9r8yvapx583kbf6fkd6d80kv3rll49xyil"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix index 9a0a9f3d860..2fd0c15b63d 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.35.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.35.nix @@ -190,11 +190,11 @@ in import ./generic.nix ( rec { - version = "2.6.35.2"; + version = "2.6.35.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1cvbk58i4724v1wkjc574d61in5q4d3l1ix6icy59dsnhx5v9krn"; + sha256 = "83149a9ab30f8dfe45c63d735018422909cf0dd3f5b5501e42f7349f4044f5f1"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4019348375a..63581e6b4ca 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -90,6 +90,17 @@ in features.fbConDecor = true; }; + fbcondecor_2_6_35 = + rec { + name = "fbcondecor-0.9.6-2.6.35-rc4"; + patch = fetchurl { + url = "http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${name}.patch"; + sha256 = "0dlks1arr3b3hlmw9k1a1swji2x655why61sa0aahm62faibsg1r"; + }; + extraConfig = fbcondecorConfig; + features.fbConDecor = true; + }; + # From http://patchwork.kernel.org/patch/19495/ ext4_softlockups_2_6_28 = { name = "ext4-softlockups-fix"; @@ -155,6 +166,15 @@ in features.aufsBase = true; }; + aufs2_2_6_35 = + { # From http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=tree;h=refs/heads/aufs2-35;hb=aufs2-35 + # Note that this merely the patch needed to build AUFS2 as a + # standalone package. + name = "aufs2"; + patch = ./aufs2-35.patch; + features.aufsBase = true; + }; + # Increase the timeout on CIFS requests from 15 to 120 seconds to # make CIFS more resilient to high load on the CIFS server. cifs_timeout = diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh new file mode 100755 index 00000000000..6941288b390 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh @@ -0,0 +1,94 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + sh $src -x +} + + +buildPhase() { + if test -z "$libsOnly"; then + echo "Building linux driver against kernel: " $kernel; + + cd usr/src/nv/ + + # Workaround: get it to build on kernels that have CONFIG_XEN + # set. Disable the test, apply a patch to disable the Xen + # functionality. + + #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord + #patch -p1 < $xenPatch + + # Create the module. + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/) + unset src # used by the nv makefile + # Hack necessary to compile on 2.6.28. + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default" + make SYSSRC=$sysSrc module + cd ../../.. + fi +} + + +installPhase() { + + # Install libGL and friends. + ensureDir $out/lib + cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ + + ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so + ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1 + ln -snf libGL.so.$versionNumber $out/lib/libGL.so + ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1 + ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1 + ln -snf libnvidia-tls.so.$versionNumber $out/lib/libnvidia-tls.so.1 + ln -snf libnvidia-tls.so.$versionNumber $out/lib/tls/libnvidia-tls.so.1 + ln -snf libXvMCNVIDIA.so.$versionNumber $out/lib/libXvMCNVIDIA_dynamic.so.1 + ln -snf libcuda.so.$versionNumber $out/lib/libcuda.so.1 + + patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.* + set +e + # Legacy nvidia doesn't have cuda + patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + set -e + + if test -z "$libsOnly"; then + + # Install the kernel module. + ensureDir $out/lib/modules/$kernelVersion/misc + cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + ensureDir $out/lib/xorg/modules + cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ + + ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 + ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so + + patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + ensureDir $out/bin + + for i in nvidia-settings nvidia-xconfig; do + cp usr/bin/$i $out/bin/$i + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + cp -prd usr/include usr/share $out + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + fi +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index bd3ee349244..d20e92f7636 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "256.35"; in +let versionNumber = "256.44"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0qpn9i1z3b0zafpk97inmhr21wp93pjf76z9jxrxhi3jzkbbdxla"; + sha256 = "1kirr1bs6kricxcbk1lxz263jyzfb2il91071h0slilmpjs5ipmi"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0in4b9k0nlbvnxrnh1v1d8m24wyljanymyh6w86yvirp24b4wang"; + sha256 = "004m97wp2bspykb96dj8kkd2pa2rx8pswscyyf7r9hb93vx47bbl"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix new file mode 100644 index 00000000000..638f2e4360e --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: + +let + + versionNumber = "173.14.27"; + +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}-${kernel.version}"; + + builder = ./builder-legacy.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; + sha256 = "08l3zs7sb8n4vjm1vg3yy1pkj54dq7gfrjashlqwbznaa2cdwknb"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; + sha256 = "0pmg5whpk0rmzg8zb7qq2imva2hf346c4pvpz5sjir6346350blw"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber kernel; + + dontStrip = true; + + glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + + cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + + programPath = stdenv.lib.makeLibraryPath [ + gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib + xlibs.libXv + ]; + + meta = { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; + license = "unfree"; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix similarity index 84% rename from pkgs/os-specific/linux/nvidia-x11/legacy.nix rename to pkgs/os-specific/linux/nvidia-x11/legacy96.nix index 58db507f622..23356b58d32 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -2,25 +2,25 @@ let - versionNumber = "96.43.16"; + versionNumber = "96.43.18"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}-${kernel.version}"; - builder = ./builder.sh; + builder = ./builder-legacy.sh; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1vcc11wxpxi1az61x2djxx60lx0dkb2vn303jjbw967qra64agi4"; + sha256 = "0ajlr5vmjgjl2rszzd86099p3fa4xcpy182pwibraggvzchi9ayw"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "1bczsfx6ck9bj6yki89bm753k4qbdc3ac8hs26h507z6nh06v2l1"; + sha256 = "0s8iq5djacqr686wd4g7fv8s9hpp2vbjnav82nqca18zanjj20rr"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 1206eb97ba0..e1e7c5acd71 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "10gx47kckjrwl6ssq8ky896gbscwnqc6gxvhsbqcdhai8m2h07ds"; + sha256 = "0p064602bgkwcs0hmij9i8fn50bx4w6liw8b71hs6qcn3isjs9ip"; }; preConfigure = diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 2299c60c081..7af6d2c0a55 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -39,7 +39,7 @@ let meta = { description = "The default build environment for Unix packages in Nixpkgs"; }; - + # Add a utility function to produce derivations that use this # stdenv and its shell. mkDerivation = attrs: @@ -90,7 +90,9 @@ let (if attrs ? passthru then attrs.passthru else {}); # Utility flags to test the type of platform. - isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin" || result.system == "x86_64-darwin"; + isDarwin = result.system == "i686-darwin" + || result.system == "powerpc-darwin" + || result.system == "x86_64-darwin"; isLinux = result.system == "i686-linux" || result.system == "x86_64-linux" || result.system == "powerpc-linux" @@ -98,6 +100,14 @@ let || result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux"; isSunOS = result.system == "i386-sunos"; isCygwin = result.system == "i686-cygwin"; + isFreeBSD = result.system == "i686-freebsd" + || result.system == "x86_64-freebsd"; + isOpenBSD = result.system == "i686-openbsd" + || result.system == "x86_64-openbsd"; + isBSD = result.system == "i686-freebsd" + || result.system == "x86_64-freebsd" + || result.system == "i686-openbsd" + || result.system == "x86_64-openbsd"; isi686 = result.system == "i686-linux" || result.system == "i686-darwin" || result.system == "i686-freebsd" @@ -136,5 +146,5 @@ let }.result; - + in stdenvGenerator ./setup.sh diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index d54bf7c761e..86729c0cdf8 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -19,8 +19,8 @@ buildPhase() { -i vncserver cd Xvnc - sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf - sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf + sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl sed -i \ -e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \ -e "s@\@$xauth/bin/xauth@g" \ @@ -36,7 +36,7 @@ installPhase() { ./vncinstall $out/bin $out/man # fix HTTP client: - t=$out/vnc + t=$out/share/tightvnc ensureDir $t sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver cp -r classes $t diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 10ed5dc50f2..187d3345e6b 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -2,19 +2,32 @@ stdenv.mkDerivation { name = "tightvnc-1.3.10"; - builder = ./builder.sh; - gcc=stdenv.gcc.gcc; - inherit perl; + src = fetchurl { url = mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; # for the builder script - inherit xauth; + inherit xauth fontDirectories perl; + gcc = stdenv.gcc.gcc; - inherit fontDirectories; + buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; + builder = ./builder.sh; - buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp - xauth]; + meta = { + license = "GPLv2+"; + homepage = "http://vnc-tight.sourceforge.net/"; + description = "TightVNC is an improved version of VNC"; + + longDescription = '' + TightVNC is an improved version of VNC, the great free + remote-desktop tool. The improvements include bandwidth-friendly + "tight" encoding, file transfers in the Windows version, enhanced + GUI, many bugfixes, and more. + ''; + + maintainers = []; + platforms = stdenv.lib.platforms.unix; + }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix new file mode 100644 index 00000000000..db1b3fcf44e --- /dev/null +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -0,0 +1,52 @@ +x@{builderDefsPackage + , libuuid + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + version = "2.0.19"; + url = "http://www.nilfs.org/download/nilfs-utils-${version}.tar.bz2"; + hash = "0q9cb6ny0ah1s9rz1rgqka1pxdm3xvg0ywcqyhzcz4yhamfhg100"; + baseName = "nilfs-utils"; + name = "${baseName}-${version}"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall"]; + + doFixPaths = a.fullDepEntry ('' + sed -e '/sysconfdir=\/etc/d; /sbindir=\/sbin/d' -i configure + sed -e 's@/sbin/@'"$out"'/sbin/@' -i ./sbin/mount/cleaner_ctl.c + '') ["doUnpack" "minInit"]; + + meta = { + description = "NILFS utilities"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.nilfs.org/download/?C=M;O=D"; + }; + }; +}) x + diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 7775aae5bd8..b45b1a0aa1f 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kde, perl }: +{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kdebase, + automoc4, phonon, perl }: stdenv.mkDerivation { name = "partitionmanager-1.0.0"; @@ -9,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ cmake gettext parted libuuid qt4 kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ]; + [ cmake gettext parted libuuid qt4 kdelibs kdebase automoc4 perl phonon ]; preConfigure = '' export VERBOSE=1 diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 3b35bc6ab2c..9c3d63d1f5a 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,17 +13,18 @@ let in stdenv.mkDerivation rec { - name = "openssh-5.5p1"; + name = "openssh-5.6p1"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin"; + sha256 = "0avc7jgp8i2jlp7b8q8g4nyil56v5fp09c1v54dc4ql15cxzb2jk"; }; prePatch = stdenv.lib.optionalString hpnSupport '' gunzip -c ${hpnSrc} | patch -p1 ''; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl perl libedit pkgconfig pam ]; diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix index 931f70afb2e..6beaff56aea 100644 --- a/pkgs/tools/networking/sitecopy/default.nix +++ b/pkgs/tools/networking/sitecopy/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, neon, openssl}: +{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "sitecopy-0.16.6"; src = fetchurl { - url = http://www.manyfish.co.uk/sitecopy/sitecopy-0.16.6.tar.gz; + url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz"; sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0"; }; - buildInputs = [openssl]; + patches = [ ./neon-29.patch ]; + + preConfigure = "autoreconf"; + + buildInputs = [ openssl neon zlib autoconf automake libtool ]; configureFlags= "--with-ssl=openssl"; } diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch new file mode 100644 index 00000000000..bddcbde95e1 --- /dev/null +++ b/pkgs/tools/networking/sitecopy/neon-29.patch @@ -0,0 +1,15 @@ +diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in +--- sitecopy-0.16.6-orig/configure.in 2008-04-02 13:59:30.000000000 +0200 ++++ sitecopy-0.16.6/configure.in 2010-08-26 15:07:04.000000000 +0200 +@@ -112,8 +112,8 @@ + AC_LIBOBJ(lib/fnmatch) + fi + +-# Support neon 0.24 through 0.28 +-NE_REQUIRE_VERSIONS([0], [24 25 26 27 28]) ++# Support neon 0.24 through 0.29 ++#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29]) + + dnl But we don't use zlib or ACL support + NEON_WITHOUT_ZLIB +Only in sitecopy-0.16.6/: configure.in~ diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 40577d673a9..b39c3c886c0 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.16pre23483"; + name = "nix-1.0pre23431"; src = fetchurl { - url = "http://hydra.nixos.org/build/608299/download/4/${name}.tar.bz2"; - sha256 = "464baf7b8b5976a10585d51857543c2b63e1e29b2380cede79a710eac5ee07e4"; + url = "http://hydra.nixos.org/build/605509/download/4/${name}.tar.bz2"; + sha256 = "63999912e1e139333f658cf1dd8fb80c8d894d127888067695b37e44e5d0ac07"; }; buildInputs = [ perl curl openssl ]; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; - license = "LGPL"; + license = "LGPLv2+"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c196eed5d..05886c41130 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -556,14 +556,6 @@ let enscript = callPackage ../tools/text/enscript { }; - eprover = callPackage ../tools/misc/eProver { - texLive = texLiveAggregationFun { - paths = [ - texLive texLiveExtra - ]; - }; - }; - ethtool = callPackage ../tools/misc/ethtool { }; exif = callPackage ../tools/graphics/exif { }; @@ -880,6 +872,8 @@ let netselect = callPackage ../tools/networking/netselect { }; + nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; + nmap = callPackage ../tools/security/nmap { inherit (pythonPackages) pysqlite; inherit (gtkLibs) gtk; @@ -1167,9 +1161,7 @@ let system_config_printer = callPackage ../tools/misc/system-config-printer { }; - sitecopy = callPackage ../tools/networking/sitecopy { - neon = neon026; - }; + sitecopy = callPackage ../tools/networking/sitecopy { }; privoxy = callPackage ../tools/networking/privoxy { autoconf = autoconf213; @@ -1909,6 +1901,8 @@ let mitscheme = callPackage ../development/compilers/mit-scheme { }; + mlton = callPackage ../development/compilers/mlton { }; + mono = callPackage ../development/compilers/mono { }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; @@ -1968,6 +1962,8 @@ let tinycc = callPackage ../development/compilers/tinycc { }; + urweb = callPackage ../development/compilers/urweb { }; + vala = callPackage ../development/compilers/vala { }; visualcpp = callPackage ../development/compilers/visual-c++ { }; @@ -2091,7 +2087,6 @@ let polyml = callPackage ../development/compilers/polyml { }; python = if getConfig ["python" "full"] false then pythonFull else pythonBase; - python25 = if getConfig ["python" "full"] false then python25Full else python25Base; python26 = if getConfig ["python" "full"] false then python26Full else python26Base; python27 = if getConfig ["python" "full"] false then python27Full else python27Base; pythonBase = python26Base; @@ -2101,23 +2096,6 @@ let python24 = lowPrio (callPackage ../development/interpreters/python/2.4 { }); - python25Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.5) { - inherit fetchurl stdenv zlib bzip2 gdbm; - }); - - python25Full = lowPrio (python25Base.override { - # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. - db4 = if getConfig ["python" "db4Support"] true then db4 else null; - sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; - readline = if getConfig ["python" "readlineSupport"] true then readline else null; - openssl = if getConfig ["python" "opensslSupport"] true then openssl else null; - tk = if getConfig ["python" "tkSupport"] true then tk else null; - tcl = if getConfig ["python" "tkSupport"] true then tcl else null; - libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; - xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; - ncurses = if getConfig ["python" "curses"] true then ncurses else null; - }); - python26Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.6) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; @@ -2352,7 +2330,7 @@ let }; doxygen = callPackage ../development/tools/documentation/doxygen { - qt = if getPkgConfig "doxygen" "qt4" true then qt4 else null; + qt = qt4; }; eggdbus = callPackage ../development/tools/misc/eggdbus { }; @@ -2580,9 +2558,7 @@ let aterm25 = callPackage ../development/libraries/aterm/2.5.nix { }; - aterm28 = lowPrio (import ../development/libraries/aterm/2.8.nix { - inherit fetchurl stdenv; - }); + aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { }); attr = callPackage ../development/libraries/attr { }; @@ -2712,6 +2688,8 @@ let inherit (gnome) glib; }; + enet = callPackage ../development/libraries/enet { }; + enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; esdl = callPackage ../development/libraries/esdl { }; @@ -3268,12 +3246,14 @@ let useGTK = getPkgConfig "libiodbc" "gtk" false; }; - libktorrent = newScope kde45 ../development/libraries/libktorrent { }; + libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (gnome) glib; }; + libmhash = callPackage ../development/libraries/libmhash {}; + libnice = callPackage ../development/libraries/libnice { inherit (gnome) glib; }; @@ -3375,6 +3355,8 @@ let libsigcxx = callPackage ../development/libraries/libsigcxx { }; + libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; + libsigsegv = callPackage ../development/libraries/libsigsegv { }; # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 @@ -3500,6 +3482,23 @@ let lipo = if stdenv.isDarwin then darwinLipoUtility else null; }; + metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { + sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; + toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; + cLibrary = callPackage ../development/libraries/c-library { aterm = aterm28; }; + errorSupport = callPackage ../development/libraries/error-support { aterm = aterm28; }; + ptSupport = callPackage ../development/libraries/pt-support { aterm = aterm28; }; + ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; }; + configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; }; + asfSupport = callPackage ../development/libraries/asf-support { aterm = aterm28; }; + tideSupport = callPackage ../development/libraries/tide-support { aterm = aterm28; }; + rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; }; + sdfSupport = callPackage ../development/libraries/sdf-support { aterm = aterm28; }; + sglr = callPackage ../development/libraries/sglr { aterm = aterm28; }; + ascSupport = callPackage ../development/libraries/asc-support { aterm = aterm28; }; + pgen = callPackage ../development/libraries/pgen { aterm = aterm28; }; + }); + ming = callPackage ../development/libraries/ming { }; mlt = callPackage ../development/libraries/mlt { @@ -3608,10 +3607,9 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { - vlc = vlc.override { qt4 = qt47; }; - inherit (kde45) automoc4; - }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + + phonon_backend_vlc = newScope pkgs.kde4 ../development/libraries/phonon-backend-vlc { }; physfs = callPackage ../development/libraries/physfs { }; @@ -3635,6 +3633,8 @@ let popt = callPackage ../development/libraries/popt { }; + portaudio = callPackage ../development/libraries/portaudio { }; + proj = callPackage ../development/libraries/proj { }; postgis = callPackage ../development/libraries/postgis { }; @@ -3669,9 +3669,7 @@ let qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; - quassel = callPackage ../applications/networking/irc/quassel { - inherit (kde4) qt4 kdelibs phonon automoc4; - }; + quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { }; quesoglc = callPackage ../development/libraries/quesoglc { }; @@ -3981,10 +3979,6 @@ let pythonPackages = python26Packages; - python25Packages = recurseIntoAttrs (import ./python-packages.nix { - inherit pkgs python buildPythonPackage; - }); - python26Packages = recurseIntoAttrs (import ./python-packages.nix { inherit pkgs; python = python26; @@ -4308,7 +4302,24 @@ let inherit devicemapper; }; - libuuid = if ! stdenv.isDarwin then utillinuxng else null; + libuuid = + if crossSystem != null && crossSystem.config == "i586-pc-gnu" + then (utillinuxng // { + hostDrv = lib.overrideDerivation utillinuxng.hostDrv (args: { + # `libblkid' fails to build on GNU/Hurd. + configureFlags = args.configureFlags + + " --disable-libblkid --disable-mount --disable-fsck" + + " --enable-static"; + doCheck = false; + CPPFLAGS = # ugly hack for ugly software! + lib.concatStringsSep " " + (map (v: "-D${v}=4096") + [ "PATH_MAX" "MAXPATHLEN" "MAXHOSTNAMELEN" ]); + }); + }) + else if stdenv.isLinux + then utillinuxng + else null; e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { }; @@ -4555,8 +4566,9 @@ let linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = - [ /*kernelPatches.fbcondecor_2_6_33*/ + [ #kernelPatches.fbcondecor_2_6_35 kernelPatches.sec_perm_2_6_24 + # kernelPatches.aufs2_2_6_35 ]; }; @@ -4619,7 +4631,8 @@ let nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy = callPackage ../os-specific/linux/nvidia-x11/legacy.nix { }; + nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; + nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -4971,7 +4984,7 @@ let xmoto = builderDefsPackage (import ../games/xmoto) { inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf - lua5 ode; + lua5 ode libxdg_basedir; }; xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; @@ -5136,13 +5149,10 @@ let awesome = callPackage ../applications/window-managers/awesome { inherit (gtkLibs) glib pango; lua = lua5; - cairo = cairo.override { xcbSupport = true; - }; + cairo = cairo.override { xcbSupport = true; }; }; - bangarang = callPackage ../applications/video/bangarang { - inherit (kde4) qt4 kdelibs automoc4 phonon soprano kdemultimedia; - }; + bangarang = newScope pkgs.kde4 ../applications/video/bangarang { }; batik = callPackage ../applications/graphics/batik { }; @@ -5414,6 +5424,8 @@ let hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; + htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + magit = callPackage ../applications/editors/emacs-modes/magit { }; maudeMode = callPackage ../applications/editors/emacs-modes/maude { }; @@ -5440,12 +5452,14 @@ let }; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; - emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages; + emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages); epdfview = callPackage ../applications/misc/epdfview { inherit (gtkLibs) gtk; }; + espeak = callPackage ../applications/audio/espeak { }; + evince = callPackage ../applications/misc/evince { inherit (gnome) gnomedocutils gnomeicontheme libgnome libgnomeui libglade glib gtk scrollkeeper gnome_keyring; @@ -5587,7 +5601,8 @@ let gnash = callPackage ../applications/video/gnash { inherit (gtkLibs) glib gtk; - inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg; + inherit (gnome) gtkglext; + inherit (gst_all) gstreamer gstPluginsBase gstPluginsGood gstFfmpeg; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { @@ -5763,6 +5778,8 @@ let # inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder; }; + konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { }; + lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -5819,10 +5836,12 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 - which gettext makeWrapper file libidn sqlite docutils libnotify; + which gettext makeWrapper file libidn sqlite docutils libnotify + vala dbus_glib; inherit (gtkLibs) gtk glib; inherit (gnome28) gtksourceview; inherit (webkit.passthru.args) libsoup; + inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto; }; minicom = callPackage ../tools/misc/minicom { }; @@ -5864,18 +5883,7 @@ let mpg321 = callPackage ../applications/audio/mpg321 { }; - MPlayer = callPackage ../applications/video/MPlayer { - alsaSupport = true; - alsa = alsaLib; - theoraSupport = true; - cacaSupport = true; - xineramaSupport = true; - randrSupport = true; - cddaSupport = true; - amrSupport = getConfig [ "MPlayer" "amr" ] false; - x264Support = true; - xvidSupport = true; - }; + MPlayer = callPackage ../applications/video/MPlayer { }; MPlayerPlugin = browser: import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { @@ -5904,6 +5912,13 @@ let nano = callPackage ../applications/editors/nano { }; + navipowm = callPackage ../applications/misc/navipowm { + }; + + navit = callPackage ../applications/misc/navit { + inherit (gtkLibs) gtk; + }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; @@ -5949,9 +5964,7 @@ let paraview = callPackage ../applications/graphics/paraview { }; - partitionManager = callPackage ../tools/misc/partition-manager { - kde = kde44; - }; + partitionManager = newScope pkgs.kde4 ../tools/misc/partition-manager { }; pdftk = callPackage ../tools/typesetting/pdftk { }; @@ -6028,14 +6041,11 @@ let libstdcpp5 = gcc33.gcc; }; - rekonq = callPackage ../applications/networking/browsers/rekonq { + rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { inherit (gtkLibs) gtk; - inherit (kde4) qt4 kdelibs automoc4 phonon; }; - rsibreak = callPackage ../applications/misc/rsibreak { - inherit (kde4) kdelibs kdebase_workspace; - }; + rsibreak = newScope pkgs.kde4 ../applications/misc/rsibreak { }; rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS); @@ -6067,9 +6077,7 @@ let }; }; - semnotes = callPackage ../applications/misc/semnotes { - inherit (kde4) qt4 kdelibs automoc4 phonon soprano; - }; + semnotes = newScope pkgs.kde4 ../applications/misc/semnotes { }; skype_linux = callPackage_i686 ../applications/networking/skype { }; @@ -6208,17 +6216,17 @@ let vimHugeX = vim_configurable; vim_configurable = import ../applications/editors/vim/configurable.nix { - inherit fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib; - inherit (xlibs) libX11 libXext libSM libXpm + inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; - inherit (gtkLibs) glib gtk; + inherit (pkgs.gtkLibs) glib gtk; features = "huge"; # one of tiny, small, normal, big or huge # optional features by passing # python # TODO mzschemeinterp perlinterp - inherit python perl tcl ruby /*x11*/; + inherit (pkgs) python perl tcl ruby /*x11*/; - lua = lua5; + lua = pkgs.lua5; # optional features by flags flags = [ "X11" ]; # only flag "X11" by now @@ -6346,6 +6354,9 @@ let base14Fonts = "${ghostscript}/share/ghostscript/fonts"; }; + libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { + }; + xpra = callPackage ../tools/X11/xpra { inherit (gtkLibs) gtk; pyrex = pyrex095; @@ -6403,6 +6414,8 @@ let qgis = qgisReleased; }; + yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { }; + zapping = callPackage ../applications/video/zapping { inherit (gnome) scrollkeeper libgnomeui libglade esound; teletextSupport = true; @@ -6417,6 +6430,11 @@ let ### GAMES + asc = callPackage ../games/asc { + lua = lua5; + libsigcxx = libsigcxx12; + }; + ballAndPaddle = callPackage ../games/ball-and-paddle { }; blackshades = callPackage ../games/blackshades { }; @@ -6440,6 +6458,8 @@ let inherit (gtkLibs) gtk; }; + egoboo = callPackage ../games/egoboo { }; + exult = callPackage ../games/exult { stdenv = overrideGCC stdenv gcc42; }; @@ -6545,6 +6565,17 @@ let tremulous = callPackage ../games/tremulous { }; + torcs = callPackage ../games/torcs { + # Torcs wants to make shared libraries linked with plib libraries (it provides static). + # i686 is the only platform I know than can do that linking without plib built with -fPIC + plib = plib.override { enablePIC = if stdenv.isi686 then false else true; }; + }; + + ufoai = callPackage ../games/ufoai { + inherit (gtkLibs) glib gtk; + inherit (gnome) gtksourceview gtkglext; + }; + ultimatestunts = callPackage ../games/ultimatestunts { }; urbanterror = callPackage ../games/urbanterror { }; @@ -6638,15 +6669,18 @@ let kde4 = kde44; kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { - qt4 = qt46; - inherit stdenv; + qt4 = pkgs.qt46; }); kde45 = callPackage ../desktops/kde-4.5 { callPackage = newScope ({ - pyqt4 = pyqt4.override { qt4 = qt47; }; - libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; }; - shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; }; + qjson = pkgs.qjson.override { inherit (pkgs.kde45) qt4; }; + pyqt4 = pkgs.pyqt4.override { inherit (pkgs.kde45) qt4; }; + libdbusmenu_qt = pkgs.libdbusmenu_qt.override { inherit (pkgs.kde45) qt4; }; + libktorrent = pkgs.libktorrent.override { + inherit (pkgs.kde45) qt4 kdelibs; + }; + shared_desktop_ontologies = pkgs.shared_desktop_ontologies.override { v = "0.5"; }; } // pkgs.kde45); }; @@ -6733,6 +6767,16 @@ let camlp5 = camlp5_transitional; }; + eprover = callPackage ../applications/science/logic/eProver { + texLive = texLiveAggregationFun { + paths = [ + texLive texLiveExtra + ]; + }; + }; + + hol = callPackage ../applications/science/logic/hol { }; + hol_light = callPackage ../applications/science/logic/hol_light { }; hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { }; @@ -6747,12 +6791,16 @@ let inherit (pkgs.emacs23Packages) proofgeneral; }; + prover9 = callPackage ../applications/science/logic/prover9 { }; + ssreflect = callPackage ../applications/science/logic/ssreflect { camlp5 = camlp5_transitional; }; ### SCIENCE / ELECTRONICS + kicad = callPackage ../applications/science/electronics/kicad { }; + ngspice = callPackage ../applications/science/electronics/ngspice { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { @@ -6845,6 +6893,8 @@ let inherit (gtkLibs1x) gtk; }; + gensgs = callPackage_i686 ../misc/emulators/gens-gs { }; + ghostscript = callPackage ../misc/ghostscript { x11Support = false; cupsSupport = getPkgConfig "ghostscript" "cups" true; @@ -7020,8 +7070,6 @@ let inherit texLiveLatexXColor texLivePGF texLive; }; - toolbuslib = callPackage ../development/libraries/toolbuslib { }; - trac = callPackage ../misc/trac { inherit (pythonPackages) pysqlite; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0c00beb352e..11547e6286d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -198,6 +198,10 @@ rec { inherit cabal mtl; }; + fingertree = import ../development/libraries/haskell/fingertree { + inherit cabal; + }; + gdiff = import ../development/libraries/haskell/gdiff { inherit cabal; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbaa21f49b1..1b478a908d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -239,6 +239,24 @@ rec { }; }; + libcloud = buildPythonPackage (rec { + name = "libcloud-0.3.1"; + + src = fetchurl { + url = mirror://apache/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2; + sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y"; + }; + + buildInputs = [ zopeInterface ]; + + preConfigure = "cp test/secrets.py-dist test/secrets.py"; + + meta = { + description = "A unified interface to many cloud providers"; + homepage = http://incubator.apache.org/libcloud/; + }; + }); + lxml = buildPythonPackage ( rec { name = "lxml-2.2.2"; @@ -491,6 +509,42 @@ rec { }; }); + pexpect = buildPythonPackage { + name = "pexpect-2.3"; + + src = fetchurl { + url = "http://pexpect.sourceforge.net/pexpect-2.3.tar.gz"; + sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk"; + }; + + doCheck = false; + + meta = { + homepage = "http://www.noah.org/wiki/Pexpect"; + description = "Automate interactive console applications such as ssh, ftp, etc."; + license = "MIT"; + + longDescription = '' + Pexpect is similar to the Don Libes "Expect" system, but Pexpect + as a different interface that is easier to understand. Pexpect + is basically a pattern matching system. It runs programs and + watches output. When output matches a given pattern Pexpect can + respond as if a human were typing responses. Pexpect can be used + for automation, testing, and screen scraping. Pexpect can be + used for automating interactive console applications such as + ssh, ftp, passwd, telnet, etc. It can also be used to control + web applications via "lynx", "w3m", or some other text-based web + browser. Pexpect is pure Python. Unlike other Expect-like + modules for Python Pexpect does not require TCL or Expect nor + does it require C extensions to be compiled. It should work on + any platform that supports the standard Python pty module. + ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = python.meta.platforms; + }; + }; + psycopg2 = buildPythonPackage rec { name = "psycopg2-2.0.13"; @@ -687,6 +741,27 @@ rec { }; }); + rdflib = buildPythonPackage (rec { + name = "rdflib-3.0.0"; + + src = fetchurl { + url = "http://www.rdflib.net/${name}.tar.gz"; + sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr"; + }; + + doCheck = false; + + postInstall = '' + find $out -name easy-install.pth | xargs rm -v + find $out -name 'site.py*' | xargs rm -v + ''; + + meta = { + description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; + homepage = http://www.rdflib.net/; + }; + }); + setuptoolsDarcs = buildPythonPackage { name = "setuptools-darcs-1.2.9"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0ebde53ca39..869e669779f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -232,6 +232,7 @@ with (import ./release-lib.nix); par2cmdline = all; pavucontrol = linux; pciutils = linux; + pdf2xml = all; perl = all; php = linux; pidgin = linux; @@ -496,6 +497,18 @@ with (import ./release-lib.nix); virtualboxGuestAdditions = linux; }; + linuxPackages_2_6_34 = { + kernel = linux; + virtualbox = linux; + virtualboxGuestAdditions = linux; + }; + + linuxPackages_2_6_35 = { + kernel = linux; + virtualbox = linux; + virtualboxGuestAdditions = linux; + }; + strategoPackages = { sdf = all; strategoxt = all;