diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 6b994c7d9ae..bb10f24b90a 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp - ''; + sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct + ''; # why doesn't scons find librdf? buildPhase = '' diff --git a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix new file mode 100644 index 00000000000..9db6e4cb736 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix @@ -0,0 +1,26 @@ +{ clangStdenv, fetchgit, llvm, clangUnwrapped }: + +clangStdenv.mkDerivation { + name = "emacs-clang-complete-async-20130218"; + src = fetchgit { + url = "git://github.com/Golevka/emacs-clang-complete-async.git"; + rev = "f01488971ec8b5752780d130fb84de0c16a46f31"; + sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf"; + }; + + buildInputs = [ llvm clangUnwrapped ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp + install -m 755 clang-complete $out/bin + install -m 644 auto-complete-clang-async.el $out/share/emacs/site-lisp + ''; + + meta = { + homepage = "https://github.com/Golevka/emacs-clang-complete-async"; + description = "An emacs plugin to complete C and C++ code using libclang"; + license = "GPLv3+"; + }; +} + diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 150bb071cb1..37905f8a73f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,14 +4,14 @@ , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { - name = "inkscape-0.48.3.1"; + name = "inkscape-0.48.4"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7"; + sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7"; }; - patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; + patches = [ ./configure-python-libs.patch ]; propagatedBuildInputs = [ # Python is used at run-time to execute scripts, e.g., those from diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index a811d759f7e..7151fc7af5c 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: +{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { name = "meshlab-1.3.2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ qt unzip ]; + buildInputs = [ qt4 unzip ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix new file mode 100644 index 00000000000..9d7b6fa7a28 --- /dev/null +++ b/pkgs/applications/misc/evtest/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }: + +stdenv.mkDerivation rec { + name = "evtest-1.30"; + + preConfigure = "autoreconf -iv"; + + buildInputs = [ autoconf automake pkgconfig libxml2 ]; + + src = fetchgit { + url = "git://anongit.freedesktop.org/evtest"; + rev = "1a50f2479c4775e047f234a24d95dda82441bfbd"; + }; + + meta = { + description = "Simple tool for input event debugging"; + license = "GPLv2"; + }; +} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index bbc8aaac49b..de1df426052 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20121212"; + version = "3.20130212"; lib = stdenv.lib; in @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1frsr2sqzsnagbxvyjsgk4nrl1p1048vybsd1zw1ln1mqik31ydz"; + sha256 = "1svajjhrwaq7wwgmhaxc2ld12cla3pdi9i7m8ll2rfa11cdhhf6m"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/networking/browsers/chromium/clone_detached.patch b/pkgs/applications/networking/browsers/chromium/clone_detached.patch new file mode 100644 index 00000000000..682de656459 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/clone_detached.patch @@ -0,0 +1,19 @@ +From 222f1e980ab84ffd3a21001feaf06dd537570a1a Mon Sep 17 00:00:00 2001 +From: Ian Farmer +Date: Sat, 16 Feb 2013 09:38:10 -0800 +Subject: [PATCH] Update Chromium dev channel version to 26.0.1410.5. + +This version requires a patch for compatibility with versions +of glibc that support older kernel versions. + +--- a/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:06.000000000 -0800 ++++ b/content/common/sandbox_seccomp_bpf_linux.cc 2013-02-15 23:26:24.000000000 -0800 +@@ -1313,7 +1313,7 @@ + return Sandbox::Cond(0, ErrorCode::TP_32BIT, ErrorCode::OP_EQUAL, + CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | + CLONE_THREAD | CLONE_SYSVSEM | CLONE_SETTLS | +- CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID, ++ CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | CLONE_DETACHED, + ErrorCode(ErrorCode::ERR_ALLOWED), + Sandbox::Trap(ReportCloneFailure, NULL)); + } else { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3aeaf41ad57..8578514f968 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -14,6 +14,15 @@ , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, mesa +# dependencies for v25 +, libvpx + +# dependencies for >= v25 +, protobuf + +# dependencies for >= v26 +, speechd, libXdamage + # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -59,6 +68,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; # http://crbug.com/143623 + use_system_protobuf = post25; use_system_harfbuzz = false; use_system_icu = false; @@ -66,6 +76,9 @@ let use_system_skia = false; use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = false; + } // optionalAttrs (post24 && !post25) { + use_system_libvpx = true; + use_system_protobuf = true; }; defaultDependencies = [ @@ -78,7 +91,9 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; + post25 = !versionOlder sourceInfo.version "26.0.0.0"; only24 = post23 && !post24; + only25 = post24 && !post25; maybeFixPulseAudioBuild = optional (only24 && pulseSupport) ./pulse_audio_fix.patch; @@ -109,7 +124,9 @@ in stdenv.mkDerivation rec { ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt ++ optional pulseSupport pulseaudio - ++ optional post24 pciutils; + ++ optionals post24 [ pciutils protobuf ] + ++ optional only25 libvpx + ++ optionals post25 [ speechd libXdamage ]; opensslPatches = optional useOpenSSL openssl.patches; @@ -117,12 +134,16 @@ in stdenv.mkDerivation rec { patches = optional cupsSupport ./cups_allow_deprecated.patch ++ optional pulseSupport ./pulseaudio_array_bounds.patch - ++ maybeFixPulseAudioBuild; + ++ maybeFixPulseAudioBuild + ++ optional post25 ./clone_detached.patch; postPatch = optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl '' + optionalString post24 '' sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi + '' + optionalString post25 '' + sed -i -e 's|/usr/bin/gcc|gcc|' \ + third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { @@ -202,4 +223,6 @@ in stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.linux; }; +} // optionalAttrs only25 { + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; } diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 700aa9a4e00..da3de4c968d 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "25.0.1364.36"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; - sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; + version = "26.0.1410.10"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.10.tar.xz"; + sha256 = "1s5c69j0g2nanapvq3fmkc5iv7s53x2q5d8fxgdzd7c5c8pzlbby"; }; beta = { - version = "25.0.1364.68"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2"; - sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9"; + version = "25.0.1364.84"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.84.tar.bz2"; + sha256 = "1p5k7vpk4v2m5yhhdkplq4iq4mm1vv297m9sp7max1sjbngwq6m5"; }; stable = { - version = "24.0.1312.69"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.69.tar.bz2"; - sha256 = "1nvnhkky72nywk601vx5bbjp1m2f5dygza9h34y20inz3jgg8nbr"; + version = "24.0.1312.70"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.70.tar.bz2"; + sha256 = "01z2xdfrlw2iynh9ink3d7hddldh2krgx3w9qnq9nq9z54vwwzfq"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/18.0.nix b/pkgs/applications/networking/browsers/firefox/19.0.nix similarity index 93% rename from pkgs/applications/networking/browsers/firefox/18.0.nix rename to pkgs/applications/networking/browsers/firefox/19.0.nix index f9258792a2e..a46143066c1 100644 --- a/pkgs/applications/networking/browsers/firefox/18.0.nix +++ b/pkgs/applications/networking/browsers/firefox/19.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, freetype, fontconfig, file, alsaLib, nspr, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , # If you want the resulting program to call itself "Firefox" instead @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "18.0.2"; + firefoxVersion = "19.0"; - xulVersion = "18.0.2"; # this attribute is used by other packages + xulVersion = "19.0"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "fe5810d61edf6f4dc8bc477a08f9483b955f747b"; + sha1 = "816d64e8c9432349cd208fd181d210c54f985351"; }; commonConfigureFlags = @@ -60,7 +60,7 @@ rec { [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa + alsaLib nspr libnotify xlibs.pixman yasm mesa xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper ]; @@ -125,7 +125,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify + dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify xlibs.pixman yasm mesa sqlite file unzip pysqlite ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 7e2bfb692a3..202dfe2b02e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -3,7 +3,6 @@ , zlib , alsaLib , curl -, nss , nspr , fontconfig , freetype @@ -44,9 +43,9 @@ let throw "no x86_64 debugging version available" else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_x86_64.tar.gz"; - sha256 = "0nkwpqp8ilv21rlmr4jv8abdnfmz292y3w1qlx6r67qf926nfrz2"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "1bfr7ajpqkah4kshhqkmi2c15mm962absrq9ks7gfsfaircp387j"; } else if stdenv.system == "i686-linux" then if debug then { @@ -55,9 +54,9 @@ let url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; } else rec { - version = "11.2.202.251"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux_i386.tar.gz"; - sha256 = "0nph42s1bspf88m1qqrvc93kkxkrvq3lfs5iq4l5dflwzs32jdm3"; + version = "11.2.202.262"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0fhslr46apa6qfzdhagmjb8vbl741ryh6j14qy2271nl2q687jsx"; } else throw "Flash Player is not supported on this platform"; @@ -77,7 +76,7 @@ stdenv.mkDerivation { }; rpath = stdenv.lib.makeLibraryPath - [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 + [ zlib alsaLib curl nspr fontconfig freetype expat libX11 libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf libvdpau ]; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 04e119afdb1..6327cf1efae 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip -, speex, readline, mediastreamer }: - +, speex, readline, mediastreamer, libsoup }: + stdenv.mkDerivation rec { - name = "linphone-3.5.0"; + name = "linphone-3.5.2"; src = fetchurl { url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz"; - sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix"; + sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys"; }; - buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ]; + patches = [ ./fix-deprecated.patch ]; + + buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ]; buildNativeInputs = [ intltool pkgconfig ]; + preConfigure = "rm -r mediastreamer2 oRTP"; + configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; meta = { diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch new file mode 100644 index 00000000000..8978e6e6652 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch @@ -0,0 +1,35 @@ +diff --git a/gtk/main.c b/gtk/main.c +index 7079bc8..f076127 100644 +--- a/gtk/main.c ++++ b/gtk/main.c +@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){ + GdkPixbuf *pbuf; + const char *app_name="Linphone"; + +- g_thread_init(NULL); ++ g_type_init(); + gdk_threads_init(); + + progpath = strdup(argv[0]); +diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c +index 1c54fca..45c9091 100644 +--- a/gtk/setupwizard.c ++++ b/gtk/setupwizard.c +@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) { + linphone_account_creator_set_username(creator, gtk_entry_get_text(username)); + + if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { +- g_thread_create(check_username_availability, (void*)w, FALSE, NULL); ++ g_thread_new (NULL, check_username_availability, (void*)w); + } + else { + if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { +@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){ + ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png")); + notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png")); + +- g_thread_init (NULL); ++ g_type_init (); + gdk_threads_init (); + + GtkWidget *p1=create_intro(); diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 9d7126452c9..147d5f49151 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.14"; + name = "notmuch-0.15"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753"; + sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Notmuch -- The mail indexer"; longDescription = ""; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index e62751cde9d..3ba9e7eb49f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20121213"; + name = "hol_light-20130124"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "153"; - sha256 = "1n4da5k3jya8mf7dgif8cl5sr2dqf6vl21fw1fcdna215v2x1rc0"; + rev = "155"; + sha256 = "057223kcv7y2vcnyzvrygvdafn6mb7ycr1m5rj3fsrwz0yl8dqnr"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3120cc84e63..75c71f9cfdf 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -49,7 +49,7 @@ rec { network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck - SafeSemaphore networkPprotocolXmpp async dns DAV; + SafeSemaphore networkPprotocolXmpp async dns DAV uuid Glob; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index aef86c06cfb..7f11462aa02 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -8,18 +8,18 @@ , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time , transformers, transformersBase, utf8String, wai, waiLogger, warp , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore -, networkPprotocolXmpp, async, dns, DAV +, networkPprotocolXmpp, async, dns, DAV, uuid, Glob }: let - version = "3.20130107"; + version = "3.20130216"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "15x4rmpxv3mgp8r4gb6jana5262nvyl6rm5p8slc5z5ijl0qwbzq"; + sha256 = "1zbxkv9kkfyr8haml0wih1fi2xi6qazwzcxjyv8q65fa80ksskbr"; name = "git-annex-${version}.tar.gz"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { networkInfo networkMulticast pcreLight QuickCheck SHA stm text time transformers transformersBase utf8String wai waiLogger warp yesod yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp - async dns DAV ]; + async dns DAV uuid Glob ]; checkTarget = "test"; doCheck = true; diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix index b518e9c7456..8109477aa64 100644 --- a/pkgs/applications/video/kdenlive/default.nix +++ b/pkgs/applications/video/kdenlive/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "kdenlive-${version}"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "mirror://kde/stable/kdenlive/0.9.2/src/${name}.tar.bz2"; - sha256 = "1h240s0c10z8sgvwmrfzam33qlx7j2a5b12lw1mk02ihs9hl43j1"; + url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; + sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif"; }; buildInputs = diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index a15755205ee..0b8b71db7e9 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ extensibleExceptions filepath mtl utf8String X11 ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv $out/share/xmonad-*/man/*.1 $out/share/man/man1/ + ''; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 2c0ca37553d..38def9c59a6 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, cpio, contents, ubootChooser}: +{stdenv, perl, cpio, contents, ubootChooser, compressor}: let inputsFun = ubootName : [perl cpio] @@ -40,4 +40,5 @@ stdenv.mkDerivation { buildNativeInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; + inherit compressor; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index b2c78463569..f6cadaf0281 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -o -H newc --null | gzip -9 > $out/initrd) +(cd root && find * -print0 | cpio -o -H newc --null | $compressor > $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 336563ae285..84dd2986750 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -46,17 +46,17 @@ stdenv.mkDerivation ( header "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR - stopNest + stopNest fi fi ''; } - // args // + // args // { name = name + (if src ? version then "-" + src.version else ""); - + postHook = '' . ${./functions.sh} origSrc=$src @@ -75,7 +75,11 @@ stdenv.mkDerivation ( echo "$system" > $out/nix-support/system if [ -z "${toString doCoverageAnalysis}" ]; then - echo "nix-build none $out" >> $out/nix-support/hydra-build-products + for i in $outputs; do + if [ "$i" = out ]; then j=none; else j="$i"; fi + mkdir -p ''${!i}/nix-support + echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products + done fi ''; diff --git a/pkgs/desktops/e17/embryo/default.nix b/pkgs/desktops/e17/embryo/default.nix index 29f157545db..59b5540f25d 100644 --- a/pkgs/desktops/e17/embryo/default.nix +++ b/pkgs/desktops/e17/embryo/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { untouched. ''; homepage = http://enlightenment.org/; - license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure + license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure }; } diff --git a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix index 320372786a5..7b1ccb97dc4 100644 --- a/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix +++ b/pkgs/desktops/gnome-2/platform/libart_lgpl/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libart_lgpl-2.3.20"; +stdenv.mkDerivation rec { + name = "libart_lgpl-2.3.21"; src = fetchurl { - url = mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.20.tar.bz2; - sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym"; + url = "mirror://gnome/sources/libart_lgpl/2.3/${name}.tar.bz2"; + sha256 = "1yknfkyzgz9s616is0l9gp5aray0f2ry4dw533jgzj8gq5s1xhgx"; }; } diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 07071ef8414..3494f63c11c 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { ln -s $f $out/etc/bash_completion.d/ echo -n . done + for s in 1 2 3 4 5 6 7 8 9; do + for f in "$currentPath/share/man/man$s/"*; do + mkdir -p $out/share/man/man$s + ln -sv $f $out/share/man/man$s/ + echo -n . + done + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 15b4aa00986..babaa2e2482 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.6"; - sha256 = "1yml1k4bis210hgi898hgs4wj5p34ainlj7vwy5lh7bjkvrksgq1"; + version = "0.9.6.1"; + sha256 = "1wy79rrm5pvg77i9nvwkcg6swsdbmg2izch48n4lj4idj0ga5g62"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix index ee68f85725a..318a336faa6 100644 --- a/pkgs/development/interpreters/love/default.nix +++ b/pkgs/development/interpreters/love/default.nix @@ -1,58 +1,32 @@ -x@{builderDefsPackage - , lua5, mpg123, physfs, freetype, libdevil, openal, SDL, libvorbis - , libogg, flac, mesa, libtiff, libpng, libjpeg, libmodplug - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, pkgconfig +, SDL, mesa, openal, lua5 +, libdevil, freetype, physfs +, libmodplug, mpg123, libvorbis, libogg +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="love"; - version="0.7.2"; - name="${baseName}-${version}"; - url="https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; - hash="0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + name = "love-0.8.0"; + src = fetchurl { + url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz"; + sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + buildInputs = [ + pkgconfig SDL mesa openal lua5 + libdevil freetype physfs libmodplug mpg123 libvorbis libogg + ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "fixSrc" "doConfigure" "doMakeInstall"]; - - fixSrc =a.fullDepEntry '' - sed -e '/typedef void (\*__GLXextFuncPtr)/d' -i src/modules/graphics/opengl/GLee.h - '' ["minInit" "doUnpack"]; - - setVars = a.noDepEntry '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2" + NIX_CFLAGS_COMPILE = '' + -I${SDL}/include/SDL + -I${freetype}include/freetype2 ''; meta = { + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.zlib; - }; - passthru = { - updateInfo = { - downloadPage = "http://love2d.org/"; - }; - }; -}) x + license = "zlib"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index dd1982e836d..83a1c0ac500 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , llvm, gmp, mpfr, readline + , llvm, gmp, mpfr, readline, bison, flex , ...}: builderDefsPackage (a : @@ -12,11 +12,11 @@ let sourceInfo = rec { baseName="pure"; project="pure-lang"; - version="0.49"; + version="0.56"; name="${baseName}-${version}"; extension="tar.gz"; url="http://${project}.googlecode.com/files/${name}.${extension}"; - hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x"; + hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj"; }; in rec { @@ -29,8 +29,10 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + + patches = [ ./new-gcc.patch ]; + meta = { description = "A purely functional programming language based on term rewriting"; maintainers = with a.lib.maintainers; diff --git a/pkgs/development/interpreters/pure/new-gcc.patch b/pkgs/development/interpreters/pure/new-gcc.patch new file mode 100644 index 00000000000..ea2cd845059 --- /dev/null +++ b/pkgs/development/interpreters/pure/new-gcc.patch @@ -0,0 +1,62 @@ +diff --git a/runtime.cc b/runtime.cc +index 04cbc40..54a0b43 100644 +--- a/runtime.cc ++++ b/runtime.cc +@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs) + } + #endif + +-/* Horrible kludge to get round, trunc and the inverse hyperbolic functions +- from libmingwex.a (these are in C99, but not in the Windows system +- libraries, and LLVM doesn't know how to get them either). */ +- +-extern "C" +-double __round(double x) +-{ +- return round(x); +-} +- +-extern "C" +-double __trunc(double x) +-{ +- return trunc(x); +-} +- +-extern "C" +-double __asinh(double x) +-{ +- return asinh(x); +-} +- +-extern "C" +-double __acosh(double x) +-{ +- return acosh(x); +-} +- +-extern "C" +-double __atanh(double x) +-{ +- return atanh(x); +-} + + /* File type bits. */ + +diff --git a/util.hh b/util.hh +index ae95b79..eab3330 100644 +--- a/util.hh ++++ b/util.hh +@@ -58,13 +58,6 @@ char *default_encoding(); + double my_strtod(const char *nptr, char **endptr); + char *my_formatd(char *buffer, const char *format, double d); + +-/* Windows doesn't have strptime, so we provide a suitable replacement from +- GNU libc (see strptime.c). */ +- +-#ifndef HAVE_STRPTIME +-extern "C" +-char *strptime(const char *s, const char *format, struct tm *tm); +-#endif + + /* Windows doesn't have mkstemp, so we provide a suitable replacement. */ + diff --git a/pkgs/development/interpreters/python/python-linkme-wrapper.sh b/pkgs/development/interpreters/python/python-linkme-wrapper.sh index 606bb76d401..42674aa83b0 100644 --- a/pkgs/development/interpreters/python/python-linkme-wrapper.sh +++ b/pkgs/development/interpreters/python/python-linkme-wrapper.sh @@ -14,7 +14,7 @@ PROG=$(basename "$0") SITES= pypath() { - BIN=$(realpath -s "$(dirname "$BIN")") + BIN=$(realpath -s "$(dirname "$1")") ENV=$(dirname "$BIN") SITE="$ENV/lib/python2.7/site-packages" SITES="$SITES${SITES:+:}$SITE" diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index aa64a743926..08c07a71973 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -4,12 +4,12 @@ g: # Get dependencies from patched gems { aliases = { ZenTest = g.ZenTest_4_9_0; - actionmailer = g.actionmailer_3_2_11; - actionpack = g.actionpack_3_2_11; - activemodel = g.activemodel_3_2_11; - activerecord = g.activerecord_3_2_11; - activeresource = g.activeresource_3_2_11; - activesupport = g.activesupport_3_2_11; + actionmailer = g.actionmailer_3_2_12; + actionpack = g.actionpack_3_2_12; + activemodel = g.activemodel_3_2_12; + activerecord = g.activerecord_3_2_12; + activeresource = g.activeresource_3_2_12; + activesupport = g.activesupport_3_2_12; arel = g.arel_3_0_2; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; @@ -17,7 +17,7 @@ g: # Get dependencies from patched gems builder = g.builder_3_1_4; buildr = g.buildr_1_4_9; bundler = g.bundler_1_2_3; - childprocess = g.childprocess_0_3_7; + childprocess = g.childprocess_0_3_8; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; erubis = g.erubis_2_7_0; @@ -31,13 +31,13 @@ g: # Get dependencies from patched gems i18n = g.i18n_0_6_1; journey = g.journey_1_0_4; jruby_pageant = g.jruby_pageant_1_1_1; - json = g.json_1_7_6; - json_pure = g.json_pure_1_7_6; + json = g.json_1_7_7; + json_pure = g.json_pure_1_7_7; macaddr = g.macaddr_1_6_1; mail = g.mail_2_4_4; - mime_types = g.mime_types_1_20_1; + mime_types = g.mime_types_1_21; minitar = g.minitar_0_5_3; - multi_json = g.multi_json_1_5_0; + multi_json = g.multi_json_1_5_1; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_5; nix = g.nix_0_1_1; @@ -48,8 +48,8 @@ g: # Get dependencies from patched gems rack_protection = g.rack_protection_1_3_2; rack_ssl = g.rack_ssl_1_3_3; rack_test = g.rack_test_0_6_2; - rails = g.rails_3_2_11; - railties = g.railties_3_2_11; + rails = g.rails_3_2_12; + railties = g.railties_3_2_12; rake = g.rake_10_0_3; rb_fsevent = g.rb_fsevent_0_9_3; rdoc = g.rdoc_3_12_1; @@ -108,71 +108,71 @@ installed versions.''; requiredGems = [ ]; sha256 = ''16bp7rwl463m0d213rmwp4rjfwiw1bm529c518v91l18h7hcnb96''; }; - actionmailer_3_2_11 = { + actionmailer_3_2_12 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-3.2.11''; - requiredGems = [ g.actionpack_3_2_11 g.mail_2_4_4 ]; - sha256 = ''12j8k1kfz5lqqlrxna88455hx62mbs638414dhnwsw358yf52qnn''; + name = ''actionmailer-3.2.12''; + requiredGems = [ g.actionpack_3_2_12 g.mail_2_4_4 ]; + sha256 = ''0rjcyz5p139iv7r9gb9nw6c490mksf6n3rnfxsg6bdaxpabinlc7''; }; - actionpack_3_2_11 = { + actionpack_3_2_12 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; - sha256 = ''0ins0by3il1fkg5aslr7rb97ykkrrns7dsp6qr8wwvr1dvrzrnbq''; + name = ''actionpack-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.rack_cache_1_2 g.builder_3_0_4 g.rack_1_4_5 g.rack_test_0_6_2 g.journey_1_0_4 g.sprockets_2_2_2 g.erubis_2_7_0 ]; + sha256 = ''19p8slf607ssvhd1xkqmk0ddhxqh99faqbgw9i0gyjh1hxyh4apk''; }; - activemodel_3_2_11 = { + activemodel_3_2_12 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit for building modeling frameworks like Active Record and Active Resource. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; }; - name = ''activemodel-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.builder_3_0_4 ]; - sha256 = ''0q5f70wv76aprdawqgwa0ldsg3v45mqi36yicir336941lcs28nf''; + name = ''activemodel-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.builder_3_0_4 ]; + sha256 = ''1w43k2yhdybrrhph87zhb9shc1j8z1ryhpqy15y7cj9gc4a1bnqf''; }; - activerecord_3_2_11 = { + activerecord_3_2_12 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 g.arel_3_0_2 g.tzinfo_0_3_35 ]; - sha256 = ''049h164hwd6j7p8rvb46h776rshmkk4dpvh9cynihaajvzmcj3lw''; + name = ''activerecord-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_35 ]; + sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi''; }; - activeresource_3_2_11 = { + activeresource_3_2_12 = { basename = ''activeresource''; meta = { description = ''REST modeling framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.''; }; - name = ''activeresource-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.activemodel_3_2_11 ]; - sha256 = ''0pjxfl589an08pm29cqid8dsbn3f7dlr56kpr6bs3gbzg9k3b44h''; + name = ''activeresource-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 ]; + sha256 = ''0dmy7n93ndxfqkccs0mv82dzkr130414djg96qi8njyj07ad84fi''; }; - activesupport_3_2_11 = { + activesupport_3_2_12 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; - name = ''activesupport-3.2.11''; - requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_0 ]; - sha256 = ''1dyi5vw118hfm88fxgrlfy3w5s6ka8505asw0nrrfma04jvpbq9s''; + name = ''activesupport-3.2.12''; + requiredGems = [ g.i18n_0_6_1 g.multi_json_1_5_1 ]; + sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg''; }; arel_3_0_2 = { basename = ''arel''; @@ -234,7 +234,7 @@ rails support and extra plugins for migrations and fixtures.''; longDescription = ''AWS SDK for Ruby''; }; name = ''aws-sdk-1.8.1.2''; - requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_6 ]; + requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ]; sha256 = ''0z3ins8rd8v3r40sn70kg21f5di58lqjfxppl19hi3pdjxgdrr7x''; }; builder_3_0_4 = { @@ -312,16 +312,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''0bf6ync0901d9q4cg5ws4ra0qh9ssw2xgsip8dka34sbm59kav4w''; }; - childprocess_0_3_7 = { + childprocess_0_3_8 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.7''; + name = ''childprocess-0.3.8''; requiredGems = [ g.ffi_1_3_1 ]; - sha256 = ''1dq7zyjm9fdivxm83nbhn8y5w9cc5wa458qlmkkcy52yvv0vsc84''; + sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4''; }; daemons_1_1_9 = { basename = ''daemons''; @@ -513,16 +513,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; }; - json_1_7_6 = { + json_1_7_7 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.7.6''; + name = ''json-1.7.7''; requiredGems = [ ]; - sha256 = ''025hdczzmj7zbwcdr53d8qc0bg8i7j5wpp1ps4cqkllz89snb82a''; + sha256 = ''1v5pn3g9ignbgrfl72dbf7bzvxsm90ybp24fa3bm9cv5cpa2ww7x''; }; json_pure_1_7_5 = { basename = ''json_pure''; @@ -535,16 +535,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; }; - json_pure_1_7_6 = { + json_pure_1_7_7 = { basename = ''json_pure''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation in pure Ruby.''; }; - name = ''json_pure-1.7.6''; + name = ''json_pure-1.7.7''; requiredGems = [ ]; - sha256 = ''1cjwg6f9gj7w2n9916w12i1g97ngqqar44sc2r1x9ib5jicspb00''; + sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6''; }; macaddr_1_6_1 = { basename = ''macaddr''; @@ -565,16 +565,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.4.4''; - requiredGems = [ g.mime_types_1_20_1 g.treetop_1_4_12 g.i18n_0_6_1 ]; + requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_1 ]; sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3''; }; - mime_types_1_20_1 = { + mime_types_1_21 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.20.1 with new MIME types. The identification of MIME +type. This is release 1.21 with new MIME types. The identification of MIME content type is based on a file's filename extensions. MIME types are used in MIME-compliant communications, as in e-mail or @@ -596,9 +596,9 @@ follows the official {IANA registry}[http://www.iana.org/assignments/media-types ({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp].''; }; - name = ''mime-types-1.20.1''; + name = ''mime-types-1.21''; requiredGems = [ ]; - sha256 = ''13l7avr24nwzk0xpyqh04iqpf58vqsb3bbqjmjr04bsryq8azlb0''; + sha256 = ''1qmx53a2kqk0nnhjbfvbc213wsxiprl0wqm7f2xvcsh253ld91iw''; }; minitar_0_5_3 = { basename = ''minitar''; @@ -611,16 +611,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; }; - multi_json_1_5_0 = { + multi_json_1_5_1 = { basename = ''multi_json''; meta = { description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.5.0''; + name = ''multi_json-1.5.1''; requiredGems = [ ]; - sha256 = ''0fk75m2496ghgv78yybzhrmf9izw65va3x90gdjkbsw8vfkghk79''; + sha256 = ''0c2jxjg6lx811515s35vnyjl9m9rsb2adw6yj2fxgqkc7yx1fjsz''; }; net_sftp_2_0_5 = { basename = ''net_sftp''; @@ -779,27 +779,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_3_2_11 = { + rails_3_2_12 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; - name = ''rails-3.2.11''; - requiredGems = [ g.activesupport_3_2_11 g.actionpack_3_2_11 g.activerecord_3_2_11 g.activeresource_3_2_11 g.actionmailer_3_2_11 g.railties_3_2_11 g.bundler_1_2_3 ]; - sha256 = ''0gk0wnydzb5dknk3d0n9vy51xixmwgcq5j6jqzr9m8wsi2cjkq7m''; + name = ''rails-3.2.12''; + requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_2_3 ]; + sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz''; }; - railties_3_2_11 = { + railties_3_2_12 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-3.2.11''; - requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_11 g.actionpack_3_2_11 ]; - sha256 = ''0gjna6jskckh35xp03sjlb7xq2cgabmjl7nvczh6kq8xb1vh09dw''; + name = ''railties-3.2.12''; + requiredGems = [ g.rake_10_0_3 g.rack_ssl_1_3_3 g.thor_0_17_0 g.rdoc_3_12_1 g.activesupport_3_2_12 g.actionpack_3_2_12 ]; + sha256 = ''0d8wy1n591x12bigj3jh8c9djzi8k68vh14342mc22raxwp5rwdw''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -857,7 +857,7 @@ documentation. See RDoc for a description of RDoc's markup and basic use.''; }; name = ''rdoc-3.12.1''; - requiredGems = [ g.json_1_7_6 ]; + requiredGems = [ g.json_1_7_7 ]; sha256 = ''1hflgw2v0lyx38kdwj71jyibc14j6ghb6zmp2l3g47v7d2m47z4g''; }; rjb_1_4_2 = { @@ -943,7 +943,7 @@ See RDoc for a description of RDoc's markup and basic use.''; * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; }; name = ''rubyforge-2.0.4''; - requiredGems = [ g.json_pure_1_7_6 ]; + requiredGems = [ g.json_pure_1_7_7 ]; sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; }; rubyzip_0_9_9 = { @@ -979,7 +979,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; name = ''selenium-webdriver-2.29.0''; - requiredGems = [ g.multi_json_1_5_0 g.rubyzip_0_9_9 g.childprocess_0_3_7 g.websocket_1_0_7 ]; + requiredGems = [ g.multi_json_1_5_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ]; sha256 = ''0c5fybp19mawq07h59b16h736pz8sz017m1pwalb6mcyliqmlwcj''; }; sinatra_1_3_2 = { @@ -1001,7 +1001,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_0 g.rack_1_5_2 g.tilt_1_3_3 ]; + requiredGems = [ g.hike_1_2_1 g.multi_json_1_5_1 g.rack_1_5_2 g.tilt_1_3_3 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; systemu_2_5_2 = { diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/default.nix similarity index 100% rename from pkgs/development/libraries/atkmm/2.22.x.nix rename to pkgs/development/libraries/atkmm/default.nix diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix deleted file mode 100644 index 4792ae790be..00000000000 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: - -stdenv.mkDerivation rec { - name = "glibmm-2.30.1"; - - src = fetchurl { - url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz; - sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39"; - }; - - buildNativeInputs = [pkgconfig]; - propagatedBuildInputs = [glib libsigcxx]; - - meta = { - description = "C++ interface to the GLib library"; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - - maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix new file mode 100644 index 00000000000..05efa275756 --- /dev/null +++ b/pkgs/development/libraries/glibmm/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, libsigcxx }: + +stdenv.mkDerivation rec { + name = "glibmm-2.34.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.34/${name}.tar.xz"; + sha256 = "1i4jsvahva2q0mig7kjnpsw0r3fnpybm8b6hzymfm2hpgqnaa9dl"; + }; + + buildNativeInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib gdk_pixbuf libsigcxx ]; + + meta = { + description = "C++ interface to the GLib library"; + + homepage = http://gtkmm.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [urkud raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/2.24.x.nix rename to pkgs/development/libraries/gtkmm/2.x.nix diff --git a/pkgs/development/libraries/gtkmm/3.2.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix similarity index 100% rename from pkgs/development/libraries/gtkmm/3.2.x.nix rename to pkgs/development/libraries/gtkmm/3.x.nix diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c10e56d1146..b1932966675 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl network resourcet transformers xmlConduit xmlHamlet ]; + jailbreak = true; meta = { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 86e219ac91d..04149400ff8 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Diff"; - version = "0.2.0"; - sha256 = "15hdkrzwajnfcx8bj4jdcy4jli115g9v20msw1xyc9wnwrmbz97k"; + version = "0.3.0"; + sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; meta = { description = "O(ND) diff algorithm in haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix new file mode 100644 index 00000000000..08ae4617956 --- /dev/null +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -0,0 +1,14 @@ +{ cabal, dlist, filepath, transformers }: + +cabal.mkDerivation (self: { + pname = "Glob"; + version = "0.7.2"; + sha256 = "1x4gh7z9jx9hdkjwsc31yyjssw6i7ziixhjrxr9b8zkijk1b4r5i"; + buildDepends = [ dlist filepath transformers ]; + meta = { + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/Graphalyze/default.nix b/pkgs/development/libraries/haskell/Graphalyze/default.nix index 489e338cba5..d61abc7a245 100644 --- a/pkgs/development/libraries/haskell/Graphalyze/default.nix +++ b/pkgs/development/libraries/haskell/Graphalyze/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Graphalyze"; - version = "0.14.0.0"; - sha256 = "027nxvv38cza6y6rivmvc9wpglbazkjrkyriwv3mn03pp21y53fg"; + version = "0.14.0.1"; + sha256 = "1prgszkrnb22x9xkwmxbvb9w1h78ffig9268f3q3y65knggmwp1x"; buildDepends = [ bktrees fgl filepath graphviz pandoc random text time ]; diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index c2c4f70b47e..3011f3a4446 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,14 +1,14 @@ -{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb -, sybWithClass, text, time, utf8String +{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text +, time, utf8String, void }: cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.12"; - sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p"; + version = "0.7.0"; + sha256 = "0xxxikgjw1dhx7kx3mjyvgh70m9avcd1kbp2bpig6gjwswk0mmai"; buildDepends = [ - blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time - utf8String + blazeBuilder deepseq filepath mtl parsec syb text time utf8String + void ]; meta = { description = "StringTemplate implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 1e2dee4fcdc..91c128756f4 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SMTPClient"; - version = "1.0.4"; - sha256 = "12m0qv8bf0s52yz07sipxlvas8k3xvi1d4lw6960q0nxr40ijyy2"; + version = "1.1.0"; + sha256 = "07njj24c43iz33c641d5ish62h13lhpvn2mx5pv5i6s3fm3bxsfk"; buildDepends = [ extensibleExceptions hsemail network ]; meta = { description = "A simple SMTP client library"; diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 9c969ed858f..916f38f66c5 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "attoparsec-conduit"; - version = "0.5.0.3"; - sha256 = "1n35v7mq93marx6ayja7zfk2hib4whspvysf0a7hjikylp4lfydw"; + version = "1.0.0"; + sha256 = "1aw071qcwhxwpd6azhgaiia97rhj50rms4pysbc19iihmdih3ib8"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 835cdce2e91..f0a1969ffba 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,17 +1,16 @@ -{ cabal, aeson, attoparsec, blazeBuilder, blazeBuilderConduit -, caseInsensitive, conduit, httpConduit, httpTypes, monadControl -, network, resourcet, tagsoup, text, transformers +{ cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit +, httpConduit, httpTypes, network, tagsoup, text, transformers , unorderedContainers, xmlConduit }: cabal.mkDerivation (self: { pname = "authenticate"; - version = "1.3.2.1"; - sha256 = "1r53mnj4b4x0prcqqf6y3gdia2j1l3155iw79jzlx0cnxbdsfnc7"; + version = "1.3.2.6"; + sha256 = "12sgi6q6kajjhh8mns9nklxj0kwn32xs5kzi7wmw50shx0smnjrz"; buildDepends = [ - aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive - conduit httpConduit httpTypes monadControl network resourcet - tagsoup text transformers unorderedContainers xmlConduit + aeson attoparsec blazeBuilder caseInsensitive conduit httpConduit + httpTypes network tagsoup text transformers unorderedContainers + xmlConduit ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 851dda488dc..c6d25384be2 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "base64-conduit"; - version = "0.5.1"; - sha256 = "1zmp6iv55rac7x7w59az7zaarq79fr7zvgg2wcb5b627axlw909l"; + version = "1.0.0"; + sha256 = "10wjgdixk5da48jpm2i91vy3ckdqpbpgba6hzn7ak6d3qac22m9q"; buildDepends = [ base64Bytestring conduit ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index a9568dde496..89ff67fac37 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-builder-conduit"; - version = "0.5.0.3"; - sha256 = "0dbymh29zg0bvhlmai5s6qiqypx46hmlg375jpcq1597vzaanwnw"; + version = "1.0.0"; + sha256 = "15q0b0k5dxrp9cw2b4qf9mmjwz1mmxrn3890df5rc9z6yajajrc6"; buildDepends = [ blazeBuilder conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index 63859d5e91f..44f0e0b0e23 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-html"; - version = "0.5.1.3"; - sha256 = "0ia7pk346lc7664w859q09p163cxgxjjpkk7cbmbl1wj2shshh1w"; + version = "0.6.0.0"; + sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll"; buildDepends = [ blazeBuilder blazeMarkup text ]; meta = { homepage = "http://jaspervdj.be/blaze"; diff --git a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix similarity index 81% rename from pkgs/development/libraries/haskell/bmp/1.2.3.4.nix rename to pkgs/development/libraries/haskell/bmp/1.2.4.1.nix index 404229cf763..a3de1d11830 100644 --- a/pkgs/development/libraries/haskell/bmp/1.2.3.4.nix +++ b/pkgs/development/libraries/haskell/bmp/1.2.4.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.3.4"; - sha256 = "134nfchsw4q1k3kr09i5w8jxbr659as4523gs5m2dch15wrmrhf6"; + version = "1.2.4.1"; + sha256 = "1ipy8v5n5dmajnai2cf7591chklxcbhpvwjdgvdwglipds2hjpap"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 0b4ae85c73a..85a1fb7bdef 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.5.0"; - sha256 = "1c1j9cxj08nz1pkrdxhphk6zyn1dxf3wbl8phcrzi8qk6q1vi0bi"; + version = "0.5.1"; + sha256 = "1vwcxwrbnczchq2b773kjjr3ysc47widak8qj0kwi26nf3jics4k"; buildDepends = [ classyPrelude conduit monadControl resourcet transformers void xmlConduit diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 4033c382766..01c26aab79f 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.5.0"; - sha256 = "187a1p2x7jw53iramdq3v2m8h451k5nrjrmnv5sz4c8x9jmj04dp"; + version = "0.5.1"; + sha256 = "0kgnffqvh13adadp85iw4ybbs5jpa5hwrr2dsi2aj9p8lvzac1jy"; buildDepends = [ basicPrelude hashable liftedBase systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 74827d407b7..3ea60db5fb5 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.6"; - sha256 = "1a5apcds3jjksz7hzw4ag725796axqk9nm5fhn5i4l82zphq2cxs"; + version = "1.0.0"; + sha256 = "1sx7s3awzb7y51prmmvrx9gxhd5068rbzwl719lfx3r50k94r00d"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 5f71e622250..dbfc60c189c 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,10 +1,10 @@ -{ cabal, cereal, entropy, largeword, tagged }: +{ cabal, cereal, entropy, tagged, transformers }: cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.10.2"; - sha256 = "06dbvdwyw2hf5cafpjfhasgyzzbigvvg74c47lafvqvgxvn9v4ms"; - buildDepends = [ cereal entropy largeword tagged ]; + version = "0.11"; + sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy"; + buildDepends = [ cereal entropy tagged transformers ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A generic interface for cryptographic operations"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index d22bfa840e7..29163f89737 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.4.3"; - sha256 = "0h9dmr88hqmz2876mlnzz8s5kmi368zs9pljvvmb9vn7m44gpyrk"; + version = "0.5.0"; + sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92"; buildDepends = [ cereal conduit cryptoApi transformers ]; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 43492d73fae..d114a5aa3af 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; + jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index fd20b7c7547..681ee682073 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "filesystem-conduit"; - version = "0.5.0.2"; - sha256 = "0vpxl32k6734vli8nky9cwyabw9alvpjm0g5q822yj9rk2439yfq"; + version = "1.0.0"; + sha256 = "1fz3iihcqpg6m3svjqdg8lvkpza955qn8cbs9b3w333vxkglhi6v"; buildDepends = [ conduit systemFileio systemFilepath text transformers ]; diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 266740cbaac..f85b7f8e208 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.11.3"; - sha256 = "13r3cz25lf0ndsyfc5adqx5mdv7hcl3qp7n2syg2msrn133xpwb2"; + version = "1.11.4"; + sha256 = "1bxmpvad415ayzwyijjm0zsck0z8aa1nfjixwb6l80i6lbxi4rfg"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index a0fb693acbb..ededea21fcc 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gloss"; - version = "1.7.8.1"; - sha256 = "0bi60zprgq1dd6prshvgqyyp13l6n5f171aryxg254kjagvrm3lf"; + version = "1.7.8.2"; + sha256 = "0jf49vdms8jzygkwch5k8s611pay0xqwq1lc0p476d37rzb8qpn4"; buildDepends = [ bmp GLUT OpenGL ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 637bb5ba45a..609863e808f 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,13 +1,14 @@ -{ cabal, colour, dlist, fgl, filepath, polyparse, text +{ cabal, colour, dlist, fgl, filepath, polyparse, temporary, text , transformers, wlPprintText }: cabal.mkDerivation (self: { pname = "graphviz"; - version = "2999.15.0.1"; - sha256 = "137d8n20fbpdz7az79gqharsfl293pl3xn444338i6blfi47ssdy"; + version = "2999.16.0.0"; + sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8"; buildDepends = [ - colour dlist fgl filepath polyparse text transformers wlPprintText + colour dlist fgl filepath polyparse temporary text transformers + wlPprintText ]; meta = { homepage = "http://projects.haskell.org/graphviz/"; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 1f5d6732198..28881da84c3 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.6.1"; - sha256 = "15jqlfb7l49xqd2szzjhffbnxs7azq85a759bbwx3jfxdz89cv0k"; + version = "1.1.6.3"; + sha256 = "1kpj8j47licmdf364n0fn5908hsl6ib1wkiqhcx3m0nimb7pjnss"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 226877ff6dc..4dd789b49e5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -6,14 +6,15 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.1.2"; - sha256 = "1pqrwsgdp1qf5jd2nzdrj2wkd2bq9n0ciwyzvzn8nmwyqgkdzs4f"; + version = "7.1.5"; + sha256 = "0w00y84arc8z92d1d3l6f7gh1hmkm4yrj70pnnrsaca3i603w11a"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath text threads time timeCompat transformers transformersBase utf8String xhtml zlib ]; + jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 780e949c714..526a9b6ed87 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.11.0"; - sha256 = "1zbwbgabdj6x0vi7l8wfq7rx77p8b4zxz5wv43nr67irszyz1k7w"; + version = "0.11.0.1"; + sha256 = "0d5nn0kfs7hbgs4b77i8c8pq2q5hldqk08dacva7xlxvjrlxsyn6"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index afb6a4be662..805519d3d30 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.5"; - sha256 = "0m76h33igw77ndllgzkqgmygi7krc5vfjvizidsgris0zd1g2yv3"; + version = "0.5.3.7"; + sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre ]; diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 58720e33f7b..6538e17c41a 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4"; - sha256 = "1w4w560p7xy3lci36xy01dpwl0hhf9iv8gy4ldqvh33931pkxhxn"; + version = "0.1.4.1"; + sha256 = "0r73hd6kn37mdbm2i3g6v3qqm696kyflqs6ajq68qr5sr62sjb1a"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 2e50b19f011..67adcb0fbdd 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -19,6 +19,9 @@ cabal.mkDerivation (self: { shakespeareJs shakespeareText text time transformers wai waiExtra warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic ]; + patchPhase = '' + sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal + ''; jailbreak = true; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 153cee7db75..a54802ef9b0 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { haskellSrcExts httpTypes parsec random safe tagsoup time transformers uniplate wai warp ]; + jailbreak = true; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index b9f3eb3cb8e..3a1ed14785b 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.16"; - sha256 = "0501fqv0xlwdmpg65s3rr0fns6gqq15x2zq2a8915n3dvipfkixb"; + version = "4.17"; + sha256 = "0vv1qsxbwwb1nfwpvxvqacfjs3sswldrx3wimaxixmw9ynkkkwdg"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 2a83df47f09..b72f4d947c4 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -2,15 +2,15 @@ cabal.mkDerivation (self: { pname = "hsdns"; - version = "1.5"; - sha256 = "2788d1ad5ef07ae5f356a460fb92316118f3a4d9c779ec27fb8243602bcf6399"; + version = "1.6"; + sha256 = "1vf3crkhs7z572bqdf7p2hfcqkjxvnyg0w0cf8b7kyfxzn8bj3fa"; buildDepends = [ network ]; extraLibraries = [ adns ]; noHaddock = true; meta = { - homepage = "http://gitorious.org/hsdns"; + homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; - license = "LGPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index d5043024fd6..e26a9d9e02a 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "hsyslog"; - version = "1.4"; - sha256 = "f3bf4bf47565cb0245afb0e8ffa3f79635b02f0032081845a5999964d828f4db"; + version = "1.5"; + sha256 = "1dpcawnl3a5lw2w8gc9920sjrw43qmq1k2zws8rx2q0r6ps7nhgp"; meta = { - homepage = "http://gitorious.org/hsyslog"; + homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001."; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 28216a54815..ff4b03c1e6a 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "0.1.0.4"; - sha256 = "1g217856dz1ad545slk020n5w0la4yyd5ygva2gg2g0999padi78"; + version = "1.1.0"; + sha256 = "11mkr7plhbn8kyki0h362habzhsnlb7yrg4ypy48d0l3i7p7vm53"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 544f6c0d674..ebb44f1512b 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.7.1"; - sha256 = "1m0f9snc2zxj8hvxw3ngw0h78ckvdlxxfjvrryk93blfwbamssi5"; + version = "1.8.9"; + sha256 = "0v99nc29h4qm1dbs7bwk4nwhxwk22vzl4ghrq9r3vishi6gwr7hb"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index e30a30fc7aa..618438e927f 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,15 +1,15 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPreludeConduit -, conduit, dataDefault, httpConduit, httpTypes, liftedBase -, monadControl, network, networkConduit, text, wai, warp, word8 +{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +, dataDefault, httpConduit, httpTypes, liftedBase, monadControl +, network, networkConduit, text, wai, warp, word8 }: cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.1"; - sha256 = "0xg6xw0j61db75smys2fgjn0nzv2dy8c1ha4m828ssnxlic98lk2"; + version = "0.1.1.3"; + sha256 = "0z2h2xbvg034snfh3hzc0v2zp5j57lcak2h4vz10lwaqr3jxqnpn"; buildDepends = [ - blazeBuilder caseInsensitive classyPreludeConduit conduit - dataDefault httpConduit httpTypes liftedBase monadControl network + blazeBuilder caseInsensitive classyPrelude conduit dataDefault + httpConduit httpTypes liftedBase monadControl network networkConduit text wai warp word8 ]; meta = { diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index fb2e4a2c1e5..879ff0affdc 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; - version = "9.0.4"; - sha256 = "0jl89p9sb76zb6j2b9ssxaai6jq3jbnnpv4v05wfvlmk8apckwgf"; + version = "9.1.0"; + sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr"; buildDepends = [ hxtCharproperties parsec ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 3339e7aa96d..51db50a75b7 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lambdabot-utils"; - version = "4.2.1"; - sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx"; + version = "4.2.2"; + sha256 = "0mmz9rn6vv8xnavmz66g164h1liir3rzg1n7lmbcsgwcyhm925d7"; buildDepends = [ binary haskellSrc mtl network random regexCompat regexPosix syb tagsoup utf8String zlib diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index e7e40312af3..b5f8851796e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -3,19 +3,19 @@ , MonadCatchIOTransformers, mtl, parallel, profunctorExtras , profunctors, reflection, semigroupoids, semigroups, split, tagged , text, transformers, transformersCompat, unorderedContainers -, vector +, vector, void }: cabal.mkDerivation (self: { pname = "lens"; - version = "3.8.5"; - sha256 = "09z2izh7mqj75yh9f0pb8ky9vnzs9zx2z2mz1ik7l8wid43gm6vn"; + version = "3.8.7.3"; + sha256 = "0z28vv3k6zg2zsd3pb1vlhv75q0zjlh4zf1md77cviyyljwc0j09"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel profunctorExtras profunctors reflection semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers vector + transformersCompat unorderedContainers vector void ]; meta = { homepage = "http://github.com/ekmett/lens/"; diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix new file mode 100644 index 00000000000..6109f33f82f --- /dev/null +++ b/pkgs/development/libraries/haskell/maccatcher/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, parsec }: + +cabal.mkDerivation (self: { + pname = "maccatcher"; + version = "2.1.5"; + sha256 = "0z56rbfr8vijhjf3dcqd4kaxgx9bf3qgi9sm61yc3i6ra60w7byb"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary parsec ]; + meta = { + description = "Obtain the host MAC address on *NIX and Windows"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 97078f2fb84..173529b443d 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.2.3.2"; - sha256 = "0b5jfmzmsb7pdawcm5i74sy934q2d78pjs39invas502kx5bxzk5"; + version = "0.3.0.1"; + sha256 = "05pwccs2f5qn22cwvzaiw6bflyxl3avrl89y737rjcsw6755r5sr"; buildDepends = [ conduit fastLogger monadControl mtl resourcet text transformers transformersBase diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix similarity index 86% rename from pkgs/development/libraries/haskell/monad-par/0.3.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.nix index d6f83dd3168..8407daef642 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3"; - sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd"; + version = "0.3.4"; + sha256 = "1j1xskd8smpfi2dpiwnpwakw0hs0i2yn1lrs9l06wz4b148hwc4k"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index b702f10354c..df63e3ec659 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.5"; - sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b"; + version = "0.5.1"; + sha256 = "10waxc0i7hcqlgb9iwcdz0xqkym4ihavgwq466xlaqzzhcpp38d6"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index a56c35a214b..67d44bd1ebb 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.6.2.2"; - sha256 = "1v8abhw977hr78hkshrbxy04abbbhafvvnhr4xxgqc0phwch02mc"; + version = "1.0.0"; + sha256 = "16kgg6wkpl10kcwfijm9iqi7r5gababaymxyhmjab6axfzknppk3"; buildDepends = [ conduit liftedBase monadControl network transformers ]; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index d53ddf7ad30..df24b4ac022 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -17,6 +17,9 @@ cabal.mkDerivation (self: { text time xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; + patchPhase = '' + sed -r -i -e 's|blaze-html >= 0.5 && < 0.6,|blaze-html >= 0.5,|' pandoc.cabal + ''; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 8fdc9f641aa..52c74af4d4d 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "1.1.2.1"; - sha256 = "1iz6w9isva1drbr37c8f42g3nnl78sp27ydaj0975yqyp7nh7and"; + version = "1.1.3.1"; + sha256 = "1lbr4x45hzk73439x6is9zw6y3mqy1ivmblncvg70kzw0kmjhpnk"; buildDepends = [ aeson conduit monadControl persistent postgresqlLibpq postgresqlSimple text time transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index 2da2c06a243..418c8c4ca74 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,13 +1,13 @@ -{ cabal, aeson, conduit, monadControl, persistent, text -, transformers +{ cabal, aeson, conduit, monadControl, monadLogger, persistent +, text, transformers }: cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "1.1.2"; - sha256 = "0pb52k7a7js71s4d2mynd62i8gk99az7y72rycs0xg9r9cr081p3"; + version = "1.1.4"; + sha256 = "1xllj5bq7rw9v32ddm515705nviarw0hp4yxj0z8jf5q5jdz2vz0"; buildDepends = [ - aeson conduit monadControl persistent text transformers + aeson conduit monadControl monadLogger persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index 596b0789445..2816a38c413 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "persistent-template"; - version = "1.1.2.1"; - sha256 = "02sqrq847cxywj9hwixvi0bqq09kxr9w6lhn6kqg4ww0mw2add6s"; + version = "1.1.2.4"; + sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 83bc9f53951..f7812a2692d 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "1.1.4"; - sha256 = "1frxhyyp8l5xvq5h9zf730c7kpnrryw2mw8mpnav2bs5g6rmmrgj"; + version = "1.1.5.1"; + sha256 = "1ds0q3mzgg60makx7impyxsvpzd3issa89igcy176yb54ypjwfnz"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index a9a10535846..541fa2026d9 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,15 +1,14 @@ -{ cabal, base64Bytestring, base64Conduit, classyPreludeConduit -, conduit, mtl, resourcet, systemFileio, systemFilepath, text -, transformers +{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +, mtl, resourcet, systemFileio, systemFilepath, text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.2"; - sha256 = "16rgarx78jwiimh3q8flxvmfraxmc1dxl8r04q4j1p9ap3mnvg61"; + version = "0.1.3"; + sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; buildDepends = [ - base64Bytestring base64Conduit classyPreludeConduit conduit mtl - resourcet systemFileio systemFilepath text transformers + base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + systemFileio systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix new file mode 100644 index 00000000000..53b7062cd0d --- /dev/null +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, dataDefault, text, utf8String }: + +cabal.mkDerivation (self: { + pname = "publicsuffixlist"; + version = "0.0.3"; + sha256 = "1drsm1zp30629rzy0693ggzcx46b7ydzzafmf07mjanmn1kyyqci"; + buildDepends = [ cereal dataDefault text utf8String ]; + meta = { + homepage = "https://github.com/litherum/publicsuffixlist"; + description = "Is a given string a domain suffix?"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 0e65740b47e..6090fc8578a 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -1,9 +1,9 @@ -{ cabal, readline, ncurses } : +{ cabal, readline, ncurses }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "readline"; - version = "1.0.1.0"; - sha256 = "07f2f039f32bf18838a4875d0f3caa3ed9436dd52b962b2061f0bb8a3316fa1d"; + version = "1.0.3.0"; + sha256 = "1sszlx34qa88fad3wlhd4rkb1my1nrpzvyd8vq7dn806j5sf3ff0"; propagatedBuildInputs = [ readline ncurses ]; # experimentally link with ncursesw because ghci can't interpret ld scripts, # and ncurses sometimes seems to be a script pointing to ncursesw @@ -14,8 +14,6 @@ cabal.mkDerivation (self : { description = "An interface to the GNU readline library"; license = "GPL"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 7b15b2bbb92..046fafca43a 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.3.1"; - sha256 = "19dnz8xa18yydprnwzgdcbrndi6akwc53rs1104z0awffh83iynm"; + version = "3.2.3.2"; + sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr"; buildDepends = [ binary bmp repa vector ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 61c783c6727..6ed553516b6 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.2"; - sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + version = "1.0.2.1"; + sha256 = "1ik0128gwziv1dajz2g73rk1yac0ymd1w59q3g8c9g8ibwxn9hca"; buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 14a70b44c4f..0e04ff4fd44 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.3"; - sha256 = "0js56njy5rbviavga5qlp8d989wdpqf7lcyhwrjf1clf3k4f8anl"; + version = "1.0.3.1"; + sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 7fe0013d0d2..411684e4953 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck, random, smallcheck, syb }: +{ cabal, QuickCheck, random, simpleReflect, smallcheck, syb }: cabal.mkDerivation (self: { pname = "show"; - version = "0.4.1.2"; - sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w"; - buildDepends = [ QuickCheck random smallcheck syb ]; + version = "0.5"; + sha256 = "1s9nwhbc1935359r76glirg858c1sg8nfvv0bzzrncrgf0gxcl4f"; + buildDepends = [ QuickCheck random simpleReflect smallcheck syb ]; meta = { description = "'Show' instances for Lambdabot"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix new file mode 100644 index 00000000000..7a7f40c6d83 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "simple-reflect"; + version = "0.3.1"; + sha256 = "189pc7fk28bwl0mq6hw502kc048n203rb4vpf2wva490r36xiw6s"; + meta = { + homepage = "http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details"; + description = "Simple reflection of expressions containing variables"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 6f858398bc9..7ecd70f25f7 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.10"; - sha256 = "07js189yyya2vs3wsc49b7c2zbh63f48kywmz88g7s394bp3n9am"; + version = "0.2.11"; + sha256 = "1q9m9lxv9jfkn6a1lf07jcl4li3n5996df1qrfkfjq2n0bvn4qfj"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 1ccedad6d11..cc910711768 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "0.1.0.11"; - sha256 = "16iy3frzxzkiybl5cglvnmvxzziwr8361s00m7130dh82r3vc21q"; + version = "0.1.0.12"; + sha256 = "1nx0ad0y7zmljc7phwin2aph6frs70hvz3di8q52kzpi5m1h3g3a"; buildDepends = [ cereal cryptoApi tagged ]; meta = { homepage = "https://github.com/meteficha/skein"; diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index a11eb501a86..b7b0dc8e974 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,10 +1,10 @@ -{ cabal, dlist }: +{ cabal, logict, mtl }: cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6.2"; - sha256 = "0yz7an3k71ia7sgs8xpkh37xz9ipsnbf13680185cij8llq8zbyr"; - buildDepends = [ dlist ]; + version = "1.0.1"; + sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk"; + buildDepends = [ logict mtl ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; description = "A property-based testing library"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 34ee639564d..b87cde89447 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad -, configurator, directoryTree, dlist, either, errors, filepath -, hashable, heist, lens, logict, MonadCatchIOTransformers, mtl -, mwcRandom, pwstoreFast, regexPosix, snapCore, snapServer, stm -, syb, text, time, transformers, unorderedContainers, vector -, vectorAlgorithms, xmlhtml +, configurator, directoryTree, dlist, errors, filepath, hashable +, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom +, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text +, time, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.0"; - sha256 = "0mw1fxjijd3z9bz1znrc5vfxa4mc1by481gxfmk2hdlcsib9sp7n"; + version = "0.11.2"; + sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator - directoryTree dlist either errors filepath hashable heist lens - logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast - regexPosix snapCore snapServer stm syb text time transformers + directoryTree dlist errors filepath hashable heist lens logict + MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix + snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index d1b4494090c..34e4bf978a4 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.4.2"; - sha256 = "1nbhx2jjij5kjqa0l68s401ach4yziq6w8mvcv589fcscw212w8r"; + version = "0.5.0"; + sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 84187bb4c1f..38f4375becd 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,13 +1,14 @@ -{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit -, text +{ cabal, attoparsec, attoparsecConduit, blazeBuilder +, blazeBuilderConduit, caseInsensitive, conduit, text, transformers }: cabal.mkDerivation (self: { pname = "tagstream-conduit"; - version = "0.5.3"; - sha256 = "08g34dbb59mrpj0lym5a0zlygvj7in57nkhbk84kxvggrhl0jndl"; + version = "0.5.4"; + sha256 = "1djf66kn3m4sdwmis82f9w2nkmjyrq12zda7ic9pcsvra579868i"; buildDepends = [ - attoparsec blazeBuilder blazeBuilderConduit conduit text + attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit + caseInsensitive conduit text transformers ]; meta = { homepage = "http://github.com/yihuang/tagstream-conduit"; diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index a17ed203941..24edaf80626 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.1.4"; - sha256 = "1a8z9r75jk4z4diyigk0qzljkjqirxm30vf3jp75plnc9irysnw5"; + version = "0.1.5"; + sha256 = "13xks5kshr51mbs112j8vvhirzhbi3fq6zjw7l4z2iwn8chh4hwg"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix new file mode 100644 index 00000000000..5b939ccb6cc --- /dev/null +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, cryptohash, maccatcher, random, time }: + +cabal.mkDerivation (self: { + pname = "uuid"; + version = "1.2.9"; + sha256 = "088wbhf21w91774icddbm3a8p8jikwjqgg8zdad0pdv8zbi7flsi"; + buildDepends = [ binary cryptohash maccatcher random time ]; + meta = { + homepage = "http://projects.haskell.org/uuid/"; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 2642af7457e..e475ca7e856 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -1,13 +1,15 @@ -{ cabal, deepseq, mtl, parallel, parsec, terminfo, utf8String -, vector +{ cabal, deepseq, mtl, parallel, parsec, stringQq, terminfo +, utf8String, vector }: cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.20"; - sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; + version = "4.7.3"; + sha256 = "0x059mzw6v2xf92fdhy0ilyqbics2as6dqrdr6njpp0m6qykkybb"; + isLibrary = true; + isExecutable = true; buildDepends = [ - deepseq mtl parallel parsec terminfo utf8String vector + deepseq mtl parallel parsec stringQq terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 2ff18247000..36ec82d88c3 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,15 +6,15 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.1"; - sha256 = "0r2ghx3nqh7nms8yxa874h5pyagj993r077f8riybjyjp078s2lk"; + version = "1.3.1.2"; + sha256 = "1i0j3n0cp1zq43g06nb3cxajd4k9isg4chdwzzlyimm078a9w54x"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes systemFileio systemFilepath text time transformers unixCompat wai ]; meta = { - homepage = "http://www.yesodweb.com/book/wai"; + homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "WAI application for static serving"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 9cebbde0009..7a4e18b3295 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.2.1"; - sha256 = "13w3nhz59h4j25fsy95221y71k300plhs4vjqz2wxaigpv9sc2y7"; + version = "1.3.2.4"; + sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index cff2cb31850..9995cd6b977 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0.1"; - sha256 = "0yy0bvkrny4kj77wvn0cflwha6yijfxvnj530ps7xnzv1qm8qn1l"; + version = "1.3.0.4"; + sha256 = "1si54frsn8s8r0ykqc9h571rqbapf82jcvbz8bd49bbylv4j6yy0"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit text transformers wai ]; meta = { - homepage = "http://www.yesodweb.com/book/wai"; + homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index ee6eb288565..deb1090dd4a 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0.2"; - sha256 = "1ijxdnl76kkm2qck5qiwdwqvwkbpw8zbilfaz67sfbz3ccwls2fc"; + version = "1.4.0"; + sha256 = "1213sib2qp1xafrrnmkxabgkba0g00awy6dx9jnlfkj5r6m32wdq"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index dd6bf66b676..290e60ff3b7 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.7.2"; - sha256 = "06cwc0lmzgna939svdw7v5s822safkfy3wd4n21f9ml20iskzqm6"; + version = "1.3.7.4"; + sha256 = "0z043v1fjblbvkn44hzp7j8iawqzbwf67qxq7gsv7jfq1q58xbrx"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 09c5a5563bc..39bcc63248e 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.0.3.3"; - sha256 = "0jw1r4vmcbxj8kgkdj4pgibihcdmbdj15g06i9p8mdklmmd7gqnz"; + version = "1.1.0.2"; + sha256 = "17wv4rngmn8jvg6c3ia48w5q9s9dww9aisrmans9llqs7ks3ndqc"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 41a5c710d6a..1be00fa0c0f 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.3"; - sha256 = "1923c2jg162jab01mcbpy52xs1pzxkrgny6sq8v0p758n8hjazwc"; + version = "0.4.0.4"; + sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; buildDepends = [ parsec shakespeare text xmlConduit ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index adbf68655ca..aff309b184f 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.0.3"; - sha256 = "03bwsm3dazc01cwndlm92nr35a4fllsxx17rp72d2vnf1571a1vb"; + version = "0.2.0.4"; + sha256 = "1z40hkq9l6nw3hcnz6d1x0han7ynjkvbvjy8bl5mq7zmhk1xhmr6"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index eb90b847fc8..9641cef56aa 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2"; - sha256 = "1c83vxgry1425z4wk2mnijy183pnlhamcra7fvh55rvhq4bql1m8"; + version = "0.8.2.1"; + sha256 = "1p0hi9psm42bsmm14gfdkj4wrbcgzkishcih6rwc2bcvn2i0hyyw"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index e0bd834f1ea..8456aa39a8e 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,6 +1,6 @@ -{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, hamlet -, httpConduit, httpTypes, liftedBase, mimeMail, network, persistent -, persistentTemplate, pureMD5, pwstoreFast, random, SHA +{ cabal, aeson, authenticate, blazeHtml, blazeMarkup, fileEmbed +, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network +, persistent, persistentTemplate, pureMD5, pwstoreFast, random, SHA , shakespeareCss, shakespeareJs, text, transformers , unorderedContainers, wai, yesodCore, yesodForm, yesodJson , yesodPersistent @@ -8,14 +8,14 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.1.4.1"; - sha256 = "18x2m1clk3nqaap51c6ayxbh5q6v0i4srcphgyf26lrxq514pvad"; + version = "1.1.5.3"; + sha256 = "07srz4zpkn8w382xwi8ri6mh9kgplf0m51819zw1hympphmd9z82"; buildDepends = [ - aeson authenticate blazeHtml blazeMarkup hamlet httpConduit - httpTypes liftedBase mimeMail network persistent persistentTemplate - pureMD5 pwstoreFast random SHA shakespeareCss shakespeareJs text - transformers unorderedContainers wai yesodCore yesodForm yesodJson - yesodPersistent + aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet + httpConduit httpTypes liftedBase mimeMail network persistent + persistentTemplate pureMD5 pwstoreFast random SHA shakespeareCss + shakespeareJs text transformers unorderedContainers wai yesodCore + yesodForm yesodJson yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index bf13f7da174..e2a36c2f184 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.1.8"; - sha256 = "03yk9ypd314830bk3jjwkzi87bn04lqkh6hq91izn1prvijjiqjm"; + version = "1.1.8.2"; + sha256 = "0brrvij1vldb5zr3vnynikaf1x479qrgf7k3162nhrmwl57lm9sz"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index d2bbf413c83..b0e720ff487 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.3"; - sha256 = "1g0hb6jl0bp2q50pw2cy3hkbww1l230al08s7vfpqir68n9infiy"; + version = "1.1.3.2"; + sha256 = "07gm9sj4c231wdmfmb7df1s8wvqa6fw7nhcq554h16h2ibv5pcqg"; buildDepends = [ dataDefault hamlet networkConduit safe shakespeareCss shakespeareJs text transformers unorderedContainers wai waiExtra warp yaml diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 9ce33159d8f..d853e217a7f 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.2.1.1"; - sha256 = "1nb0sxg8ln6yiw1a7f896nfqhbrmywhcxcv658g21h8y26jhiizm"; + version = "1.2.1.3"; + sha256 = "1mrqr6pfrhkk0vv9lhd4wxiic8d1hsraiqmjcqsfbpdyrc6fqypq"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 1c46d7977aa..4b1777676a8 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-json"; - version = "1.1.2"; - sha256 = "0vbjg038vgdwd5a4w7r5261xgvylzzk4gikk4285ns471x8n0vrf"; + version = "1.1.2.1"; + sha256 = "0vrhn3v26q7cqwds99hqyibq09vyxnviqzgyn7w5ldnl3ycg7dqd"; buildDepends = [ aeson attoparsecConduit blazeBuilder conduit safe shakespeareJs text transformers vector wai waiExtra yesodCore yesodRoutes diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index a47cc59ecc5..a661a83c731 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2"; - sha256 = "0rh5vdpiq1ryw7isyaqqw3sif833k8j32m47lvr0dj46lj2jz0a0"; + version = "1.1.2.2"; + sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 2d7496b3c1c..b11c88534b2 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.3.1"; - sha256 = "052dc68r2k56jzl9yh72kwcgdp35rm9w9vyj6xprqk506i43x7m1"; + version = "0.3.3.2"; + sha256 = "0skr710fqqnna17gywaj30kpj352px2d17fwwqb832j7mj92bmv5"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index c4f865d3e85..ebb46f68bc8 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.8"; - sha256 = "0ygcsrq8nf1jvksig72r3i13qz1d3hgh5476fy6l4wl33idk6jb1"; + version = "1.1.9"; + sha256 = "0fcvf0bg7dsrka639q20dncinqq0fdv21zyvwpx63qfcmilhmjlm"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index e902cce44e5..cf62afc6c01 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-conduit"; - version = "0.5.0.3"; - sha256 = "05rlbyxcwq952psbfp94irmygabqxyf1kkm80pwdanlaaky03nsb"; + version = "1.0.0"; + sha256 = "0q0l4qw1f2cwjj71n4i082ba47x1xba695q8xk0ky2vw5s8cg0bv"; buildDepends = [ conduit transformers void zlibBindings ]; meta = { homepage = "http://github.com/snoyberg/conduit"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 87aaafabcc4..e0c00d07044 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-2.40.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz; + sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9"; }; + buildNativeInputs = [ pkgconfig intltool python ]; - buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + preConfigure = '' + substituteInPlace libsoup/tld-parser.py \ + --replace "/usr/bin/env python" ${python}/bin/python + ''; + meta = { inherit (glib.meta) maintainers platforms; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 8916e926771..517fbf2bd43 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib }: +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python }: stdenv.mkDerivation rec { name = "libtorrent-rasterbar-${version}"; - version = "0.15.8"; + version = "0.16.8"; src = fetchurl { url = "http://libtorrent.googlecode.com/files/${name}.tar.gz"; - sha256 = "0767i20igrfadscw3vdyadd4qidybwx9h898rkaq95zlwhaygpzm"; + sha256 = "01jxhyndqkc0qag22s5w0vs63hlp4rr4bca8k7fj37gky7w119c0"; }; - buildInputs = [ boost pkgconfig openssl zlib ]; + buildInputs = [ boost pkgconfig openssl zlib python ]; - configureFlags = [ "--with-boost=${boost}/include/boost" "--with-boost-libdir=${boost}/lib" ]; + configureFlags = [ + "--with-boost=${boost}/include/boost" + "--with-boost-libdir=${boost}/lib" + "--enable-python-binding" + ]; meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 3d5dff53ff4..ebd6826bc9e 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -2,11 +2,11 @@ libv4l, libtheora, intltool, libvpx, gsm }: stdenv.mkDerivation rec { - name = "mediastreamer-2.8.0"; + name = "mediastreamer-2.8.2"; src = fetchurl { url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz"; - sha256 = "0h1qda2mjc76xirldlvpmzf57vcbgr113a9b0kw1xm5i58s0w34f"; + sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6"; }; # TODO: make it load plugins from *_PLUGIN_PATH diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 640bc7edc32..4e4790bd2a0 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.8.0"; + version = "0.8.8"; src = fetchurl { url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1pf61imb5xzgzf65g54kybjr67235rxi20691023mcv34qwppl3v"; + sha256 = "0m4nzxli1pl8w59m4iwwhpmr1xdz7xfknmbl3a0mkkd1jzdiq3nc"; }; buildInputs = diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix deleted file mode 100644 index 6b06e54e73d..00000000000 --- a/pkgs/development/libraries/neon/0.26.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, libxml2, pkgconfig -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; - -stdenv.mkDerivation { - name = "neon-0.26.4"; - - src = fetchurl { - url = http://www.webdav.org/neon/neon-0.26.4.tar.gz; - sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; - }; - - buildInputs = [libxml2] - ++ stdenv.lib.optional compressionSupport zlib - ++ (if sslSupport then [ openssl pkgconfig ] else []); - - configureFlags = '' - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; - - passthru = {inherit compressionSupport sslSupport;}; - - meta = { - description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; - }; -} diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix deleted file mode 100644 index 8e717ff52d8..00000000000 --- a/pkgs/development/libraries/neon/0.28.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, libxml2, pkgconfig -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? false -, shared ? true -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -stdenv.mkDerivation rec { - name = "neon-0.28.6"; - - src = fetchurl { - url = "http://www.webdav.org/neon/${name}.tar.gz"; - sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6"; - }; - - buildInputs = [libxml2 pkgconfig openssl] - ++ stdenv.lib.optional compressionSupport zlib; - - configureFlags = '' - ${if shared then "--enable-shared" else "--disable-shared"} - ${if static then "--enable-static" else "--disable-static"} - ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl" else "--without-ssl"} - --enable-shared - ''; - - passthru = {inherit compressionSupport sslSupport;}; - - meta = { - description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; - }; -} diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/default.nix similarity index 100% rename from pkgs/development/libraries/neon/0.29.nix rename to pkgs/development/libraries/neon/default.nix diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 928e9723e08..42740ea2e1b 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.9.4"; in +let version = "4.9.5"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "196l8123gg5knxp7pgksngfcwm9k7n3qilkl725jyzz1bg3ld43l"; + sha1 = "03885e992607e2be975f6525c6764c2167fe2eff"; }; preConfigure = "cd mozilla/nsprpub"; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index fef902fec03..b39d8bc4aff 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake}: stdenv.mkDerivation rec { - name = "physfs-2.0.2"; + name = "physfs-2.0.3"; src = fetchurl { - url = "${meta.homepage}/downloads/${name}.tar.gz"; - sha256 = "02dwy0vsn2dp31f15vxd3yxxr1rgy25ab7ncavyh73i290qnsadf"; + url = "${meta.homepage}/downloads/${name}.tar.bz2"; + sha256 = "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; }; buildNativeInputs = [ cmake ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://icculus.org/physfs/; + homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = "free"; }; diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix deleted file mode 100644 index 47832a114b4..00000000000 --- a/pkgs/development/libraries/qt-4.x/4.7/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ stdenv, fetchurl -, alsaLib, pulseaudio -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql, sqlite -, perl, coreutils, libXi -, buildDemos ? false, buildExamples ? false, useDocs ? false -}: - -let - v = "4.7.4"; -in - -stdenv.mkDerivation rec { - name = "qt-${v}"; - - src = fetchurl { - url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp"; - }; - - preConfigure = - '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations - " - ''; - - configureFlags = - '' - -v -no-separate-debug-info -release -fast -confirm-license -opensource - -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng - -opengl -xrender -xrandr -xinerama -xcursor - -plugin-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - -multimedia -audio-backend -no-phonon - -webkit -javascript-jit - -make libs -make tools -make translations - ${if buildDemos == true then "-make demos" else "-nomake demos"} - ${if buildExamples == true then "-make examples" else "-nomake examples"} - ${if useDocs then "-make docs" else "-nomake docs"} - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - libmng - mysql - postgresql - libpng - which - mesa - libXmu - libXv - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - pulseaudio - ]; - - buildInputs = [ perl ]; - - prefixKey = "-prefix "; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = '' - ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""} - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix new file mode 100644 index 00000000000..ff1bfa7d4eb --- /dev/null +++ b/pkgs/development/libraries/snappy/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "snappy-1.1.0"; + + src = fetchurl { + url = "http://snappy.googlecode.com/files/${name}.tar.gz"; + sha256 = "0q31cx3zkw0apx1fy8z3xlh2lvivssvykqn0vxsgm4xvi32jpa0z"; + }; + + # -DNDEBUG for speed + preConfigure = '' + configureFlagsArray=("CXXFLAGS=-DNDEBUG -O2") + ''; + + doCheck = true; + + meta = { + homepage = http://code.google.com/p/snappy/; + license = "BSD"; + description = "Compression/decompression library for very high speeds"; + }; +} diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 4f70b7a39a4..24234469fa2 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1 }: +{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }: stdenv.mkDerivation { - name = "vmime-0.9.1"; + name = "vmime-0.9.2svn"; src = fetchurl { - url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; - sha256 = "1bninkznn07zhl7gc3jnigzvb0x1sclwqwgjy47ahzdwv5vcnriv"; + url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2; + #url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2; + sha256 = "1jhxiy8c2cgzfjps0z4q40wygdpgm8jr7jn727cbzrscj2c48kxx"; }; - buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 ]; + buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 libgcrypt ]; meta = { homepage = http://www.vmime.org/; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix new file mode 100644 index 00000000000..9e00b0d8bcf --- /dev/null +++ b/pkgs/development/libraries/wayland/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: + +stdenv.mkDerivation rec { + name = "wayland-1.0.5"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + + sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w"; + }; + + buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; + + meta = { + description = "The reference implementation of the Wayland protocol"; + + homepage = http://wayland.freedesktop.org; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index aa46517f571..c05bf88ffbf 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { cp -av * $out cd $out - ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" + ${titaniumsdk}/mobilesdk/*/*/iphone/builder.py build 6.0 $(pwd) ${appId} "${name}" universal '' else throw "Target: ${target} is not supported!"} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix index d3831a9c2be..b4cd1a98fb0 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: +{stdenv, src ? null, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { name = "titanium-mobilesdk-2.1.5.v20121112144658"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; - sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; - sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = if src == null then + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-linux.zip; + sha1 = "79f073d11ee893c508c5aa675a3126501dd385fd"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/2_1_X/mobilesdk-2.1.5.v20121112144658-osx.zip; + sha1 = "6a9a726882222d1615de332aa1ca608c15564e1c"; + } + else throw "Platform: ${stdenv.system} not supported!" + else src; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 456732abe1f..e3eff458d27 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -2,14 +2,14 @@ {name, app, device ? "iPhone", baseDir ? ""}: stdenv.mkDerivation { - inherit name; + name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' ensureDir $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - cd ${app}/${baseDir}/${name}.app - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication ./${name} -SimulateDevice '${device}' + cd '${app}/${baseDir}/${name}.app' + "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${name}' -SimulateDevice '${device}' EOF chmod +x $out/bin/run-test-simulator ''; diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix index c6cbc4a5358..3cb85b86acb 100644 --- a/pkgs/development/tools/haskell/BNFC/default.nix +++ b/pkgs/development/tools/haskell/BNFC/default.nix @@ -1,4 +1,4 @@ -{ cabal, mtl }: +{ cabal, mtl, fetchurl }: cabal.mkDerivation (self: { pname = "BNFC"; @@ -7,6 +7,8 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ]; + patchFlags = "-p2"; meta = { homepage = "http://bnfc.digitalgrammars.com/"; description = "A compiler front-end generator"; diff --git a/pkgs/development/tools/haskell/SourceGraph/default.nix b/pkgs/development/tools/haskell/SourceGraph/default.nix index f5d43a7ab50..17d19106481 100644 --- a/pkgs/development/tools/haskell/SourceGraph/default.nix +++ b/pkgs/development/tools/haskell/SourceGraph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "SourceGraph"; - version = "0.7.0.4"; - sha256 = "1rxbanvw1dpdnpmrf5gpl12gn9796yq89dnmdxy56mb9qzsm7nm6"; + version = "0.7.0.5"; + sha256 = "0lbgs5a0ivn44bmc242hynsvczvxq2snz1fyjf13mrpfx8j5n8gk"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 4b01c9d33e8..5c0b1a3b101 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,39 +1,22 @@ {stdenv, fetchurl, libftdi}: -let - # The "GuruPlug installer" from Marvell. See - # , - # linked from . - 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"; +stdenv.mkDerivation rec { + name = "openocd-${version}"; + version = "0.6.1"; src = fetchurl { - url = "http://download.berlios.de/openocd/openocd-0.4.0.tar.bz2"; - sha256 = "1c9j8s3mqgw5spv6nd4lqfkd1l9jmjipi0ya054vnjfsy2617kzv"; + url = "http://downloads.sourceforge.net/project/openocd/openocd/${version}/openocd-${version}.tar.bz2"; + sha256 = "0argjhff9x4ilgycics61kfgkvb6kkkhhhmj3fxcyydd8mscri7l"; }; - configureFlags = [ "--enable-ft2232_libftdi" "--disable-werror" ]; + configureFlags = [ "--enable-ft2232_libftdi" + "--enable-jlink" + "--enable-rlink" + "--enable-ulink" + "--enable-stlink" ]; 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 = "OpenOCD, an on-chip debugger"; diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix similarity index 100% rename from pkgs/development/tools/misc/texinfo/default.nix rename to pkgs/development/tools/misc/texinfo/4.13a.nix diff --git a/pkgs/development/tools/misc/texinfo/5.0.nix b/pkgs/development/tools/misc/texinfo/5.0.nix new file mode 100644 index 00000000000..a4fb2e9b468 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/5.0.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ncurses, perl }: + +stdenv.mkDerivation rec { + name = "texinfo-5.0"; + + src = fetchurl { + url = "mirror://gnu/texinfo/${name}.tar.xz"; + sha256 = "1p34f68h9ggfj6ckgj0p62qlj7pmz3ha3vc91kh4hr44pnwm1pla"; + }; + + buildInputs = [ ncurses perl ]; + + doCheck = true; + + meta = { + homepage = "http://www.gnu.org/software/texinfo/"; + description = "GNU Texinfo, the GNU documentation system"; + license = stdenv.lib.licenses.gpl3Plus; + + longDescription = '' + Texinfo is the official documentation format of the GNU project. + It was invented by Richard Stallman and Bob Chassell many years + ago, loosely based on Brian Reid's Scribe and other formatting + languages of the time. It is used by many non-GNU projects as + well. + + Texinfo uses a single source file to produce output in a number + of formats, both online and printed (dvi, html, info, pdf, xml, + etc.). This means that instead of writing different documents + for online information and another for a printed manual, you + need write only one document. And when the work is revised, you + need revise only that one document. The Texinfo system is + well-integrated with GNU Emacs. + ''; + }; +} diff --git a/pkgs/development/tools/parsing/alex/3.0.4.nix b/pkgs/development/tools/parsing/alex/3.0.4.nix new file mode 100644 index 00000000000..bc82079aa79 --- /dev/null +++ b/pkgs/development/tools/parsing/alex/3.0.4.nix @@ -0,0 +1,18 @@ +{ cabal, perl, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "alex"; + version = "3.0.4"; + sha256 = "0fgh7ziwxyb140wghh7dpndh41sixcssnba0q942cvkg77m6ah6d"; + isLibrary = false; + isExecutable = true; + buildDepends = [ QuickCheck ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index bffc5ad90d1..535e575fdc4 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,72 +1,49 @@ { stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.1"; - src1 = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip"; - sha256 = "0pr6xpwq8zllc0xsdxl8cfd0zz5fhggw5fsbrizygr6hhdvra1jp"; - }; - src2 = fetchurl { - url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip"; - sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn"; - }; + version = "4.2.009"; + srcs = + [ (fetchurl { + url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip"; + sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i"; + }) + (fetchurl { + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz"; + sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn"; + }) + ]; buildInputs = [ unzip SDL mesa openal curl ]; - unpackPhase = '' - mkdir urbanterror - cd urbanterror - unzip $src1 - unzip $src2 - ''; - patches = [ ./l_script.patch ]; - patchPhase = '' - for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource - do - cd "$d" - patch -p 0 < "''${patches[0]}" - cd .. - done - ''; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007"; configurePhase = '' - cd ioUrbanTerrorClientSource echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local echo "USE_CURL = 1" >> Makefile.local echo "USE_CURL_DLOPEN = 0" >> Makefile.local - substituteInPlace code/tools/asm/Makefile --replace -Werror "" - cd .. - ''; - buildPhase = '' - for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource - do - cd $d - make - cd .. - done ''; installPhase = '' destDir="$out/opt/urbanterror" mkdir -p "$destDir" mkdir -p "$out/bin" - cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \ - "$destDir/ioUrbanTerror" - cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \ - "$destDir/ioUrTded" - cp -rv UrbanTerror/q3ut4 "$destDir" + cp -v build/release-linux-*/Quake3-UrT.* \ + "$destDir/Quake3-UrT" + cp -v build/release-linux-*/Quake3-UrT-Ded.* \ + "$destDir/Quake3-UrT-Ded" + cp -rv ../UrbanTerror42/q3ut4 "$destDir" cat << EOF > "$out/bin/urbanterror" - #!/bin/sh + #! ${stdenv.shell} cd "$destDir" - exec ./ioUrbanTerror "\$@" + exec ./Quake3-UrT "\$@" EOF chmod +x "$out/bin/urbanterror" cat << EOF > "$out/bin/urbanterror-ded" - #!/bin/sh + #! ${stdenv.shell} cd "$destDir" - exec ./ioUrTded "\$@" + exec ./Quake3-UrT-Ded "\$@" EOF chmod +x "$out/bin/urbanterror-ded" ''; postFixup = '' - p=$out/opt/urbanterror/ioUrbanTerror + p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; diff --git a/pkgs/games/urbanterror/l_script.patch b/pkgs/games/urbanterror/l_script.patch deleted file mode 100644 index 8aa176cca8c..00000000000 --- a/pkgs/games/urbanterror/l_script.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur code/botlib/l_script.c kode/botlib/l_script.c ---- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400 -+++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400 -@@ -1118,7 +1118,7 @@ - { - if (*string == '\"') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\"') - { -@@ -1135,7 +1135,7 @@ - { - if (*string == '\'') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string) - 1); - } //end if - if (string[strlen(string)-1] == '\'') - { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index eac49f9ec69..aeb7e37cd7e 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype +, makeWrapper }: stdenv.mkDerivation rec { name = "warsow-${version}"; @@ -25,18 +26,20 @@ stdenv.mkDerivation rec { substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; + libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper + ]; installPhase = '' dest=$out/opt/warsow cd release - for f in warsow wsw_server wswtv_server; do - substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest - done mkdir -p $dest mkdir -p $out/bin - cp -v {warsow,wsw_server,wswtv_server}.* $dest + cp -v {warsow,wsw_server,wswtv_server}* $dest cp -rv basewsw libs $dest - cp -v warsow wsw_server wswtv_server $out/bin + # Since 1.03 some modules are _always_ downloaded from server, thus + makeWrapper $dest/warsow $out/bin/warsow \ + --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib" + makeWrapper $dest/wsw_server $out/bin/wsw_server + makeWrapper $dest/wswtv_server $out/bin/wswtv_server ''; postFixup = '' p=$out/opt/warsow/warsow.* diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index bff4ffa3b19..76aa2de723d 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -20,6 +20,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + iElectric = "Domen Kozar "; jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 169b020befd..9c2821d7776 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,18 +1,17 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: # BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) -# BLCR 0.8.5_beta3 should works for kernel version up to 3.7.1 +# BLCR 0.8.5 should works for kernel version up to 3.7.1 assert stdenv.isLinux; -#assert builtins.compareVersions "2.6.39" kernel.version == 1; assert builtins.compareVersions "3.7.2" kernel.version == 1; stdenv.mkDerivation { - name = "blcr_${kernel.version}-0.8.5pre3"; + name = "blcr_${kernel.version}-0.8.5"; src = fetchurl { - url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.5_b3.tar.gz; - sha256 = "1xp2k140w79zqbnfnb2q7z91hv15d5a6p39zdc97f9pfxmyyc8fn"; + url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz; + sha256 = "01a809nfbr715pnidlslv55pxadm3021l97p98zkqy8chyrnkjb0"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index 3e3ad74adb3..266c7795d23 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -4,7 +4,8 @@ stdenv.mkDerivation rec { name = "iwlwifi-4965-ucode-228.57.1.21"; src = fetchurl { - url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz"; + url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz"; + name = "${name}.tgz"; sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas"; }; diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch b/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch deleted file mode 100644 index 13d17ad6485..00000000000 --- a/pkgs/os-specific/linux/kernel/cifs-timeout-3.5.7.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/fs/cifs/transport.c.old 2012-11-06 10:53:23.640093369 +0100 -+++ a/fs/cifs/transport.c 2012-11-06 10:54:31.835469340 +0100 -@@ -176,8 +176,8 @@ - * after the retries we will kill the socket and - * reconnect which may clear the network problem. - */ -- if ((i >= 14) || (!server->noblocksnd && (i > 2))) { -- cERROR(1, "sends on sock %p stuck for 15 seconds", -+ if ((i >= 119) || (!server->noblocksnd && (i > 2))) { -+ cERROR(1, "sends on sock %p stuck for 119 seconds", - ssocket); - rc = -EAGAIN; - break; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a58430401c5..48f050f98cc 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation { homepage = http://www.kernel.org/; maintainers = [ lib.maintainers.eelco - lib.maintainers.shlevy lib.maintainers.chaoflow ]; platforms = lib.platforms.linux; diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 18ef471f4af..b7ccdde367c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.62"; + version = "3.0.65"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0bmvsh3n8llx2zynd2q3z0hg3i3ib36yr4j5pd7jlapf8pzmgi25"; + sha256 = "1vmk0bmg0djwbh9scrhpyljan01ygkwn4q0j1ydn8snag7sn4x8y"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix deleted file mode 100644 index 0ec50303ee2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ /dev/null @@ -1,251 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - NUMA? n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI y - MTD_COMPLEX_MAPPINGS y # needed for many devices - NET_POCKET y # enable pocket and portable adapters - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - CIFS_XATTR y - CIFS_POSIX y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_L2CAP y - BT_SCO y # audio support - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Devtmpfs support. - DEVTMPFS y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.1.10"; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1vcpbh7wnc9smw2l5ci27a5p0rgmc1a5dc6a1aljm6f6wcfic8lz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix deleted file mode 100644 index 01b00b499cb..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ /dev/null @@ -1,265 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.3.8"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0bgppngf711mlxp0jcsnv5xc0xxc8vs5rzc1czkv2igrfb1kvrnz"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index aa568eb6d25..0e032935900 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.4.29"; + version = "3.4.32"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "117s6q71hf0p88bfpj7nsa7rdmz35b0c1vw5x87fd2ysb5lvnz4i"; + sha256 = "0z218ibz36lpdyjjch94jx12fcghj376x3fkmgxmwdjaz7zngn4i"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix deleted file mode 100644 index 273697da6e3..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ /dev/null @@ -1,271 +0,0 @@ -args @ { stdenv, fetchurl, extraConfig ? "" -, perl, mktemp, module_init_tools -, ... }: - -let - configWithPlatform = kernelPlatform : - '' - # Power management and debugging for powertop. - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - - # Support drivers that need external firmware. - STANDALONE n - - # Make /proc/config.gz available. - IKCONFIG_PROC y - - # Optimize with -O2, not -Os. - CC_OPTIMIZE_FOR_SIZE n - - # Enable the kernel's built-in memory tester. - MEMTEST y - - # Include the CFQ I/O scheduler in the kernel, rather than as a - # module, so that the initrd gets a good I/O scheduler. - IOSCHED_CFQ y - BLK_CGROUP y # required by CFQ - - # Enable NUMA. - NUMA? y - - # Disable some expensive (?) features. - FTRACE n - KPROBES n - PM_TRACE_RTC n - - # Enable various subsystems. - ACCESSIBILITY y # Accessibility support - AUXDISPLAY y # Auxiliary Display support - DONGLE y # Serial dongle support - HIPPI? y - MTD_COMPLEX_MAPPINGS y # needed for many devices - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SPI y # needed for many devices - SPI_MASTER y - WAN y - - # Networking options. - IP_PNP n - IPV6_PRIVACY y - NETFILTER_ADVANCED y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IP_VS_PROTO_ESP y - IP_VS_PROTO_AH y - IP_DCCP_CCID3 n # experimental - CLS_U32_PERF y - CLS_U32_MARK y - - # Wireless networking. - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HOSTAP_FIRMWARE_NVRAM y - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATH9K_AHB y # Ditto, AHB bus - B43_PHY_HT y - BCMA_HOST_PCI y - - # Some settings to make sure that fbcondecor works - in particular, - # disable tileblitting and the drivers that need it. - - # Enable various FB devices. - FB y - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_SAVAGE_I2C y - FB_SAVAGE_ACCEL y - FB_SIS_300 y - FB_SIS_315 y - FB_3DFX_ACCEL y - FB_GEODE y - - # Video configuration - # Enable KMS for devices whose X.org driver supports it. - DRM_I915_KMS y - DRM_RADEON_KMS y - # Hybrid graphics support - VGA_SWITCHEROO y - - # Sound. - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_USB_CAIAQ_INPUT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) - - # USB serial devices. - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - - # Filesystem options - in particular, enable extended attributes and - # ACLs for all filesystems that support them. - EXT2_FS_XATTR y # Ext2 extended attributes - EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists - EXT2_FS_SECURITY y # Ext2 Security Labels - EXT2_FS_XIP y # Ext2 execute in place support - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - REISERFS_FS_XATTR y - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - JFS_POSIX_ACL y - JFS_SECURITY y - XFS_QUOTA y - XFS_POSIX_ACL y - XFS_RT y # XFS Realtime subvolume support - OCFS2_DEBUG_MASKLOG n - BTRFS_FS_POSIX_ACL y - UBIFS_FS_XATTR? y - UBIFS_FS_ADVANCED_COMPR y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NFS_FSCACHE y - CIFS_XATTR y - CIFS_POSIX y - CIFS_FSCACHE y - - # Security related features. - STRICT_DEVMEM y # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # disable SELinux by default - - # Misc. options. - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - B43_PCMCIA y - BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support - BLK_DEV_IDEACPI y # IDE ACPI support - BLK_DEV_INTEGRITY y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM m - BT_RFCOMM_TTY y # RFCOMM TTY support - CRASH_DUMP n - DMAR? n # experimental - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - FUSION y # Fusion MPT device support - IDE_GD_ATAPI y # ATAPI floppy support - IRDA_ULTRA y # Ultra (connectionless) protocol - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEGARAID_NEWGEN y - MICROCODE_AMD y - MODVERSIONS y - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTRR_SANITIZER y - NET_FC y # Fibre Channel driver support - PPP_MULTILINK y # PPP multilink support - REGULATOR y # Voltage and Current Regulator Support - SCSI_LOGGING y # SCSI logging facility - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - THERMAL_HWMON y # Hardware monitoring support - USB_DEBUG n - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XEN_DOM0 y - - # Linux Containers - RT_GROUP_SCHED? y - CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y - DEVPTS_MULTIPLE_INSTANCES? y - - # Enable staging drivers. These are somewhat experimental, but - # they generally don't hurt. - STAGING y - - # PROC_EVENTS requires that the netlink connector is not built - # as a module. This is required by libcgroup's cgrulesengd. - CONNECTOR y - PROC_EVENTS y - - # Tracing - FTRACE y - FUNCTION_TRACER y - FTRACE_SYSCALLS y - SCHED_TRACER y - - # Devtmpfs support. - DEVTMPFS y - - # Easier debug of NFS issues - SUNRPC_DEBUG y - - ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} - ${extraConfig} - ''; -in - -import ./generic.nix ( - - rec { - version = "3.5.7"; - testing = false; - - preConfigure = '' - substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" - ''; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini"; - }; - - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; - } - - // removeAttrs args ["extraConfig"] -) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index b5a28baca3e..9c96c2a8fd2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.nix @@ -250,7 +250,7 @@ in import ./generic.nix ( rec { - version = "3.7.6"; + version = "3.7.9"; testing = false; preConfigure = '' @@ -259,7 +259,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0r5njypz4ypcq1g7wpfzscc267k0zm0xh916rk3ypi0vj55k6pdv"; + sha256 = "1d9834flw0jyfn0lq1l0ahp8v12p227qn6z39v1pk53dap1zl0v1"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix similarity index 98% rename from pkgs/os-specific/linux/kernel/linux-3.6.nix rename to pkgs/os-specific/linux/kernel/linux-3.8.nix index 987f14f0921..58e6f28453a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -237,6 +237,7 @@ let # Media support MEDIA_CAMERA_SUPPORT? y MEDIA_RC_SUPPORT? y + MEDIA_USB_SUPPORT y # Easier debug of NFS issues SUNRPC_DEBUG y @@ -249,7 +250,8 @@ in import ./generic.nix ( rec { - version = "3.6.11"; + version = "3.8"; + modDirVersion = "3.8.0"; testing = false; preConfigure = '' @@ -258,7 +260,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0cnbdhsgxxdl44gqfqlh8nyf6yzmdz7xkfa0xh2rzdscwqh8085h"; + sha256 = "0jqqhfskd88480hkwnkc8rlwkwb56p322irp9xm6gmfyzfyx2w70"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f886c2c49f4..5288050d70d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -119,20 +119,6 @@ rec { features.aufs3 = true; }; - aufs3_1 = rec { - name = "aufs3.1"; - version = "3.1.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "82c9fe43d197072a82cab6f02a5fd5cc4f50306a"; - sha256 = "f03d00964c9fc9975144d315fb79a1cd56d99f8c11853ed81d34afca35cd560a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; @@ -147,20 +133,6 @@ rec { features.aufs3 = true; }; - aufs3_3 = rec { - name = "aufs3.3"; - version = "3.3.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "65ab607cfb2c411d86da8fcee25c0f6dada1c4d5"; - sha256 = "55c887932f1c12aed4ee20d9e749a80e9e0412951bd0a40fa3949ba972764a0a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_4 = rec { name = "aufs3.4"; version = "3.4.20121210"; @@ -175,34 +147,6 @@ rec { features.aufs3 = true; }; - aufs3_5 = rec { - name = "aufs3.5"; - version = "3.5.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "1658e9080c0e49f38feee5027cf0d32940a661ca"; - sha256 = "4577fe1dd34299520155767a7c42697d41aabc0055ae8b1e448449b8c24a1044"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - - aufs3_6 = rec { - name = "aufs3.6"; - version = "3.6.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "f541ebfd88df0f4e6f9daf55053282e4f52cc4d9"; - sha256 = "4d615a5f3c14a6a7c49bc6d65e78a2cdb89321cbd8a53f87cc8fe9edda382c3a"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - # not officially released yet, but 3.x seems to work fine aufs3_7 = rec { name = "aufs3.7"; @@ -244,12 +188,6 @@ rec { features.cifsTimeout = true; }; - cifs_timeout_3_5_7 = - { name = "cifs-timeout"; - patch = ./cifs-timeout-3.5.7.patch; - features.cifsTimeout = true; - }; - no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -261,12 +199,6 @@ rec { patch = ./dell-rfkill.patch; }; - # seems no longer necessary on 3.6 - perf3_5 = - { name = "perf-3.5"; - patch = ./perf-3.5.patch; - }; - sheevaplug_modules_2_6_35 = { name = "sheevaplug_modules-2.6.35"; patch = ./sheevaplug_modules-2.6.35.patch; diff --git a/pkgs/os-specific/linux/kernel/perf-3.5.patch b/pkgs/os-specific/linux/kernel/perf-3.5.patch deleted file mode 100644 index 6d62a1db80e..00000000000 --- a/pkgs/os-specific/linux/kernel/perf-3.5.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://permalink.gmane.org/gmane.linux.kernel.perf.user/960 - -Fix to build perf. - -diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c -index 9f6cebd..d5491f1 100644 ---- a/tools/perf/util/evsel.c -+++ b/tools/perf/util/evsel.c -@@ -15,7 +15,7 @@ - #include "cpumap.h" - #include "thread_map.h" - #include "target.h" --#include "../../include/linux/perf_event.h" -+#include "../../../include/linux/perf_event.h" - - #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y)) - #define GROUP_FD(group_fd, cpu) (*(int *)xyarray__entry(group_fd, cpu, 0)) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index afa19491ce5..96d756bc7d2 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, xz, zlib, pkgconfig }: +{ stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "kmod-9"; + name = "kmod-12"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz"; - sha256 = "1kyfplx0gygzxp5dn81yk3cn8zzraqm497vis04r1g1dnry2c1q6"; + sha256 = "c6189dd8c5a1e8d9224e8506bd188c0cd5dfa119fd6b7e5869b3640cbe8bf92f"; }; # Disable xz/zlib support to prevent needing them in the initrd. - buildInputs = [ pkgconfig /* xz zlib */ ]; + buildInputs = [ pkgconfig libxslt /* xz zlib */ ]; configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ]; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index c95060a5ffb..b07a51c1ace 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { ''; configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build ''; meta = { diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index f0f7fcbb9ce..220abf88ae7 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "A userspace helper that runs x86 code in an emulated environment"; homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; license = "BSD"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index d8840d08460..297991ff4d9 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; }; + preConfigure = "patchShebangs ."; + buildInputs = [ pciutils python ]; installPhase = '' @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An identification utility for the x86 series of processors."; - longDescription = + longDescription = '' x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages the cpuid kernel module where possible. it supports parsing model specific diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 4769d78a2fd..33a5dbc0735 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation { ''; configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build - --with-spl=${spl}/libexec/spl/${kernel.version} + --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build + --with-spl=${spl}/libexec/spl/${kernel.modDirVersion} ${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""} ''; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix new file mode 100644 index 00000000000..7828cf84398 --- /dev/null +++ b/pkgs/servers/http/yaws/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, erlang, pam, perl }: + +stdenv.mkDerivation rec { + name = "yaws-${version}"; + version = "1.95"; + + src = fetchurl { + url = "http://yaws.hyber.org/download/${name}.tar.gz"; + sha256 = "01jlp6v8l95n9k5rbp4kvklnh95q7yv9lp2a6ahyixb1cn1sxvz4"; + }; + + # The tarball includes a symlink yaws -> yaws-1.95, which seems to be + # necessary for importing erlang files + unpackPhase = '' + tar xzf $src + cd $name + ''; + + configureFlags = "--with-extrainclude=${pam}/include/security"; + + buildInputs = [ erlang pam perl ]; + + postInstall = '' + sed -i "s#which #type -P #" $out/bin/yaws + ''; + + meta = with stdenv.lib; { + description = "A high performance HTTP 1.1 server in Erlang"; + homepage = http://http://yaws.hyber.org; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu ]; + }; + +} diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 71c7046b0b7..4c7e8997148 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { --replace '"/bin/true"' '"${coreutils}/bin/true"' substituteInPlace x11vnc/ssltools.h \ + --replace /bin/su /var/setuid-wrappers/su \ --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo ''; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index c6ad0876823..f0a6ade8444 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "bacula-5.0.3"; src = fetchurl { - url = mirror://sourceforge/bacula/bacula-5.0.3.tar.gz; - sha256 = "1d7x6jw5x9ljbdxvcc8k635lsxcbxw9kzjyxf6l4zsdv3275j1cr"; + url = mirror://sourceforge/bacula/bacula-5.2.13.tar.gz; + sha256 = "1n3sc0kd7r0afpyi708y3md0a24rbldnfcdz0syqj600pxcd9gm4"; }; buildInputs = [ sqlite zlib acl ncurses openssl readline ]; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index a9cba3f7dee..3da2fad21f2 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "rsnapshot-1.3.0"; src = fetchurl { - url = "mirrors://sourceforge/rsnapshot/${name}.tar.gz"; + url = "mirror://sourceforge/rsnapshot/${name}.tar.gz"; sha256 = "19p35ycm73a8vd4ccjpah18h5jagvcr11rqca6ya87sg8k0a5h9z"; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index ce4421f9ca7..d16af28010c 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, neon, zlib, noDavsUser ? false}: +{ stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { name = "davfs2-1.4.7"; @@ -8,19 +8,26 @@ stdenv.mkDerivation rec { sha256 = "0i7hrwlfzisb4l2mza1kjj9q9xxixggjplsjm339zl7828mfxh2h"; }; - prePatch = stdenv.lib.optional noDavsUser '' - echo "dav_user root" >> etc/davfs2.conf - echo "dav_group root" >> etc/davfs2.conf - ''; - buildInputs = [ neon zlib ]; - patches = [ ./davfs2-install.patch ./isdir.patch ]; + patches = [ ./davfs2-install.patch ./isdir.patch ./fix-sysconfdir.patch ]; + + configureFlags = "--sysconfdir=/etc"; meta = { - longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV."; + homepage = "http://savannah.nongnu.org/projects/davfs2"; + description = "mount WebDAV shares like a typical filesystem"; + license = stdenv.lib.licenses.gpl3Plus; - license = "GPLv3+"; - homepage = http://savannah.nongnu.org/projects/davfs2; + longDescription = '' + Web Distributed Authoring and Versioning (WebDAV), an extension to + the HTTP-protocol, allows authoring of resources on a remote web + server. davfs2 provides the ability to access such resources like + a typical filesystem, allowing for use by standard applications + with no built-in support for WebDAV. + ''; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch new file mode 100644 index 00000000000..f71248a28f4 --- /dev/null +++ b/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch @@ -0,0 +1,60 @@ +diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am +--- davfs2-1.4.7-orig/etc/Makefile.am 2013-02-21 11:45:00.185763558 +0100 ++++ davfs2-1.4.7/etc/Makefile.am 2013-02-21 11:53:05.423197775 +0100 +@@ -24,17 +24,17 @@ + + install-data-local: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) +- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf +- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private +- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private ++ $(mkinstalldirs) $(out)$(pkgsysconfdir) ++ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf ++ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets ++ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs ++ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private ++ chmod 700 $(out)$(pkgsysconfdir)/certs/private + + uninstall-local: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \ +- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \ ++ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ ++ rm -f $(out)$(pkgsysconfdir)/$$f; \ + done +diff -ubr davfs2-1.4.7-orig/etc/Makefile.in davfs2-1.4.7/etc/Makefile.in +--- davfs2-1.4.7-orig/etc/Makefile.in 2013-02-21 11:45:00.185763558 +0100 ++++ davfs2-1.4.7/etc/Makefile.in 2013-02-21 11:53:27.241207128 +0100 +@@ -408,19 +408,19 @@ + + install-data-local: $(dist_pkgdata_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) +- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf +- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs +- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private +- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private ++ $(mkinstalldirs) $(out)$(pkgsysconfdir) ++ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf ++ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets ++ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs ++ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private ++ chmod 700 $(out)$(pkgsysconfdir)/certs/private + + uninstall-local: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \ +- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \ ++ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ ++ rm -f $(out)$(pkgsysconfdir)/$$f; \ + done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index ce564e8de4f..5ef6db7ae47 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gd, texinfo +{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper , texLive ? null , lua ? null , emacs ? null @@ -11,25 +11,36 @@ , cairo ? null , pkgconfig ? null , readline +, fontconfig ? null, gnused ? null, coreutils ? null }: +assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); + stdenv.mkDerivation rec { name = "gnuplot-4.4.4"; - + src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; }; - configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - buildInputs = [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig + wxGTK pango cairo pkgconfig makeWrapper ]; + configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + + postInstall = stdenv.lib.optionalString (libX11 != null) '' + wrapProgram $out/bin/gnuplot \ + --prefix PATH : '${gnused}/bin' \ + --prefix PATH : '${coreutils}/bin' \ + --prefix PATH : '${fontconfig}/bin' \ + --run '. ${./set-gdfontpath-from-fontconfig.sh}' + ''; + meta = { - homepage = http://www.gnuplot.info; + homepage = "http://www.gnuplot.info"; description = "A portable command-line driven graphing utility for many platforms"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh new file mode 100644 index 00000000000..4886b4f2b7c --- /dev/null +++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh @@ -0,0 +1,4 @@ +p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) ) +IFS=: +export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}" +unset IFS p diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 7293c0db66d..60301b9b164 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.22"; + name = "pngcrush-1.7.50"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp"; + sha256 = "1xabqjgvwsyazs0hw7bzzm256zbd7v33alwzp0lbawm521m3m651"; }; configurePhase = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 249456580d4..1bd40025e5d 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid -, pkgconfig, gtkmm, gnomedocutils, libxml2 }: +, pkgconfig, gtkmm, libxml2 }: -stdenv.mkDerivation { - name = "gparted-0.8.1"; +stdenv.mkDerivation rec { + name = "gparted-0.14.1"; src = fetchurl { - url = mirror://sourceforge/gparted/gparted-0.5.1/gparted-0.8.1.tar.bz2; - sha256 = "128pnrcqp3d4a4jnjxm0mqglbyrs2q841pmg5g8ilyc827b6j163"; + url = "mirror://sourceforge/gparted/${name}.tar.bz2"; + sha256 = "0697sq2dbs9cn689bk68gs9pj3k08bfp9wfg6j291zrprdd3rddi"; }; configureFlags = "--disable-doc"; - buildInputs = - [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm - gnomedocutils libxml2 - ]; + buildInputs = [ + parted gtk glib intltool gettext libuuid pkgconfig gtkmm libxml2 + ]; - meta = { + meta = { description = "Graphical disk partitioning tool"; homepage = http://gparted.sourceforge.net; license = "GPLv2"; diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix index 341939ea40f..cf2fe713461 100644 --- a/pkgs/tools/misc/gummiboot/default.nix +++ b/pkgs/tools/misc/gummiboot/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, gnu_efi, unzip }: +{ stdenv, fetchurl, gnu_efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gummiboot-16"; + name = "gummiboot-23"; - buildInputs = [ unzip ]; + buildInputs = [ unzip pkgconfig utillinux libxslt docbook_xsl docbook_xml_dtd_42 ]; patches = [ ./no-usr.patch ]; - buildFlags = [ - "GNU_EFI=${gnu_efi}" - ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "ARCH=ia32"; + buildFlags = [ "GNU_EFI=${gnu_efi}" ]; - installPhase = "mkdir -p $out/bin; mv gummiboot.efi $out/bin"; + makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "http://cgit.freedesktop.org/gummiboot/snapshot/${name}.zip"; - sha256 = "0as5svmvsbz08qgbvns77qfb36xi9lx2138ikiinqv6finzm8fi1"; + sha256 = "1lmfk4k52ha00ppna5g7h51vhd27i9fipf5k7mc2d9jkm2480z4j"; }; meta = { diff --git a/pkgs/tools/misc/gummiboot/no-usr.patch b/pkgs/tools/misc/gummiboot/no-usr.patch index 7f63e20d3e9..db906894740 100644 --- a/pkgs/tools/misc/gummiboot/no-usr.patch +++ b/pkgs/tools/misc/gummiboot/no-usr.patch @@ -1,14 +1,24 @@ -diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile ---- gummiboot-16-orig/Makefile 2013-01-24 04:20:58.000000000 -0500 -+++ gummiboot-16/Makefile 2013-02-01 17:27:42.922371399 -0500 -@@ -1,13 +1,13 @@ - VERSION=16 +diff -Naur gummiboot-23-orig/Makefile gummiboot-23/Makefile +--- gummiboot-23-orig/Makefile 2013-02-20 00:55:44.000000000 -0500 ++++ gummiboot-23/Makefile 2013-02-21 12:00:35.783637645 -0500 +@@ -10,7 +10,8 @@ + export E Q ARCH=$(shell $(CC) -dumpmachine | sed "s/\(-\).*$$//") -LIBDIR=$(shell echo $$(cd /usr/lib/$$(gcc -print-multi-os-directory); pwd)) ++PREFIX=/usr +LIBDIR=$(GNU_EFI)/lib LIBEFIDIR=$(or $(wildcard $(LIBDIR)/gnuefi), $(LIBDIR)) + ifeq ($(ARCH),i686) +@@ -25,13 +26,13 @@ + -mno-red-zone + endif + +-all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot ++all: gummiboot$(MACHINE_TYPE_NAME).efi gummiboot man + + # ------------------------------------------------------------------------------ CPPFLAGS = \ -I. \ - -I/usr/include/efi \ @@ -18,3 +28,52 @@ diff -Naur gummiboot-16-orig/Makefile gummiboot-16/Makefile CFLAGS = \ -DVERSION=$(VERSION) \ +@@ -82,6 +83,7 @@ + `pkg-config --cflags --libs blkid` \ + src/setup/setup.c \ + src/setup/efivars.c \ ++ -DPREFIX=\"$(PREFIX)\" \ + -o $@ + + # ------------------------------------------------------------------------------ +@@ -101,11 +103,11 @@ + rm -f src/efi/gummiboot.o src/efi/gummiboot.so gummiboot gummiboot$(MACHINE_TYPE_NAME).efi + + install: all +- mkdir -p $(DESTDIR)/usr/bin/ +- cp gummiboot $(DESTDIR)/usr/bin +- mkdir -p $(DESTDIR)/usr/lib/gummiboot/ +- cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)/usr/lib/gummiboot/ +- [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)/usr/share/man/man1/ && cp gummiboot.1 $(DESTDIR)/usr/share/man/man1/ || : ++ mkdir -p $(DESTDIR)$(PREFIX)/bin/ ++ cp gummiboot $(DESTDIR)$(PREFIX)/bin ++ mkdir -p $(DESTDIR)$(PREFIX)/lib/gummiboot/ ++ cp gummiboot$(MACHINE_TYPE_NAME).efi $(DESTDIR)$(PREFIX)/lib/gummiboot/ ++ [ -e gummiboot.1 ] && mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1/ && cp gummiboot.1 $(DESTDIR)$(PREFIX)/share/man/man1/ || : + + tar: + git archive --format=tar --prefix=gummiboot-$(VERSION)/ $(VERSION) | xz > gummiboot-$(VERSION).tar.xz +diff -Naur gummiboot-23-orig/src/setup/setup.c gummiboot-23/src/setup/setup.c +--- gummiboot-23-orig/src/setup/setup.c 2013-02-20 00:55:44.000000000 -0500 ++++ gummiboot-23/src/setup/setup.c 2013-02-21 11:57:43.295324700 -0500 +@@ -736,7 +736,7 @@ + char *p = NULL, *q = NULL, *v = NULL; + int r; + +- if (asprintf(&p, "/usr/lib/gummiboot/%s", name) < 0) { ++ if (asprintf(&p, PREFIX "/lib/gummiboot/%s", name) < 0) { + fprintf(stderr, "Out of memory.\n"); + r = -ENOMEM; + goto finish; +@@ -791,9 +791,9 @@ + return r; + } + +- d = opendir("/usr/lib/gummiboot"); ++ d = opendir(PREFIX "/lib/gummiboot"); + if (!d) { +- fprintf(stderr, "Failed to open /usr/lib/gummiboot: %m\n"); ++ fprintf(stderr, "Failed to open " PREFIX "/lib/gummiboot: %m\n"); + return -errno; + } + diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix deleted file mode 100644 index 649def69115..00000000000 --- a/pkgs/tools/misc/parted/2.3.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, enableStatic ? false, hurd ? null }: - -stdenv.mkDerivation rec { - name = "parted-2.3"; - - src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836"; - }; - - buildInputs = [ libuuid ] - ++ stdenv.lib.optional (readline != null) readline - ++ stdenv.lib.optional (gettext != null) gettext - ++ stdenv.lib.optional (devicemapper != null) devicemapper - ++ stdenv.lib.optional (hurd != null) hurd; - - configureFlags = - (if (readline != null) - then [ "--with-readline" ] - else [ "--without-readline" ]) - ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" - ++ stdenv.lib.optional enableStatic "--enable-static"; - - doCheck = true; - - preCheck = - stdenv.lib.optionalString doCheck - # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinux}/sbin:$PATH\""; - - meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; - - longDescription = '' - GNU Parted is an industrial-strength package for creating, destroying, - resizing, checking and copying partitions, and the file systems on - them. This is useful for creating space for new operating systems, - reorganising disk usage, copying data on hard disks and disk imaging. - - It contains a library, libparted, and a command-line frontend, parted, - which also serves as a sample implementation and script backend. - ''; - - homepage = http://www.gnu.org/software/parted/; - license = "GPLv3+"; - - maintainers = [ - # Add your name here! - stdenv.lib.maintainers.ludo - ]; - - # GNU Parted requires libuuid, which is part of util-linux-ng. - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index dc2a8498223..6ed89adee6e 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.5.6"; + name = "dhcpcd-5.6.7"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5"; + sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h"; }; configureFlags = "--sysconfdir=/etc"; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 200bac53086..d95360ccb45 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonPackage { +pythonPackages.buildPythonPackage { name = "httpie-0.3.1"; namePrefix = ""; @@ -9,6 +9,8 @@ buildPythonPackage { sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a"; }; + propagatedBuildInputs = with pythonPackages; [ pygments requests014 ]; + doCheck = false; meta = { diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 736ca980cfb..02013d8ede6 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,28 +1,32 @@ -{stdenv, fetchurl, libav, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }: +{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }: + +let version = "1.0.25"; in + stdenv.mkDerivation rec { - name = "minidlna-1.0.24"; + name = "minidlna-${version}"; + src = fetchurl { - url = mirror://sourceforge/project/minidlna/minidlna/1.0.24/minidlna_1.0.24_src.tar.gz; - sha256 = "0hmrrrq7d8940rckwj93bcdpdxxy3qfkjl17j5k31mi37hqc42l4"; + url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna_${version}_src.tar.gz"; + sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p"; }; + patches = [ ./config.patch ]; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libav}/include/libavutil -I${libav}/include/libavcodec -I${libav}/include/libavformat" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ffmpeg}/include/libavutil -I${ffmpeg}/include/libavcodec -I${ffmpeg}/include/libavformat" export makeFlags="INSTALLPREFIX=$out" ''; - buildInputs = [ libav flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; - patches = [ ./config.patch ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; meta = { description = "MiniDLNA Media Server"; longDescription = '' - MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully - compliant with DLNA/UPnP-AV clients. + MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully + compliant with DLNA/UPnP-AV clients. ''; homepage = http://sourceforge.net/projects/minidlna/; license = stdenv.lib.licenses.gpl2; - - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3aa818db728..2879c5cc1a1 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "openresolv-3.4.6"; + name = "openresolv-3.5.4"; src = fetchurl { url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; - sha256 = "026z4973b0vqp5acr6mn5fyxyc84y4ahg1f8fddh8dph86jcnhba"; + sha256 = "0in40iha4ghk12lr2p65v0by3h0jp7qsdajmj4vm7iis0plzr4db"; }; configurePhase = diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index c1504697a18..2d60b0f0e30 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,8 +6,8 @@ let hpnSrc = fetchurl { - url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz; - sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl"; + url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz; + sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq"; }; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gunzip -c ${hpnSrc} | patch -p1 export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - + patches = [ ./locale_archive.patch ]; buildNativeInptus = [ perl ]; diff --git a/pkgs/tools/networking/snx/default.nix b/pkgs/tools/networking/snx/default.nix new file mode 100644 index 00000000000..7a73314d0e3 --- /dev/null +++ b/pkgs/tools/networking/snx/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, libX11, pam, gcc33 }: + +let + # The proper value for this offset can be found at the top of the snx_install script. + archiveOffset = "78"; + libraryPath = stdenv.lib.makeSearchPath "lib" [libX11 pam gcc33.gcc]; +in +stdenv.mkDerivation rec { + name = "snx-800007027"; + + src = fetchurl { + url = "https://remote.us.publicisgroupe.net/CSHELL/snx_install.sh"; + sha256 = "1yq0r8gb6jw5pyfrw3wxvplrxxfhbhgm9ph4gyd754fyn52iwgxv"; + }; + + buildInputs = [makeWrapper]; + + unpackPhase = '' + tail -n +${archiveOffset} ${src} | bunzip2 -c - | tar xfvp - + ''; + + buildPhase = '' + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" snx + ''; + + installPhase = '' + mkdir -p "$out/sbin" "$out/libexec" + mv snx "$out/libexec/" + makeWrapper "$out/libexec/snx" "$out/sbin/snx" --prefix LD_LIBRARY_PATH ":" "${libraryPath}" + ''; + + meta = { + homepage = "https://www.checkpoint.com/"; + description = "Check Point SSL Network Extender"; + license = "unknown"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/tools/networking/snx/snx_install.sh b/pkgs/tools/networking/snx/snx_install.sh new file mode 100755 index 00000000000..759f870468d Binary files /dev/null and b/pkgs/tools/networking/snx/snx_install.sh differ diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 6332ff8ad5d..57c2e1d6d3c 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus, - wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute, + wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, locale ? "C" }: # Wicd has a ncurses interface that we do not build because it depends @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default - sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in + sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${openresolv}/sbin:${iproute}/sbin" in/scripts=wicd.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix new file mode 100644 index 00000000000..9e4b8d12712 --- /dev/null +++ b/pkgs/tools/security/aespipe/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "aespipe-${version}"; + version = "v2.4c"; + + src = fetchurl { + url = "mirror://sourceforge/loop-aes/aespipe/${name}.tar.bz2"; + sha256 = "0pl49jnjczjvfxwm9lw576qsjm1lxh8gc4g776l904cixaz90096"; + }; + + meta = { + description = "AES encrypting or decrypting pipe"; + homepage = http://loop-aes.sourceforge.net/aespipe.README; + license = "GPL"; + maintainers = stdenv.lib.maintainers.goibhniu; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix new file mode 100644 index 00000000000..7eeb491374a --- /dev/null +++ b/pkgs/tools/security/apg/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "apg-2.2.3"; + src = fetchurl { + url = "http://www.adel.nursat.kz/apg/download/${name}.tar.gz"; + sha256 = "1fkxpaifv925i385krsyslrig42ksws5y19hfq5asn1rwv6zmjb9"; + }; + configurePhase = '' + substituteInPlace Makefile --replace /usr/local "$out" + ''; + preInstall = '' + export CHOWNPROG=true + export CHGRPPROG=true + ''; + + meta = { + description = "A tool set for random password generation."; + longDescription = '' + APG (Automated Password Generator) is the tool set for random + password generation. + + Standalone version + + Generates some random words of required type and prints them + to standard output. + + Network version + + APG server: When client's request is arrived generates some + random words of predefined type and send them to client over + the network (according to RFC0972). + + APG client: Sends the password generation request to the APG + server, wait for generated Passwords arrival and then prints + them to the standard output. + + Advantages + + * Built-in ANSI X9.17 RNG (Random Number Generator) (CAST/SHA1) + * Built-in password quality checking system (it has support for + Bloom filter for faster access) + * Two Password Generation Algorithms: + 1. Pronounceable Password Generation Algorithm (according to + NIST FIPS 181) + 2. Random Character Password Generation Algorithm with 35 + configurable modes of operation + * Configurable password length parameters + * Configurable amount of generated passwords + * Ability to initialize RNG with user string + * Support for /dev/random + * Ability to crypt() generated passwords and print them as + additional output + * Special parameters to use APG in script + * Ability to log password generation requests for network version + * Ability to control APG service access using tcpd + * Ability to use password generation service from any type of box + (Mac, WinXX, etc.) that connected to network + * Ability to enforce remote users to use only allowed type of + password generation + ''; + homepage = http://www.adel.nursat.kz/apg/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 2d422385bd5..e490d55bc5f 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,10 +1,10 @@ args: with args; rec { - version = "1.1.1"; + version = "1.3.0"; name = "moderncv-${version}"; src = fetchurl { url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; - sha256 = "929c118eff339a5c59ed58cc961ddee787e9a5933d12ec8801613fd2e2500e9f"; + sha256 = "0wdj90shi04v97b2d6chhvm9qrp0bcvsm46441730ils1y74wisq"; }; buildInputs = [texLive unzip]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a5639fe2dd..8707db52520 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -323,9 +323,10 @@ let inherit lib; }; - makeInitrd = {contents}: import ../build-support/kernel/make-initrd.nix { - inherit stdenv perl cpio contents ubootChooser; - }; + makeInitrd = {contents, compressor ? "gzip -9"}: + import ../build-support/kernel/make-initrd.nix { + inherit stdenv perl cpio contents ubootChooser compressor; + }; makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; @@ -370,6 +371,8 @@ let aefs = callPackage ../tools/filesystems/aefs { }; + aespipe = callPackage ../tools/security/aespipe { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; analog = callPackage ../tools/admin/analog {}; @@ -419,6 +422,8 @@ let pkgs_i686 = pkgsi686Linux; }; + apg = callPackage ../tools/security/apg { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = import ../development/mobile/titaniumenv { @@ -611,9 +616,7 @@ let dar = callPackage ../tools/archivers/dar { }; - davfs2 = callPackage ../tools/filesystems/davfs2 { - neon = neon029; - }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -713,6 +716,8 @@ let euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; }; + evtest = callPackage ../applications/misc/evtest { }; + exif = callPackage ../tools/graphics/exif { }; exiftags = callPackage ../tools/graphics/exiftags { }; @@ -1290,7 +1295,6 @@ let patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { hurd = null; }; - parted_2_3 = callPackage ../tools/misc/parted/2.3.nix { hurd = null; }; hurdPartedCross = if crossSystem != null && crossSystem.config == "i586-pc-gnu" @@ -1527,6 +1531,11 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + snx = callPackage_i686 ../tools/networking/snx { + inherit (pkgsi686Linux) pam gcc33; + inherit (pkgsi686Linux.xlibs) libX11; + }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; @@ -3339,9 +3348,10 @@ let swftools = callPackage ../tools/video/swftools { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo49 = callPackage ../development/tools/misc/texinfo/4.9.nix { }; - - texinfo = callPackage ../development/tools/misc/texinfo { }; + texinfo5 = callPackage ../development/tools/misc/texinfo/5.0.nix { }; + texinfo = texinfo413; texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -3460,8 +3470,6 @@ let caelum = callPackage ../development/libraries/caelum { }; - cairomm = callPackage ../development/libraries/cairomm { }; - scmccid = callPackage ../development/libraries/scmccid { }; ccrtp = callPackage ../development/libraries/ccrtp { }; @@ -3945,31 +3953,27 @@ let }; glib = callPackage ../development/libraries/glib/2.34.x.nix { }; - - glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; + glibmm = callPackage ../development/libraries/glibmm { }; glib_networking = callPackage ../development/libraries/glib-networking {}; atk = callPackage ../development/libraries/atk/2.6.x.nix { }; - - atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; + atkmm = callPackage ../development/libraries/atkmm { }; cairo = callPackage ../development/libraries/cairo { }; + cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango/1.30.x.nix { }; - pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; - + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtk = pkgs.gtk2; - gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; - gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { }; - - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); + gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; + gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtksharp2; @@ -4631,7 +4635,9 @@ let mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = callPackage ../development/libraries/mlt { + ffmpeg = ffmpeg_1_1; + }; libmpeg2 = callPackage ../development/libraries/libmpeg2 { }; @@ -4671,19 +4677,7 @@ let else stdenv; }; - neon = neon029; - - neon026 = callPackage ../development/libraries/neon/0.26.nix { - compressionSupport = true; - sslSupport = true; - }; - - neon028 = callPackage ../development/libraries/neon/0.28.nix { - compressionSupport = true; - sslSupport = true; - }; - - neon029 = callPackage ../development/libraries/neon/0.29.nix { + neon = callPackage ../development/libraries/neon { compressionSupport = true; sslSupport = true; }; @@ -4857,8 +4851,6 @@ let qt4 = pkgs.kde4.qt4; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { }; - qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; @@ -4963,6 +4955,8 @@ let # optional }; + snappy = callPackage ../development/libraries/snappy { }; + sofia_sip = callPackage ../development/libraries/sofia-sip { }; soprano = callPackage ../development/libraries/soprano { }; @@ -5105,6 +5099,8 @@ let libpng = libpng12; }; + wayland = callPackage ../development/libraries/wayland { }; + webkit = builderDefsPackage ../development/libraries/webkit { inherit (gnome) gtkdoc libsoup; @@ -5662,6 +5658,8 @@ let xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { }; + yaws = callPackage ../servers/http/yaws { }; + zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix { inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib; }); @@ -5940,15 +5938,6 @@ let ]; }; - linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_1 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5965,15 +5954,6 @@ let ''; }; - linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ #kernelPatches.fbcondecor_2_6_38 - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_3 - ]; - }; - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5986,34 +5966,6 @@ let ]; }; - linux_3_5 = makeOverridable (import ../os-specific/linux/kernel/linux-3.5.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_5 - kernelPatches.perf3_5 - kernelPatches.cifs_timeout_3_5_7 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_6 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_7 = makeOverridable (import ../os-specific/linux/kernel/linux-3.7.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -6027,6 +5979,18 @@ let ]; }; + linux_3_8 = makeOverridable (import ../os-specific/linux/kernel/linux-3.8.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 + ] ++ lib.optionals (platform.kernelArch == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -6142,14 +6106,11 @@ let linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32); linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 pkgs.linuxPackages_2_6_35); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); - linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen); - linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); - linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); - linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 pkgs.linuxPackages_3_7); + linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 pkgs.linuxPackages_3_8); # The current default kernel / kernel modules. linux = linuxPackages.kernel; @@ -6813,7 +6774,14 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = lib.setName "darcs-${haskellPackages.darcs.version}" haskellPackages.darcs; + darcs = haskellPackages.darcs.override { + # A variant of the Darcs derivation that containts only the executable and + # thus has no dependencies on other Haskell packages. + cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // { + isLibrary = false; + configureFlags = "-f-library"; }); }.final; + }; + }; darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade; @@ -6936,6 +6904,8 @@ let jabber = callPackage ../applications/editors/emacs-modes/jabber { }; + emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { }; + emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { }; emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { }; @@ -7099,7 +7069,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox18Pkgs; + firefoxPkgs = pkgs.firefox19Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -7113,12 +7083,12 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox18Pkgs = callPackage ../applications/networking/browsers/firefox/18.0.nix { + firefox19Pkgs = callPackage ../applications/networking/browsers/firefox/19.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; - firefox18Wrapper = lowPrio (wrapFirefox { browser = firefox18Pkgs.firefox; }); + firefox19Wrapper = lowPrio (wrapFirefox { browser = firefox19Pkgs.firefox; }); flac = callPackage ../applications/audio/flac { }; @@ -7495,9 +7465,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { - qt = qt47; - }; + meshlab = callPackage ../applications/graphics/meshlab { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; @@ -7847,7 +7815,6 @@ let sublime = callPackage ../applications/editors/sublime { }; subversion = callPackage ../applications/version-management/subversion/default.nix { - neon = pkgs.neon029; bdbSupport = true; httpServer = false; httpSupport = true; @@ -8231,7 +8198,9 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby {}; + blobby = callPackage ../games/blobby { + boost = boost149; + }; bsdgames = callPackage ../games/bsdgames { }; @@ -8289,10 +8258,7 @@ let gnugo = callPackage ../games/gnugo { }; - gparted = callPackage ../tools/misc/gparted { - parted = parted_2_3; - inherit (gnome) gnomedocutils; - }; + gparted = callPackage ../tools/misc/gparted { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; @@ -8487,10 +8453,10 @@ let enlightenment = callPackage ../desktops/enlightenment { }; - # e17 = recurseIntoAttrs ( - # let callPackage = newScope pkgs.e17; in - # import ../desktops/e17 { inherit callPackage pkgs; } - # ); + e17 = recurseIntoAttrs ( + let callPackage = newScope pkgs.e17; in + import ../desktops/e17 { inherit callPackage pkgs; } + ); gnome2 = callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ac9cdbcf28e..36069e8854f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -147,7 +147,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok - alex = self.alex_3_0_2; # 7.6 ok + alex = self.alex_3_0_4; # 7.6 ok haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok primitive = self.primitive_0_5_0_1; # semi-official, but specified @@ -525,7 +525,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {}; bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; - bmp_1_2_3_4 = callPackage ../development/libraries/haskell/bmp/1.2.3.4.nix {}; + bmp_1_2_4_1 = callPackage ../development/libraries/haskell/bmp/1.2.4.1.nix {}; bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond Boolean = callPackage ../development/libraries/haskell/Boolean {}; @@ -874,6 +874,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); libc = pkgs.stdenv.gcc.libc; }; + Glob = callPackage ../development/libraries/haskell/Glob {}; + GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { @@ -1181,6 +1183,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logict = callPackage ../development/libraries/haskell/logict {}; + maccatcher = callPackage ../development/libraries/haskell/maccatcher {}; + mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {}; @@ -1218,8 +1222,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); monadLogger = callPackage ../development/libraries/haskell/monad-logger {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {}; - monadPar = self.monadPar_0_3; + monadPar_0_3_4 = callPackage ../development/libraries/haskell/monad-par/0.3.4.nix {}; + monadPar = self.monadPar_0_3_4; monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {}; @@ -1423,6 +1427,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); PSQueue = callPackage ../development/libraries/haskell/PSQueue {}; + publicsuffixlist = callPackage ../development/libraries/haskell/publicsuffixlist {}; + pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {}; pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {}; @@ -1532,6 +1538,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); shelly = callPackage ../development/libraries/haskell/shelly {}; + simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {}; + simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; silently = callPackage ../development/libraries/haskell/silently {}; @@ -1755,6 +1763,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uulib = callPackage ../development/libraries/haskell/uulib {}; + uuid = callPackage ../development/libraries/haskell/uuid {}; + uuParsinglib = callPackage ../development/libraries/haskell/uu-parsinglib {}; vacuum = callPackage ../development/libraries/haskell/vacuum {}; @@ -1942,7 +1952,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); alex_2_3_5 = callPackage ../development/tools/parsing/alex/2.3.5.nix {}; alex_3_0_1 = callPackage ../development/tools/parsing/alex/3.0.1.nix {}; alex_3_0_2 = callPackage ../development/tools/parsing/alex/3.0.2.nix {}; - alex = self.alex_3_0_2; + alex_3_0_4 = callPackage ../development/tools/parsing/alex/3.0.4.nix {}; + alex = self.alex_3_0_4; alexMeta = callPackage ../development/tools/haskell/alex-meta {}; @@ -2000,10 +2011,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # Applications. - darcs = callPackage ../applications/version-management/darcs { - tar = self.tar_0_3_2_0; - haskeline = self.haskeline_0_6_4_7; - }; + darcs = callPackage ../applications/version-management/darcs {}; leksah = callPackage ../applications/editors/leksah { QuickCheck = self.QuickCheck2; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5efb56fe05f..43c2aa4dba5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,13 +119,13 @@ pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e"; + rev = "c765ebd6041a845a800cc9fd30705102ae2d040f"; name = "alot-0.3.3_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4"; + sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4"; }; # error: invalid command 'test' @@ -275,12 +275,35 @@ pythonPackages = python.modules // rec { propagatedBuildInputs = [ logilab_common ]; }; - beautifulsoup = buildPythonPackage (rec { - name = "beautifulsoup-3.0.8"; + + beets = buildPythonPackage rec { + name = "beets-1.0.0"; src = fetchurl { - url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; - sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; + url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz"; + md5 = "88ad09a93aa0d69ce813205cf23b2a6c"; + }; + + # tests depend on $HOME setting + configurePhase = "export HOME=$TMPDIR"; + + propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ]; + + meta = { + homepage = http://beets.radbox.org; + description = "Music tagger and library organizer"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + beautifulsoup = buildPythonPackage (rec { + name = "beautifulsoup-3.2.1"; + + src = fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; + sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; }; # error: invalid command 'test' @@ -288,13 +311,30 @@ pythonPackages = python.modules // rec { meta = { homepage = http://www.crummy.com/software/BeautifulSoup/; - license = "bsd"; - description = "Undemanding HTML/XML parser"; }; }); + beautifulsoup4 = buildPythonPackage (rec { + name = "beautifulsoup4-4.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz"; + md5 = "c012adc06217b8532c446d181cc56586"; + }; + + # invalid command 'test' + doCheck = false; + + meta = { + homepage = http://crummy.com/software/BeautifulSoup/bs4/; + description = "HTML and XML parser"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); + # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { name = "boto-1.9b"; @@ -402,7 +442,7 @@ pythonPackages = python.modules // rec { # It makes buildout useful in a nix profile, but this alters the default functionality patchPhase = '' sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py - ''; + ''; meta = { homepage = http://www.buildout.org/; @@ -721,6 +761,60 @@ pythonPackages = python.modules // rec { }; }; + deluge = buildPythonPackage rec { + name = "deluge-1.3.5"; + + src = fetchurl { + url = "http://download.deluge-torrent.org/source/${name}.tar.gz"; + md5 = "fbf52593a85bfa7c8520834fa9177fba"; + }; + + # TODO: gui, procsettitle + buildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ]; + propagatedBuildInputs = [ pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl ]; + + meta = { + homepage = http://deluge-torrent.org; + description = "Torrent client"; + license = "GPLv3"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + pyxdg = buildPythonPackage rec { + name = "pyxdg-0.25"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz"; + md5 = "bedcdb3a0ed85986d40044c87f23477c"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://freedesktop.org/wiki/Software/pyxdg; + description = "Contains implementations of freedesktop.org standards"; + license = "LGPLv2"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + chardet = buildPythonPackage rec { + name = "chardet-2.1.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; + md5 = "295367fd210d20f3febda615a88e1ef0"; + }; + + meta = { + homepage = https://github.com/erikrose/chardet; + description = "Universal encoding detector"; + license = "LGPLv2"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; django = buildPythonPackage rec { name = "Django-${version}"; @@ -909,6 +1003,23 @@ pythonPackages = python.modules // rec { }; + feedparser = buildPythonPackage (rec { + name = "feedparser-5.1.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz"; + md5 = "f2253de78085a1d5738f626fcc1d8f71"; + }; + + meta = { + homepage = http://code.google.com/p/feedparser/; + description = "Universal feed parser"; + license = stdenv.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); + + flake8 = buildPythonPackage (rec { name = "flake8-1.7.0"; @@ -949,6 +1060,26 @@ pythonPackages = python.modules // rec { }; + flexget = buildPythonPackage (rec { + name = "FlexGet-1.0.3353"; + + src = fetchurl { + url = "http://download.flexget.com/archive/${name}.tar.gz"; + md5 = "cffc4e51b5c5efddb339d265524e46b8"; + }; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ]; + + meta = { + homepage = http://flexget.com/; + description = "Multipurpose automation tool for content like torrents, ..."; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); + + flup = buildPythonPackage (rec { name = "flup-1.0.2"; @@ -1145,6 +1276,21 @@ pythonPackages = python.modules // rec { }; }; + html5lib = buildPythonPackage (rec { + name = "html5lib-0.95"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/h/html5lib/${name}.tar.gz"; + md5 = "fe607f9917d81763e842f818f23464ee"; + }; + + meta = { + homepage = http://code.google.com/p/html5lib/; + description = "HTML parser based on WHAT-WG HTML5 specification"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); httplib2 = buildPythonPackage rec { name = "httplib2-0.7.7"; @@ -1383,6 +1529,43 @@ pythonPackages = python.modules // rec { }; }; + + Mako = buildPythonPackage rec { + name = "Mako-0.7.3"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/Mako/${name}.tar.gz"; + md5 = "daf7cc50f997533b573f9b40193139a2"; + }; + + buildInputs = [ MarkupSafe nose ]; + propagatedBuildInputs = [ MarkupSafe ]; + + meta = { + description = "Super-fast templating language."; + homepage = http://www.makotemplates.org; + license = "MIT"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + MarkupSafe = buildPythonPackage rec { + name = "MarkupSafe-0.15"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/M/MarkupSafe/${name}.tar.gz"; + md5 = "4e7c4d965fe5e033fa2d7bb7746bb186"; + }; + + meta = { + description = "Implements a XML/HTML/XHTML Markup safe string"; + homepage = http://dev.pocoo.org; + license = "BSD"; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + manuel = buildPythonPackage rec { name = "manuel-${version}"; version = "1.6.0"; @@ -1533,6 +1716,43 @@ pythonPackages = python.modules // rec { }; + munkres = buildPythonPackage rec { + name = "munkres-1.0.5.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz"; + md5 = "cb9d114fb523428bab4742e88bc83696"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://bmc.github.com/munkres/; + description = "Munkres algorithm for the Assignment Problem"; + license = pkgs.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + + musicbrainzngs = buildPythonPackage rec { + name = "musicbrainzngs-0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz"; + md5 = "bc32aa1cf121f29c3ca1c06e9668865f"; + }; + + meta = { + homepage = http://alastair/python-musicbrainz-ngs; + description = "Python bindings for musicbrainz NGS webservice"; + license = pkgs.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + + mutagen = buildPythonPackage (rec { name = "mutagen-1.20"; @@ -2282,6 +2502,28 @@ pythonPackages = python.modules // rec { }; }; + pyglet = buildPythonPackage rec { + name = "pyglet-1.1.4"; + + src = fetchurl { + url = "http://pyglet.googlecode.com/files/${name}.tar.gz"; + sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx"; + }; + + patchPhase = let + libs = [ pkgs.mesa pkgs.xlibs.libX11 pkgs.freetype pkgs.fontconfig ]; + paths = pkgs.lib.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); + in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; + + doCheck = false; + + meta = { + homepage = "http://www.pyglet.org/"; + description = "A cross-platform windowing and multimedia library"; + license = stdenv.lib.licenses.bsd3; + }; + }; + pygments = buildPythonPackage rec { name = "Pygments-1.5"; @@ -2361,6 +2603,56 @@ pythonPackages = python.modules // rec { }; }; + pyrss2gen = buildPythonPackage (rec { + name = "PyRSS2Gen-1.0.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz"; + md5 = "eae2bc6412c5679c287ecc1a59588f75"; + }; + + meta = { + homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; + description = "Library for generating RSS 2.0 feeds"; + license = stdenv.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); + + pynzb = buildPythonPackage (rec { + name = "pynzb-0.1.0"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz"; + md5 = "63c74a36348ac28aa99732dcb8be8c59"; + }; + + meta = { + homepage = http://github.com/ericflo/pynzb; + description = "Unified API for parsing NZB files"; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); + + progressbar = buildPythonPackage (rec { + name = "progressbar-2.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz"; + md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28"; + }; + + # invalid command 'test' + doCheck = false; + + meta = { + homepage = http://code.google.com/p/python-progressbar/; + description = "Text progressbar library for python"; + license = stdenv.lib.licenses.lgpl3Plus; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }); ldap = buildPythonPackage rec { name = "python-ldap-2.4.3"; @@ -2498,6 +2790,24 @@ pythonPackages = python.modules // rec { }); + pyserial = buildPythonPackage rec { + name = "pyserial-2.6"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyserial/${name}.tar.gz"; + md5 = "cde799970b7c1ce1f7d6e9ceebe64c98"; + }; + + doCheck = false; + + meta = { + homepage = "http://pyserial.sourceforge.net/"; + license = stdenv.lib.licenses.psfl; + description = "Python serial port extension"; + }; + }; + + pysqlite = buildPythonPackage (rec { name = "pysqlite-2.5.5"; @@ -3082,11 +3392,11 @@ pythonPackages = python.modules // rec { sqlalchemy = buildPythonPackage { - name = "sqlalchemy-0.6.6"; + name = "sqlalchemy-0.7.9"; src = fetchurl { - url = mirror://sourceforge/sqlalchemy/0.6.6/SQLAlchemy-0.6.6.tar.gz; - sha256 = "0inj9b66pi447cw500mqn7d09dij20ic3k5bnyhj6rpdl2l83a0l"; + url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz; + md5 = "c4852d586d95a59fbc9358f4467875d5"; }; buildInputs = [ nose ]; @@ -3303,11 +3613,11 @@ pythonPackages = python.modules // rec { turses = buildPythonPackage (rec { - name = "turses-0.2.11"; + name = "turses-0.2.12"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm"; + sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; @@ -3326,11 +3636,11 @@ pythonPackages = python.modules // rec { }); tweepy = buildPythonPackage (rec { - name = "tweepy-1.13"; + name = "tweepy-2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; - sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5"; + sha256 = "1b95xcw11b5871gd4br78hxbvcq8y9f0i0sqga85dgg9hnmvdcx0"; }; meta = { @@ -3494,6 +3804,24 @@ pythonPackages = python.modules // rec { }; + websockify = buildPythonPackage rec { + version = "0.3.0"; + name = "websockify-${version}"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/w/websockify/websockify-${version}.tar.gz"; + md5 = "29b6549d3421907de4bbd881ecc2e1b1"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = { + description = "WebSockets support for any application/server"; + homepage = https://github.com/kanaka/websockify; + }; + }; + + webtest = buildPythonPackage rec { version = "1.2.3"; name = "webtest-${version}"; @@ -4010,7 +4338,7 @@ pythonPackages = python.modules // rec { url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; md5 = "e7e581af8193551831560a736a53cf58"; }; - + propagatedBuildInputs = [ zope_event zope_interface zope_testing ]; # ignore circular dependency on zope_location @@ -4280,6 +4608,23 @@ pythonPackages = python.modules // rec { }; }; + + unidecode = buildPythonPackage rec { + name = "Unidecode-0.04.12"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz"; + md5 = "351dc98f4512bdd2e93f7a6c498730eb"; + }; + + meta = { + homepage = http://pypi.python.org/pypi/Unidecode/; + description = "ASCII transliterations of Unicode text"; + license = pkgs.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; + }; + txamqp = buildPythonPackage rec { name = "txamqp-${version}"; version = "0.3"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index d5a57337f4f..b80ab43b931 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -16,9 +16,7 @@ let #xorgserver.hostDrv = nativePlatforms; }; nixUnstable.hostDrv = nativePlatforms; - linuxPackages_3_3.kernel.hostDrv = linux; linuxPackages_3_4.kernel.hostDrv = linux; - linuxPackages_3_6.kernel.hostDrv = linux; }; /* Basic list of packages to be natively built, diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index f5fc2f3a7f6..7d98a51cab5 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1501,7 +1501,6 @@ in qshowdiff = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qsynth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - qt47 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qt_gstreamer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtpfsgui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; qtractor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b3b58f43e1b..9772c353102 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -349,7 +349,7 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox18Pkgs.firefox = linux; + firefox19Pkgs.firefox = linux; gnome = { gnome_panel = linux;