diff options
Diffstat (limited to 'pkgs')
19 files changed, 266 insertions, 119 deletions
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix new file mode 100644 index 000000000000..dd23504d3fad --- /dev/null +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cairo, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "ams-lv2-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "https://github.com/blablack/ams-lv2/archive/v${version}.tar.gz"; + sha256 = "0fa1ghf6qahbhj9j1ciyw0hr6nngwksa37hbs651mlz0fn7lz4xm"; + }; + + buildInputs = [ cairo gtk gtkmm lv2 lvtk pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "An LV2 port of the internal modules found in Alsa Modular Synth"; + homepage = http://objectivewave.wordpress.com/ams-lv2; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix new file mode 100644 index 000000000000..73138cc269d0 --- /dev/null +++ b/pkgs/applications/audio/ingen/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jackaudio, lilv +, lv2, pkgconfig, python, raul, serd, sord, sratom, suil +}: + +stdenv.mkDerivation rec { + name = "ingen-svn-${rev}"; + rev = "5317"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ingen"; + rev = rev; + sha256 = "0zm3wbv9qsingjyr95nwin3khmnf3wq3fz2xa6p420dpcy6qnl4x"; + }; + + buildInputs = [ + boost ganv glibmm gtk gtkmm jackaudio lilv lv2 pkgconfig python + raul serd sord sratom suil + ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; + homepage = http://drobilla.net/software/ingen; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 3fc3e1e8e5f3..7e67682f17f9 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do wrapProgram "$file" \ - --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --set MATPLOTLIBRC "$out/share/gnuradio" done ''; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 093b801401dc..f557af41db92 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,30 +1,51 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk2, gnome2 /*just GConf*/ -, libsoup, libunique, libxslt, webkit_gtk2, json_glib -, libnotify /*optional*/ }: +{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3 +, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup +, webkitgtk, json_glib, gobjectIntrospection, gsettings_desktop_schemas +, gst_all_1 +, libnotify +, makeWrapper +}: -let version = "1.8.15"; +let pname = "liferea"; + version = "1.10.6"; in stdenv.mkDerivation rec { - name = "liferea-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/liferea/Liferea%20Stable/${version}/${name}.tar.bz2"; - sha256 = "12hhdl5biwcvr9ds7pdhhvlp4vggjix6xm4z5pnfaz53ai2dnc99"; + url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.gz"; + sha256 = "0vp19z4p3cn3zbg1zjpg2iyzwq893dx5c1kh6aac06s3rf1124gm"; }; - buildInputs = [ - pkgconfig intltool gtk2 gnome2.GConf - libsoup libunique libxslt webkit_gtk2 json_glib + buildInputs = with gst_all_1; [ + pkgconfig intltool python + glib gnome3.gtk pango libxml2 libxslt sqlite libsoup + webkitgtk json_glib gobjectIntrospection gsettings_desktop_schemas + gnome3.libpeas + gst-plugins-base gst-plugins-good gst-plugins-bad + gnome3.gnome_keyring libnotify + makeWrapper ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache''; + postInstall = '' + for f in "$out"/bin/*; do + wrapProgram "$f" \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gsettings_desktop_schemas}/share:${gnome3.gtk}/share:$out/share" + done + ''; + meta = { description = "A GTK-based news feed agregator"; homepage = http://lzone.de/liferea/; - maintainers = [ stdenv.lib.maintainers.vcunat ]; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ vcunat romildo ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 58e657f8b2e7..5918f0612ce0 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,10 +6,10 @@ { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd -, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon +, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups -, libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler +, icu, boost, jdk, ant, cups, xorg +, openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra @@ -246,13 +246,14 @@ stdenv.mkDerivation rec { make slowcheck ''; - buildInputs = + buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst mdds mesa mythes + libXaw libXext libXi libXinerama libxml2 libxslt libXtst + libXdmcp libpthreadstubs mdds mesa mythes neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler python3 sablotron saneBackends tcsh unzip vigra which zip zlib mdds bluez5 glibc libmspub libixion liborcus liblangtag diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index eeec43a1b65f..9cf8426104be 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -1,10 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, intltool +, glib, gtk3, gobjectIntrospection, python, pygobject3 +}: stdenv.mkDerivation rec { name = "libpeas-${version}"; version = "1.9.0"; - buildInputs = with gnome3; [ intltool pkgconfig glib gobjectIntrospection gtk3 ]; + buildInputs = [ + intltool pkgconfig + glib gtk3 gobjectIntrospection python pygobject3 + ]; src = fetchurl { url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz"; @@ -15,8 +20,10 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = with stdenv.lib; { - platforms = platforms.linux; + meta = { + description = "A GObject-based plugins engine"; + homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; - } diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index af37b4372b76..33b67a10f19b 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let majorVersion = "3.3"; - version = "${majorVersion}.4"; + version = "${majorVersion}.5"; buildInputs = filter (p: p != null) [ zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "12ank7in8xyncim3yyn3mi84wkc4g9nx7yrci1406kn0j5ni5k66"; + sha256 = "1rdncc7g8g6f3lfdg33rli1yffbiq8z283xy4f5ksl1l8i49psdb"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix new file mode 100644 index 000000000000..0abe3f0376b9 --- /dev/null +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lvtk-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "http://lvtoolkit.org/code/browse/lvtk/snapshot/${name}.tar.gz"; + sha256 = "161l4n3a2kar2r5mn3zz6dbj1p2s6361ainrka3s74518z7yf42w"; + }; + + buildInputs = [ boost gtkmm lv2 pkgconfig python ]; + + configurePhase = '' + python waf configure --prefix=$out --boost-includes=${boost}/include + ''; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A set C++ wrappers around the LV2 C API"; + homepage = http://lvtoolkit.org; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix new file mode 100644 index 000000000000..aad3656cde80 --- /dev/null +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "raul-svn-${rev}"; + rev = "5205"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/raul"; + rev = rev; + sha256 = "1rkl7vxhwf6d0qfl2ymfd1qwmh9cl1xv6kkz893xg0blpvzcdmp3"; + }; + + buildInputs = [ boost gtk pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "A C++ utility library primarily aimed at audio/musical applications"; + homepage = http://drobilla.net/software/raul; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix new file mode 100644 index 000000000000..40e0388d749e --- /dev/null +++ b/pkgs/development/libraries/ganv/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "ganv-svn-${rev}"; + rev = "5318"; + + src = fetchsvn { + url = "http://svn.drobilla.net/lad/trunk/ganv"; + rev = rev; + sha256 = "0wi87ks2xjma979d9hy82wmlm06g4sr0pm3b1n3zv27y52wrf7fl"; + }; + + buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + + configurePhase = "python waf configure --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = "python waf install"; + + meta = with stdenv.lib; { + description = "An interactive Gtk canvas widget for graph-based interfaces"; + homepage = http://drobilla.net; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix deleted file mode 100644 index 123d229f2ba5..000000000000 --- a/pkgs/development/libraries/poppler/0.18.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib -, libjpeg, curl, libpthreadstubs, xorg, openjpeg -, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty -, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted -, qt4Support ? false, qt4 ? null -}: - -stdenv.mkDerivation rec { - name = "poppler-0.18.4"; - - src = fetchurl { - url = "${meta.homepage}${name}.tar.gz"; - sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik"; - }; - - propagatedBuildInputs = with xorg; - [ zlib cairo freetype fontconfig libjpeg lcms curl - libpthreadstubs libxml2 stdenv.gcc.libc - libXau libXdmcp libxcb libXrender libXext - openjpeg - ] - ++ stdenv.lib.optional glibSupport glib - ++ stdenv.lib.optional gtk3Support gtk3 - ++ stdenv.lib.optional qt4Support qt4; - - nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty; - - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - - patches = [ ./datadir_env.patch ]; - - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; - - enableParallelBuilding = true; - - meta = { - homepage = http://poppler.freedesktop.org/; - description = "Poppler, a PDF rendering library"; - - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; - - platforms = if qt4Support - then qt4.meta.platforms - else stdenv.lib.platforms.all; - - license = "GPLv2"; - }; -} diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index 8aedd8a6159b..5d7da48ccede 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -5,9 +5,9 @@ let baseName="cl-launch"; version="4.0.2.2"; name="${baseName}-${version}"; - hash="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz.asc"; - sha256="068bq66az3qhwgaxi9mx7f80396jilmd3zf4d3qamsyd81aq323c"; + hash="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz"; + sha256="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b"; }; buildInputs = [ ]; diff --git a/pkgs/development/tools/misc/cl-launch/default.upstream b/pkgs/development/tools/misc/cl-launch/default.upstream index 1ff5daca02c5..ff7ee9446d28 100644 --- a/pkgs/development/tools/misc/cl-launch/default.upstream +++ b/pkgs/development/tools/misc/cl-launch/default.upstream @@ -1,2 +1,2 @@ url http://common-lisp.net/project/xcvb/cl-launch/ -version_link '.-[0-9].*[0-9][.]tar[.].*' +version_link '.-[0-9].*[0-9][.]tar[.][a-z0-9]*$' diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 9bee6c81a8af..88807ab6deaa 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -2,12 +2,12 @@ cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "oxygen-gtk2-${version}"; src = fetchurl { url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "1611zkblfy8ahadyz4a1hc0vjfwkh8mdbnwjqm02i30vnhv3iy1j"; + sha256 = "1w3300v7kclpaccvd0wsajgay4mgg2fbbi1nd0zak0p5nn40sqf8"; }; buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix new file mode 100644 index 000000000000..6a3fbd33d689 --- /dev/null +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "can-utils-${version}"; + # There are no releases (source archives or git tags), so use the date of the + # latest commit in git master as version number. + version = "20140227"; + + src = fetchgit { + url = "https://git.gitorious.org/linux-can/can-utils.git"; + rev = "67a2bdcd336e6becfa5784742e18c88dbeddc973"; + sha256 = "0pnnjl141wf3kbf256m6qz9mxz0144z36qqb43skialzcnlhga38"; + }; + + preConfigure = ''makeFlagsArray+=(PREFIX="$out")''; + + meta = with stdenv.lib; { + description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; + homepage = "https://gitorious.org/linux-can/can-utils"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/tools/networking/badvpn/default.nix index fbea93d7edbc..64f669a480e2 100644 --- a/pkgs/tools/networking/badvpn/default.nix +++ b/pkgs/tools/networking/badvpn/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="badvpn"; - version="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2"; + version="1.999.129"; name="${baseName}-${version}"; - hash="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b"; - url="http://badvpn.googlecode.com/files/badvpn-openwrt.tar.bz2"; - sha256="1sr7i52msdjy8g7mrgwgqn3fqfvfjs48nz3waxf8r7wg1livvl2b"; + hash="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; + url="https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz"; + sha256="078gax6yifkf9y9g01wn1p0dypvgiwcsdmzp1bhwwfi0fbpnzzgl"; }; buildInputs = [ cmake openssl nss pkgconfig nspr diff --git a/pkgs/tools/networking/badvpn/default.upstream b/pkgs/tools/networking/badvpn/default.upstream index 1c746698fefe..2a85ba7cb519 100644 --- a/pkgs/tools/networking/badvpn/default.upstream +++ b/pkgs/tools/networking/badvpn/default.upstream @@ -1,3 +1,3 @@ -url http://gc.codehum.com/p/badvpn/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'gc.codehum.com//' '' +url https://github.com/ambrop72/badvpn/releases +version_link '[0-9][.]tar[.][a-z0-9]+$' +version '.*/([0-9.]+)[.]tar[.].*' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bdf2440576c..36fdd6e78bbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -661,6 +661,8 @@ let cabextract = callPackage ../tools/archivers/cabextract { }; + can-utils = callPackage ../os-specific/linux/can-utils { }; + ccid = callPackage ../tools/security/ccid { }; ccrypt = callPackage ../tools/security/ccrypt { }; @@ -4182,6 +4184,8 @@ let gamin = callPackage ../development/libraries/gamin { }; + ganv = callPackage ../development/libraries/ganv { }; + gav = callPackage ../games/gav { }; gsb = callPackage ../games/gsb { }; @@ -5437,13 +5441,6 @@ let poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; - poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { - lcms = lcms2; - glibSupport = true; - gtk3Support = false; - qt4Support = false; - }; - popt = callPackage ../development/libraries/popt { }; portaudio = callPackage ../development/libraries/portaudio { @@ -5546,6 +5543,8 @@ let rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + raul = callPackage ../development/libraries/audio/raul { }; + readline = readline6; readline4 = callPackage ../development/libraries/readline/readline4.nix { }; @@ -5575,6 +5574,8 @@ let lv2 = callPackage ../development/libraries/audio/lv2 { }; + lvtk = callPackage ../development/libraries/audio/lvtk { }; + qrupdate = callPackage ../development/libraries/qrupdate { }; redland = pkgs.librdf_redland; @@ -7463,6 +7464,8 @@ let alchemy = callPackage ../applications/graphics/alchemy { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; @@ -8388,7 +8391,6 @@ let freefont_ttf xorg.fontmiscmisc xorg.fontbhttf ]; }; - poppler = poppler_0_18; clucene_core = clucene_core_2; lcms = lcms2; mdds = mdds_0_7_1; @@ -9482,6 +9484,8 @@ let icbm3d = callPackage ../games/icbm3d { }; + ingen = callPackage ../applications/audio/ingen { }; + instead = callPackage ../games/instead { lua = lua5; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b44e7272c584..927c1483c432 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4152,7 +4152,7 @@ rec { checkPhase = if python.is_py3k or false then '' ${python}/bin/${python.executable} setup.py build_tests '' else "" + '' - rm functional_tests/test_multiprocessing/test_concurrent_shared.py # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 + rm functional_tests/test_multiprocessing/test_concurrent_shared.py* # see https://github.com/nose-devs/nose/commit/226bc671c73643887b36b8467b34ad485c2df062 ${python}/bin/${python.executable} selftest.py ''; @@ -6754,46 +6754,44 @@ rec { }; }); - - sqlalchemy = buildPythonPackage rec { - name = "sqlalchemy-${version}"; - version = "0.7.10"; - + sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { + name = "SQLAlchemy-0.7.10"; src = fetchurl { - url = "http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz"; + url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; }; - patches = [ # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ # waiting for 0.7.11 release ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch ]; + }); - buildInputs = [ nose ]; - - propagatedBuildInputs = [ modules.sqlite3 ]; - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; + sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { + name = "SQLAlchemy-0.8.5"; + src = fetchurl { + url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; + md5 = "ecf0738eaf1229bae27ad2be0f9978a8"; }; - }; - - - sqlalchemy8 = buildPythonPackage rec { - name = "SQLAlchemy-${version}"; - version = "0.8.2"; + }); + + sqlalchemy9 = buildPythonPackage rec { + name = "SQLAlchemy-0.9.3"; src = fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "5a33fb43dea93468dbb2a6562ee80b54"; + md5 = "a27989b9d4b3f14ea0b1600aa45559c4"; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ modules.sqlite3 ]; + checkPhase = '' + ${python.executable} sqla_nose.py + ''; + meta = { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; |