diff options
Diffstat (limited to 'pkgs/development')
23 files changed, 209 insertions, 66 deletions
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix index adfa92b428db9..73ba92e8d061f 100644 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ b/pkgs/development/compilers/sbcl/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.42"; - name="sbcl-1.0.42"; - hash="0j699rb3nw7akcmpqjlzwsrc0yg6kj6nf9bzfhnw19q1m4kl4pm5"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.42/sbcl-1.0.42-source.tar.bz2"; + version="1.0.43"; + name="sbcl-1.0.43"; + hash="0csykjcmy0gjlvxx7pg7kd2b7h610zpys3xla85qjj9ngjzpmbcq"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.43/sbcl-1.0.43-source.tar.bz2"; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index c9330a5067021..594ee980bbd97 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"''; - doCheck = true; + # The test suite is known to fail on Darwin. If maude is ever updated to a + # new version, this exception ought to be removed again. + doCheck = !stdenv.isDarwin; postInstall = '' diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 7f11ee7c3dfbd..f9b6c5ab24106 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,20 +1,6 @@ -{ stdenv -, fetchurl -, cairo -, coreutils -, file -, libjpeg -, libpng -, libtool -, libXaw -, libXext -, libXft -, libXrender -, libXt -, libXmu -, mesa -, pkgconfig -, which } : +{ stdenv, fetchurl, cairo, file, libjpeg +, libpng, libtool, libXaw, libXext, libXft, libXrender +, libXt, libXmu, mesa, pkgconfig, which } : stdenv.mkDerivation rec { name = "racket"; @@ -27,7 +13,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ cairo - coreutils file libjpeg libpng @@ -64,7 +49,8 @@ stdenv.mkDerivation rec { ''; homepage = http://racket-lang.org/; - license = "LGPL"; - platforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.kkallio ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index b4424b445c5fa..9e72862a5c2ae 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -5,10 +5,11 @@ assert qt4Support -> qt4 != null; stdenv.mkDerivation rec { - name = "avahi-0.6.27"; + name = "avahi-0.6.28"; + src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "112yqh5k4ph5f1fsd98q1035477wmzq5nm2jrkivz5fnn3hgabf2"; + sha256 = "14gw611d3srn2r18a6g4y04r571w3l4lihiiaffryar1i2n0mn50"; }; patches = [ ./no-mkdir-localstatedir.patch ]; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix new file mode 100644 index 0000000000000..d04f8c8e750a3 --- /dev/null +++ b/pkgs/development/libraries/check/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv }: + +let version = "0.9.8"; in +stdenv.mkDerivation { + name = "check-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; + sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42"; + }; + + doCheck = true; + + meta = { + description = "Check, a unit testing framework for C"; + + longDescription = + '' Check is a unit testing framework for C. It features a simple + interface for defining unit tests, putting little in the way of the + developer. Tests are run in a separate address space, so Check can + catch both assertion failures and code errors that cause + segmentation faults or other signals. The output from unit tests + can be used within source code editors and IDEs. + ''; + + homepage = http://check.sourceforge.net/; + + license = "LGPLv2+"; + }; +} diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 93cec825d6bab..666e5f539edd4 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.10.1"; + name = "gnutls-2.10.2"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "1vh2qc2pk6srlqk4ag0v7ba41jmy9816a2mj8yx1253626y7h43k"; + sha256 = "09479y0qy91qg20kkq9j0yy4agnpi4knb8ciq83cq0lvqqzplbp8"; }; configurePhase = '' diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index df4cdf5b46498..98fc62c056807 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "cairo"; - version = "0.11.0"; - sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a"; + version = "0.11.1"; + sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58"; extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools]; propagatedBuildInputs = [mtl]; meta = { diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix new file mode 100644 index 0000000000000..b9d3ee4d13e8a --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -0,0 +1,13 @@ +{cabal, binary, mtl}: + +cabal.mkDerivation (self : { + pname = "ghc-events"; + version = "0.2.0.1"; + sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6"; + propagatedBuildInputs = [binary mtl]; + meta = { + description = "Library and tool for parsing .eventlog files from GHC"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix new file mode 100644 index 0000000000000..f3152a9248306 --- /dev/null +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, gtk, mtl, pango, gtk2hsBuildtools, pkgconfig, gnome, glibc}: + +cabal.mkDerivation (self : { + pname = "glade"; + version = "0.11.1"; + sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc]; + propagatedBuildInputs = [cairo glib gtk mtl pango]; + meta = { + description = "Binding to the glade library"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix new file mode 100644 index 0000000000000..d56a9abe5958b --- /dev/null +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -0,0 +1,13 @@ +{cabal, gtk2hsBuildtools, pkgconfig, glib, glibc}: + +cabal.mkDerivation (self : { + pname = "glib"; + version = "0.11.2"; + sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb"; + extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools]; + meta = { + description = "Binding to the GLIB library for Gtk2Hs"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix new file mode 100644 index 0000000000000..5e940e4e8c5a7 --- /dev/null +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, mtl, pango, gtk2hsBuildtools, pkgconfig, gtk, glibc}: + +cabal.mkDerivation (self : { + pname = "gtk"; + version = "0.11.2"; + sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc]; + propagatedBuildInputs = [cairo glib mtl pango]; + meta = { + description = "Binding to the Gtk+ graphical user interface library"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 41a3ac41e54dd..07fa2fbf9a971 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "gtk2hs-buildtools"; - version = "0.9"; - sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20"; + version = "0.11.2"; + sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad"; extraBuildInputs = [alex happy]; meta = { description = "Tools to build the Gtk2Hs suite of User Interface libraries"; diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix new file mode 100644 index 0000000000000..2a8ba497f3f97 --- /dev/null +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -0,0 +1,14 @@ +{cabal, cairo, glib, mtl, gtk2hsBuildtools, pkgconfig, pango, glibc}: + +cabal.mkDerivation (self : { + pname = "pango"; + version = "0.11.2"; + sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504"; + extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc]; + propagatedBuildInputs = [cairo glib mtl]; + meta = { + description = "Binding to the Pango text rendering engine"; + license = "LGPLv2+"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix new file mode 100644 index 0000000000000..be0e9a44ae832 --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon, + gettext, pkgconfig, apr, aprutil, boost }: + +stdenv.mkDerivation rec { + name = "kdevplatform-1.0.2"; + + src = fetchurl { + url = "mirror://kde/stable/kdevelop/4.0.2/src/${name}.tar.bz2"; + sha256 = "0yn4v3jx1dks84nvi7s40a1pmnvipqx5hlbvbmdgqhhpqik5y9qg"; + }; + + propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; + buildInputs = [ cmake automoc4 perl gettext pkgconfig apr aprutil boost stdenv.gcc.libc ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = platforms.linux; + description = "KDE libraries for IDE-like programs"; + longDescription = '' + A free, opensource set of libraries that can be used as a foundation for + IDE-like programs. It is programing-language independent, and is planned + to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." + ''; + }; +} diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 83707b2477e3b..3d34f6303e390 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -17,11 +17,13 @@ in stdenv.mkDerivation rec { sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6"; }; - buildInputs = [ pkgconfig glib libxml2 gnutls gsasl ] + buildInputs = [ pkgconfig glib libxml2 gsasl ] ++ optional gtkWidgets gtk ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; + + propagatedBuildInputs = [ gnutls ]; configureFlags = '' ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index b02fca888e0c4..a2fdeb09ce01f 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.7"; + name = "libtasn1-2.8"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0rhyg043cqhajrmk30ylfvpk4dfig4djgy1j3q957vj5pqg7zzqh"; + sha256 = "0njl5l9h48v2ikfim96yxpnwjhhfwfmszz4i08psw60bn7s78z9b"; }; doCheck = true; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 7066bc6f9d5e5..36c8073348d82 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk"; }; - buildInputs = [ pkgconfig libxml2 glibmm perl ]; + buildInputs = [ pkgconfig glibmm perl ]; + + propagatedBuildInputs = [ libxml2 ]; configureFlags = "--disable-documentation"; #doesn't build without this for some reason diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix index 14d425b23a26b..47418be669342 100644 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = "pango-1.28.1"; + name = "pango-1.28.3"; src = fetchurl { url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2"; - sha256 = "8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2"; + sha256 = "0ch640zmf159gr9qp3i4a5mh1ib2s9h3660g4w0bpiqc8g4qn9sy"; }; - buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; + buildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin gettext; propagatedBuildInputs = [ x11 glib cairo libpng ]; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index ccef9d08f7344..65eb51af9b003 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,10 +13,9 @@ stdenv.mkDerivation { # problem. In case we ever update the Darwin GCC version, the exception for # that platform ought to be removed. configureFlags = '' - CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; doCheck = true; diff --git a/pkgs/development/python-modules/flup/default.nix b/pkgs/development/python-modules/flup/default.nix deleted file mode 100644 index 2c0a84aec1a57..0000000000000 --- a/pkgs/development/python-modules/flup/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, python, setuptools, ... }: - -rec { - name = "flup-1.0.2"; - - src = fetchurl { - url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz"; - sha256 = "1nbx174g40l1z3a8arw72qz05a1qxi3didp9wm7kvkn1bxx33bab"; - }; - - buildInputs = [ python setuptools ]; - - phaseNames = ["addInputs" "createPythonInstallationTarget" "installPythonPackage"]; - - meta = { - description = "FastCGI Python module set"; - }; -} diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix new file mode 100644 index 0000000000000..1d1d5ed25a9d7 --- /dev/null +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -0,0 +1,14 @@ +{cabal, binary, cairo, ghcEvents, glade, gtk, mtl}: + +cabal.mkDerivation (self : { + pname = "threadscope"; + version = "0.1.2"; + sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90"; + propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl]; + meta = { + description = "A graphical thread profiler"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 6896da2ec4c8f..f0c3458dd5ada 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { - name = "autoconf-2.67"; + name = "autoconf-2.68"; src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.bz2"; - sha256 = "1vwalyqzgk1liyinblbc78isxa5qa4fvs5bx2fkjd7crfhhdkph0"; + sha256 = "1j1j8d2p3r9mzx8b2hnmfqy2683r2wyyvki6bs9cmm6n7wkzp4f4"; }; buildInputs = [ m4 perl ]; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index c6f34f8e8371b..4b01c9d33e8ef 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,5 +1,15 @@ {stdenv, fetchurl, libftdi}: +let + # The "GuruPlug installer" from Marvell. See + # <http://www.plugcomputer.org/index.php/us/resources/downloads?func=select&id=16>, + # linked from <http://www.globalscaletechnologies.com/t-downloads.aspx>. + guruplug_installer = fetchurl { + url = "http://www.plugcomputer.org/index.php/us/resources/downloads?func=download&id=65&chk=d6878f4bf86070f7b4f7bc93317fcb0f&no_html=1"; + sha256 = "1nps9li9k1kxb31f9x6d114hh0a3bx886abvgh8vg004ni996hlv"; + name = "guruplug-installer.tar.gz"; + }; +in stdenv.mkDerivation { name = "openocd-0.4.0"; @@ -8,15 +18,37 @@ stdenv.mkDerivation { sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv"; }; - configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ]; buildInputs = [ libftdi ]; + # Copy the GuruPlug stuff. + # XXX: Unfortunately, these files were written for OpenOCD 0.2.0 and don't + # work with 0.4.0. + # postInstall = + # '' tar xf "${guruplug_installer}" + # for dir in interface target board + # do + # cp -v "guruplug-installer/openocd/$dir/"* \ + # "$out/share/openocd/scripts/$dir/" + # done + # ''; + meta = { homepage = http://openocd.berlios.de; - description = "Open On Chip Debugger"; - license = "GPLv2"; + description = "OpenOCD, an on-chip debugger"; + + longDescription = + '' OpenOCD provides on-chip programming and debugging support with a + layered architecture of JTAG interface and TAP support, debug target + support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, + etc.). Several network interfaces are available for interactiving + with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables + OpenOCD to function as a "remote target" for source-level debugging + of embedded systems using the GNU GDB program. + ''; + + license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; |