diff options
Diffstat (limited to 'pkgs/applications')
83 files changed, 4325 insertions, 1165 deletions
diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix index 56d22d0b53b2..89ff12f8f742 100644 --- a/pkgs/applications/altcoins/darkcoin.nix +++ b/pkgs/applications/altcoins/darkcoin.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig +{ fetchzip, stdenv, pkgconfig , openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf , utillinux , withGui }: @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "0.10.99.99"; - src = fetchurl { + src = fetchzip { url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz"; - sha256 = "1a05a7l878klg4wqk9ykndkhyknrd7jp75v38k99qgk5fi8wa752"; + sha256 = "0sigvimqwc1mvaq43a8c2aq7fjla2ncafrals08qfq3jd6in8b4f"; }; buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ] diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cc13868e9d4e..c9b16b65267d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -46,8 +46,8 @@ let usbmuxd ]; - unwrapped = stdenv.mkDerivation { - name = "clementine-unwrapped-${version}"; + free = stdenv.mkDerivation { + name = "clementine-free-${version}"; inherit patches src buildInputs; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -91,7 +91,7 @@ with stdenv.lib; runCommand "clementine-${version}" { - inherit blob unwrapped; + inherit blob free; buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks dontPatchELF = true; dontStrip = true; @@ -109,7 +109,12 @@ runCommand "clementine-${version}" } '' mkdir -p $out/bin - makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \ + makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done '' diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 2d738f55c286..cb1def12dfd0 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme, dconf +, makeWrapper, gnome3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf + itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf ]; meta = { diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix new file mode 100644 index 000000000000..00b6c3e0c677 --- /dev/null +++ b/pkgs/applications/audio/fomp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lv2, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "fomp-${version}"; + version = "1.0.0"; + + src = fetchurl { + url = "http://download.drobilla.net/${name}.tar.bz2"; + sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; + }; + + buildInputs = [ lv2 pkgconfig python ]; + + installPhase = '' + python waf configure --prefix=$out + python waf + python waf install + ''; + + meta = with stdenv.lib; { + homepage = http://drobilla.net/software/fomp/; + description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index a3f356e75c45..0e7f8ad9957c 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype +{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis , libsndfile, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig autoconf automake gnutls freetype SDL SDL_gfx SDL_ttf + pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib libvorbis libsndfile libogg ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index e8c14a9c763d..853cdff4a515 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }: + ipodSupport ? true, libgpod, gnome3 }: with pkgs.lib; @@ -16,8 +16,7 @@ in buildPythonPackage rec { buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool - gnome3.gnome_themes_standard gnome3.gnome_icon_theme - gnome3.gnome_icon_theme_symbolic hicolor_icon_theme + gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 9c08b2ab6d7d..f01abb13e67c 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.gnome_icon_theme_symbolic gnome.gnome_icon_theme + gnome.gdl gnome.defaultIconTheme hicolor_icon_theme ]; patchPhase = '' diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix new file mode 100644 index 000000000000..c333492fd13e --- /dev/null +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "ladspa-sdk-${version}"; + version = "1.13"; + src = fetchurl { + url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; + }; + + patchPhase = '' + cd src + sed -i 's@/usr/@$(out)/@g' makefile + sed -i 's@-mkdirhier@mkdir -p@g' makefile + ''; + + meta = { + description = "The SDK for the LADSPA audio plugin standard"; + longDescription = '' + The LADSPA SDK, including the ladspa.h API header file, + ten example LADSPA plugins and + three example programs (applyplugin, analyseplugin and listplugins). + ''; + homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index 8c4d8a8c1ed5..8c4d8a8c1ed5 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 8e4c31302e26..7e392679c712 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper - gnome3.gnome_icon_theme ]; + gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 3e7bcb9d912e..b76e1183c0ee 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { configurePhase = "export CC=${CC}"; - meta = { + meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; # expat version - maintainers = stdenv.lib.maintainers.eduarrrd; + platforms = platforms.linux; + license = licenses.mit; # expat version + maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix new file mode 100644 index 000000000000..91b3954de0df --- /dev/null +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, boost, ladspaH, lilv, lv2, pkgconfig, serd, sord, sratom }: + +stdenv.mkDerivation rec { + name = "plugin-torture-git-${version}"; + version = "2013-10-03"; + + src = fetchgit { + url = "https://github.com/cth103/plugin-torture"; + rev = "9ee06016982bdfbaa215cd0468cc6ada6367462a"; + sha256 = "bfe9213fd2c1451d7acc1381d63301c4e6ff69ce86d31a886ece5159ba850706"; + }; + + buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; + + installPhase = '' + mkdir -p $out/bin + cp plugin-torture $out/bin/ + cp README $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/cth103/plugin-torture; + description = "A tool to test LADSPA and LV2 plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8a613ee68617..4b04a6e79090 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,24 +4,25 @@ }: let - ver_branch = "1.14"; - version = "1.14.0"; + ver_branch = "1.15"; + version = "1.15.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0fkbzqncx34dhylrg5328fih7xywmsqj2p40smnx33nyf047jdgc"; + sha256 = "0f0c2irb7qq49dabxhh99bwyvkxpfpscy4vynm7y800sz15lm2hs"; }; + patches = [ ./fix-paths.patch ]; + buildInputs = [ pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt qt4 ] ++ stdenv.lib.optional (qt5 != null) qt5.base; configureFlags = [ - "--enable-liblightdm-gobject" "--localstatedir=/var" "--sysconfdir=/etc" ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch new file mode 100644 index 000000000000..56930418caca --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/fix-paths.patch @@ -0,0 +1,61 @@ +diff --git a/common/user-list.c b/common/user-list.c +index 792c6d3..57fbfb7 100644 +--- a/common/user-list.c ++++ b/common/user-list.c +@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) + + value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); + if (!value) +- value = g_strdup ("/bin/false /usr/sbin/nologin"); ++ value = g_strdup ("/run/current-system/sw/bin/nologin"); + hidden_shells = g_strsplit (value, " ", -1); + g_free (value); + +diff --git a/src/seat.c b/src/seat.c +index f9b149d..9029742 100644 +--- a/src/seat.c ++++ b/src/seat.c +@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + + /* Set POSIX variables */ + process_set_clear_environment (script, TRUE); +- process_set_env (script, "SHELL", "/bin/sh"); ++ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); + + /* Variables required for regression tests */ + if (g_getenv ("LIGHTDM_TEST_ROOT")) +@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, + process_set_env (script, "PATH", g_getenv ("PATH")); + } + else +- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); ++ process_set_env (script, "PATH", "/run/current-system/sw/bin"); + + if (user) + { +diff --git a/src/session-child.c b/src/session-child.c +index e85f57d..93db0bd 100644 +--- a/src/session-child.c ++++ b/src/session-child.c +@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) + else + { + /* Set POSIX variables */ +- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); ++ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); + pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); + pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); +diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c +index 47f1c10..cc82652 100644 +--- a/src/shared-data-manager.c ++++ b/src/shared-data-manager.c +@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) + + gchar *path = g_build_filename (USERS_DIR, user, NULL); + gchar *quoted_path = g_shell_quote (path); +- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); ++ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); + + g_spawn_command_line_async (cmd, &error); + if (error) diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index db0d05584e1c..a9f3e53fb595 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.7"; + name = "${emacsName}-mac-5.8"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1a86l3556h24x9ml6r8n6xbrxymb9gr38sicny3f0m281myhlsvv"; + sha256 = "0ljhrag5lag8i72xfsmgk9lndqv0b3sahyyd48svj6jlg4jachir"; }; buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; diff --git a/pkgs/applications/editors/emacs-modes/tuareg/default.nix b/pkgs/applications/editors/emacs-modes/tuareg/default.nix index 364daed439d2..be03938f8a53 100644 --- a/pkgs/applications/editors/emacs-modes/tuareg/default.nix +++ b/pkgs/applications/editors/emacs-modes/tuareg/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "tuareg-mode-${version}"; src = fetchzip { url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz"; - sha256 = "1rd7ai1wn476zfkkxv2xk72bbzi4d9c17gngd35882q4b5vzp756"; + sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 8d150ded4ab7..9d42aecf5f0e 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -212,86 +212,86 @@ in android-studio = buildAndroidStudio rec { name = "android-studio-${version}"; - version = "1.2.0.12"; - build = "141.1890965"; + version = "1.2.1.1"; + build = "141.1903250"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${build}-linux.zip"; - sha256 = "01k96rql192ksnprc4yai97fcals7msf06m9bx1q7asn46887h7n"; + sha256 = "17n0hsw0655b2w7a3avj5hw6njhv4gayxnsj1bwi9p3dgzr5d5zp"; }; }; clion = buildClion rec { name = "clion-${version}"; - version = "1.0"; - build = "141.353"; + version = "1.0.3"; + build = "141.873"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0xjdx13ljp1vy51a7rsj25wg3bsvry4kxq5cdng8zrc1g2y1fqw5"; + sha256 = "0ksxpml6fzj91hnzy59wlgz7q76dhc3715jalacq748y0i1jdh3f"; }; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "14.1.2"; - build = "IC-141.713.2"; + version = "14.1.3"; + build = "IC-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1skxbax7gsxxf7519qasxwp9q0v9ff755ibqr1w47dv2al47kjzq"; + sha256 = "104ba057p49l41g9gdcgbywdxyqzkm4rfm7yivkcsddh5drsk4jv"; }; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "14.1.2"; - build = "IU-141.713.2"; + version = "14.1.3"; + build = "IU-141.1010.3"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "1ddy0f83rs3yx3w8v49cmlhkc8qxapdh702g26gzlapbpvfw58ay"; + sha256 = "1flg3rpb86xfcxlys5rxywa0z9c6j9h3qd8mkadx5pnay1f97pwi"; }; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "7.0.4"; - build = "139.1231"; + version = "7.1.2"; + build = "141.1119"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38"; + sha256 = "1gz14lv5jhnrnshp7lkx3wgrdf0y60abs4q78yhv2x9dc6ld1gmj"; }; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Community Edition"; + version = "4.5"; + build = "141.1116"; + description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "16lf2slssfgbds6zyp2rs0ssrg8aw5d2w7b755iqimiyfhyyv83s"; + sha256 = "0igx62rijalppsd1nwrri1r4m1597n93ncglyb6b94m3fm32fca6"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.0.6"; - build = "139.1659"; - description = "PyCharm 4.0 Professional Edition"; + version = "4.5"; + build = "141.1116"; + description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wavw41nzqnx75y3k3l5kq09i5d9j8hb4r6a0y3nxzqvmdfza55r"; + sha256 = "0zga8sxwrvjvyw9v1pvq40gasp485r1d627jj6jvwzcv78il50d9"; }; }; diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 692a728b12e4..189682ec4e3f 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig vala which autoconf automake libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte python3Packages.pygments ]; + gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; configureScript = "./autogen.sh"; diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 0d4b9fd1dab5..0170319871f0 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "1.0.0"; + version = "1.1.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; + sha256 = "1zvlngv73h968jd2m42ylr9vfhf35n80wzy616cv2ic7gmr1fl9p"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index cd75f2d58fa9..e74ff1ec45f4 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -1,23 +1,24 @@ { self, fetchurl, fetchgit ? null, lib }: { - by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.1"; - by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.1"; + by-spec."accepts"."~1.2.7" = + self.by-version."accepts"."1.2.7"; + by-version."accepts"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.2.7"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; - name = "accepts-1.1.1.tgz"; - sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; + name = "accepts-1.2.7.tgz"; + sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); - deps = [ - self.by-version."mime-types"."2.0.2" - self.by-version."negotiator"."0.4.8" - ]; + deps = { + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "accepts" ]; @@ -25,7 +26,8 @@ by-spec."asn1"."0.1.11" = self.by-version."asn1"."0.1.11"; by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "node-asn1-0.1.11"; + name = "asn1-0.1.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; @@ -35,46 +37,48 @@ ]; buildInputs = (self.nativeDeps."asn1" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "asn1" ]; }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-assert-plus-0.1.2"; + by-spec."assert-plus"."^0.1.5" = + self.by-version."assert-plus"."0.1.5"; + by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "assert-plus-0.1.5"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + name = "assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }) ]; buildInputs = (self.nativeDeps."assert-plus" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "assert-plus" ]; }; by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-async-0.9.0"; + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = lib.makeOverridable self.buildNodePackage { + name = "async-0.9.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; }) ]; buildInputs = (self.nativeDeps."async" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "async" ]; @@ -82,7 +86,8 @@ by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "node-aws-sign2-0.5.0"; + name = "aws-sign2-0.5.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; @@ -92,64 +97,88 @@ ]; buildInputs = (self.nativeDeps."aws-sign2" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "aws-sign2" ]; }; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "node-block-stream-0.0.7"; + self.by-version."block-stream"."0.0.8"; + by-version."block-stream"."0.0.8" = lib.makeOverridable self.buildNodePackage { + name = "block-stream-0.0.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"; + name = "block-stream-0.0.8.tgz"; + sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b"; }) ]; buildInputs = (self.nativeDeps."block-stream" or []); - deps = [ - self.by-version."inherits"."2.0.1" - ]; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.9.0"; - by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.9.0"; + self.by-version."body-parser"."1.12.4"; + by-version."body-parser"."1.12.4" = lib.makeOverridable self.buildNodePackage { + name = "body-parser-1.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; - name = "body-parser-1.9.0.tgz"; - sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + name = "body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."depd"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - self.by-version."media-typer"."0.3.0" - self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.4" - self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.2" - ]; + deps = { + "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + }; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.9.0"; + "body-parser" = self.by-version."body-parser"."1.12.4"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "node-boom-0.4.2"; + name = "boom-0.4.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; @@ -159,17 +188,40 @@ ]; buildInputs = (self.nativeDeps."boom" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "boom" ]; }; - by-spec."bytes"."1" = + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; + by-spec."bytes"."1.0.0" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-bytes-1.0.0"; + name = "bytes-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"; @@ -179,30 +231,49 @@ ]; buildInputs = (self.nativeDeps."bytes" or []); - deps = [ + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bytes" ]; + }; + by-spec."bytes"."2.0.1" = + self.by-version."bytes"."2.0.1"; + by-version."bytes"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "bytes-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; + name = "bytes-2.0.1.tgz"; + sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; + }) ]; + buildInputs = + (self.nativeDeps."bytes" or []); + deps = { + }; peerDependencies = [ ]; passthru.names = [ "bytes" ]; }; - by-spec."bytes"."1.0.0" = - self.by-version."bytes"."1.0.0"; by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.5"; - by-version."combined-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-combined-stream-0.0.5"; + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "combined-stream-0.0.7"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz"; - name = "combined-stream-0.0.5.tgz"; - sha1 = "29ed76e5c9aad07c4acf9ca3d32601cce28697a2"; + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }) ]; buildInputs = (self.nativeDeps."combined-stream" or []); - deps = [ - self.by-version."delayed-stream"."0.0.5" - ]; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; peerDependencies = [ ]; passthru.names = [ "combined-stream" ]; @@ -210,7 +281,8 @@ by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-commander-2.1.0"; + name = "commander-2.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; @@ -220,16 +292,77 @@ ]; buildInputs = (self.nativeDeps."commander" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "commander" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "content-disposition-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }) + ]; + buildInputs = + (self.nativeDeps."content-disposition" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-disposition" ]; + }; + by-spec."content-type"."~1.0.1" = + self.by-version."content-type"."1.0.1"; + by-version."content-type"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "content-type-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"; + name = "content-type-1.0.1.tgz"; + sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600"; + }) + ]; + buildInputs = + (self.nativeDeps."content-type" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-type" ]; + }; by-spec."cookie"."0.1.2" = self.by-version."cookie"."0.1.2"; by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-0.1.2"; + name = "cookie-0.1.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; @@ -239,46 +372,48 @@ ]; buildInputs = (self.nativeDeps."cookie" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie" ]; }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-cookie-signature-1.0.5"; + by-spec."cookie-signature"."1.0.6" = + self.by-version."cookie-signature"."1.0.6"; + by-version."cookie-signature"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "cookie-signature-1.0.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + name = "cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }) ]; buildInputs = (self.nativeDeps."cookie-signature" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "cookie-signature" ]; }; - by-spec."crc"."3.0.0" = - self.by-version."crc"."3.0.0"; - by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-crc-3.0.0"; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage { + name = "crc-3.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; - name = "crc-3.0.0.tgz"; - sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; }) ]; buildInputs = (self.nativeDeps."crc" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "crc" ]; @@ -286,7 +421,8 @@ by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "node-cryptiles-0.2.2"; + name = "cryptiles-0.2.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; @@ -296,48 +432,50 @@ ]; buildInputs = (self.nativeDeps."cryptiles" or []); - deps = [ - self.by-version."boom"."0.4.2" - ]; + deps = { + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + }; peerDependencies = [ ]; passthru.names = [ "cryptiles" ]; }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ctype-0.5.2"; + by-spec."ctype"."0.5.3" = + self.by-version."ctype"."0.5.3"; + by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "ctype-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + name = "ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; }) ]; buildInputs = (self.nativeDeps."ctype" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ctype" ]; }; - by-spec."debug"."~2.0.0" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-debug-2.0.0"; + by-spec."debug"."~2.2.0" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.2.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; }) ]; buildInputs = (self.nativeDeps."debug" or []); - deps = [ - self.by-version."ms"."0.6.2" - ]; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; peerDependencies = [ ]; passthru.names = [ "debug" ]; @@ -345,7 +483,8 @@ by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-delayed-stream-0.0.5"; + name = "delayed-stream-0.0.5"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; @@ -355,46 +494,28 @@ ]; buildInputs = (self.nativeDeps."delayed-stream" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.5" = - self.by-version."depd"."0.4.5"; - by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.5"; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "depd-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; - name = "depd-0.4.5.tgz"; - sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; }) ]; buildInputs = (self.nativeDeps."depd" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "depd" ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.0"; - by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-1.0.0"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; - name = "depd-1.0.0.tgz"; - sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; - }) - ]; - buildInputs = - (self.nativeDeps."depd" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "depd" ]; @@ -402,7 +523,8 @@ by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-destroy-1.0.3"; + name = "destroy-1.0.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; @@ -412,27 +534,28 @@ ]; buildInputs = (self.nativeDeps."destroy" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "destroy" ]; }; - by-spec."ee-first"."1.0.5" = - self.by-version."ee-first"."1.0.5"; - by-version."ee-first"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-ee-first-1.0.5"; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ee-first-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"; - name = "ee-first-1.0.5.tgz"; - sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0"; + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; }) ]; buildInputs = (self.nativeDeps."ee-first" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ee-first" ]; @@ -440,7 +563,8 @@ by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-escape-html-1.0.1"; + name = "escape-html-1.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; @@ -450,92 +574,97 @@ ]; buildInputs = (self.nativeDeps."escape-html" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.4.0" = - self.by-version."etag"."1.4.0"; - by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.4.0"; + by-spec."etag"."~1.6.0" = + self.by-version."etag"."1.6.0"; + by-version."etag"."1.6.0" = lib.makeOverridable self.buildNodePackage { + name = "etag-1.6.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; - name = "etag-1.4.0.tgz"; - sha1 = "3050991615857707c04119d075ba2088e0701225"; + url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz"; + name = "etag-1.6.0.tgz"; + sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207"; }) ]; buildInputs = (self.nativeDeps."etag" or []); - deps = [ - self.by-version."crc"."3.0.0" - ]; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.5"; - by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.5"; + self.by-version."express"."4.12.4"; + by-version."express"."4.12.4" = lib.makeOverridable self.buildNodePackage { + name = "express-4.12.4"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; - name = "express-4.9.5.tgz"; - sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; + url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz"; + name = "express-4.12.4.tgz"; + sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2"; }) ]; buildInputs = (self.nativeDeps."express" or []); - deps = [ - self.by-version."accepts"."1.1.1" - self.by-version."cookie-signature"."1.0.5" - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."finalhandler"."0.2.0" - self.by-version."fresh"."0.2.4" - self.by-version."media-typer"."0.3.0" - self.by-version."methods"."1.1.0" - self.by-version."on-finished"."2.1.0" - self.by-version."parseurl"."1.3.0" - self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.3" - self.by-version."qs"."2.2.4" - self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.3" - self.by-version."serve-static"."1.6.3" - self.by-version."type-is"."1.5.2" - self.by-version."vary"."1.0.0" - self.by-version."cookie"."0.1.2" - self.by-version."merge-descriptors"."0.0.2" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.5"; - by-spec."finalhandler"."0.2.0" = - self.by-version."finalhandler"."0.2.0"; - by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "node-finalhandler-0.2.0"; + "express" = self.by-version."express"."4.12.4"; + by-spec."finalhandler"."0.3.6" = + self.by-version."finalhandler"."0.3.6"; + by-version."finalhandler"."0.3.6" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.3.6"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz"; - name = "finalhandler-0.2.0.tgz"; - sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d"; + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz"; + name = "finalhandler-0.3.6.tgz"; + sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b"; }) ]; buildInputs = (self.nativeDeps."finalhandler" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."escape-html"."1.0.1" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + }; peerDependencies = [ ]; passthru.names = [ "finalhandler" ]; @@ -543,7 +672,8 @@ by-spec."forever-agent"."~0.5.0" = self.by-version."forever-agent"."0.5.2"; by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-forever-agent-0.5.2"; + name = "forever-agent-0.5.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; @@ -553,8 +683,8 @@ ]; buildInputs = (self.nativeDeps."forever-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forever-agent" ]; @@ -562,7 +692,8 @@ by-spec."form-data"."~0.1.0" = self.by-version."form-data"."0.1.4"; by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "node-form-data-0.1.4"; + name = "form-data-0.1.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; @@ -572,11 +703,11 @@ ]; buildInputs = (self.nativeDeps."form-data" or []); - deps = [ - self.by-version."combined-stream"."0.0.5" - self.by-version."mime"."1.2.11" - self.by-version."async"."0.9.0" - ]; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.2" = self.by-version."async"."0.9.2"; + }; peerDependencies = [ ]; passthru.names = [ "form-data" ]; @@ -584,7 +715,8 @@ by-spec."forwarded"."~0.1.0" = self.by-version."forwarded"."0.1.0"; by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-forwarded-0.1.0"; + name = "forwarded-0.1.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; @@ -594,8 +726,8 @@ ]; buildInputs = (self.nativeDeps."forwarded" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "forwarded" ]; @@ -603,7 +735,8 @@ by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-fresh-0.2.4"; + name = "fresh-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; @@ -613,8 +746,8 @@ ]; buildInputs = (self.nativeDeps."fresh" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "fresh" ]; @@ -622,7 +755,8 @@ by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "node-fstream-0.1.31"; + name = "fstream-0.1.31"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; @@ -632,31 +766,56 @@ ]; buildInputs = (self.nativeDeps."fstream" or []); - deps = [ - self.by-version."graceful-fs"."3.0.2" - self.by-version."inherits"."2.0.1" - self.by-version."mkdirp"."0.5.0" - self.by-version."rimraf"."2.2.8" - ]; + deps = { + "graceful-fs-3.0.7" = self.by-version."graceful-fs"."3.0.7"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.4" = self.by-version."rimraf"."2.3.4"; + }; peerDependencies = [ ]; passthru.names = [ "fstream" ]; }; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.3"; + by-version."glob"."4.5.3" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.5.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + name = "glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }) + ]; + buildInputs = + (self.nativeDeps."glob" or []); + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.8" = self.by-version."minimatch"."2.0.8"; + "once-1.3.2" = self.by-version."once"."1.3.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "glob" ]; + }; by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.2"; - by-version."graceful-fs"."3.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-graceful-fs-3.0.2"; + self.by-version."graceful-fs"."3.0.7"; + by-version."graceful-fs"."3.0.7" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.7"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"; - name = "graceful-fs-3.0.2.tgz"; - sha1 = "2cb5bf7f742bea8ad47c754caeee032b7e71a577"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz"; + name = "graceful-fs-3.0.7.tgz"; + sha1 = "e935be4b3e57892d289dc3bef7be8c02779d2b54"; }) ]; buildInputs = (self.nativeDeps."graceful-fs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "graceful-fs" ]; @@ -664,7 +823,8 @@ by-spec."hawk"."~1.0.0" = self.by-version."hawk"."1.0.0"; by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-hawk-1.0.0"; + name = "hawk-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; @@ -674,12 +834,12 @@ ]; buildInputs = (self.nativeDeps."hawk" or []); - deps = [ - self.by-version."hoek"."0.9.1" - self.by-version."boom"."0.4.2" - self.by-version."cryptiles"."0.2.2" - self.by-version."sntp"."0.2.4" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + "boom-0.4.2" = self.by-version."boom"."0.4.2"; + "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; + "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; + }; peerDependencies = [ ]; passthru.names = [ "hawk" ]; @@ -687,7 +847,8 @@ by-spec."hoek"."0.9.x" = self.by-version."hoek"."0.9.1"; by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-hoek-0.9.1"; + name = "hoek-0.9.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; @@ -697,57 +858,82 @@ ]; buildInputs = (self.nativeDeps."hoek" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "hoek" ]; }; by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "node-http-signature-0.10.0"; + self.by-version."http-signature"."0.10.1"; + by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "http-signature-0.10.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; + url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + name = "http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }) ]; buildInputs = (self.nativeDeps."http-signature" or []); - deps = [ - self.by-version."assert-plus"."0.1.2" - self.by-version."asn1"."0.1.11" - self.by-version."ctype"."0.5.2" - ]; + deps = { + "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; + "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; + "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "http-signature" ]; }; - by-spec."iconv-lite"."0.4.4" = - self.by-version."iconv-lite"."0.4.4"; - by-version."iconv-lite"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-iconv-lite-0.4.4"; + by-spec."iconv-lite"."0.4.8" = + self.by-version."iconv-lite"."0.4.8"; + by-version."iconv-lite"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "iconv-lite-0.4.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"; - name = "iconv-lite-0.4.4.tgz"; - sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + name = "iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }) ]; buildInputs = (self.nativeDeps."iconv-lite" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "iconv-lite" ]; }; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "inflight-1.0.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }) + ]; + buildInputs = + (self.nativeDeps."inflight" or []); + deps = { + "once-1.3.2" = self.by-version."once"."1.3.2"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "inflight" ]; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-inherits-2.0.1"; + name = "inherits-2.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; @@ -757,48 +943,50 @@ ]; buildInputs = (self.nativeDeps."inherits" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "inherits" ]; }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.3" = - self.by-version."ipaddr.js"."0.1.3"; - by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.3"; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; - name = "ipaddr.js-0.1.3.tgz"; - sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; }) ]; buildInputs = (self.nativeDeps."ipaddr.js" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ipaddr.js" ]; }; by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-json-stringify-safe-5.0.0"; + self.by-version."json-stringify-safe"."5.0.1"; + by-version."json-stringify-safe"."5.0.1" = lib.makeOverridable self.buildNodePackage { + name = "json-stringify-safe-5.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; + url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + name = "json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }) ]; buildInputs = (self.nativeDeps."json-stringify-safe" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "json-stringify-safe" ]; @@ -806,7 +994,8 @@ by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-media-typer-0.3.0"; + name = "media-typer-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; @@ -816,54 +1005,77 @@ ]; buildInputs = (self.nativeDeps."media-typer" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "media-typer" ]; }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-merge-descriptors-0.0.2"; + by-spec."merge-descriptors"."1.0.0" = + self.by-version."merge-descriptors"."1.0.0"; + by-version."merge-descriptors"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "merge-descriptors-1.0.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + name = "merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; }) ]; buildInputs = (self.nativeDeps."merge-descriptors" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."methods"."1.1.0" = - self.by-version."methods"."1.1.0"; - by-version."methods"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-methods-1.1.0"; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "methods-1.1.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz"; - name = "methods-1.1.0.tgz"; - sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f"; + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; }) ]; buildInputs = (self.nativeDeps."methods" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "methods" ]; }; - by-spec."mime"."1.2.11" = + by-spec."mime"."1.3.4" = + self.by-version."mime"."1.3.4"; + by-version."mime"."1.3.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-1.3.4"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + name = "mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }) + ]; + buildInputs = + (self.nativeDeps."mime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "mime" ]; + }; + by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-1.2.11"; + name = "mime-1.2.11"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; @@ -873,59 +1085,81 @@ ]; buildInputs = (self.nativeDeps."mime" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime" ]; }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.1.0" = - self.by-version."mime-db"."1.1.0"; - by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.1.0"; + by-spec."mime-db"."~1.10.0" = + self.by-version."mime-db"."1.10.0"; + by-version."mime-db"."1.10.0" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.10.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; - name = "mime-db-1.1.0.tgz"; - sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz"; + name = "mime-db-1.10.0.tgz"; + sha1 = "e6308063c758ebd12837874c3d1ea9170766b03b"; }) ]; buildInputs = (self.nativeDeps."mime-db" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.2" = - self.by-version."mime-types"."2.0.2"; - by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.2"; + by-spec."mime-types"."~2.0.11" = + self.by-version."mime-types"."2.0.12"; + by-version."mime-types"."2.0.12" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.12"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; - name = "mime-types-2.0.2.tgz"; - sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz"; + name = "mime-types-2.0.12.tgz"; + sha1 = "87ae9f124e94f8e440c93d1a72d0dccecdb71135"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); - deps = [ - self.by-version."mime-db"."1.1.0" - ]; + deps = { + "mime-db-1.10.0" = self.by-version."mime-db"."1.10.0"; + }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.8"; + by-version."minimatch"."2.0.8" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.8"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz"; + name = "minimatch-2.0.8.tgz"; + sha1 = "0bc20f6bf3570a698ef0ddff902063c6cabda6bf"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "node-minimist-0.0.8"; + name = "minimist-0.0.8"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; @@ -935,47 +1169,49 @@ ]; buildInputs = (self.nativeDeps."minimist" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "minimist" ]; }; by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "mkdirp-0.5.1"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }) ]; buildInputs = (self.nativeDeps."mkdirp" or []); - deps = [ - self.by-version."minimist"."0.0.8" - ]; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; peerDependencies = [ ]; passthru.names = [ "mkdirp" ]; }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ms-0.6.2"; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }) ]; buildInputs = (self.nativeDeps."ms" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "ms" ]; @@ -983,7 +1219,8 @@ by-spec."nan"."~1.0.0" = self.by-version."nan"."1.0.0"; by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-nan-1.0.0"; + name = "nan-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; @@ -993,46 +1230,48 @@ ]; buildInputs = (self.nativeDeps."nan" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.8" = - self.by-version."negotiator"."0.4.8"; - by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.8"; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.5.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; - name = "negotiator-0.4.8.tgz"; - sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }) ]; buildInputs = (self.nativeDeps."negotiator" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "negotiator" ]; }; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-node-uuid-1.4.1"; + self.by-version."node-uuid"."1.4.3"; + by-version."node-uuid"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.3"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; + name = "node-uuid-1.4.3.tgz"; + sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; }) ]; buildInputs = (self.nativeDeps."node-uuid" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "node-uuid" ]; @@ -1040,7 +1279,8 @@ by-spec."oauth-sign"."~0.3.0" = self.by-version."oauth-sign"."0.3.0"; by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-oauth-sign-0.3.0"; + name = "oauth-sign-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; @@ -1050,38 +1290,59 @@ ]; buildInputs = (self.nativeDeps."oauth-sign" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "oauth-sign" ]; }; - by-spec."on-finished"."2.1.0" = - self.by-version."on-finished"."2.1.0"; - by-version."on-finished"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-on-finished-2.1.0"; + by-spec."on-finished"."~2.2.1" = + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "on-finished-2.2.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"; - name = "on-finished-2.1.0.tgz"; - sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }) ]; buildInputs = (self.nativeDeps."on-finished" or []); - deps = [ - self.by-version."ee-first"."1.0.5" - ]; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; peerDependencies = [ ]; passthru.names = [ "on-finished" ]; }; - by-spec."on-finished"."~2.1.0" = - self.by-version."on-finished"."2.1.0"; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.2"; + by-version."once"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "once-1.3.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; + name = "once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }) + ]; + buildInputs = + (self.nativeDeps."once" or []); + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "once" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.6"; + name = "options-0.0.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; @@ -1091,8 +1352,8 @@ ]; buildInputs = (self.nativeDeps."options" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "options" ]; @@ -1100,7 +1361,8 @@ by-spec."parseurl"."~1.3.0" = self.by-version."parseurl"."1.3.0"; by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-parseurl-1.3.0"; + name = "parseurl-1.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; @@ -1110,8 +1372,8 @@ ]; buildInputs = (self.nativeDeps."parseurl" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "parseurl" ]; @@ -1119,7 +1381,8 @@ by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "node-path-to-regexp-0.1.3"; + name = "path-to-regexp-0.1.3"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; @@ -1129,67 +1392,50 @@ ]; buildInputs = (self.nativeDeps."path-to-regexp" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."~1.0.3" = - self.by-version."proxy-addr"."1.0.3"; - by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.3"; + by-spec."proxy-addr"."~1.0.8" = + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "proxy-addr-1.0.8"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; - name = "proxy-addr-1.0.3.tgz"; - sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); - deps = [ - self.by-version."forwarded"."0.1.0" - self.by-version."ipaddr.js"."0.1.3" - ]; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "proxy-addr" ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "node-punycode-1.3.1"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."2.2.4" = - self.by-version."qs"."2.2.4"; - by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.4"; + by-spec."qs"."2.4.2" = + self.by-version."qs"."2.4.2"; + by-version."qs"."2.4.2" = lib.makeOverridable self.buildNodePackage { + name = "qs-2.4.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; - name = "qs-2.2.4.tgz"; - sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; + url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + name = "qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; }) ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1197,7 +1443,8 @@ by-spec."qs"."~0.6.0" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-0.6.6"; + name = "qs-0.6.6"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; @@ -1207,8 +1454,8 @@ ]; buildInputs = (self.nativeDeps."qs" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "qs" ]; @@ -1216,7 +1463,8 @@ by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "node-range-parser-1.0.2"; + name = "range-parser-1.0.2"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; @@ -1226,29 +1474,30 @@ ]; buildInputs = (self.nativeDeps."range-parser" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "range-parser" ]; }; - by-spec."raw-body"."1.3.0" = - self.by-version."raw-body"."1.3.0"; - by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-raw-body-1.3.0"; + by-spec."raw-body"."~2.0.1" = + self.by-version."raw-body"."2.0.1"; + by-version."raw-body"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "raw-body-2.0.1"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"; - name = "raw-body-1.3.0.tgz"; - sha1 = "978230a156a5548f42eef14de22d0f4f610083d1"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; + name = "raw-body-2.0.1.tgz"; + sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; }) ]; buildInputs = (self.nativeDeps."raw-body" or []); - deps = [ - self.by-version."bytes"."1.0.0" - self.by-version."iconv-lite"."0.4.4" - ]; + deps = { + "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + }; peerDependencies = [ ]; passthru.names = [ "raw-body" ]; @@ -1256,7 +1505,8 @@ by-spec."request"."~2.34.0" = self.by-version."request"."2.34.0"; by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage { - name = "node-request-2.34.0"; + name = "request-2.34.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz"; @@ -1266,92 +1516,96 @@ ]; buildInputs = (self.nativeDeps."request" or []); - deps = [ - self.by-version."qs"."0.6.6" - self.by-version."json-stringify-safe"."5.0.0" - self.by-version."forever-agent"."0.5.2" - self.by-version."node-uuid"."1.4.1" - self.by-version."mime"."1.2.11" - self.by-version."tough-cookie"."0.12.1" - self.by-version."form-data"."0.1.4" - self.by-version."tunnel-agent"."0.3.0" - self.by-version."http-signature"."0.10.0" - self.by-version."oauth-sign"."0.3.0" - self.by-version."hawk"."1.0.0" - self.by-version."aws-sign2"."0.5.0" - ]; + deps = { + "qs-0.6.6" = self.by-version."qs"."0.6.6"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; + "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; + "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + }; peerDependencies = [ ]; passthru.names = [ "request" ]; }; "request" = self.by-version."request"."2.34.0"; by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; + self.by-version."rimraf"."2.3.4"; + by-version."rimraf"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "rimraf-2.3.4"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz"; + name = "rimraf-2.3.4.tgz"; + sha1 = "82d9bc1b2fcf31e205ac7b28138a025d08e9159a"; }) ]; buildInputs = (self.nativeDeps."rimraf" or []); - deps = [ - ]; + deps = { + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + }; peerDependencies = [ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.3" = - self.by-version."send"."0.9.3"; - by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.3"; + by-spec."send"."0.12.3" = + self.by-version."send"."0.12.3"; + by-version."send"."0.12.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.12.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; - name = "send-0.9.3.tgz"; - sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz"; + name = "send-0.12.3.tgz"; + sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc"; }) ]; buildInputs = (self.nativeDeps."send" or []); - deps = [ - self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.5" - self.by-version."destroy"."1.0.3" - self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.4.0" - self.by-version."fresh"."0.2.4" - self.by-version."mime"."1.2.11" - self.by-version."ms"."0.6.2" - self.by-version."on-finished"."2.1.0" - self.by-version."range-parser"."1.0.2" - ]; + deps = { + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.6.0" = self.by-version."etag"."1.6.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.3.4" = self.by-version."mime"."1.3.4"; + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; peerDependencies = [ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.3" = - self.by-version."serve-static"."1.6.3"; - by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.3"; + by-spec."serve-static"."~1.9.3" = + self.by-version."serve-static"."1.9.3"; + by-version."serve-static"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.9.3"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; - name = "serve-static-1.6.3.tgz"; - sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz"; + name = "serve-static-1.9.3.tgz"; + sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57"; }) ]; buildInputs = (self.nativeDeps."serve-static" or []); - deps = [ - self.by-version."escape-html"."1.0.1" - self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.3" - self.by-version."utils-merge"."1.0.0" - ]; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.12.3" = self.by-version."send"."0.12.3"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; peerDependencies = [ ]; passthru.names = [ "serve-static" ]; @@ -1359,7 +1613,8 @@ by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "node-sntp-0.2.4"; + name = "sntp-0.2.4"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; @@ -1369,9 +1624,9 @@ ]; buildInputs = (self.nativeDeps."sntp" or []); - deps = [ - self.by-version."hoek"."0.9.1" - ]; + deps = { + "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; + }; peerDependencies = [ ]; passthru.names = [ "sntp" ]; @@ -1379,7 +1634,8 @@ by-spec."tar"."~0.1.19" = self.by-version."tar"."0.1.20"; by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "node-tar-0.1.20"; + name = "tar-0.1.20"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; @@ -1389,11 +1645,11 @@ ]; buildInputs = (self.nativeDeps."tar" or []); - deps = [ - self.by-version."block-stream"."0.0.7" - self.by-version."fstream"."0.1.31" - self.by-version."inherits"."2.0.1" - ]; + deps = { + "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; peerDependencies = [ ]; passthru.names = [ "tar" ]; @@ -1402,7 +1658,8 @@ by-spec."tinycolor"."0.x" = self.by-version."tinycolor"."0.0.1"; by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tinycolor-0.0.1"; + name = "tinycolor-0.0.1"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; @@ -1412,28 +1669,28 @@ ]; buildInputs = (self.nativeDeps."tinycolor" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tinycolor" ]; }; by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "node-tough-cookie-0.12.1"; + self.by-version."tough-cookie"."1.1.0"; + by-version."tough-cookie"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "tough-cookie-1.1.0"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; + name = "tough-cookie-1.1.0.tgz"; + sha1 = "126d2490e66ae5286b6863debd4a341076915954"; }) ]; buildInputs = (self.nativeDeps."tough-cookie" or []); - deps = [ - self.by-version."punycode"."1.3.1" - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tough-cookie" ]; @@ -1441,7 +1698,8 @@ by-spec."tunnel-agent"."~0.3.0" = self.by-version."tunnel-agent"."0.3.0"; by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-tunnel-agent-0.3.0"; + name = "tunnel-agent-0.3.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; @@ -1451,29 +1709,30 @@ ]; buildInputs = (self.nativeDeps."tunnel-agent" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "tunnel-agent" ]; }; - by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.2"; - by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.2"; + by-spec."type-is"."~1.6.2" = + self.by-version."type-is"."1.6.2"; + by-version."type-is"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.6.2"; + bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; - name = "type-is-1.5.2.tgz"; - sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; + name = "type-is-1.6.2.tgz"; + sha1 = "694e83e5d110417e681cea278227f264ae406e33"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); - deps = [ - self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.2" - ]; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12"; + }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; @@ -1481,7 +1740,8 @@ by-spec."utils-merge"."1.0.0" = self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-utils-merge-1.0.0"; + name = "utils-merge-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; @@ -1491,8 +1751,8 @@ ]; buildInputs = (self.nativeDeps."utils-merge" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "utils-merge" ]; @@ -1500,7 +1760,8 @@ by-spec."vary"."~1.0.0" = self.by-version."vary"."1.0.0"; by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "node-vary-1.0.0"; + name = "vary-1.0.0"; + bin = false; src = [ (fetchurl { url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz"; @@ -1510,16 +1771,37 @@ ]; buildInputs = (self.nativeDeps."vary" or []); - deps = [ - ]; + deps = { + }; peerDependencies = [ ]; passthru.names = [ "vary" ]; }; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "wrappy-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }) + ]; + buildInputs = + (self.nativeDeps."wrappy" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "wrappy" ]; + }; by-spec."ws"."~0.4.32" = self.by-version."ws"."0.4.32"; by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage { name = "ws-0.4.32"; + bin = true; src = [ (fetchurl { url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; @@ -1529,12 +1811,12 @@ ]; buildInputs = (self.nativeDeps."ws" or []); - deps = [ - self.by-version."commander"."2.1.0" - self.by-version."nan"."1.0.0" - self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.6" - ]; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; peerDependencies = [ ]; passthru.names = [ "ws" ]; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f3141a30bf15..08e804b7ae93 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -2,7 +2,7 @@ pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }: stdenv.mkDerivation rec { - name = "qgis-2.8.1"; + name = "qgis-2.8.2"; buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla fcgi libspatialindex libspatialite postgresql ] ++ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741"; + sha256 = "fd3c01e48224f611c3bb279b0af9cc1dff3844cdc93f7b45e4f37cf8f350bc4b"; }; postInstall = '' diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ca52a4f2766d..41531ed0de84 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs share/extensions '' # Clang gets misdetected, so hardcode the right answer - + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace src/ui/tool/node.h \ --replace "#if __cplusplus >= 201103L" "#if true" ''; diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index b4becafdb0b4..3ec25b503ebf 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, lzip, texinfo }: stdenv.mkDerivation rec { - name = "ocrad-0.24"; + name = "ocrad-0.25"; src = fetchurl { url = "mirror://gnu/ocrad/${name}.tar.lz"; - sha256 = "0hhlx072d00bi9qia0nj5izsq4qkscpfz2mpbyfc72msl3hfvslv"; + sha256 = "1m2dblgvvjs48rsglfdwq0ib9zk8h9n34xsh67ibrg0g0ffbw477"; }; buildInputs = [ lzip texinfo ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optical character recognition (OCR) program & library"; - longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. It reads images in pbm (bitmap), pgm @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; platforms = platforms.gnu; # arbitrary choice }; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 629126503c92..d438bb77b859 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -51,8 +51,7 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg makeWrapper gnome_doc_utils - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme ]; + gnome3.defaultIconTheme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index 83aff09e2aae..f20c868d4a0a 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff }: +{ stdenv, fetchurl, autoconf, automake, libtool, leptonica, libpng, libtiff +, enableLanguages ? null +}: + +with stdenv.lib; let majVersion = "3.02"; version = "${majVersion}.02"; - f = lang : sha256 : let - src = fetchurl { - url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; - inherit sha256; - }; - in - "tar xfvz ${src} -C $out/share/ --strip=1"; - - extraLanguages = '' - ${f "cat" "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"} - ${f "rus" "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"} - ${f "spa" "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"} - ${f "nld" "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"} - ${f "eng" "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"} - ${f "slv" "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"} - ${f "jpn" "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"} - ''; + mkLang = lang: sha256: let + src = fetchurl { + url = "http://tesseract-ocr.googlecode.com/files/tesseract-ocr-${majVersion}.${lang}.tar.gz"; + inherit sha256; + }; + in "tar xfvz ${src} -C $out/share/ --strip=1"; + + wantLang = name: const (enableLanguages == null || elem name enableLanguages); + + extraLanguages = mapAttrsToList mkLang (filterAttrs wantLang { + cat = "0d1smiv1b3k9ay2s05sl7q08mb3ln4w5iiiymv2cs8g8333z8jl9"; + rus = "059336mkhsj9m3hwfb818xjlxkcdpy7wfgr62qwz65cx914xl709"; + spa = "1c9iza5mbahd9pa7znnq8yv09v5kz3gbd2sarcgcgc1ps1jc437l"; + nld = "162acxp1yb6gyki2is3ay2msalmfcsnrlsd9wml2ja05k94m6bjy"; + eng = "1y5xf794n832s3lymzlsdm2s9nlrd2v27jjjp0fd9xp7c2ah4461"; + slv = "0rqng43435cly32idxm1lvxkcippvc3xpxbfizwq5j0155ym00dr"; + jpn = "07v8pymd0iwyzh946lxylybda20gsw7p4fsb09jw147955x49gq9"; + }); in stdenv.mkDerivation rec { @@ -40,7 +45,7 @@ stdenv.mkDerivation rec { 'LIBLEPT_HEADERSDIR=${leptonica}/include' ''; - postInstall = extraLanguages; + postInstall = concatStrings extraLanguages; meta = { description = "OCR engine"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 6e9a1fdeb095..e22c7804914b 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { - name = "yEd-3.14.1"; + name = "yEd-3.14.2"; src = fetchurl { url = "http://www.yworks.com/products/yed/demo/${name}.zip"; - sha256 = "09zik3pjs5x0vc0jvndm762blk85y44lxac3vdfqqbinwd9gfnm2"; + sha256 = "1i2fncp7q0xin42sf55zc79jzrkzbp25yw8rcjkgsy6hgnhl73nh"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 798d6d977b0d..9cab1775c425 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -34,8 +34,8 @@ let "Kexiv2" = "libkexiv2"; "Kdcraw" = "libkdcraw"; "Kipi" = "libkipi"; - "LibKMahjongg" = "libkmahjongg"; "LibKonq" = "kde-baseapps"; + "Marble" = "marble"; }; mkDerivation = drv: kf5.mkDerivation (drv // { @@ -63,6 +63,7 @@ let (with pkgs; { ACL = acl; + AccountsQt5 = accounts-qt.override { inherit qt5; }; Akonadi = kde4.akonadi; Alsa = alsaLib; Automoc4 = automoc4; @@ -70,9 +71,10 @@ let BISON = bison; Baloo = kde4.baloo; Boost = boost156; + CFitsio = cfitsio; + CUPS = cups; Canberra = libcanberra; Cdparanoia = cdparanoia; - CUPS = cups; DBusMenuQt = libdbusmenu_qt; DjVuLibre = djvulibre; ENCHANT = enchant; @@ -90,15 +92,20 @@ let Gpgme = gpgme; Gphoto2 = libgphoto2; Grantlee = grantlee; + Grantlee5 = grantlee5; GSL = gsl; HUNSPELL = hunspell; HUpnp = herqq; + INDI = indilib; + Intltool = intltool; Jasper = jasper; KActivities = kde4.kactivities; + KDEGames = kde4.libkdegames; LCMS2 = lcms2; Ldap = openldap; LibAttica = attica; LibGcrypt = libgcrypt; + LibKMahjongg = kde4.libkmahjongg; LibSSH = libssh; LibSpectre = libspectre; LibVNCServer = libvncserver; @@ -114,12 +121,14 @@ let PythonLibrary = python; Qalculate = libqalculate; QCA2 = qca2; + Qca-qt5 = qca-qt5.override { inherit qt5; }; QImageBlitz = qimageblitz; QJSON = qjson; Qt4 = qt4; Samba = samba; Sasl2 = cyrus_sasl; SharedDesktopOntologies = shared_desktop_ontologies; + SignOnQt5 = signon.override { inherit qt5; }; SndFile = libsndfile; Speechd = speechd; TIFF = libtiff; @@ -129,6 +138,7 @@ let TunePimp = libtunepimp; UDev = udev; USB = libusb; + Xplanet = xplanet; Xscreensaver = xscreensaver; Xsltproc = libxslt; } @@ -191,17 +201,9 @@ let nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig]; }; - kaccounts-integration = - let accounts-qt = pkgs.accounts-qt.override { inherit qt5; }; - signon = pkgs.signon.override { inherit qt5; }; - in super.kaccounts-integration // { - buildInputs = super.kaccounts-integration.buildInputs - ++ [ accounts-qt signon ]; - }; - kaccounts-providers = super.kaccounts-providers // { buildInputs = super.kaccounts-providers.buildInputs - ++ (with pkgs; [ intltool libaccounts-glib ]); + ++ (with pkgs; [ libaccounts-glib ]); preConfigure = '' ${super.kaccounts-providers.preConfigure or ""} substituteInPlace webkit-options/CMakeLists.txt \ @@ -301,6 +303,12 @@ let buildInputs = super.kgpg.buildInputs ++ [boost]; }; + khangman = super.khangman // { + buildInputs = + super.khangman.buildInputs + ++ [ kf5.kio ]; + }; + kmix = with pkgs; super.kmix // { nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig]; cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ]; @@ -319,7 +327,33 @@ let krfb = super.krfb // { buildInputs = super.krfb.buildInputs - ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals]; + ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals]; + }; + + kstars = super.kstars // { + buildInputs = + super.kstars.buildInputs + ++ (with kf5; [ kparts ]) + ++ [ pkgs.cfitsio ]; + }; + + ktp-accounts-kcm = super.ktp-accounts-kcm // { + buildInputs = + super.ktp-accounts-kcm.buildInputs + ++ [ pkgs.libaccounts-glib ]; + }; + + ktp-common-internals = super.ktp-common-internals // { + buildInputs = + super.ktp-common-internals.buildInputs + ++ (with kf5; [ kdelibs4support kparts ]) + ++ [ pkgs.libotr ]; # needed for ktp-text-ui + }; + + lokalize = super.lokalize // { + buildInputs = + super.lokalize.buildInputs + ++ [ kf5.kdbusaddons ]; }; libkdcraw = with pkgs; super.libkdcraw // { @@ -335,6 +369,14 @@ let buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv]; }; + libkgeomap = super.libkgeomap // { + cmakeFlags = + (super.libkgeomap.cmakeFlags or []) + ++ [ + "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules" + ]; + }; + libkipi = with pkgs; super.libkipi // { buildInputs = super.libkipi.buildInputs ++ [scope.KDE4]; }; @@ -343,11 +385,14 @@ let buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends]; }; - marble = super.marble // { - preConfigure = '' - ${super.preConfigure or ""} - cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake" - ''; + okular = super.okular // { + nativeBuildInputs = + super.okular.nativeBuildInputs + ++ [ pkgs.pkgconfig ]; + }; + + rocs = super.rocs // { + buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]); }; signon-kwallet-extension = diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix index 09d89ef70458..bdf5b3cfc560 100644 --- a/pkgs/applications/kde-apps-15.04/manifest.nix +++ b/pkgs/applications/kde-apps-15.04/manifest.nix @@ -2036,6 +2036,2040 @@ }; } { + name = stdenv.lib.nameFromURL "okular-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0j337gxam8fflqmaq9ggjgdjqmz53ank-okular-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okular-15.04.1.tar.xz"; + sha256 = "0yg9ivscx8nrdb9gq6xq6fm3y8lksnkcjdi0908axmqr8gxnh5c5"; + name = "okular-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktux-15.04.1.tar.xz" ".tar"; + store = "/nix/store/909abb7a2m5zlw96wycw77ry7na2y6fc-ktux-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktux-15.04.1.tar.xz"; + sha256 = "07v559yw4dpryfi7x4c7305dac9i5pkaj0m5dxbgsvsyc5qmmv18"; + name = "ktux-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcalc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gy0khp88rwah803y4r9q6jfghkjf857h-kcalc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcalc-15.04.1.tar.xz"; + sha256 = "1w279713fipi82skai7f31q5yzn6yjm3bhd236igd9a24blzr2xa"; + name = "kcalc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kollision-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sr1wh5xb0kj4yw5qy5qqf5mfrbwva980-kollision-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kollision-15.04.1.tar.xz"; + sha256 = "0pq8pvqjynfmkafaxx9hl4dd8i0blq8vkzpnkhn3zkd450bwjdpc"; + name = "kollision-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgamma-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3nifa51gknij2kxwlhsi70qz5xmc36dg-kgamma-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgamma-15.04.1.tar.xz"; + sha256 = "1w0sb9yk3wj38jqhbr1g72jagy99v2ihrm81r4wp274i602h9s2s"; + name = "kgamma-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapptemplate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/illwb8qn9c9s67m5y4f5cx0d5f3l860k-kapptemplate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapptemplate-15.04.1.tar.xz"; + sha256 = "09s0bk8kp338iy2bpq3gaa3sa52qk42zw4wxccgvxj9hjhh894nk"; + name = "kapptemplate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalgebra-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0dz4823nkpmlvxby7ki3vb0ppfshwz45-kalgebra-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalgebra-15.04.1.tar.xz"; + sha256 = "17qxij5kdk0vymqfq1csmp071sscjc19pw9y39g59njk4bbdih3m"; + name = "kalgebra-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "oxygen-icons-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ck0pb49q3kv6jzkmwliw1sdp8qbpzplr-oxygen-icons-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/oxygen-icons-15.04.1.tar.xz"; + sha256 = "0asr2k1i0bm8pm9kj12c9s5bkwvz25pgsv167hb2cvfgm8ahyvlj"; + name = "oxygen-icons-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6w7jbq7m0kfjc37rnd6yf0ww3xdmb27x-kdesdk-kioslaves-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-kioslaves-15.04.1.tar.xz"; + sha256 = "1pb258bhqikc9nmzs10y98gzd6na0sqyhgfzm1rq1hkmg4dkslwa"; + name = "kdesdk-kioslaves-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "pairs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ky762jidy4zxzwbllfxz46h7bq76v2df-pairs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/pairs-15.04.1.tar.xz"; + sha256 = "078j19w99v50zck64mrir0pr1r45k136lprdndxrpdmxq3zx36px"; + name = "pairs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "svgpart-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qgdyrm00y38n3xidjc5hqyi1aid7hn0y-svgpart-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/svgpart-15.04.1.tar.xz"; + sha256 = "0mwbbx490i1z038jxkl8pyjaisks2k18nn5ccs1d65k5p67pcf3b"; + name = "svgpart-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "amor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qjyg81gbsdbdwc4vzxhfwvbc2r5jqbxc-amor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/amor-15.04.1.tar.xz"; + sha256 = "071wnfp1p9xd6asir4ssvb19jcfbwqg472znl5bw7n09qp5i7w9m"; + name = "amor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zi9amimbp5ag5frcx0myg5ksc25whknc-kde-l10n-bs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bs-15.04.1.tar.xz"; + sha256 = "1il3l1fmavigjndy8pwb0m9jvz0wzm39p0pm10b12vv394623i5f"; + name = "kde-l10n-bs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zs5dds7lhag23vwc2f83bd9wchi6k0zh-kde-l10n-he-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-he-15.04.1.tar.xz"; + sha256 = "1jn8b5m4i9gxyfi2acjxjqcq0rzp9b70miji17vjc8q1a7241pmg"; + name = "kde-l10n-he-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8nlrz9m17ljb459zm6zq5nx8nnpwly16-kde-l10n-ug-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ug-15.04.1.tar.xz"; + sha256 = "184xqway79p33fi8mc1xx6h0lply1r8xsj4qjjqnd30sg5hzn0lp"; + name = "kde-l10n-ug-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zgij63xalg6c9i3nm1bc6ap6zvspm8p2-kde-l10n-nb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nb-15.04.1.tar.xz"; + sha256 = "1zlarins81lj11ljr1k1ma27wy6jyl7q33p2xisjwqi4qw6jmhza"; + name = "kde-l10n-nb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xy0x7in8bkpn6z6ac2v6cx3rvzij2jma-kde-l10n-de-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-de-15.04.1.tar.xz"; + sha256 = "0gki5x7nlpvhxqwg6gqajh5swql6vvi9c37lys7ng2hpqc5xy7pf"; + name = "kde-l10n-de-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pr9ckm8k6y78gqb5y33ny8zm6hgbm6iy-kde-l10n-it-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-it-15.04.1.tar.xz"; + sha256 = "1grfxlcc896zgq74q6cqy6l878bkyhchr4n8jcjiqzl7xn3p2q5c"; + name = "kde-l10n-it-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqbgin8gv0jy20hgl2j0pp56k93k4hp6-kde-l10n-sv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sv-15.04.1.tar.xz"; + sha256 = "1wzpisiqdcsw698j1bf22gzjqawwmmcpslx6yhmrn8462k5iq0d7"; + name = "kde-l10n-sv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5vbrfwv9s2klrxw3k6vz4833qvldarp0-kde-l10n-ja-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ja-15.04.1.tar.xz"; + sha256 = "0jsnx9sjs1wz2f8i9bbl2v59f56azggqbl610idj0xdjn7zhk311"; + name = "kde-l10n-ja-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j9mbwhpxw612xc9bilzhdgsayi9bqwjl-kde-l10n-lv-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lv-15.04.1.tar.xz"; + sha256 = "1c6g0rkd209j2q9m2q5rcf8j24gnc1g11kq87cjyj88jvidc0jpl"; + name = "kde-l10n-lv-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wziwfgk9xh3k79xz9pvpfjvjavjalc37-kde-l10n-mr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-mr-15.04.1.tar.xz"; + sha256 = "02hd8p6fzralbhz622nzxyn13p1lqxzyi229vc8ni7qz9mqia02k"; + name = "kde-l10n-mr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vg6xw3206sf0nys7179l6a04ymiwqy3w-kde-l10n-nds-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nds-15.04.1.tar.xz"; + sha256 = "10hija63jh38pqm9j9lln2n705sfm13zn2h3rv4jl0q7m75hdl0m"; + name = "kde-l10n-nds-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2fk00654fxijdpmzqpf5qwbbxdlfxs25-kde-l10n-zh_CN-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_CN-15.04.1.tar.xz"; + sha256 = "16rsjrwfafvrgl48dnpbd2lnzja186zq7sq83dafg9hs636md6ff"; + name = "kde-l10n-zh_CN-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i30703ryicxz0zf6fk08mzpcr7wvyps8-kde-l10n-ca-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca-15.04.1.tar.xz"; + sha256 = "1008mb8ygak03dg0xxwsb54px0qashh1nnrpj0wwfqvgfbqa19fm"; + name = "kde-l10n-ca-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/mdcybgna88hx6jlmyj2m6ss32yw4i7z3-kde-l10n-nl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nl-15.04.1.tar.xz"; + sha256 = "1s6zrnbhnpqwpb1mgrnayqvzggb1wrmc4w166y8j9bvjc0jahlfp"; + name = "kde-l10n-nl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k179rl7a4avlv20w4spxzl19mk567jv3-kde-l10n-sr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sr-15.04.1.tar.xz"; + sha256 = "1k6q4l7xllrs26xvrhfp8lbq0rgp49aq3r9y85crdmf5xy1zk4bc"; + name = "kde-l10n-sr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8i9bjzsxfxh4n5w385k0figmm9cwfy65-kde-l10n-ro-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ro-15.04.1.tar.xz"; + sha256 = "1svqhp23y5xmnmrba8vzamac6zf4lz02gfck9xi8kq5zhs1zky7w"; + name = "kde-l10n-ro-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vd6ihrlxp8m0hf7x3b05sglmn9xggjy1-kde-l10n-hr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hr-15.04.1.tar.xz"; + sha256 = "00rn1947pw57cl4lwyx3hm7ic4w45lsh82m3sr3l8wa26qm6qz17"; + name = "kde-l10n-hr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8rp1dba5nc9b2b2m4dvl51rd74xrnkdn-kde-l10n-pl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pl-15.04.1.tar.xz"; + sha256 = "09rs6abbm4bj0wy2s0y7b44lacraq1ypxvmil5cxj95apk6qy4sa"; + name = "kde-l10n-pl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bnwiza33rhdlnc61bvfx521cy02d8scc-kde-l10n-cs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-cs-15.04.1.tar.xz"; + sha256 = "1xl397n7vdfcpzg5qfcdbmw92p6ail90s15vvbxq2c4didysgrcz"; + name = "kde-l10n-cs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7mxx0v3fd90vi123hw0k9hinmzxh4z1z-kde-l10n-is-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-is-15.04.1.tar.xz"; + sha256 = "0c03jsb4lbp5wn0inzv3z86as0din40ypjh5jwj6zparjgg7v017"; + name = "kde-l10n-is-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lwqhr1l80ki47ysz51ckiz05z9wxfphv-kde-l10n-hi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hi-15.04.1.tar.xz"; + sha256 = "0gwin6w51iskb9wss97mg3pvwbfca67jqisz3v6qljy770p8d16j"; + name = "kde-l10n-hi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iqfv8rf2qlaif5k6km6i68qpdha2p8ib-kde-l10n-es-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-es-15.04.1.tar.xz"; + sha256 = "00j195zzqmirq3d64sq86n11fhp4gzd8wq7bvr4byg76crv1wsqv"; + name = "kde-l10n-es-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zkjp2bbs8d6j6k3wgwij5q1zaiaxvzhi-kde-l10n-eo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eo-15.04.1.tar.xz"; + sha256 = "1kpd83bf72hjp8dir6cv75rb9wjnljdwxk4ff1mp2ph7rzhm8hxf"; + name = "kde-l10n-eo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.1.tar.xz" ".tar"; + store = "/nix/store/09hg9zfgwdgvdaxx985kk1xf9hky3r7h-kde-l10n-zh_TW-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-zh_TW-15.04.1.tar.xz"; + sha256 = "1k4f9031572mxkg5rk2i98angr9rqcbqkp3zrg7blfpndbqbhzzl"; + name = "kde-l10n-zh_TW-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5lzgd16vdwbziizylnx114dpaycm0xmy-kde-l10n-sk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sk-15.04.1.tar.xz"; + sha256 = "1j96parls7psj0nr0305wdpdjxdrh8bqgbs89mrbk8wgzj9agsh8"; + name = "kde-l10n-sk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hf6x95pyziykm6j2kxlaavr4585l19x5-kde-l10n-ru-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ru-15.04.1.tar.xz"; + sha256 = "1lqc7fvw4spca4va4id24ni19s4gzxzf5qrzfqgav4xf6hwndi3c"; + name = "kde-l10n-ru-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x29ma96kp1mf389k6kjpl65fwqbkkjzk-kde-l10n-ga-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ga-15.04.1.tar.xz"; + sha256 = "1m1dihyak0z5h6932rmb09q3hhbyzkck0gwnp3gdqa84m1b8kmid"; + name = "kde-l10n-ga-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iacgwmkzrc75y7xf281zcfz7fha9c740-kde-l10n-kk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-kk-15.04.1.tar.xz"; + sha256 = "1lcan2x6f7v159zmix2h730pj21rlqmqxvizcd0jrwmnqxf9ww1k"; + name = "kde-l10n-kk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lk6ncn5aa4p373igs7j8g6mwa4a2iqma-kde-l10n-pt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt-15.04.1.tar.xz"; + sha256 = "07pqq7yggq2cjsn60wygbzz37dprp30dhabqj6il6gahl9y5y1fj"; + name = "kde-l10n-pt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adcsrsz6kj7605a7whakszmsjrb3r0nc-kde-l10n-pt_BR-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pt_BR-15.04.1.tar.xz"; + sha256 = "0c5z73pr7m4pq52pjk7q097755g2kswjzjcq5pwc94za0yj055l2"; + name = "kde-l10n-pt_BR-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i9kc413jrn1l9rywv7vsbhgsvz7lffis-kde-l10n-ko-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ko-15.04.1.tar.xz"; + sha256 = "1i34awq71si561p6ggahk6phav9p7rlyc34lg38w7mlqb0d6bjqq"; + name = "kde-l10n-ko-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s9rqm9a1rvwx7zikmm5fwydsaggsgk25-kde-l10n-da-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-da-15.04.1.tar.xz"; + sha256 = "0h5784ba12yh5szyilbw6l4alac4kvgq9bmzpmga032jpc0g9k0l"; + name = "kde-l10n-da-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4pxnpsmz3siicy40i3m1x4ji852ps53s-kde-l10n-et-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-et-15.04.1.tar.xz"; + sha256 = "0x208lv7qrhflgz5qmpp64wqx4avb3mbjr625nqpk8c5w9swqify"; + name = "kde-l10n-et-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0bdylm7gbn4ddfw95mz3zwvpizjfflgz-kde-l10n-fa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fa-15.04.1.tar.xz"; + sha256 = "11lsciiys8dk6mzvd5fp4kypk2355ppdd20fkqd99vp2z3rknv9r"; + name = "kde-l10n-fa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1pxdddwrqh1lwq69ybfc3bq4wqyp4wsp-kde-l10n-nn-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-nn-15.04.1.tar.xz"; + sha256 = "1vn9bcjba6wcym0cvfwhzyn7n4aa9jc3w7apahc72sqzq1irjapl"; + name = "kde-l10n-nn-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k8jamljw1l6zrpqwl4ai6103rcxlkxr6-kde-l10n-en_GB-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-en_GB-15.04.1.tar.xz"; + sha256 = "10gypxkclg037crrv5ifyrj5yahjmfr8x7h41b2zrxy2mvibfpw8"; + name = "kde-l10n-en_GB-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cr32nv49a2k622v9g0x8c3wbq0ydv9g4-kde-l10n-gl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-gl-15.04.1.tar.xz"; + sha256 = "1wjw21vifqzr35rpmffavxljbw6h9ci7awllj447sgqyw2c59pls"; + name = "kde-l10n-gl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxabywd2fc6249jy9pwqkjmbigi11hca-kde-l10n-ar-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ar-15.04.1.tar.xz"; + sha256 = "0ngff802m80bi28khp9m60j5j2fh8f3nghp81l8a27kmlzl0np9j"; + name = "kde-l10n-ar-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7xgibrqzv5gsvswx0k5y52pawd5fd14k-kde-l10n-eu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-eu-15.04.1.tar.xz"; + sha256 = "0fpfahmlniyhsxlx7p1ln9ldy3zjxak8cqi24p2rv8xcm3238dlf"; + name = "kde-l10n-eu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/fk5q2f8nwj9cw94k036yf1fgn5kg4g1c-kde-l10n-tr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-tr-15.04.1.tar.xz"; + sha256 = "1r40gg4cz5s7g5c54a8c6mmx6v27lqx1sbygm5cb9xsqqp0il1yi"; + name = "kde-l10n-tr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/j3xp083a1ggngx4rkbg7jzvci8nmpwkh-kde-l10n-ca_valencia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ca@valencia-15.04.1.tar.xz"; + sha256 = "0gm5aljn22jf5vpanvmhxviyqr3wbi5rn3m6dkx552j2rw2qkazd"; + name = "kde-l10n-ca_valencia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zqkgqclj5c9ssqnzycg6449740s6n1rm-kde-l10n-km-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-km-15.04.1.tar.xz"; + sha256 = "0prmwyjjmw5mimbi5dkzcmgynazi5lvrjkinfl9z49l2dcqmwkks"; + name = "kde-l10n-km-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hicn3pxa99ihaj704v6f1l1kfmxdfm98-kde-l10n-pa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-pa-15.04.1.tar.xz"; + sha256 = "1civainv5170xvn20vx8rmghkfdlc6554nncq22l55q2f78pgg29"; + name = "kde-l10n-pa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m08cm6y7gnpyhdszbza3id8j08v1qvsn-kde-l10n-fi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fi-15.04.1.tar.xz"; + sha256 = "1q3b25h983y2jin4llml0s4wm5ja0rplsczr5zci99vyi1jv2i3w"; + name = "kde-l10n-fi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c5ssvbyi0gdr7da99a3mg0snwwmqzi1c-kde-l10n-id-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-id-15.04.1.tar.xz"; + sha256 = "0gs7l2i71hzwyn12gjrdqr5lm996vglrbqbvn0jmzyp6zjzha6ah"; + name = "kde-l10n-id-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.1.tar.xz" ".tar"; + store = "/nix/store/hslbisaanz2z17mvspp4jbsx95pgwsgh-kde-l10n-lt-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-lt-15.04.1.tar.xz"; + sha256 = "02qmdg0gkcmcgj9gffawij8c64fjs7s70yysnlnp3wmb7vy4ppqh"; + name = "kde-l10n-lt-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3lzxjwp4rrgp3rn6f3x42ylfk1qf4g12-kde-l10n-wa-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-wa-15.04.1.tar.xz"; + sha256 = "139v2k0jvm7xndwhgrs0x15l1plb49qpzbdny928gjymxq5x66ar"; + name = "kde-l10n-wa-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yzfn0nlwhlm1q6x04ydz4p4rdinwazpn-kde-l10n-fr-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-fr-15.04.1.tar.xz"; + sha256 = "1x36334bi1q4sii7j24xr39jxw6k22p4m1c2mz43s0ix0gzyx6n0"; + name = "kde-l10n-fr-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v3qlbc9qq7m6pa8m1iz6qw3wam7c8qh4-kde-l10n-bg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-bg-15.04.1.tar.xz"; + sha256 = "1frd276wzvhwczdws589xy4bpg58yill263lfg8bjvg1v00pr6j8"; + name = "kde-l10n-bg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sjnpw624x3hm8spj91lfy2aqilfn9vv4-kde-l10n-uk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-uk-15.04.1.tar.xz"; + sha256 = "041zhdfmdbca74cgc69dzspn670i9cv32mhb8319q85xp1jr3wbs"; + name = "kde-l10n-uk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k5f977w8bgbi72wcf00p1wng4wr58y2q-kde-l10n-sl-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-sl-15.04.1.tar.xz"; + sha256 = "078r48vgbi72wrx5hnjbgkakp108v79lyb6jpllcn7a8sd71cm6s"; + name = "kde-l10n-sl-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rck5qqcnw6id22p4ak703wbpygwxl3gx-kde-l10n-hu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-hu-15.04.1.tar.xz"; + sha256 = "1vbbv0lmim0368kc328x430s69fybsg3mh5wnadfrkmlzliigh3l"; + name = "kde-l10n-hu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ydwfc2skbipdis45li6vj1qahaxdqxxj-kde-l10n-el-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-el-15.04.1.tar.xz"; + sha256 = "131064jjxqqi50ywljic71fdismqpqg9h1yjyv8wxs9rl1mb8s90"; + name = "kde-l10n-el-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l89gan31lfivzmmjq1wvqgk6jaqvi6bw-kde-l10n-ia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-l10n/kde-l10n-ia-15.04.1.tar.xz"; + sha256 = "092s5b2abb8amiqcvg95p84b91jncxcmbad3yhkxw2lkzllrl83y"; + name = "kde-l10n-ia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksystemlog-15.04.1.tar.xz" ".tar"; + store = "/nix/store/42gd0z1f41kc9jfk2sdqyx7lr5dzyh6l-ksystemlog-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksystemlog-15.04.1.tar.xz"; + sha256 = "0zf7vzlxvby6kf8ccydy4dxwwkmr3lhhpklgiywz6m26i4iapjdg"; + name = "ksystemlog-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdeedu-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8pcp0gamz0v2vfjgvjr2avgchwzrs128-libkdeedu-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdeedu-15.04.1.tar.xz"; + sha256 = "1y3zmhbbwl98cm8whkpafsrk4n9pn7ass6pyn9pnwz8g1lc853ig"; + name = "libkdeedu-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcharselect-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gwccqzp4a5glln0zpp179j932l9cdwbd-kcharselect-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcharselect-15.04.1.tar.xz"; + sha256 = "1v4j2jn05vynnzpk11r2vg79v8ih945vkv37xw4isvfcicd5bjjh"; + name = "kcharselect-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krfb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k67yxmxak82q0bigh94har3zd57g8ijb-krfb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krfb-15.04.1.tar.xz"; + sha256 = "0mscrcvbhmhm7a330rwxywxpk09h4255j0ah3f5lq08zwhrpzd9r"; + name = "krfb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "palapeli-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zyqcyz9b4g57ww1cwz6hmhga1nwhmcjd-palapeli-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/palapeli-15.04.1.tar.xz"; + sha256 = "17xxsmrksxvf4km7a1dbcx2fsbiiwkhszdr17gywlz6b1k2rpybj"; + name = "palapeli-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwalletmanager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c7m3wis5dcxivjswlzcw8pp216pq813a-kwalletmanager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwalletmanager-15.04.1.tar.xz"; + sha256 = "0j197d8cmmgv8mz1scgp9qdq87sx318nkb7jymc28cc6d49mrwgx"; + name = "kwalletmanager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgeography-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bzaka1rvr5lr71h054w8zw10xlqpgd70-kgeography-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgeography-15.04.1.tar.xz"; + sha256 = "0g4wxd3qzsp99m4h5aga5cwky1xffwpys3lm29083agl8gvyrs0p"; + name = "kgeography-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "blinken-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wdnknychhn65zahmpka1x60n082mqjfg-blinken-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/blinken-15.04.1.tar.xz"; + sha256 = "0vavcjbsc4lx0a715pwqshc5l03h3nlpk8lpbbswik47rs10k156"; + name = "blinken-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "rocs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/im5b97nl4p7f5f1pkzrhjbqbhx6p5ap7-rocs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/rocs-15.04.1.tar.xz"; + sha256 = "1cplxlv8a7vsa18j7m629h06v4a0z123mhmg8blzqwh0wwsj71r8"; + name = "rocs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepimlibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/mxcxsdllc81x1w8y4p40b1s5gkkbzsqm-kdepimlibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz"; + sha256 = "0522aby3gm99n18g7p59vi0rzz0ysj9rzljlci5j873mv7yff242"; + name = "kdepimlibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knetwalk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kmp1kna6sixbxjdzcnn1agarx8xq9ps4-knetwalk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knetwalk-15.04.1.tar.xz"; + sha256 = "1hq7cldh4n9kbfhc1bj3mra9dgafk6hkn5pazp2rfipmfmxj3w3b"; + name = "knetwalk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "marble-15.04.1.tar.xz" ".tar"; + store = "/nix/store/klfb6qwspc6raf7kw49s3y5xgdxn9l77-marble-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/marble-15.04.1.tar.xz"; + sha256 = "0aqgh7s07ryhyz0a62pzj3a73ip26df1cw9g103x5iapia5lyp3p"; + name = "marble-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xd8id5gbv47bg5jrk8qammqviv861s60-kolf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolf-15.04.1.tar.xz"; + sha256 = "1r8zqlmwz2dr3pgh921z3j8pvcry7366qyr6kybkjhyjqr1rmhdh"; + name = "kolf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbounce-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhp18ifxb0v5nnfna3z8qnkpdksc51bd-kbounce-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbounce-15.04.1.tar.xz"; + sha256 = "0qxmvkwcanm50w8jd2fcf0q557ywz198ifgsx8piyxmjg8j0hal6"; + name = "kbounce-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "audiocd-kio-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3ma0rszdvi8hsz0r5f27yafarzmbr1l0-audiocd-kio-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/audiocd-kio-15.04.1.tar.xz"; + sha256 = "1gxr9ny09sqb80bhkd21wfl902j8kl5qlgvs9amasabgq7450rbq"; + name = "audiocd-kio-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kwordquiz-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l1yn11z138jfwx11qz2hdvklsvray4ml-kwordquiz-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kwordquiz-15.04.1.tar.xz"; + sha256 = "0xjk9ihlvs8v79mwqry91lzr5kqnj80wfg84gab8djz7gsixgp0y"; + name = "kwordquiz-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmousetool-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wwv9f44nhm3rqhw2x67yb9fvxsc31shf-kmousetool-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmousetool-15.04.1.tar.xz"; + sha256 = "1833yjmgky80w8l06k31j5fd607kada5pi85rcc1730i3g18mqys"; + name = "kmousetool-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zsx5r10khmay1jfph7202zd9k0kqk68f-kdesdk-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "1yhaixb6dqpw02v1y0zqj6yl2i4lr1m69ns20bb2qaz44kbril7k"; + name = "kdesdk-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksaneplugin-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6jdycwm8ads0midd532mh8g4rc3zis63-ksaneplugin-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksaneplugin-15.04.1.tar.xz"; + sha256 = "0wlirj6dqigdnz2xy5yab0cf6npzvx91zbyg9plfqig4h0m5vjrw"; + name = "ksaneplugin-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccessible-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f7ik0yppcn93na9m9dm7qxkfykm7n0im-kaccessible-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccessible-15.04.1.tar.xz"; + sha256 = "01jnaz0n81vyy8wghy21h5ignx4sllv56g3dpck86cj16dh2ymiz"; + name = "kaccessible-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ypf8qvq4gmys2llq8v7nzayi7nw782lj-kqtquickcharts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kqtquickcharts-15.04.1.tar.xz"; + sha256 = "0spg0hfhsngipbdbm8c6yxfw538jk5rdfs83rp2hk7zhhkqvphmj"; + name = "kqtquickcharts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbreakout-15.04.1.tar.xz" ".tar"; + store = "/nix/store/i08nk9biny2fqal1kkzs9lwpxxp2rwf5-kbreakout-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbreakout-15.04.1.tar.xz"; + sha256 = "0fg6z8b2p43c0p11ijbha2f6dycc4f0z487sg6y8jr6vqszqwm6q"; + name = "kbreakout-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnakeduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r12i36mznnvlgwxm6x3vazwnvargpc60-ksnakeduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnakeduel-15.04.1.tar.xz"; + sha256 = "00b0ssad8cvjbp30n5lif41ni1515r892xxfvmyl50ajn0s484g1"; + name = "ksnakeduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kreversi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qqw2j0bsr3s5rn9s0a32ia15ciqa0ggj-kreversi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kreversi-15.04.1.tar.xz"; + sha256 = "0czkvks9i7i4nl64afml9g029ahp9xxqyfv2jqphhyrz7al36l81"; + name = "kreversi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdcraw-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xca9i6zvlnrnn6cqvab1dj91id7ns8bz-libkdcraw-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdcraw-15.04.1.tar.xz"; + sha256 = "115b8m4f588mxmq8f4chg10nbb3wry3zvxgmji7pac49aszvdgj0"; + name = "libkdcraw-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "artikulate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b5ybam6zgslfklbmr1nvj8xxb2n0ay27-artikulate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/artikulate-15.04.1.tar.xz"; + sha256 = "1498gndm0w96s7v109f8fc9y4bkb6bl9c0jaw24i1wn97hiiwigf"; + name = "artikulate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkipi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/czagm2ybdwy6z3672z5ck07pqjjkdh7z-libkipi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkipi-15.04.1.tar.xz"; + sha256 = "12rmhva1kcjvcb21rhb5r6kx5bhs3zp66zg05zp0r4r5kbcf7rir"; + name = "libkipi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiriki-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4dv1qqm1cvl2lym8yppwgiqj3bxbas7k-kiriki-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiriki-15.04.1.tar.xz"; + sha256 = "0fqx790jz7pfajqjhpza2fz3vr7q8mxixx6nvv8shfsqxaqi1xf8"; + name = "kiriki-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kremotecontrol-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4wd2nryy9gg0x5p1vm5fv3hxl48bxcw2-kremotecontrol-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kremotecontrol-15.04.1.tar.xz"; + sha256 = "1nrnq46qa2m5rh4lj9sxrqb130jljfwafw6asz8gm32202xg4fqi"; + name = "kremotecontrol-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kigo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s7my7ndzl4cf3nkxhp23krf8cc0rxpb6-kigo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kigo-15.04.1.tar.xz"; + sha256 = "0a2a39x1249vjgwc7sxvf1kxmkjd6nq97rhh7cp7j3ssa2gggspn"; + name = "kigo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "jovie-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9dhsv2hxy8pwh8i6sp9dmirz3d7hlk77-jovie-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/jovie-15.04.1.tar.xz"; + sha256 = "051ycpgifz9si8301167rr7h50qcnkhffk0wyr59iqxyyf69aqbf"; + name = "jovie-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdf-15.04.1.tar.xz" ".tar"; + store = "/nix/store/m088jnlvz3b3fabza6hcy3dh57mbs3f5-kdf-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdf-15.04.1.tar.xz"; + sha256 = "0by7dn3r22cx9slibc2jplbi6k498xiizidymaxkf6wa9f6m76yn"; + name = "kdf-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kapman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4lnw56hhsqbrgp60fwwcf62wdxb3k2aq-kapman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kapman-15.04.1.tar.xz"; + sha256 = "1pwbxc9pbhr2cbr4n48hsnja7fghr2af02aifvrsj6jgcxzryfgd"; + name = "kapman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kanagram-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kgjhkp3h6gaz1pi62mmyg8z0xyb1h4lz-kanagram-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kanagram-15.04.1.tar.xz"; + sha256 = "1i9z5hyqj326iim43mlrvvpl47b4244s1spk3xf8a3a929bwlf9l"; + name = "kanagram-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-send-file-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5bs3g1zqj5b13h4flvy9v4m620lcw7lf-ktp-send-file-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-send-file-15.04.1.tar.xz"; + sha256 = "0dzyvsnnxi6n3hy3rwyng4pszx4ghcgry3cvw6d3jrzlg4y3afmz"; + name = "ktp-send-file-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rqnvyiybcn99da45q2bvl8dwpa4y764z-kmines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmines-15.04.1.tar.xz"; + sha256 = "1g02fbyqz8nb0qlz49dqn5jay4kdafpdmjx127n0p8wmkw4lh261"; + name = "kmines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bovo-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrgnwbhl85qivg7hglzgaqqv0hwm91rv-bovo-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bovo-15.04.1.tar.xz"; + sha256 = "10y1px3vk9iv19m6m4jlh6bxky10vhyd1r0q7s50rhr44i3ibwml"; + name = "bovo-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kruler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vhls9fra4la0ymwa2s387mw5n119hf47-kruler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kruler-15.04.1.tar.xz"; + sha256 = "0vhwg4qqiv4gflvqspjibm7zh2zgaxql5xmaylpr90hyc1k3vykl"; + name = "kruler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.1.tar.xz" ".tar"; + store = "/nix/store/a7lgl9rd9bpmh8yqdibk0zym25mfc3gm-ktp-desktop-applets-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-desktop-applets-15.04.1.tar.xz"; + sha256 = "19rzq0k2dklzrlpn1qkad1x0v72dk6szya8fsfgxcv1047cczrma"; + name = "ktp-desktop-applets-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kpat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r4n7jrlw47j1mvipzyfw9mx6cksk3rpy-kpat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kpat-15.04.1.tar.xz"; + sha256 = "1aa6m64slfg12zg02an8sbv51k5jnq9bs95y666bc1697yij8sag"; + name = "kpat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vnpm0h4amj9pxqbrgn8m7xjl04x2ybb7-libkcompactdisc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcompactdisc-15.04.1.tar.xz"; + sha256 = "0lis8llzl684z12yzvrc74zckxxbi06fn1krqkiawhpafl0kc8qs"; + name = "libkcompactdisc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgpg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6ampb59zxfj4qm8a7fxs0kqchwcxv5kl-kgpg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgpg-15.04.1.tar.xz"; + sha256 = "013z6ryq1khk1hwird678n4rfikgyl173j5chkqpgw7nrz93770c"; + name = "kgpg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7ajx21aws82z92wiqc041jmbysna95cn-kdenetwork-filesharing-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-filesharing-15.04.1.tar.xz"; + sha256 = "1f26z4zm0bzkbsanj9rw704s25iq0ahw3mi51sgj4ak8gb9r6ibb"; + name = "kdenetwork-filesharing-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kubrick-15.04.1.tar.xz" ".tar"; + store = "/nix/store/clxa7535xdqii03b5rp3p8vs2xpc6263-kubrick-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kubrick-15.04.1.tar.xz"; + sha256 = "0anysvrnyj5pafy7svgszqaj68ryvgbmc8s9xcaw7xpqxxjv2bvd"; + name = "kubrick-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfourinline-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xk72vmcz1gl5w05wsv0f5qw182hy72vf-kfourinline-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfourinline-15.04.1.tar.xz"; + sha256 = "1qg8cg4w207f9ir9saraxyvrhz7y0hr8di9yjv3i32hhmi36v35a"; + name = "kfourinline-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.1.tar.xz" ".tar"; + store = "/nix/store/b0381wzz8yr0g7a5f89cxq0ay0vvskq7-libkeduvocdocument-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkeduvocdocument-15.04.1.tar.xz"; + sha256 = "0lky05kb4yqggfzwips4jagfsmi7lc5fwp1zv4mlgh0w68rbzq0f"; + name = "libkeduvocdocument-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7wjw21kqy746kxq8ciprhc2jn9sda1qw-mplayerthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/mplayerthumbs-15.04.1.tar.xz"; + sha256 = "0a5w3cz6pdsj6vn1zzsjx61x52lqmfnblad0gjv29h7rzxx4p8vr"; + name = "mplayerthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9i6281xfgc9xs8r16kvj96r3f5sq4sx2-kdegraphics-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-thumbnailers-15.04.1.tar.xz"; + sha256 = "1lpr7k7mhlrl4f8psixkp64j5igv0kbmfyml618pydbdbkyzy7wb"; + name = "kdegraphics-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gplbfp23pqx6kklb57j6p4pw2hnfy98h-kde-dev-scripts-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-scripts-15.04.1.tar.xz"; + sha256 = "0yg2xw7ni25i1dvnfd18p0vdpli66xx9dn351av22k313wa7dyw2"; + name = "kde-dev-scripts-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblocks-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9rkp8602jhay2myxc1wm1s3511ivf1ix-kblocks-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblocks-15.04.1.tar.xz"; + sha256 = "19dhccamka291p75brd03a3r5zll7yfzk9hd9dr52xr45lpbhqd9"; + name = "kblocks-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klines-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1hb2447kzfdymip921a3k08rdvls1b10-klines-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klines-15.04.1.tar.xz"; + sha256 = "1yb4qya06b3ld0xmnvqxzn6lgvxr8nyfwihgi4ldysxap6v629ra"; + name = "klines-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z1pwkj78q3vrjh6yvs5p8wdikl67skgm-kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + sha256 = "03dc3h6r06dzl6z7nagmsahrzivylyiqlnwin9qjm1jw7wvcfdvk"; + name = "kdenetwork-strigi-analyzers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeartwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3aj5jpa1s6hzqiwlws6vg00qkn7m49jd-kdeartwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeartwork-15.04.1.tar.xz"; + sha256 = "023d74d1k6lriy7hg1xigp2dv053dc6cnf74kxj4sgglg8qqnph3"; + name = "kdeartwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.1.tar.xz" ".tar"; + store = "/nix/store/83s2nk00gahqlc1akhv6gv72w165ab4j-ktp-common-internals-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-common-internals-15.04.1.tar.xz"; + sha256 = "1g7ms93b756iksjimf0vmrrv1cva0956yjyrxa6zx86z2gsqai0m"; + name = "ktp-common-internals-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "granatier-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vs49yw5vjlplwgsskrwv1i6dva0x12x6-granatier-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/granatier-15.04.1.tar.xz"; + sha256 = "09dazsxch26kh7pvakqzdcmb1vwx5dakq693v692payxgsrbd9zv"; + name = "granatier-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kspaceduel-15.04.1.tar.xz" ".tar"; + store = "/nix/store/flf9jk3v67l044291iscpc7yxqynr8s0-kspaceduel-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kspaceduel-15.04.1.tar.xz"; + sha256 = "1ypiyj7vz4g8dpzd2lygnlrv4gmzfjwbqflzkqq6gsx2a5v671v8"; + name = "kspaceduel-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lskat-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2rrzkyrqqmxphhcszdii2qrfag7y91bg-lskat-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lskat-15.04.1.tar.xz"; + sha256 = "1nyjhispwf7brg4a1a50br3k583jh734vqj8v8gwjq68q7sig1an"; + name = "lskat-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkcddb-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s34in46wqxw0pyf0fgzmagbi9r18r1i5-libkcddb-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkcddb-15.04.1.tar.xz"; + sha256 = "1fp8zq00nijwygap3571lpcyy3qn318djv0gj6vjyzfxlkijl745"; + name = "libkcddb-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.1.tar.xz" ".tar"; + store = "/nix/store/yrpx93448287fy645dnvwkc21c5fw41y-kdegraphics-mobipocket-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-mobipocket-15.04.1.tar.xz"; + sha256 = "1y4ci3l837l3pi308jzh1mvw9rxhyjdx8hgz29vca2gpwyp0v6zi"; + name = "kdegraphics-mobipocket-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkface-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7pmab8n861ng48b8483d2l71qy7prm75-libkface-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkface-15.04.1.tar.xz"; + sha256 = "1iannhmn3gh7j3q8x9dm4jvkilrnpkvzhqz4rs4cksr1q49hh8ah"; + name = "libkface-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kbruch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n7n2q3a4r9par2kc13nixqidwl5z1qwg-kbruch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kbruch-15.04.1.tar.xz"; + sha256 = "0d747mv9mwp0kk6q2bx0h3bn1km99wcxljhsz62kd9g3myzga6sj"; + name = "kbruch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cantor-15.04.1.tar.xz" ".tar"; + store = "/nix/store/5dbbmdm1w5r7hsy2z999aj8b7amy5mz8-cantor-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cantor-15.04.1.tar.xz"; + sha256 = "0rlldfww4rzhxvsq3yl2a5ybcd4h4xihcy4924dbjzp15zgxjzyb"; + name = "cantor-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksnapshot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xya1fmdi09yiq9xvvpqp5bks628n6yqz-ksnapshot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksnapshot-15.04.1.tar.xz"; + sha256 = "0bmq7qvi5522qcj1ksjy9m7pf3yr6n8hf809isvbamvqk285vln6"; + name = "ksnapshot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kopete-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qq5dm0qrnb40nk2lhdyhhwxwnm2w73ry-kopete-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kopete-15.04.1.tar.xz"; + sha256 = "195vdbnk9azfhk7i3vq5zbw1c8f7wz3xdjm2n5g2sv3gnmgm598q"; + name = "kopete-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kteatime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cgc2v9iffy7a48sn95rr9x05xwi6h1cy-kteatime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kteatime-15.04.1.tar.xz"; + sha256 = "0sxdnk9v1p5mcwp8wka60saiqdm4r9bfpyh40qksd89jkjzw7aj9"; + name = "kteatime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdelibs-4.14.8.tar.xz" ".tar"; + store = "/nix/store/jwibw4jpjfxxhkv6kps17yqmaljsymi0-kdelibs-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdelibs-4.14.8.tar.xz"; + sha256 = "1fwvqgxxwy9ka6wq4ysn5x6blqw8wqrfnh6hk6m65jdknflshpvh"; + name = "kdelibs-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kajongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/r34lymfzw7s9j1j30llnkj9b0nn0pxr3-kajongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kajongg-15.04.1.tar.xz"; + sha256 = "15yn5ixkwmwg1hvkdr6sl26zch5rdmjq0iqmc1kyrdipdhdp5mzm"; + name = "kajongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "print-manager-15.04.1.tar.xz" ".tar"; + store = "/nix/store/7a9mkd04lsih0rq5dld1mnsx3cxrkr1z-print-manager-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/print-manager-15.04.1.tar.xz"; + sha256 = "05dpx0cwlpy17x2knq98kf6s1bh72lfn8i5l5xzf4bxil9s2fir9"; + name = "print-manager-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-baseapps-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lz0chc1pimbj5ddi5bkp2nlrlbvgi5l1-kde-baseapps-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-baseapps-15.04.1.tar.xz"; + sha256 = "0970mw5ywjimrmhcfskwiwc048w1rvjffs3d2a9v74yvv64irkgv"; + name = "kde-baseapps-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kiten-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f02ixhrvj27hwwsswk7p8n9hdwfrlyms-kiten-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kiten-15.04.1.tar.xz"; + sha256 = "0l85ccy71ag6nn8fn7b3yr8pjikzivrq6dxka2342nfqidhfpzfh"; + name = "kiten-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "krdc-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kcp6bc4c7vwnrvpjgvlwx0q3ss74f3ay-krdc-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/krdc-15.04.1.tar.xz"; + sha256 = "1d1cjy9b5sx533j1aayw503b65gg7pc5wk3n9hy3x9f1a2yywv1i"; + name = "krdc-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "superkaramba-15.04.1.tar.xz" ".tar"; + store = "/nix/store/akzfq1iqi1p5zyy4ha003jxq93hx41bk-superkaramba-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/superkaramba-15.04.1.tar.xz"; + sha256 = "1ncvmmvsfs4jp67ij1vs87sjg59x960pqqxblq49m0l6vmp0l6j8"; + name = "superkaramba-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "katomic-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xqifvkcnpvncp34cz72axncvfm4ar17r-katomic-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/katomic-15.04.1.tar.xz"; + sha256 = "1lpsvi2hnf4f5ngdkcg56j73qwjzm8zahl2pm5l0r53i95kxlqyd"; + name = "katomic-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "killbots-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rzm4an2qh22q4d8gxn7hf2lc1h8apblj-killbots-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/killbots-15.04.1.tar.xz"; + sha256 = "1wrdwjcpr75lwbrb6ijbwi8ghkgdlp3sv5sbbmws9p77xa13scyk"; + name = "killbots-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkgeomap-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2sprrk9f1bp0i1pyprzkbfx93p44qr3h-libkgeomap-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkgeomap-15.04.1.tar.xz"; + sha256 = "1zj7wimigjlrg2sq3288wc1h5by155ngascwbbn1x9zy86akb5dj"; + name = "libkgeomap-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konsole-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6p788sim5alh13lbgfc4095nas0rav9m-konsole-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konsole-15.04.1.tar.xz"; + sha256 = "0fddv6ag23m5ks1cj8rrfbd2xcifxwijkypx6dhxk4pbgkhy0m8m"; + name = "konsole-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kuser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z7jv74ig27pxaf6fw9sq33r4xvanm4k-kuser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kuser-15.04.1.tar.xz"; + sha256 = "1gvpqazrij2ipdfhyfbsw1vgv4173j4r4qnbp2sd8kjibryqcm76"; + name = "kuser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.1.tar.xz" ".tar"; + store = "/nix/store/8krkra77y0vck4pki2r25zivig521cqk-ktp-kded-module-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-kded-module-15.04.1.tar.xz"; + sha256 = "0hyyz9f8qjzcqj6g92a4g4a3xp7fgyfgznir65mx2kka6fq7532s"; + name = "ktp-kded-module-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lbvr1zi1lipmmdx5pkga2k06isy0kk5y-ktp-accounts-kcm-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-accounts-kcm-15.04.1.tar.xz"; + sha256 = "0s2nny6l744fvf45yczzbcrx1win47b0xvxgf16s29q3y2l51y3s"; + name = "ktp-accounts-kcm-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klettres-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xdqivsid3wvc73mxnwzn7ayva3002l3a-klettres-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klettres-15.04.1.tar.xz"; + sha256 = "1shlhdmzmis0szafk6kvjy0w25xr7p261zj1fi4gz5hr7262lirz"; + name = "klettres-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ayi379ldyhmq5cn53nf89lmvwwfyp9gm-signon-kwallet-extension-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/signon-kwallet-extension-15.04.1.tar.xz"; + sha256 = "0nk1gjz2bw6kssv09kwksj8p5qpzz90plpnd4nd19qnhgz0a0v7r"; + name = "signon-kwallet-extension-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-runtime-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wg7pzsw9s8lm35cxihc08fs9jd21jm13-kde-runtime-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-runtime-15.04.1.tar.xz"; + sha256 = "178n0zfjzzfpr1shqxyixlb2swmkz2n17xhnmf04hql2l4yj3khp"; + name = "kde-runtime-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k0ph8jkjq43ym4851swr12csj53vdh6m-kaccounts-providers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-providers-15.04.1.tar.xz"; + sha256 = "1bd9v89r6y90r8bkm9m46p8yzpbv1zyf4bg0c3scbaqkviqihi09"; + name = "kaccounts-providers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "bomber-15.04.1.tar.xz" ".tar"; + store = "/nix/store/sczdf7d6q8qr4kjlyk1q4s573mr7g0fd-bomber-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/bomber-15.04.1.tar.xz"; + sha256 = "0mzik0cfz6v0jd31z5q9hkfxsynrhiwm704ns4pgb8qsww41yzrf"; + name = "bomber-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkexiv2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qc76hz1v7rawy1xb3d7dlf4yxw9d6clz-libkexiv2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkexiv2-15.04.1.tar.xz"; + sha256 = "0f3ljs8n2gc9frn3j0cjy60hp8wq0f66ry2qpmdaypdswr7vx04n"; + name = "libkexiv2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/lmzsbajhy53ay7swff47gsq3il629wfj-ktp-auth-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-auth-handler-15.04.1.tar.xz"; + sha256 = "1ixxvf5lvy0isv0gqc6sw2pfjqz139kcd0pncq4i89kwqnca8jkp"; + name = "ktp-auth-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.8.tar.xz" ".tar"; + store = "/nix/store/xxnnkp49p5s0hc4sgsb0id14mnfsd6f5-kdepim-runtime-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz"; + sha256 = "1c9lmacadkxdl8kaxn823a7r07w67hrzdypijvvz3ms7k5i84k0z"; + name = "kdepim-runtime-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "klickety-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wffyflkf9im135fdalll1x68cm523rgm-klickety-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/klickety-15.04.1.tar.xz"; + sha256 = "0igw7rm7ii30x3971gg5zjpzljlr1ajxbk5bjylizxbl960dx0kw"; + name = "klickety-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkomparediff2-15.04.1.tar.xz" ".tar"; + store = "/nix/store/rmzhngxxfnvbr76mm85zgp4zlqbjid9z-libkomparediff2-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkomparediff2-15.04.1.tar.xz"; + sha256 = "16fkixmpvxn7459v41418rs49n6knnf1lpfz1mjidaz6q7ii5y8p"; + name = "libkomparediff2-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c6yg7sc1xnla574r1bc122gp63y8wvyp-ktp-contact-list-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-list-15.04.1.tar.xz"; + sha256 = "1vmcs0ww4hv7ckb9nddkpci57ha7j6wqrwiikq4rxcvq9a4z1g7x"; + name = "ktp-contact-list-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/v7wjiq2vwpv0r1c6rqfxhjsdcvcr9ffd-ktp-contact-runner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-contact-runner-15.04.1.tar.xz"; + sha256 = "19hin3qmcznxlp1lypka7h1nqj4n40hys6sxf6m74fx0myk6jia9"; + name = "ktp-contact-runner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcolorchooser-15.04.1.tar.xz" ".tar"; + store = "/nix/store/al6rmbszcmx8m2fk4i2ihxxp4wk2n06p-kcolorchooser-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcolorchooser-15.04.1.tar.xz"; + sha256 = "1q1ipvvd02kgrvz322m7gn6rwxdnpkkj4575yrn6vpxx616q1pf7"; + name = "kcolorchooser-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kfloppy-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4zgqikwm771c85nkd20xw9lplpyqhycf-kfloppy-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kfloppy-15.04.1.tar.xz"; + sha256 = "1rqccsiyfazsbfjs8mpjsqbbw9pd6fakdb076q0mj2syrlm7xr36"; + name = "kfloppy-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/277d4282d2h3cqrjrrlh6w6z0f9sp12l-kde-wallpapers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-wallpapers-15.04.1.tar.xz"; + sha256 = "0nbv456714vr5mp125bdza3czgxzhbv2wglsmxj0sqc1k6fiadfi"; + name = "kde-wallpapers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksirk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vzxblpcsa0jrzcwcp5a9pnax60dkjwav-ksirk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksirk-15.04.1.tar.xz"; + sha256 = "1v56n78cxd9201r5pz3vn4mkpry2rihy138ar7kpqvcp7radipr6"; + name = "ksirk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmag-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ir7qgza1smfbnwdxf1aj60p1xqmgb44p-kmag-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmag-15.04.1.tar.xz"; + sha256 = "0xh66mpddlriivcqg931nd5bbqvrylq1gpccqbajahhr0jbp6lzf"; + name = "kmag-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xli6mjyym1qql8id8fwjvx9yils6kihx-ktp-text-ui-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-text-ui-15.04.1.tar.xz"; + sha256 = "00nbzyh2m9gg401krcnm5p38xj6xyp8n6v4lh779hdx63d755myw"; + name = "ktp-text-ui-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "okteta-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gxnx1dmd8964wj7cz37c50i382sg2gbp-okteta-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/okteta-15.04.1.tar.xz"; + sha256 = "17jvf6ca27xj1vv7yss2886imdaws2xpkibz13aicjvw23xhxhvj"; + name = "okteta-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmix-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0wvrlr0afl9j7mwn6qp59qb5662bnjv4-kmix-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmix-15.04.1.tar.xz"; + sha256 = "0gf1a63ycz8hmlzz7xm361hszzr4l7dibwam9pwg4wipankdipxh"; + name = "kmix-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kget-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0yx4x1f5rxhk7wg1fj9ck54z5b9wim8q-kget-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kget-15.04.1.tar.xz"; + sha256 = "0qckya9r4gic6axq4fi5r5qv4wj31jahbyv1jlyi468wv16cxmnq"; + name = "kget-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kate-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0ky72glm45d5p7knpg00xzjp08shjc1b-kate-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kate-15.04.1.tar.xz"; + sha256 = "0ykppas7fnnslj71y77y2p2qv4jnnv8gdmmfaz5plxkcdjk63a87"; + name = "kate-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kamera-15.04.1.tar.xz" ".tar"; + store = "/nix/store/331lhb9vdk6jr5bcd9z9kdg0nsy74sha-kamera-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kamera-15.04.1.tar.xz"; + sha256 = "1g1lq4g1gk9cw6l1pxaaxzqy4qrqr0f4idkg9bkqbhj20xrl51xd"; + name = "kamera-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kstars-15.04.1.tar.xz" ".tar"; + store = "/nix/store/29wwk2c90zcifni2hra686nwqlxjqh4m-kstars-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kstars-15.04.1.tar.xz"; + sha256 = "1r2sf1ifgkmg8f59jj1j41js538h2x9nr2j6bppd16bbp8gzs2na"; + name = "kstars-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmouth-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vwkzr7jkym3x2lhilv4vp92pzsc7zj69-kmouth-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmouth-15.04.1.tar.xz"; + sha256 = "0qq45lmgxy5wn24wwi8d5p1vc8h25a70xzaw2gdhj1m2vq37sn5p"; + name = "kmouth-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "poxml-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nfm24h17jvwp3sbl9r4wyjqhm1ly853h-poxml-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/poxml-15.04.1.tar.xz"; + sha256 = "0by57c11p2g82cbl4pmv281dnkdky2943bzcy4yb0qnhihpl99nh"; + name = "poxml-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/zcadi1mwn8qb0s4j9y33cm46z07wlnlv-kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + sha256 = "1xp7k0m2blm6nfzv6pf8vqc2wfdw1pp08dfgg9qvvl4ar80wi62v"; + name = "kdegraphics-strigi-analyzer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksudoku-15.04.1.tar.xz" ".tar"; + store = "/nix/store/iz57bv4hld01cxkdm6dv2i0n72ckv8g9-ksudoku-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksudoku-15.04.1.tar.xz"; + sha256 = "1x81q0bya702dcksn86pi8qzw13zb8x558nw3wv8q3z4cp7bzwba"; + name = "ksudoku-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.1.tar.xz" ".tar"; + store = "/nix/store/33kal7ji8dw5a89n6m7wpfpf519kdwbp-kde-dev-utils-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-dev-utils-15.04.1.tar.xz"; + sha256 = "01ivnsjvpbl1i55zgrcz01hzcn02mrvr14a0nz8bi5s5l53r88sy"; + name = "kde-dev-utils-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kompare-15.04.1.tar.xz" ".tar"; + store = "/nix/store/if8mcxgb9bf6i7hmrvlgmwjvjq92p6k1-kompare-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kompare-15.04.1.tar.xz"; + sha256 = "1h9xvd48kixrffr89kj3lr6nwbj4jvrw5nqz05jl7q6a4rd11p47"; + name = "kompare-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kppp-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k2vyy51405ds24y3mm1dz8y8yifwk60x-kppp-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kppp-15.04.1.tar.xz"; + sha256 = "0d4mk303yw1f17sw517ni8g0lqr3wdl9r2whz2l3pznnd3hh447q"; + name = "kppp-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dragon-15.04.1.tar.xz" ".tar"; + store = "/nix/store/nk9ya7riashh1gaw9jnqwypdalr5sq2l-dragon-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dragon-15.04.1.tar.xz"; + sha256 = "1kmp3klp86mmkgvdy973cpnqw9ghbvvs7iqbsqkg19gqg5p3qi6n"; + name = "dragon-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkdegames-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kl3yj4xk86l67vl3lahdzq4x6gi8w8yv-libkdegames-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkdegames-15.04.1.tar.xz"; + sha256 = "0jwvywzamfnjv9lfyxbvki9j1y8ksk6x54v4p16k7mkz7dx7qmd7"; + name = "libkdegames-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kgoldrunner-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfyd2yxzm5y2bc8mvchpa5scd297lx5h-kgoldrunner-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kgoldrunner-15.04.1.tar.xz"; + sha256 = "19aiabdyyyfsc8vdgvh26sh9i2cg4lcvgfca296ch0wdlbs8xdd3"; + name = "kgoldrunner-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdewebdev-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l3hf3r3q9a0mas8i2br6ajlq1h1wnm9h-kdewebdev-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdewebdev-15.04.1.tar.xz"; + sha256 = "00av449nc04mascih5ii17hbjxxpanr8gbdimjjhdp2z9dvgnb0h"; + name = "kdewebdev-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "knavalbattle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/vkm47y3nws18va3cz13isi02g1wrkf6p-knavalbattle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/knavalbattle-15.04.1.tar.xz"; + sha256 = "0d94bmd2jvd6jzjxzdbc4rgq1k1a22md4azddqm6z1yc1n41qkyc"; + name = "knavalbattle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n5dxy147bwqxx9i49h2lia68846f1zwg-kmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmahjongg-15.04.1.tar.xz"; + sha256 = "0zl0z3p07hxyiy5p894cf0rai0ad0i4sihxgj8n23cqs653wglb7"; + name = "kmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ark-15.04.1.tar.xz" ".tar"; + store = "/nix/store/shl563g5w7cn13zynzpbm94ri1ccy6lm-ark-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ark-15.04.1.tar.xz"; + sha256 = "077xvn6symzzr9jb5cdfvzf1xbpliq2krnw1ab1c9a251x90zclw"; + name = "ark-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "gwenview-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ccy2m84g722ihs95n2kindl14n93ir6n-gwenview-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/gwenview-15.04.1.tar.xz"; + sha256 = "07vvcamksgvk8xgj872ql8a7ml7drw3pbv4z7zgrprzracniapwr"; + name = "gwenview-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ksquares-15.04.1.tar.xz" ".tar"; + store = "/nix/store/n63xlpj38d1ziy7fg5y5fa0smw12whpa-ksquares-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ksquares-15.04.1.tar.xz"; + sha256 = "0i6rf5x6wsij05xgv9rzizax7j029am7xgwrzzjdk7anph1mx6i9"; + name = "ksquares-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "umbrello-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g91s71jw5mbiy8y2gdknkqnxyklm39wj-umbrello-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/umbrello-15.04.1.tar.xz"; + sha256 = "1sp8f2bjgp5gv9834csa42531psx0sq43ldjgsgygrnbggzmv8nw"; + name = "umbrello-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kblackbox-15.04.1.tar.xz" ".tar"; + store = "/nix/store/w1s27mkqknc6q7ni39641vgviyqgnxk0-kblackbox-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kblackbox-15.04.1.tar.xz"; + sha256 = "02b9kfqm64qz0jnyviag02rd0h36ajmfbnswwgin3i7zbvd5xph0"; + name = "kblackbox-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kolourpaint-15.04.1.tar.xz" ".tar"; + store = "/nix/store/xsvwhyp6j478pjbjslilb62s89ljdfrd-kolourpaint-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kolourpaint-15.04.1.tar.xz"; + sha256 = "04vamlgbsmpkfw4g3hrm9mm6imnrk3gk994pqb35ajvz8089prwp"; + name = "kolourpaint-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "step-15.04.1.tar.xz" ".tar"; + store = "/nix/store/gjcms2qdl726gv00644ljmsl6ddyywwl-step-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/step-15.04.1.tar.xz"; + sha256 = "1sy42yxpp1qkpcj151xpi2576j59s0cznig3bj65klm5iamiar48"; + name = "step-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcachegrind-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3x1mlqph515m8nf31pdk8wxhhrcbj444-kcachegrind-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcachegrind-15.04.1.tar.xz"; + sha256 = "16fvs27gbpsras3q2qva9x9sc4r056rk2q5b0jijqpncha51wnr2"; + name = "kcachegrind-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.1.tar.xz" ".tar"; + store = "/nix/store/x3hq5g8vcvm5a9npa7amn5w492rh9fhw-ffmpegthumbs-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ffmpegthumbs-15.04.1.tar.xz"; + sha256 = "196hc96ifqq1m5jja8gkl83a23206l304kqh9rngqbqx2xqbis7g"; + name = "ffmpegthumbs-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "parley-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qj4bmbkiah1jrf0arh2r1ygd6ki0vi6q-parley-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/parley-15.04.1.tar.xz"; + sha256 = "1mz2s4l3bzdpz3jd2rkamwvjiqx133sq7agmrg3ssmhl583bgyln"; + name = "parley-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kmplot-15.04.1.tar.xz" ".tar"; + store = "/nix/store/4s3kx66a51gj19imxp7y73q59dx3dsb1-kmplot-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kmplot-15.04.1.tar.xz"; + sha256 = "1rz7l1lggpprmanyr6d1hpyjw6c3z1gdpcf475573y5gip1sylvj"; + name = "kmplot-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kturtle-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6irgf5syddcsvyn8jpfmzjmdccy9mp3j-kturtle-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kturtle-15.04.1.tar.xz"; + sha256 = "0qkaspwdb60cqizf3ph9w245nqg7rarb7riwzdpf007kcpx16905"; + name = "kturtle-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2xabxjp756c62b9l4iaqjb2hn6jm57bn-kaccounts-integration-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kaccounts-integration-15.04.1.tar.xz"; + sha256 = "0rm4i69b63vmcjcdvgc5bj3sygdjxkk5bx12vm70h2wx72zi7bmm"; + name = "kaccounts-integration-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktouch-15.04.1.tar.xz" ".tar"; + store = "/nix/store/889f6956q1d0k0m9n1j9bx36y446zaqd-ktouch-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktouch-15.04.1.tar.xz"; + sha256 = "040xb5bpc848g4m7lpgh2qp7zn3x88pi8lx49rvd7cwy9r0yypxg"; + name = "ktouch-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "analitza-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ci7yardryphabk0561gfqv9w3bg2dld9-analitza-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/analitza-15.04.1.tar.xz"; + sha256 = "0ndz76kdk0x63269324c516d7vyssni8q89im62hkcvsjv0y1wb5"; + name = "analitza-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "cervisia-15.04.1.tar.xz" ".tar"; + store = "/nix/store/6v595hx7jz5v0k6pvmxixva0pz9a86c2-cervisia-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/cervisia-15.04.1.tar.xz"; + sha256 = "01j8ai5s5gqh5wb6c74yrpr6x8652zdmh25dchpafih5sm5y1s8l"; + name = "cervisia-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "filelight-15.04.1.tar.xz" ".tar"; + store = "/nix/store/kxzx5vxg5cl6v99c2q0dx6svzq66lmq3-filelight-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/filelight-15.04.1.tar.xz"; + sha256 = "1pi3j10h23s7ianr5dhf17skdspnxgqfv9hxzfi0pyy3z9yfhs9r"; + name = "filelight-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktimer-15.04.1.tar.xz" ".tar"; + store = "/nix/store/bfgk2rpkifs0kmmg8a9cw2sbcw9x4acj-ktimer-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktimer-15.04.1.tar.xz"; + sha256 = "0avscwyksa6rba9ppp6pcd332phd2zwsvpbprn0sbsias63mx7rb"; + name = "ktimer-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "picmi-15.04.1.tar.xz" ".tar"; + store = "/nix/store/adzmd2pnn5lss9fm35x6hqvb6jfb3dc5-picmi-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/picmi-15.04.1.tar.xz"; + sha256 = "06v2cxdlg8366r122gfs03y2zfhcml2bp0q79a357b4aj14xah76"; + name = "picmi-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g7mzrah5zhp760dw67z836yjb9ycscqb-dolphin-plugins-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/dolphin-plugins-15.04.1.tar.xz"; + sha256 = "1zw626gzrc0sxbif1y2mnqm96s2yap3fnh3ij1cv81v43yy12jsk"; + name = "dolphin-plugins-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libkmahjongg-15.04.1.tar.xz" ".tar"; + store = "/nix/store/9awn6c5akngz6f7h9xbwvnxfjh7k4k6c-libkmahjongg-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libkmahjongg-15.04.1.tar.xz"; + sha256 = "1lw9k7h2cli65738lp06wwn763aggqdaqm52gf4s25ia6sqa1vs2"; + name = "libkmahjongg-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wygvvlqqdcah3ilsr18n32jbidb3vjp2-kde-base-artwork-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-base-artwork-15.04.1.tar.xz"; + sha256 = "1jxmg1s11kj1qiwlh5jji2bhcgn2d0sx6lljh65snwxg26liwz6v"; + name = "kde-base-artwork-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kscd-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k6bz5mzppxksahygjg51bfyr2lmb56vq-kscd-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kscd-15.04.1.tar.xz"; + sha256 = "17spvnflbq2wq80awk6y895ls214n8h0ssk87r7qmr03pvzhnyaa"; + name = "kscd-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "sweeper-15.04.1.tar.xz" ".tar"; + store = "/nix/store/s35plhhx4ic5ghzqa9v3ivsvr1rynang-sweeper-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/sweeper-15.04.1.tar.xz"; + sha256 = "0vzqpyhi5kn2p6waj2pn1myaz44v7dw2ll0hz8vp0rfh9qnwq70l"; + name = "sweeper-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kde-workspace-4.11.19.tar.xz" ".tar"; + store = "/nix/store/lxglid45py66valnl34y41z7ny1zyla3-kde-workspace-4.11.19.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kde-workspace-4.11.19.tar.xz"; + sha256 = "1hn5q86p1wpv6y4wia0sxfn83iya00d6y70gdq3svmhj1bdjj50w"; + name = "kde-workspace-4.11.19.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "konquest-15.04.1.tar.xz" ".tar"; + store = "/nix/store/wags5sgprgy7cngppjj2n9b29625yp1r-konquest-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/konquest-15.04.1.tar.xz"; + sha256 = "078503rf9r7rb161xi5j22d08imk2b1g4ma5xyaap8j7jr8qykak"; + name = "konquest-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kig-15.04.1.tar.xz" ".tar"; + store = "/nix/store/pii50yzi2wkj384pvswiqcqf3m6w2b22-kig-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kig-15.04.1.tar.xz"; + sha256 = "07dw82q68akjzc3v1igx1ah1j4b53ph4pgpkrxzh3468nrhkrxqc"; + name = "kig-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-approver-15.04.1.tar.xz" ".tar"; + store = "/nix/store/0z3zii1zjnnjk34x0i94nc41i2cdi0gw-ktp-approver-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-approver-15.04.1.tar.xz"; + sha256 = "158c93kmwffnsx78qr84qqjb34p7czynrqbz3iyj29s79kkx4ix0"; + name = "ktp-approver-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kalzium-15.04.1.tar.xz" ".tar"; + store = "/nix/store/f4jk61d6sgcx57k7ppjql6qml9q2pazn-kalzium-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kalzium-15.04.1.tar.xz"; + sha256 = "1islh3c67hlar51hf2hx31c1pg8kkw6h7c6vl3mv442wl468ilvl"; + name = "kalzium-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kcron-15.04.1.tar.xz" ".tar"; + store = "/nix/store/q6dydf2sgx486rf4rfm3sfbbbsrcns89-kcron-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kcron-15.04.1.tar.xz"; + sha256 = "0ppdydcasrigqmpldjgvrxmjffizf9gnqbxrjypwirhsay2z5clv"; + name = "kcron-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktuberling-15.04.1.tar.xz" ".tar"; + store = "/nix/store/z7nqzkmyfc7fw4a2c4kwh8flvx9309pb-ktuberling-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktuberling-15.04.1.tar.xz"; + sha256 = "1nm0g089c22nc06xi7446drsgllsxrsfd68r7mm5p38fdh1rmxll"; + name = "ktuberling-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "juk-15.04.1.tar.xz" ".tar"; + store = "/nix/store/k9pq6074j197y1hz9hr3xdcla9pcqhic-juk-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/juk-15.04.1.tar.xz"; + sha256 = "158mxy9c73g27i3plndik4zw8p527zgqq7rj1mrdlj2sic1jd6df"; + name = "juk-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdiamond-15.04.1.tar.xz" ".tar"; + store = "/nix/store/266jwjlfnq0njn09f26xnif9bl3v12h8-kdiamond-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdiamond-15.04.1.tar.xz"; + sha256 = "0kkprlaghidb0skmra1ja9vwncg0zsvawvnjrzb0fgi065iz6bc2"; + name = "kdiamond-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.1.tar.xz" ".tar"; + store = "/nix/store/cw3cr2nrhmid0miwp6nfh7c3kqwf072k-ktp-filetransfer-handler-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/ktp-filetransfer-handler-15.04.1.tar.xz"; + sha256 = "1dzkbgpv9fbkwxlzdch0axc722m5kq6viy33isihv2j0hcxvjjzy"; + name = "ktp-filetransfer-handler-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdepim-4.14.8.tar.xz" ".tar"; + store = "/nix/store/2jiwn6rshw66kv3v058w34qv45qgkrna-kdepim-4.14.8.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdepim-4.14.8.tar.xz"; + sha256 = "19z3pfmb8d6gsr9njyfyrjl4llzkk7q6fcl0ng0k0w1q4i4igd2j"; + name = "kdepim-4.14.8.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.1.tar.xz" ".tar"; + store = "/nix/store/3hz1jgliry4xb27cbn4khkynvz42asfm-kdesdk-thumbnailers-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdesdk-thumbnailers-15.04.1.tar.xz"; + sha256 = "104wyrapk77mi11a72p03liln0qh0mq84hbgklyf3rwxbdsmysz9"; + name = "kdesdk-thumbnailers-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdeedu-data-15.04.1.tar.xz" ".tar"; + store = "/nix/store/c4kzdj7sq4557wcmhwf2cg566b04x617-kdeedu-data-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdeedu-data-15.04.1.tar.xz"; + sha256 = "1fvvam4wilijvmlfklqwgvl47ffy7w7lhp61hjgn6chjhrk3wxd1"; + name = "kdeedu-data-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "libksane-15.04.1.tar.xz" ".tar"; + store = "/nix/store/l09dwrlxm13fl8qnk7cpgs66537287cb-libksane-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/libksane-15.04.1.tar.xz"; + sha256 = "1wlp09c2djprwwsbip0i1jx3d9cj16axbvbyn1hhc1hzaim3wnsc"; + name = "libksane-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kshisen-15.04.1.tar.xz" ".tar"; + store = "/nix/store/2mb9v1738cif1qwwkfqyqgbs3lysg0ij-kshisen-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kshisen-15.04.1.tar.xz"; + sha256 = "0vgh980plqrd0r8s4pp79xy39j7n6z2xjrj62z6bna65wywv8cim"; + name = "kshisen-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kjumpingcube-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ap7dpxkmh50bay925x93hhchdvga0zc0-kjumpingcube-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kjumpingcube-15.04.1.tar.xz"; + sha256 = "0lsd14qpb1c6hs9ff9fwpmrbdn7khk6lwdar82l9dwvzd9zk9vpd"; + name = "kjumpingcube-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.1.tar.xz" ".tar"; + store = "/nix/store/ncrdk952fj4sg748lqfdm9xf5wi5rm2d-zeroconf-ioslave-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/zeroconf-ioslave-15.04.1.tar.xz"; + sha256 = "181q88i8ygqp2g4c78qr2flwbrnwphix0ksm2qrinrchbc7v7mxm"; + name = "zeroconf-ioslave-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "kdenlive-15.04.1.tar.xz" ".tar"; + store = "/nix/store/qcwij9xp4fv8s5zgizij3rmb220r7193-kdenlive-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/kdenlive-15.04.1.tar.xz"; + sha256 = "0v4qx1r5kkkiqvxzdvr2467dhx0ndylvwl1vd723lbdi9vk9gg4q"; + name = "kdenlive-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "khangman-15.04.1.tar.xz" ".tar"; + store = "/nix/store/g1f0f255pjr3wd2jh10q05xjkgm3340h-khangman-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/khangman-15.04.1.tar.xz"; + sha256 = "1jnc5cjij32sbxcq2bvmzkdsj2f7w194lwkj48gdkkwfplbn4kwc"; + name = "khangman-15.04.1.tar.xz"; + }; + } + { + name = stdenv.lib.nameFromURL "lokalize-15.04.1.tar.xz" ".tar"; + store = "/nix/store/1j2l2qhfkxrgqbwiglg8mn60480sanfy-lokalize-15.04.1.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.1/src/lokalize-15.04.1.tar.xz"; + sha256 = "0h46kf14i4gd17k2fad629b7yq66mcy2cp5w0ir0f071z2s9jvg3"; + name = "lokalize-15.04.1.tar.xz"; + }; + } + { name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar"; store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz"; src = fetchurl { @@ -2414,6 +4448,15 @@ }; } { + name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar"; + store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz"; + src = fetchurl { + url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz"; + sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f"; + name = "kde-l10n-ca_valencia-15.04.0.tar.xz"; + }; + } + { name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar"; store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz"; src = fetchurl { diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh index 3ef8c11c3a14..2aa3cee8c85b 100755 --- a/pkgs/applications/kde-apps-15.04/manifest.sh +++ b/pkgs/applications/kde-apps-15.04/manifest.sh @@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../.. -A autonix.manifest) \ "${KDE_MIRROR}/stable/applications/15.04.0/" \ + "${KDE_MIRROR}/stable/applications/15.04.1/" \ $MANIFEST_EXTRA_ARGS -A '*.tar.xz' else diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0f9dbf8d4223..fc013e9125fc 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite +, imagemagick, libjpeg, fontconfig, podofo, qt53, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp , xdg_utils }: stdenv.mkDerivation rec { - name = "calibre-2.27.0"; + name = "calibre-2.28.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "13id1r2q6alw4wzb4z0njkyr6lsmzs2fjp3cflqavx3qk25darv5"; + sha256 = "15sb74v0nlj45fhlnw1afll35l90cxw78s15fb2nx3fih7ahv3cf"; }; inherit python; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt5 sip_4_16 poppler_utils libpng imagemagick libjpeg - fontconfig podofo qt5.base pil chmlib icu sqlite libusb1 libmtp xdg_utils + fontconfig podofo qt53 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 1637586eb477..54aec8606cd4 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dmenu2"; + name = "dmenu2-0.3pre-2014-07-08"; src = fetchhg { url = "https://bitbucket.org/melek/dmenu2"; diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index e4b0675aa945..bdd1a9e8e28e 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { wrapProgram "$out/bin/finalterm" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; meta = with lib; { diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile new file mode 100644 index 000000000000..0788a359116d --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem 'jekyll' +gem 'rdiscount' diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock new file mode 100644 index 000000000000..76bddef5869e --- /dev/null +++ b/pkgs/applications/misc/jekyll/Gemfile.lock @@ -0,0 +1,72 @@ +GEM + remote: https://rubygems.org/ + specs: + blankslate (2.1.2.4) + celluloid (0.16.0) + timers (~> 4.0.0) + classifier-reborn (2.0.3) + fast-stemmer (~> 1.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.9.1.1) + colorator (0.1) + execjs (2.5.2) + fast-stemmer (1.0.2) + ffi (1.9.8) + hitimes (1.2.2) + jekyll (2.5.3) + classifier-reborn (~> 2.0) + colorator (~> 0.1) + jekyll-coffeescript (~> 1.0) + jekyll-gist (~> 1.0) + jekyll-paginate (~> 1.0) + jekyll-sass-converter (~> 1.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 2.6.1) + mercenary (~> 0.3.3) + pygments.rb (~> 0.6.0) + redcarpet (~> 3.1) + safe_yaml (~> 1.0) + toml (~> 0.1.0) + jekyll-coffeescript (1.0.1) + coffee-script (~> 2.2) + jekyll-gist (1.2.1) + jekyll-paginate (1.1.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-watch (1.2.1) + listen (~> 2.7) + kramdown (1.7.0) + liquid (2.6.2) + listen (2.10.0) + celluloid (~> 0.16.0) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + mercenary (0.3.5) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) + posix-spawn (~> 0.3.6) + yajl-ruby (~> 1.2.0) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) + rdiscount (2.1.8) + redcarpet (3.2.3) + safe_yaml (1.0.4) + sass (3.4.13) + timers (4.0.1) + hitimes + toml (0.1.2) + parslet (~> 1.5.0) + yajl-ruby (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + jekyll + rdiscount diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix new file mode 100644 index 000000000000..cc1d4e7c6592 --- /dev/null +++ b/pkgs/applications/misc/jekyll/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, bundlerEnv, ruby_2_1, curl }: + +bundlerEnv { + name = "jekyll-2.5.3"; + + ruby = ruby_2_1; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + + buildInputs = [ curl ]; + + meta = with lib; { + description = "Simple, blog aware, static site generator"; + homepage = http://jekyllrb.com/; + license = with licenses; mit; + maintainers = with maintainers; [ pesterhazy ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix new file mode 100644 index 000000000000..0ceb095b4c82 --- /dev/null +++ b/pkgs/applications/misc/jekyll/gemset.nix @@ -0,0 +1,282 @@ +{ + "blankslate" = { + version = "2.1.2.4"; + source = { + type = "gem"; + sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx"; + }; + }; + "celluloid" = { + version = "0.16.0"; + source = { + type = "gem"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "classifier-reborn" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby"; + }; + dependencies = [ + "fast-stemmer" + ]; + }; + "coffee-script" = { + version = "2.4.1"; + source = { + type = "gem"; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + }; + dependencies = [ + "coffee-script-source" + "execjs" + ]; + }; + "coffee-script-source" = { + version = "1.9.1.1"; + source = { + type = "gem"; + sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5"; + }; + }; + "colorator" = { + version = "0.1"; + source = { + type = "gem"; + sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs"; + }; + }; + "execjs" = { + version = "2.5.2"; + source = { + type = "gem"; + sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0"; + }; + }; + "fast-stemmer" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh"; + }; + }; + "ffi" = { + version = "1.9.8"; + source = { + type = "gem"; + sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879"; + }; + }; + "hitimes" = { + version = "1.2.2"; + source = { + type = "gem"; + sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4"; + }; + }; + "jekyll" = { + version = "2.5.3"; + source = { + type = "gem"; + sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n"; + }; + dependencies = [ + "classifier-reborn" + "colorator" + "jekyll-coffeescript" + "jekyll-gist" + "jekyll-paginate" + "jekyll-sass-converter" + "jekyll-watch" + "kramdown" + "liquid" + "mercenary" + "pygments.rb" + "redcarpet" + "safe_yaml" + "toml" + ]; + }; + "jekyll-coffeescript" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg"; + }; + dependencies = [ + "coffee-script" + ]; + }; + "jekyll-gist" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv"; + }; + }; + "jekyll-paginate" = { + version = "1.1.0"; + source = { + type = "gem"; + sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8"; + }; + }; + "jekyll-sass-converter" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1"; + }; + dependencies = [ + "sass" + ]; + }; + "jekyll-watch" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja"; + }; + dependencies = [ + "listen" + ]; + }; + "kramdown" = { + version = "1.7.0"; + source = { + type = "gem"; + sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna"; + }; + }; + "liquid" = { + version = "2.6.2"; + source = { + type = "gem"; + sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb"; + }; + }; + "listen" = { + version = "2.10.0"; + source = { + type = "gem"; + sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i"; + }; + dependencies = [ + "celluloid" + "rb-fsevent" + "rb-inotify" + ]; + }; + "mercenary" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb"; + }; + }; + "parslet" = { + version = "1.5.0"; + source = { + type = "gem"; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + }; + dependencies = [ + "blankslate" + ]; + }; + "posix-spawn" = { + version = "0.3.11"; + source = { + type = "gem"; + sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr"; + }; + }; + "pygments.rb" = { + version = "0.6.3"; + source = { + type = "gem"; + sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i"; + }; + dependencies = [ + "posix-spawn" + "yajl-ruby" + ]; + }; + "rb-fsevent" = { + version = "0.9.4"; + source = { + type = "gem"; + sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7"; + }; + }; + "rb-inotify" = { + version = "0.9.5"; + source = { + type = "gem"; + sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9"; + }; + dependencies = [ + "ffi" + ]; + }; + "rdiscount" = { + version = "2.1.8"; + source = { + type = "gem"; + sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v"; + }; + }; + "redcarpet" = { + version = "3.2.3"; + source = { + type = "gem"; + sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sass" = { + version = "3.4.13"; + source = { + type = "gem"; + sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig"; + }; + }; + "timers" = { + version = "4.0.1"; + source = { + type = "gem"; + sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l"; + }; + dependencies = [ + "hitimes" + ]; + }; + "toml" = { + version = "0.1.2"; + source = { + type = "gem"; + sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v"; + }; + dependencies = [ + "parslet" + ]; + }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index f2e23e0babfe..bbae8aca2b8b 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,12 +4,12 @@ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21"; + version = "21-git-2015-04-27"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "refs/tags/v${version}"; - sha256 = "0rxdq6j3bs4drnhlxgm0gcwkhxi98vmxm22lnkpic7h67lgsz51q"; + rev = "66868744188151eaa433d42c807e1efc5f623aa4"; + sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c"; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index c0cc702c9862..3c5caeda789e 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index a636c3bcfe56..ba68a46cf0c7 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/mina86/urxvt-tabbedex"; - rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; - sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363"; + sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3"; }; installPhase = '' @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index f655a0f8c260..a1d5ef153bbd 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4, qscintilla }: +{ stdenv, fetchFromGitHub, cmake, qt4, qscintilla }: stdenv.mkDerivation rec { - name = "sqliteman"; - version = "1.2.0-c41b89e1"; + name = "sqliteman-${version}"; + version = "1.2.0"; - src = fetchurl { - url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; - sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + src = fetchFromGitHub { + repo = "sqliteman"; + owner = "pvanek"; + rev = version; + sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; }; buildInputs = [ cmake qt4 qscintilla ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 7c1fe5fc5cbd..ba3d3db3267d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "9"; + version = "10"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh"; + sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2"; }; makeFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 6ead69db2209..c70436e68f99 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { buildInputs = [tcl tk x11 makeWrapper]; + patchPhase = '' + sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c + ''; + # Needs the path to `tclConfig.sh' and `tkConfig.sh'. configureFlags = "--with-tcl=" + tcl + "/lib " + "--with-tk=" + tk + "/lib"; diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 6612c22d4fee..a4427c11f6a5 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xmove-2.0b2"; src = fetchurl { - url = http://ftp.debian.org/debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; + url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz; sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf"; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 247a27ca37be..3d85afef8f49 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -113,7 +113,7 @@ let glib gtk dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 + pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 4d002119a898..c5d82573a322 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "37.0.2"; + version = "38.0.1"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "77e30ca3d592424f80cf7c6cf31e90edddbebb3d"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "c101098915d8955da06751d5bdf2afe029054e3f"; } - { locale = "af"; arch = "linux-i686"; sha1 = "4287ba79e3aaaa601ae36643ad281c64554b847f"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "a787ec352ad94375600185902766ddfd91ac2d5d"; } - { locale = "an"; arch = "linux-i686"; sha1 = "4910dab93896ca7198b0154f0518ea5613b9a3b0"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "60d2c5122a67bae8d7c27fd01caa8d8eef0a143f"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "f2b70fc8a72d3d43a28cc51776eaacff22f288ad"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "409d2981a9aff39e23bd00231761899e65e80862"; } - { locale = "as"; arch = "linux-i686"; sha1 = "d27e921e475608cc52e6f07a22687497eb575b01"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "3bfa7ccaff6b04f9f1d0a479c10412a1308caf4f"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "d1c94f4c5fe83d52fa8e0ee586f78747616e1aaf"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "df3d38e59a5f233caa97134713e29cfa0dce6e27"; } - { locale = "az"; arch = "linux-i686"; sha1 = "5d01ef1267ddcc28e89009b86f2bb0a1e70fc386"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "440a5cd423147412335636326618e6b6b4c02416"; } - { locale = "be"; arch = "linux-i686"; sha1 = "1b9a9758c17ae74876ee6d09373dd99e89da05a3"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "940d2a07808aedc1f9c927b62f03b75270bbecd7"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "ee3f4b60ebb6fd3639ba7e2a3acd81ffcd13ba3f"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "f97ef4f7d3264b1aaf7699fe656f7dccf2cd4238"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "1a0e2da3014a811a766164953d003c136e28c174"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "703116b7d2583d21fda09933e5d8b9244c15c6ee"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f501f69cf65bf340d5d5ce6744394f1a83c2daf3"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "eb74b7a12a2fddf8c47e9c0b0ab9359b7da10703"; } - { locale = "br"; arch = "linux-i686"; sha1 = "9ecc2ca3344559a63fefee144fde9faa391f1c29"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "5121ac58aa90f6a2e3b3f87bcf7dbd8670b7c9bf"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "42b9ace3d28e103fb195599c7c88ae78f16c3e4c"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "06b81108ec1509e36de108837f3c7ed1d96ebc0e"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "5fb5aee535cbede12169d1208d59fb1510207a66"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "e8e6ebb6d70a809cfe8e9102ede99b7ce6239b8e"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "13d157533dfca54b2a81625dbf3642b915f18e47"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "f7fc30f448e981a47c63c21756dcd6feff08783c"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "c9cdc5eefca689aabb7861e1ad9f44f42b36acb0"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "a76182a74992ce7031fa2254f056694910c963d1"; } - { locale = "da"; arch = "linux-i686"; sha1 = "afb09acee0d8456e2bab32d7579da39244754038"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "26bca2ea48a814b7b3ffb91fc461867bf775c6dc"; } - { locale = "de"; arch = "linux-i686"; sha1 = "36a8bf02f324d929c52a6f4f38bb8cd413bbec3e"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "2d39187c71ad006e1fbd7ab488c7560d1c88f9cb"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "8c9843547aec04af07a09c2f9902583b2daab3f0"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7778c1588580bf735e5dd4da89ab16528163a2c3"; } - { locale = "el"; arch = "linux-i686"; sha1 = "8aef1a9b8c6d1297d53002f1852bf52d6728c0fa"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "b7c2ad5da9c446939bf5e7071f84a6c3f8cd7b22"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "f85f36fcd900f642f53a74d6b843e2c67b3ab950"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "9dcc21ec189c588931e9bf38310522bb994d98c2"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "df80ad28979145a116d13db19c1c4e4b516c362d"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b4e2da05fcd224ee01e2742d86d6b68bbdc108cd"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "73a83b23f2f1edcc4114df0b728e791c0626292a"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "fd451735b82a9b609b7f5f09aa0461191b490e5a"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "471873938d52ccebe8958407be1989937181ca9a"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc8c668d3d66a4e42be9aa0fd46ca84cf061dade"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "599823d54919efb62ffd4f65fd8b873720d64b08"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "cc2e509b55de680d4c9a95ac84765c5fb5fa8b44"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "754b32bbc0108f0e9c3c2e78f4c3e023e0486bff"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "7ab4206b66783a72fbe66c59fda120dc1afd0e3c"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "b52814a56ee620693aa4d658ada67e816a3daf59"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "b4cbbc984c7cc9f566ddce0e180410ccb79adc13"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "874cb197fe4498a83822fa386ac0824bffc9646d"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "056746dae1ba7e88a3f2403fb11b17ee831b199b"; } - { locale = "et"; arch = "linux-i686"; sha1 = "70bb834ac4d70fb1f20625027c73a6ece8f24cc8"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "57202dd5e34ed24e31f30bab79b0fcbb220e81b7"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "1e7287dfcd55f79e2157f3e49875a85f8a500c75"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "a6389d117c02ad2d9a997dcac64ba54c0310d715"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "5f82328712e7a16ae6dab5928623b0c652b646bc"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "5625f288967b3afc86a5d0136d64a1ba9581a6c1"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "73afc152eca2aeb346b1ea46a35b24132061c6af"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "ea1eab3e656f1bc68fc76425cd10be01945e7d66"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "24d0bc254438b96307c650700ca58d4e1b2d5fe8"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d5b8f8f2052985c5f6dcbcdd5b122094347ed26b"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "118d981ae14f0425e27726afb516519b8de11390"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "af883c88b1a1e31a31a5a20d603b6109209c6f6b"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "44d6d4be0a1d1ddd75f476a94b3e2f6117ffca72"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "1629ea289914570257e611323618b477b2cf6576"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c3ac3c11a490f37a6c209d753d6db5cd0c696dff"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ea778a04a997632a38e70d3b96c5cc86545056d3"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "2e71d653007e589cd93a90e3239beb0074d33e9d"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "d878a2c149a96e2181d110e5ae265f35c0d44b62"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "2669d169a07cfbba062e147d12cd2a708579c76e"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "515622615f08c49a257ba6766ff0af1984c134a1"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "98bc0711616e665dc386e2c24b6a96ca5e3bfe25"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "a87c089251356074bc039c88e040138db3485539"; } - { locale = "he"; arch = "linux-i686"; sha1 = "b8fb6b91641f89159485ea65efb98c0f3aa23d84"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "2a2a6cc3dcf6b988138549649ede6b030c26818c"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "611ed2ff88f2872acfd1302f2ee3defe59142dbd"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "04922ffab952b7493059304d70064956cbaf5dce"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "13a43d380043f008e26f6fb77b16e6087c622a64"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "c7d45cdd831bafba438c81efa6cf5dd3f4a5657e"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "319a922186b3a8a9bea749014498e7f492043b4b"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "fdd0485af2b0684436bd6207701c287a2f3d05c6"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "33e82dea7e4a6e421ee23a94ba3a5ca5171fef34"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "fde72e1c7f93e4bcbebc9803e78d3e1cbce2d64b"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ad702a8c047a5044ffb39039eaa74e7a86bd80ae"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b83ff7323e9e66907a02f798cbb13a114fdc652c"; } - { locale = "id"; arch = "linux-i686"; sha1 = "c435f7c84ee188d09b5352163334a6458ec125ba"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "dc8858ac8ae9ef92013fa73f986daf6eade1ae26"; } - { locale = "is"; arch = "linux-i686"; sha1 = "c1d853deba529e750b8b705581aedb218f0c57d9"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "ba819e0bd9e630a6299fd8ef1dd99d1203abbd2d"; } - { locale = "it"; arch = "linux-i686"; sha1 = "1ffccd73282e28a52d99b8e98e3bf8ccefcf405b"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "9d68d2cb24ecf349ff504638e04272d56a636f90"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "e7cae2f72552fdcd1ccb57c760ddd4b694218513"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "57befb5643689b0ab2b456651735c75fc47a312a"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "345e0cf27301357d46ead1ef04fcc415c9db4f99"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "ac55fbb3ca6e8ad69c7aceebad99d18ed1353cbc"; } - { locale = "km"; arch = "linux-i686"; sha1 = "9c8d7c1a6b79dc2ff7a28e309e24fdb2d07385ba"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e122a13e5485d9a8bf12e91487cf0247fb652eea"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "4da07bc2cdb714f8083032f99e702333ece64dfa"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "48b5f227919b06ee995b68ee0b6117df8f428942"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "ce22701571474e14ad690ccb5ee700c790667fe8"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "d901ffdec4217b389b96268f9094fc1d01cd2263"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "2191718817cbf9eefef3f7d994849a737e9adb88"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "f21245f7b00187d8b6fb3d30f6ec83510acf7546"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "47ebc8005959e431cca843a0514c2499449ed9b2"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "18220fab22a9737d1577455ec218f5b2f9226e53"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "e4e3d2de5a899c422b85ab1518c454d81ee54bd8"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "45a2551248ee43e189492b1416ed096799857382"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "aa1374d602fff2d393be86563d3cab72b35f7384"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "acfb03ba9f3d232ff68af24d61f80c6c0a94aeca"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "a9295e006982059b01f7bd7e2c6f8959de2a2e23"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "e37dcfc6bd29e8a5034624df71726091c6c768f0"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "b81b278d31aff4d4912da328f2c3ecdbb1ec830a"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "b5c21e4d32f9f78043eee8605d131e63d9568ef1"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "56d7cc6bf3a125c9e9f5b4799a2d34a5d941dc43"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "528db467e4f64f9149f88ecd36c19c8a23835c17"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "71482b740ea057ae9cdd15cfba89467639dbda63"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "bdaff803efa7cb1e2bd31e7f7a29b4c174fb60e3"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "1f4642a4dd61ad57d833ae961ce0f0f1c6c7471a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "3e89f59c82ae0ee52af586364bad8b6e69fdec28"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "3292597b5f499193c8a1bd1f71b9df81925e4c87"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "ddb145bb406c096be680d246b9a727d6e926f9cb"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9cedfe3a1f98db1a999f64bcfdc77e8df72cbbc5"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "a58a8593b49cbf1d6f6b35feb61df95a51717127"; } - { locale = "or"; arch = "linux-i686"; sha1 = "b80d8770ce0358674d1b2f39c7bb5b8a042a5d32"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "66540a388aa07190fa98aff515f09a01d1c173ee"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d9e85c6de7487b13e91f400ce8a06c0104b08ddc"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "01da681d516c6b1febd0096c6dcd8ccbc9b6fdef"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "faa22ad8c24d6465976412d1bd252c74936f937c"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "5410dcf34d4207e005f207fc430892f23f160461"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0735e4827702f896332e1461dcdb3e7088e60d90"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8b083ad5aad313afd9fa9c4e91ebbd03f205b67f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "2fc593cebbfe2bdae3689255f46cd9c41314f00c"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "5bfa929956b1ce9a0ef2afb08ae3510326e962c6"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "81e5a280e47fbbac82d1c0e0604828ab9937e1e6"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "fbc333306bb32eaf2b2d815efa32a5915cd15ede"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "df75129e5c618cdfe180ddf71598704f8c652e5c"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6b0556075110eac4263e1b2ba9bef29a3504d302"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "3309c2e1bcc6d623a28c01cf3e61ed9d9a2d676b"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "f729504273d11b18f3b9c1f4918a18a2a63483da"; } - { locale = "si"; arch = "linux-i686"; sha1 = "9d54da726bd01800a7fa41de9bc0b9aaba9202b9"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "1550492673a913ecd0ff14ccdea0289bbfc680f6"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "d8b97959e6d77ac9d1e0c512414824c9c037d2f0"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "1056467b1726dc0469745d5eb80407e3715c6aee"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "9c51bd6b10adfb2dc3cf07d38981636c3a13557a"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "9f58166807385e0e95682b361e0654125311b4d6"; } - { locale = "son"; arch = "linux-i686"; sha1 = "cf5b8b7266e6c6c5054aeab213c37e61df68057f"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "36a609e8e1a2002653520b7a872562ecd34d6afc"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "6c723410982cf03559199122ce358757670f0d61"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "7e0dae98aa342781a5e89c7f531545704d48b9b6"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "eb000da14a0e48ffac929e51db640c721e8c9e11"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "5696ee19d90930527370021a9eb51f0579080293"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ed9c5d17963779cebd526a65abd10d82b9b7aadc"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7086405ab9008c91c9acbe7685590ee4497b0576"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "0f0aea80ca1dbf604a3c0ac28a255431c1952f88"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "e794ceab525cbc0314d10398a807c436ef66d17d"; } - { locale = "te"; arch = "linux-i686"; sha1 = "09c3427c855d7c82e44997accc80a52317d0d22d"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "af19d02ed9dbb366d0c7b34b538ae83bf2f6212c"; } - { locale = "th"; arch = "linux-i686"; sha1 = "3064e5bcea910f32fbef60acd41a9917145c48a1"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "a7ad2f98a7a534667370ef3f22ae00f90002a1a7"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "76726e6bbbd89eb6469df960ec889ce781cfc68b"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "031b5eb83b6e96dcd9bdf2eabdfab7a370b0becb"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "5d31c283914d67dcfc0af09525ab3814d0e05db4"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "a9e577f4e9aba0af6b019b566f98121586112552"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "f84745683934f221dc5de1b970dae5c919979a71"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "95aef2a68a86030078ac64346445f5f92a85fb63"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "53e9197a3de8d63950b5d324a4da0d3533dd492c"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "be24b818a6ba1209d383c9c43af0bb0ddd82070b"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "be808769e77a47ace01b1b2455607c56a402e795"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "9feca0a4ba5ab71b05bad4ff0324c648ccae7f38"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "057c9ead60a3819eecae1f31ed512ea3e5e2aab4"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2503f8354c07929c1b943c64ea233bb6453c2740"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "75c439a7002183aa5ad8795c1986c109714c2f00"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "add241bb07ff446df18f98f6eec18ebec3bb4e31"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "912fff124863aba8189cdb2f22a2c1cf96c5057a"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "72d9bf343fac24312faf42272553b37e7cb5df5e"; } + { locale = "af"; arch = "linux-i686"; sha1 = "c266d1ce84018e55f239c0cf692feab0b3d2bb58"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "28df7ec17c9008e59af3ba50225e2e6b53f9722a"; } + { locale = "an"; arch = "linux-i686"; sha1 = "2d254b3818afcc0510efba99fe469754076b8841"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "6428c38cd5c00c2a9c02e26b71945831c3c102d2"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "5477725a61b9479a90e76727eb9f69d19e282f83"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "e663608972b44aca2b08abcc2d92a3f8e8c92ed9"; } + { locale = "as"; arch = "linux-i686"; sha1 = "101da7d20a72980cdc5db7c4b2755edc3e0a5d66"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e6b94146534ec11d00ecd4f1e06680f0fd918b8"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "b5e195606434b4dd90818877e5aea05fa995f136"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "851276e8a86b27ad7b92e075e6e20a527284dd4e"; } + { locale = "az"; arch = "linux-i686"; sha1 = "48ed44ab60ca16fc39abce13a630d997dd5099c1"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "fb6b4ca689670a3d994e3c524490e46636a8cd59"; } + { locale = "be"; arch = "linux-i686"; sha1 = "6c4d9cdb9fb8aa0fb3ed8042306268600e3c385a"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "0795a804507837821fed591849169c13bf193302"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "3423b59b472eff5bdd0d16994a777c06de734b2b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5571d632e5dc7efea9fccae5035ed070542adc52"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c9724715fa1036e872b09b4bc453c9ff9344831a"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f99413c5716c4d45eee22cf1f547138b1ba3d044"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "76d5752e8bc131ece1a43a3376b99280545861bc"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b9ea600f884e50afc31d096697b54366186b1331"; } + { locale = "br"; arch = "linux-i686"; sha1 = "e72e62a49ebda9cadf032e2e90c14adb5a7db1c4"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "7c64d69d3510d06ccdf98fbf85f41d3b7f4b532f"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "c69f54bd537c9d16ce4ccf5169646c6f7dde98a5"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "abe0137bb0cb8536b6bdaf03246bfc97e7cba4bc"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "3c914e3f26a61568a220b8eed2742c70ee879fd5"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "b3aa2e0caa2b145df9b3c099bb5158eb6c21402d"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "bfc8733ee396bfa0dedfdffb5aa11bb4c8816be0"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6de8e3bb0038676a906b75a9603b9f057251538a"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "125c53350f599e975b177db3e11ce367b2250fd8"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "4535f608f78f91014371b4b49ca5d73ba369e5be"; } + { locale = "da"; arch = "linux-i686"; sha1 = "860baa240c24453b55bb3c3273eee85821ab4a7f"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "2078e23dbeeeaad80ef55a07888a94958a8bce85"; } + { locale = "de"; arch = "linux-i686"; sha1 = "d3d6fbcfc622a303b932c6f9fed134d26fa3a32f"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "1e7e7608ad79337212d73fd72df189bcfbc08be5"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "aadd04915c3dd07b4fa257071382081531e910cb"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "ab57a27336d9b2b379dd9370781cbe38fb34f274"; } + { locale = "el"; arch = "linux-i686"; sha1 = "a96898e37be58096490ce26313760e9595eab0cb"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "fd83ef7ac7b6b44ca61737b85f4b2aa9e297566b"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "923e977c4a53e91ff0299271bfacf675d1c9f047"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "6250c59ec325ce9f2a6520cc326a500fe8a61106"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "11647b846463af53eebc70e5000c1b2072bcb08e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "c65084273a4684898d1bd265714bcd2a577939a0"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "cbe33f717d3548913cc316adc4163824f63301dd"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "ddaa35f6f054184484856254927bb4b0c7009ec1"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "d8c0d5adbebac214be559354e6f83efc6c01c874"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "e2deaaea97169a50e50c7a3cd7963b7627fd0271"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "cee1c800c773dd784900e8e1d9efc7ae59764907"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "38efb3a002d3ffafd825b24d0aa5c55617f0a198"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "419ca07f1d5bb1d460ce22a7bf8488611b3efee3"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "4ccd1423a7840b9bc696dbe9f1edc1e1629e664e"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "9398c4714f01ce1a2420ad879fc710a84c19f666"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "79e8fff4b9390f3258a7ed78995759d0005e167e"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "c3b4d3496c08ec12f3dc96d2600b327f8d326377"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "d5ee06667437b1d2f56de89b5f5e5f2f007c4eb1"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1c9a8326ca27152a4a8554c62d69784ad4f07ac6"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "f4002b8fa6734353d02e605bf870aa51d67940a8"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "39bf95af55156896df07a2a5f77909987095f567"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "99a70da03d31e8209e2818ef07d8d380c1521164"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "1346de9715783742fcafe60df6d1c37460c6db93"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "d2e0b04bbc4617e35a1d46f22801ecebdb6e873f"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "2ec4e8bd9cdaefe06c390a5e41b5a234a2b1d7e2"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "293dad19f7278909b216107c229e20a79bcfa1fd"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "15c2fe0d7c6a53ee5bc7d8284ff414dd6da6b883"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "09222ca13bc199c8c32fad00a638f335276ff44b"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "10a45fab960d898d65f0dc45a6d0e6368f6bde8e"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "e6ed3e2d6d8e272d6a82bd39a0986afe9f9d5b00"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0222d1158829d06f3fee3314296ebe9126e0d9ab"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "a0c5529c5439c4a4ac29578dd0df6801310b1279"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "95e9d1636243553b72c8d5a6a653f5cd12539ca0"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c525824667f8fe9225fafd1c1bbe6d84413d3e30"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "d29e93647a906856033607ef15e88307cf98fab7"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "5473877025c6a4e57c286a7dc8c7550b71d4e156"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "350847f8853219234edb68b9316cbcf486191f2a"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "7e4c444870d24d9b5ce283bbbf0e2ecdd5ed4d85"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "6aa7416aeb84000778df3ff354f4efd2cd805d70"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "262b35a170b39750dc19579caa05df19c98cac94"; } + { locale = "he"; arch = "linux-i686"; sha1 = "e6a798072a9fb01e947e5d40e431d3e71256d3e3"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "6674ba9cad77bbc912f94084f8fd2403f0ce42fb"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d10a236c1e8bc425cd8077b87816fe0a28405274"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "d67449c5cfe939ab5531cf5a27e1da6e5b9335d7"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "f5e151299b3da7788e40dadf1c1d0fab6e409a00"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "6f6b79f283f11414ba2344e83cfb1f0197011c2e"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "a56600d80d772d4009c8feeca7dc6d63c344c199"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "40a7724e59e002446c0a9cfd35de948fc5311e54"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "d1e68650ec713a0d24e159fe967b73b26198d33c"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "abac7894c98a55bb3f7f2ca02a439575c241ea7c"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d45c305cb676c7456d8e8f4f803089d82077a8fa"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "473b7beca08bcbf8d443f6efbe3ac8752a6773c8"; } + { locale = "id"; arch = "linux-i686"; sha1 = "084dd83725e94a557e73d11f78633e1bf98e5d69"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e173e4f47878070a98afde349d2fb93a6ae1c342"; } + { locale = "is"; arch = "linux-i686"; sha1 = "65b89daf623810a94bbaaaad301a2c3e9e6d4d5f"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "f108f862dafe32a047c08c6fe1135611728d3f4f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "ba049d6eb3b455674caf424745607f49675a8ed6"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "006f094f2966358ec685b00033e640a94d809d53"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "95f6d91f882d9d0ab8ff5d4b7654a102d973543f"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "e2a70547561a1fed87e3308ebf857df6cc3a315e"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c0d239c2220979dc0daa15ab1e9af510d7c09706"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "d23bdcacb5714b10f773381fb9c8e3d628d2e278"; } + { locale = "km"; arch = "linux-i686"; sha1 = "d9119536b4295fea892afd8ee1b46fd5eb881314"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "1c7eb6d62b050769634fb487c0161c5748b8e4a2"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "491269cc3bbd577d24cfe898b862cad008d2da41"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "9043341ce5c84064aa80f95545404f5415bea782"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "13cad5dea192e57b03a26c09254e6fb7cc4022d3"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "8b2f6551415637ff8c9d2de1e1643aa5cd721d48"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "b57d7e89e0cf548ab016867d468d5fa2e3b429aa"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "3246755855f5d869ddf5724cbd2fb6c237d3ad35"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "804ee921241432208c83bdf70986628c5fc1ce1d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "c2bd411ddf33382afd091cda7f2f6c4cf3dfb5d4"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "89dfa9f319c1d6681deea122a3f23e8ea4bf6248"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "8b209580ff83965ebc27aa3f97eac1180fb82ffd"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "ff727fe52dac2468d430c5d8d734dca133693e9c"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "21844cd80358d5ac24bd9d9ea2a6daadd296e760"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "cbc4cb34957fde341affa780ea743fb30aa13aad"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "4e395325fd1550710197822495c8873a89ff014c"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "19f538b937a9f4a3ef2ee498c64de69b214b87d4"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "ebc164cd9cf4c3993270949a13c9cb1123379093"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "a942c265bedf537e59fcde8bff39c3addb4a2963"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "8967615af2f2efe359f0babe614d282569e44691"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "89f8a2bd49ff4793b2d69efb48aaa93b031dfa69"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "d2be6c9f62cc0615f9041470bae3b139b69ef55c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "99afd0b77d350df671acbe403b9b19d975bcb91a"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b14f1b45617773a0e010d81ce83b493dd93dc03a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "9a043691524087b9968aaac1b5d19a212ddffebb"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "f22f09a85bdd943c874a0b321ae1ec017200d0b4"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1cdbd8319688ccd0af636e71568d7f2244ca0d1a"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "bf660208d072b92f4d961d63f6bfadf5d2848e97"; } + { locale = "or"; arch = "linux-i686"; sha1 = "fe1edc33462f5b31d76b7b39ef7de459b2260658"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "679eb537bd4007ef14b09dd705a0eaf5de6c29ff"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "cfa52529dcb953c5448d589845bf22343fc6339f"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a603ec800745b17d7ef31ee4008b2ccfc6515a51"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "09e02683fa6fc34ff152533026824205f976b866"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "94ed7980eb737171e6d9a428a99cc1cbcfa98daa"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "2a73ca16724778da05aca6284b50f8ce6b2855c9"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "0c0fc357264ed7ef806729cf5f3a636829740c47"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "02a6ce278285830a1d9a2f092321d73755fc6b71"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "0bcf7133711b812d55e4c4f824f6cd53b83ce3ef"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "e314ce94c7f7f72882e4b2671f8a52488e293adc"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "878d2fa1fb737963bb93296d4e0f2e67cd58cb04"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "e4643626b93bacd2f2dae152228287aa0d84acf3"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "6e99ce189e18f7056720500cfa596c8caf8f5a17"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "cffab960763f296586e4bbbbc671409323844464"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "7455db46a81f99ba21d7a3ed0ae5a97246fae822"; } + { locale = "si"; arch = "linux-i686"; sha1 = "ba2a4ddaf8f8978d01f996b599f26801ce3c3a5b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "8e5cf5885fe5e12e1cf28e7b77171ed23c4fd1c3"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "423e824526557309cb2ec007c41c57daf69e8b42"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "8205ce31e27a6595f2384a85f35f48610cd8b187"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "8766cf70ffd089e79d1eac1211bcc3255c86146d"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f49ae94b77df1f038bae64f47f3ded0e4f10f349"; } + { locale = "son"; arch = "linux-i686"; sha1 = "dd07bb545505ce0251760d7960ddcfb235856b79"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "aa660969f12a316dd85f7e69678f583430e084aa"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "ea498b08ae2dceb0a103a7980ca086bc5ce94cb2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "4e2d7c6098c3cc48cc7a3e5b1557b75e1a9c1958"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "e03a369d834c2a2a0a5bc9e539f2a007fa78641f"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "b8cc41734b718deb50654ccc24c20e5be0b767fd"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "358efd06a28a9ad43703335d190f4bea9b5ef95a"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e63d4ad88ad45e1e4ed43906c4525a24c1b1cd1b"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "ce0fb4901e621dea2330cf80df632d9424ea46b6"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "5910ddf0f1bee1ae3e2ce5c2882ce93732edf586"; } + { locale = "te"; arch = "linux-i686"; sha1 = "367816038ddfbd11b7ad6cc2bae41fe4d82b132b"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "6e6c46db9e45bbe20861fc8d6f971daaaa63d181"; } + { locale = "th"; arch = "linux-i686"; sha1 = "0d4859a54ae11c114cb449b150373465d92b795b"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "16d95125a4c51df9ebd587df16cb428f560cb8e9"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "6bab2ad51c7cf6e761c147d0a0f748573b1683a2"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "ba660dbe60c4e95ac82f536313989933e1edddb6"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "1e1e5dd54da8e3b94da831909149721dd2766267"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "1f32f890d4a1ba2a672d25a005ef5daa76040e33"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "49b36171729e3e0924d8398b62c22d5a02b36b8c"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "2336db0769fa921f2a50774791174565e6828978"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "2b40d9003eca218d235574d1ee7d6da73244d614"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "517d6269f4c2a98f4817be8a926b82c261a8d1f5"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "9d24460c7bcd1e8b36d900a130bb88ecda967678"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "e70d742aa94bb4678446a4b94edd915033a640fb"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3eb4e076fc42e9cbd97dd82af8eb77d3ea6bb068"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "bdbf6abd8e86f6811d032b302818f15f343e8883"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "b7e4cf9bf9db13f3e2d92bdb91ede3f243232a0a"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "411cfc0033ac8edeb30d9d371738864e9401200c"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index bd8fb4d2cd7b..0fa1d2068f1e 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "37.0.2"; in +let version = "38.0.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071"; + sha1 = "20f52c37e099cb2b21f3a76c6e39fe698e1e79e8"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 5ebd26078412..409f7d29ba2f 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { desktopItem = makeDesktopItem { name = browserName; exec = browserName + " %U"; - icon = browserName; + inherit icon; comment = ""; desktopName = desktopName; genericName = "Web Browser"; @@ -43,7 +43,7 @@ stdenv.mkDerivation { --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ - --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" ${ lib.optionalString libtrick '' @@ -58,8 +58,14 @@ stdenv.mkDerivation { '' } - mkdir -p $out/share/icons - ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png + if [ -e "${browser}/share/icons" ]; then + mkdir -p "$out/share" + ln -s "${browser}/share/icons" "$out/share/icons" + else + mkdir -p "$out/share/icons/hicolor/128x128/apps" + ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \ + "$out/share/icons/hicolor/128x128/apps/${browserName}.png" + fi mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix index c44db8db759b..1969a1f502f2 100644 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ b/pkgs/applications/networking/browsers/jumanji/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib_networking, makeWrapper +, gsettings_desktop_schemas }: stdenv.mkDerivation rec { name = "jumanji-${version}"; @@ -10,13 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1xq06iabr4y76faf4w1cx6fhwdksfsxggz1ndny7icniwjzk98h9"; }; - buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper ]; + buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; preFixup='' wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ced16da5f7ee..b29f2d1974c0 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.cc.cc.isGNU or false && stdenv.cc.libc != null; +assert stdenv.isLinux && stdenv.cc.isGNU && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 3eebc6de3cf3..4311b352ab96 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, jdk, mesos, fetchurl }: stdenv.mkDerivation rec { - name = "marathon-v${version}"; + name = "marathon-${version}"; version = "0.8.1"; src = fetchurl { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \ --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \ - --prefix "MESOS_NATIVE_LIBRARY" : "$MESOS_NATIVE_LIBRARY" + --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 9458ffc39256..c330b8acfbf3 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf -, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython +, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython , setuptools, distutils-cfg, boto, pythonProtobuf, apr, subversion , leveldb, glog, perf, utillinux, libnl, iproute }: @@ -9,18 +9,18 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.22.1"; name = "mesos-${version}"; dontDisableStatic = true; src = fetchurl { url = "http://www.apache.org/dist/mesos/${version}/mesos-${version}.tar.gz"; - sha256 = "0z8c1vr7b06l3nqgbxq8ydcz79ayw75y2szipfqkw17c7gv6d7v8"; + sha256 = "0ry0ppzgpab68fz5bzd7ry5rjbg8xjz73x1x4c5id42cpsqnn7x5"; }; buildInputs = [ - makeWrapper autoconf automake libtool curl sasl jdk maven + makeWrapper autoconf automake114x libtool curl sasl jdk maven python wrapPython boto distutils-cfg setuptools leveldb subversion apr glog ] ++ lib.optionals stdenv.isLinux [ @@ -129,7 +129,7 @@ in stdenv.mkDerivation rec { homepage = "http://mesos.apache.org"; license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; - maintainers = with maintainers; [ cstrahan offline ]; + maintainers = with maintainers; [ cstrahan offline rushmorem ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 97573fb1e7b0..14360f9ff0bb 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -18,19 +18,25 @@ # them with our own. let - arch = if stdenv.system == "x86_64-linux" then "x86_64" - else if stdenv.system == "i686-linux" then "x86" - else throw "Dropbox client for: ${stdenv.system} not supported!"; - - interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" - else if stdenv.system == "i686-linux" then "ld-linux.so.2" - else throw "Dropbox client for: ${stdenv.system} not supported!"; - - # NOTE: When updating, please also update in current stable, as older versions stop working - version = "3.4.4"; - sha256 = if stdenv.system == "x86_64-linux" then "05ncbxwkimq7cl3bad759qvda7zjdh07f5wh6aw12g472l4yqq98" - else if stdenv.system == "i686-linux" then "18089bh6i64yw75pswgn2vkcl1kf7ipxxncmssw3qhb6791qfhbk" - else throw "Dropbox client for: ${stdenv.system} not supported!"; + # NOTE: When updating, please also update in current stable, as older versions stop working + version = "3.4.6"; + sha256 = + { + "x86_64-linux" = "0crhv21q48lwa86qcqgbcd9g73biibfrc2vgbavi67cwxvzcskky"; + "i686-linux" = "0kli84kzg1wcwszjni948zb4qih8mynmyqhdwyiv1l7v5lrhb8k2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + arch = + { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + + interpreter = + { + "x86_64-linux" = "ld-linux-x86-64.so.2"; + "i686-linux" = "ld-linux.so.2"; + }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; @@ -109,6 +115,9 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "${ldpath}" + + mkdir -p "$out/share/icons" + ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" ''; meta = { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index cae9fe294f34..7ce47d53d141 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool perl perlXMLParser evolution_data_server gnome_doc_utils avahi libsigcxx gtk dbus_glib libnotify libXext xextproto sqlite - gnome3.libsoup glib gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme gnome3.gnome_icon_theme boost + gnome3.libsoup glib gnome3.defaultIconTheme boost autoreconfHook pkgconfig libxml2 videoproto unixODBC db nspr nss zlib libsecret libXrandr randrproto which libxslt libtasn1 gmp nettle makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index b9f9667ad3b6..f82ffa5ecd38 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1287"; + version = "2.2.1373"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b"; + sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5"; + sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5"; } else throw "HipChat is not supported on ${stdenv.system}"; @@ -92,10 +92,11 @@ stdenv.mkDerivation { mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c290975152cd..7b80ec85661a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = http://www.cypherpunks.ca/otr; + homepage = https://otr.cypherpunks.ca/; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 586ce26e8c95..4a5522039c84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9771f29c770f..874f68f0ec20 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv +{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv , libsodium, libXScrnSaver }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ - libtoxcore openalSoft opencv libsodium filteraudio + libtoxcore openal opencv libsodium filteraudio qt5.base qt5.tools libXScrnSaver ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d268cbc55cfb..521f568ff5bb 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jagajaga ]; + broken = true; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 991f8cbd53bd..8dce20f60dab 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,117 +4,117 @@ # ruby generate_source.rb > source.nix { - version = "31.6.0"; + version = "31.7.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha1 = "4c0c50d5c315f438d09b8bf2ba821c7148552076"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "d0361df60873c787ebcb487acb65e9e4e7bf6c97"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "84e0ab9f62afbf1c673383a6c6c0d07ce369b360"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "b590ca477b00dd2080a887ee4451d06d59da5e6c"; } - { locale = "be"; arch = "linux-i686"; sha1 = "06812c96cbd62c07180062fca293171cf4177d77"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "1cf6501aa77adfa41ad48316f471201f2c2e1976"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "322654ebdf12a9d60738e0a5f30dfde77e095951"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "00fa9855d81a59f7340d69ef25389503b3374c5b"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "efd6f1afc8787295071f1577e043fe8ed4824604"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0163078b1edc17b3df86d9d80d2dcf1b14e289c5"; } - { locale = "br"; arch = "linux-i686"; sha1 = "1051e4faa171ea762dd0d4c79d1f7b6d59fa1343"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "cad5ff8a920a90e79c1e343022aba0d95347a9a6"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "1801969f47164e9e40fe611b2b11c664541ea619"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "8427fdbf5149c7e0a96e6037f3b7690cc43684f1"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "8ae6c4b5e97b1a129c178c17ddb787b8a499bbbf"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "422d73aa8d853afd219c4be983e9d0b0c165d3a7"; } - { locale = "da"; arch = "linux-i686"; sha1 = "ee6239de012bb2d581c42e4271736b3565932d2d"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "3e24c6d239e5d55ffefdecab5c280668d36f3c14"; } - { locale = "de"; arch = "linux-i686"; sha1 = "474f1b4ce9b6cf635c60ab32dc99268f30bd906b"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "7327c84c0b447cbeb00a57790334dbd4df02441a"; } - { locale = "el"; arch = "linux-i686"; sha1 = "a1cced1eb8d290f8f7668839af68a42b47172fda"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "c7a41b26bee1bcf1a1012ab122036983c42223ed"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "73309ee5d0304762b24b040fea3be934b0193b76"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "79466a14532bac1c5db7de4f1aacd97538b12ccd"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "1886939dd4fa0bd720f209a9280bdd48f2805144"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "18090d7adbb45350d47d796ee0d4a52da68629b4"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "6d5b993c8c5f9a311e128520a2eb1115a1004d72"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "04afb8826d04dc6511a77377d78f9dcdd67bb73f"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "c49c2175842d40698128da293305317c5d986561"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "65e6d24657a47d69cec4820fc699b948ef7235df"; } - { locale = "et"; arch = "linux-i686"; sha1 = "4a066d35ab922587ed1000b770becbaeafb91d39"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "fad64bc6cdf1bbc03ef0e6fd4fac96e0ddd26578"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "ac90f02584bedfe3b958020c37d3677b2312b203"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "7152187af874799ca22dffca1d85afc0346a5f7c"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "797c494042986578e79290a827056ee56ad32526"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "5fec8fc94b8296c5189be29fdc0f43f074c88722"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "2f90216459e8bd24fe775bc84f3d3371c64c705e"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "07176c2825be793521e11dde8a73ead970c58385"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "0e7f95afef9fc01667b0e2ee33e2620069662b4b"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "ff9a84cb2ca4e222a6d75b5591e5337b3b5e3b3b"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "a392c2287a3907b5b79c443c67dfb4d8e6624ebf"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "766035560552bb26b1d9a6c98357acab515153e3"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "5f9dcab41f522ca84833cf5dc566ee9679efcc01"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "46ced4f5c67f560b15341db70dc04d1a19e176cc"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "66f1b772f981ce5bbd3c7c2a73d260d2243887a9"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "2c087b2ba065f06aa4e4e491d92864ef679f14c2"; } - { locale = "he"; arch = "linux-i686"; sha1 = "b157e04413ee246304f30b0dc68eeed3e00d5cf3"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "72e77175705052c6102405897edc1c5887f94c58"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "f515c41dda71a69974b67d70ca1980987ab895ba"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "9b560bc16985e8610d11c1aa1df6a8b29a650528"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "24b0e2555617b1b0e7dcb601b3f7a8c54bf64524"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "a1cf5c244fd98a024b2987b72b95671a90c7e0f9"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "20a07254d51cc94be8153426e472d8c7b077a014"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3e5c41c5239da37ee52070c043b5de2f16859055"; } - { locale = "id"; arch = "linux-i686"; sha1 = "bbbc669ead8c716725ad162247dbb35f6b6d3376"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "30c73fff969d9d94e6a24b27fa5b03285104ed38"; } - { locale = "is"; arch = "linux-i686"; sha1 = "d8ede481d0f04237b1a36356880d76a5439e6796"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "d5c70452102f0c1f513a45b3b05339b171e7e149"; } - { locale = "it"; arch = "linux-i686"; sha1 = "00bad56fb3a4bcc4032b204471a66dc64a9976e9"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "cd15137766f9bdb693743401d14e69c4c990aeab"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "eb51ca9c4d5d22ff178c45c99ba35270d9f006d1"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "ec7bdce8ecba50aa4c6f0495ec4737b032e85688"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "ce2a6f518fe69b6cf87ba6a2d5ff7e32f676e516"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "614808276829835d81f6a330154c3dbf617109e2"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "95da07c69121bf0e22b480f3e4df9db3e7676a8b"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "02dee38474393cf86c78aacfb2c546bfd2130e0a"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "cd8b7dc6eda97de0ec1c8a5dde36f4afd60b720a"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "748030706822a80156e5ffcfbaed413b3905280a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "eafd2b7fa376f58fd5320a8e67bd76c9eb17819e"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "f04672081b0281dec909fd110f1c1dc8f340cc40"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "c51c6a23f5e99181cd2aa6e324165a523c7e7c41"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "29adc20bbdb3b1de7b0c1a325ded1159f7627478"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "b94fc235c3644455ca19238aed9e2e4cff4ce7d2"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "78bd45bf21196cc4bb400d10d19151931e390681"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "0b921d11a43968bc12a31be48baa962fb084be3d"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "b975d958fdb152c942cf68ed6dbde8df6b6cfe09"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "5384bc8f899d1ba75c96b11276dd98cb5049896a"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "dbd5db203127f01b1ec46259f9b668aa2dec8d63"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "eb6590aecd509ee02b02fd6d39aec32a77616b59"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "750f9d25164f2aae4d5bb3147738cb604c131b94"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "5dc246fc1c661d5a965da6eed7d0b57dacbcc643"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "ca3d7a76564552cab92cf1c3f2098bbb740e6315"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "ceb0264ab40dc437c2a44fa03c2f9a3ff18b667c"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "d2200d241c26059136169850a5ad4f702c273301"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "678bae69497e2ab6c4d895192b5093a0d120ddc1"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "9ca3af62babeeda8a46609ffd265ff0cc059349a"; } - { locale = "si"; arch = "linux-i686"; sha1 = "46376507d77af110a63de24a7a136c43b2d6cb1b"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "d43e51c5e504bfa1a0f7370e1cea3bda247b81e0"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "e97bc9017953f91f4fc9a158dca36ae1217a8a97"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "f80a0473ff265295f3eaa8ed8b8fe99a0a71b049"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "449cf3770e4eaa4289bac9abbf7f655bbdcdf8ca"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ef1092cdef4dd2d4ebf62b29654da4ad08c7a6e0"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "0d856fdb66ca1208a08eef5073744f66de7c94f5"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "346888cbc1428897df1b50651a263ae5cc449475"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "3252ea6a0706813d4c536cab9251ec707a46fe47"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "ea55159965bc8b5fb5c692efc1a30ac3ddd74a48"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5191f311d6324e1fbc98763e80316bb7584999ba"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "4c8387f5db87776ae6ba322fa81983f7bab14690"; } - { locale = "ta-LK"; arch = "linux-i686"; sha1 = "e1fa5437760c8964aa312ed296454c0736009479"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "1e277512366a60745cfdc409530943e42bb62b11"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "8907cb5f77b0dafd6c2c69d63b6f9b72ab58d7d1"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "b101b37f7fe86686db1813786cbf2ee994bf33c3"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "ab0e84cd69808d12efa28f5062372ba8983b8c42"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "bce4718c183c9fc62f38025f7f9329999ba1f8a4"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "7a05e5dd98215dab96746166fe46c96592e8768a"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "c2c54c1831199ac8b5ba0bbebb564e9dc2ff2563"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "3c2a7f6096eb16a00451d1ec71f6ff382910bf43"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "e3d43d6aa007419d057da99d06fdd200faf8d9c5"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "97bc53d2216eb24ad6c0496fed4698da4e481c38"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "3e5fcc5058646ee326f4b6b1ef885999222ab0b8"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "8d5dd6af05d9a285097db7f96372464e2c48a7fe"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "07866e3716bc3bd370e4aa4711ee2882be8380b9"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "f9c353e03792ade2c3df9842bad6707c50b59395"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "ecbfaa883c2dda597213ca739e92c30ec9c2eac1"; } + { locale = "be"; arch = "linux-i686"; sha1 = "ac1abca375cfbc2e45b7eb0f66b9cef73924ae4e"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "5f296643c42890a200416678a6ed8240ee219d9f"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "4b59b171b67641097da95fd76113efe1019fd2aa"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "13d5124fd8925de174f83a8075fb711aa14438b7"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "833c826ee2be3c8664060d4ad24c508b5c122a5e"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b29fb50d9eb83e98802655236a6c1ccb56bf6be3"; } + { locale = "br"; arch = "linux-i686"; sha1 = "5985c09eab409db0c62e525e9cd3d7469b82f0e1"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2e4e3efe1d89b8cf329a64894807b69555e505e2"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "1a81aabe1ded11bde92349e8b9f5ae499aaebdfa"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "406212f107939a627f2166d8fc6a72a0dcff56a4"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "6cc272e25d45e54c6008da968884de039eba9db9"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6f7e54ff4fe7d8bfa477475aaad371fc8b2f85d4"; } + { locale = "da"; arch = "linux-i686"; sha1 = "8f944829ef98bfdb46eadfd10fafe75a353c1a4a"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f22e4293a3462effa0a928be3ae1ddbd8273450f"; } + { locale = "de"; arch = "linux-i686"; sha1 = "c115ea9356b457b25526c8469ebcf7a8e1c6241a"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "04ac40b3e10f96e17db70c9541040970cbe2e480"; } + { locale = "el"; arch = "linux-i686"; sha1 = "b0ccb81db2b8cb505ade10a0fc1eaf4322f7de0d"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "410da87c432e3d4e4ddfbe4912bc00c8fcfb8dfd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "b91bea9a1813f1772a85873fb712c9857234864f"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f6a08558fb3b6ebd79fdf9b359286b7ba58f2a9c"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "b433601ffdf83cc2a90224f683f627f562d8e3e3"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68624fead16c459f87cbdeefd75326bcabccd805"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "14c4a6abb6269dea926efccfdae41d2eeab9031a"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "ffd800950b8a768d4e7ec4c8666fc2e7a390a080"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "61889cee58be7c5da0f3424faae5192f07d31651"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "360335d5c3a1eccaba29095f88d9b50dc04fbc6d"; } + { locale = "et"; arch = "linux-i686"; sha1 = "ba1e1dbcb1c0c87ba1c916b1053cf876e42d76bf"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "c40a2e0c70d3c3af5e0c34045864a7279f95b2fa"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "45c6270bb1350799df089620cdae4919833d5a54"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ee8cacf035658fda1605f3a2968c56fa03cd73d4"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "45329cd3222d74cefaa0e96e18b71b6ddc844e77"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "47c1ec1e67829a86111a76f6ea6cb40c9f178066"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "1f2e1edbb49f141c1ac63f20e47bc4bcbe0361f4"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "cf70711b4fb6130b31d3286ad1b2a102d5cb8fc5"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "938ee57e657b3b2f0a228bc1dc7a9bc2eebee1cc"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "5c807541fa4e232b6b5119cbc482a79dd9e4f54e"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "6f2ef03c505f4936f6263b643bbfd6e0befd54f4"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "7246ed88b0c3f504ca0043f3f20c5cc86eea8ac6"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "130f7ae3c0127d00e24946e9ec2558161fd3fcf1"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "aed0e1e7e699c6df4538663dc6a0556a106cb35f"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "69fca12c63c023f689463de709db731073a3c812"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "45ab4866e3f6989e4a08920564292622abea7f97"; } + { locale = "he"; arch = "linux-i686"; sha1 = "2898eed89af21c6a4122937bf596b97828cb9271"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "a3fb3b8564fcbe8cad29d430665d3f369d765369"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "143d8dcbccd3ad219330d7389e93597cb98d20f8"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "3fdc0095646678c2885e374e277ab50c4a4ffe53"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "4c135cfaa8644fab4558d53eb7f5f0ae53ed3704"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "a4faeb5aa6dc7f6a16d436a56ef9f954c80271fd"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f3e60e515fa20c4092ecf4df64970bc750c849e5"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2d6ea4a41a33db4e2aeb67d7bcd38f32f427f757"; } + { locale = "id"; arch = "linux-i686"; sha1 = "cd97780c5f70dca5e9c2a61e9af11f38f79b014b"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "da2ae751b6b0dd2caf5c54fcd30560a57c6746cb"; } + { locale = "is"; arch = "linux-i686"; sha1 = "f6f3b56e8b134e93e30ecfcf706e9ddbb9b181cc"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "a922a569b293005e5efc797bf51e0c33e87cea7f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "2643526d774e44fc41b0b7b6872ba683b01a9c77"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "e91689f635060087f8c8c9806ac1607a59e26776"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "dafca3f2c34ae417b5bd3065026af4a075c9bee7"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "6a1d03062d599ea35af8479dea3e6cfc45840ba1"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "9b92baecd3906b35499513723685cd791e1aab9e"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "116c8b02f8be6c739595cc88888a19e225ed865d"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "85f44f77cc27deb9cf95487a9a3673918f102bd9"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "0bd82afbe4c27318ce8882eff62e53fda13d3590"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "07cd4e46a5811096759c565bb533adf1ee9cb0d9"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "ece8a8b69aef74f9c22db1660a14ae5205aa7ff7"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "1f1e30f5aef29bf96d0e2b8609acb03d1b6ec0aa"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "5a0ffeb38b183b835966568c1b3fc719c0908fea"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9bbb5e61eecf09d059cfb17bd75fd0e64c455d78"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "e1115c4451ede51833387ef8c592ce7342d508d3"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "65dcef7d9bfcdbd35a09ff6a9e436261b79e4d90"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "cd64fb45459e699e0c8c2269a52bb0512e592db0"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "ea2650cb700a42dc96fb56ad1860061e87626bc9"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "976a52d128e8d912363fadb7e14adec0a7c9d973"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "323b876b6c11c4881c280cdb64d2867076970abf"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "952d5b82b0d3d47d5494f2d9667fc2a5b88408df"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5ce1feb2446c6dba96c3b3a0e9afd6a00655b738"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "83115d2fdc8494451b79cc67d581c77b64c27af4"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "a26678482d8c425f3291116e99e0196952d0cb09"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "327391e44d43d58b4d3fee97904a336f5c52648e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "8b67f03c053f89af7d50331eec056402cfbd5bf4"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "15ec5c6fa7e6aa843910bc6c6479bf308393b52f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "09127b5202cf63c7b9715813061ca79bc27c2f37"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "8b409350741edcd33b3eeaf7928a133eb1c2a399"; } + { locale = "si"; arch = "linux-i686"; sha1 = "733d049ffd66d5007ef68c761f2d84ab579bd400"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "dc5460e82bdf613e9d778687d11533dc97b77ffb"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "b4b9b10b53c48adf224507faf77a04c19c750d58"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "81aeb1d95fd2b220c17f388ba882127fc6d290de"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a621f04b7e5accf05f946ce775391667579679e6"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "f9086f1ce56d84e3b732f22d086fcce43d2373a7"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "1b2b11fd04b7d1979f88268db37510ef231c158b"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f06ad4d533c7144695fbe2eb3ba700bb1d5151b7"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "92d4cd9bbc5f24045295bda6c75420708d593aac"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "53e661b5c485fae7c27770d2a2701d6d21e481c9"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "e4614597ef42eaa6ede065b4c3b9f11de491dd5b"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e3c8af45ab65e7977a350ae617cd55afa685e8d0"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "17b3d419fe769a02a360b96042c78c497063b9e8"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "cbc34ab650bfc95926b98e63c474f1997a1256fa"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "ba63efda6864a6984d492cda30d4fca6157e26a8"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "9b8cb45aab578b3dbfeace90f44dad26eda6e798"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "36a9867155fa0e6924ed62d7dbc350a2425178e1"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "abbc155c34c5d404b3143ccc63a1bb5c99c3d395"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "850ac8190adef8d227166b9b4478ea8c88c90287"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "afba1f0043ba96a89bc8ab23fe6b6e19af4f826b"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "acda86b5c48b751eb06719754921e7604a1c222e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "a88745a4a8f85d5d2861e40ba8d72b0af73bb055"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "c03e6e4fae7fec1ae0b30e5cb600a4cf28151cc7"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "c5788c6672b230681cfb3ee2fe97763ef81d34b1"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 6d5dd577bf22..f2a088164d20 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "31.6.0"; in +let version = "31.7.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - sha1 = "147ba0f3c7da29a7814ee9ce4265fb107744559e"; + sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { ../mozilla/mach configure ''; + enableParallelBuilding = true; + buildPhase = "../mozilla/mach build"; installPhase = diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 904f69049798..26078c8e5830 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas gnome3.libpeas gnome3.dconf gst-plugins-base gst-plugins-good gst-plugins-bad - gnome3.libgnome_keyring + gnome3.libgnome_keyring gnome3.defaultIconTheme libnotify makeWrapper ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" done ''; diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix index 4ac3a0448dea..21d99013a1a0 100644 --- a/pkgs/applications/networking/pond/default.nix +++ b/pkgs/applications/networking/pond/default.nix @@ -14,11 +14,6 @@ buildGoPackage rec { subPackages = [ "client" ]; - renameImports = [ - "code.google.com/p/go.crypto golang.org/x/crypto" - "code.google.com/p/goprotobuf github.com/golang/protobuf" - ]; - buildInputs = [ trousers net crypto protobuf ed25519 govers ]; buildFlags = "--tags nogui"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 84d0d4ba2391..54e4e64cdcf3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.1"; + version = "0.11.5"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4"; + sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06"; }; subPackages = [ "cmd/syncthing" ]; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e82ce2d7b9ed..14e130ba1ffc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3 +, gnome3, makeWrapper, gtk3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # ToDo: optional libgda, python, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser - goffice gtk3 makeWrapper + gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; preFixup = '' diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d0d6fd136efd..720a07afcfa3 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -3,11 +3,11 @@ , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { - name = "scribus-1.4.4"; + name = "scribus-1.4.5"; src = fetchurl { - url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz"; - sha256 = "1bhp09x8rgdhyq8b516226nn0p7pxd2arkfkf2vvvklca5arsfx4"; + url = "mirror://sourceforge/scribus/scribus/${name}.tar.bz2"; + sha256 = "1644ym79q7a1m5xf3xl1wf4kdk870np911jmpqdv2syjc42nyw4z"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f5a835423bdd..1fa0a0d97b50 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.9.0b"; - name = "fritzing"; + name = "fritzing-${version}"; src = fetchurl { url = "http://fritzing.org/download/${version}/source-tarball/fritzing-${version}.source.tar_1.bz2"; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 4d391379e819..2d93fdd61968 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ]; enableParallelBuilding = true; - preConfigure = "cd src"; + preConfigure = '' + patchShebangs bin/leantags + cd src + ''; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index ffc16a330542..e42bd0f83ee0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.35.1"; + version = "5.36.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy"; + sha256 = "0x1rk659sn3cq0n5c90848ilzr1gb1wf0072fl6jhkdq00qgh2s0"; }; buildInputs = [sbcl texinfo perl makeWrapper]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index a73e3dbcec04..8af49621dd98 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "14.12.1"; + version = "15.04.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z"; + sha256 = "1fm47ah4aw5qdjqhkz67w5fwhy8yfffa5z896crp0d3hk2bh4180"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 620d3264be88..60bfaa861996 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.4.0"; + version = "2.4.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "095v8n0b0c314sfg5mrnxjx2d9mklbjcmajh92kmi6b5jkfkhd5k"; + sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj"; }; patches = [ diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 476abd4e19bd..4afb1b20e32c 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchhg, autoconf, sqlite }: -stdenv.mkDerivation { - name = "vcprompt"; +stdenv.mkDerivation rec { + name = "vcprompt-${version}"; + version = "1.2.1"; src = fetchhg { url = "http://hg.gerg.ca/vcprompt/"; - rev = "1.2.1"; + rev = version; sha256 = "03xqvp6bfl98bpacrw4n82qv9cw6a4fxci802s3vrygas989v1kj"; }; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 83fb7546a3bc..be0517b6376b 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -15,12 +15,16 @@ , portaudioSupport ? false, portaudio ? null , pulseSupport ? true, pulseaudio ? null , cddaSupport ? false, libcdda ? null +, youtubeSupport ? true, youtube-dl ? null }: +with stdenv.lib; + assert jackSupport -> jack != null; assert portaudioSupport -> portaudio != null; assert pulseSupport -> pulseaudio != null; assert cddaSupport -> libcdda != null; +assert youtubeSupport -> youtube-dl != null; let waf = fetchurl { @@ -32,18 +36,18 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.5"; + version = "0.9.10"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; + sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17"; }; buildInputs = with stdenv.lib; [ libX11 libxcb mesa - qt5.base qt5.quick1 qt5.x11extras + qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols ffmpeg libchardet mpg123 @@ -65,13 +69,17 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs configure - # src/mpv/waf build-mpv; do ''; preBuild = '' - patchShebangs build-mpv install -m755 ${waf} src/mpv/waf - sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf + patchShebangs src/mpv/waf + patchShebangs build-mpv + ''; + + postInstall = '' + wrapProgram $out/bin/bomi \ + ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; configureFlags = with stdenv.lib; @@ -82,7 +90,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl which ]; + nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 69b0ffbe1314..79b9ab92ad9a 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: +{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: stdenv.mkDerivation rec { version = "0.2.3.alpha"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; - buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 675f0a3a2f67..1256572de7ca 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, makeDesktopItem, qt4 }: -let version = "3.4.9"; in +let version = "3.4.11"; in stdenv.mkDerivation rec { name = "clipgrab-${version}"; src = fetchurl { - sha256 = "0valq3cgx7yz11zcscz1vdjmppwbicvg0id61dcar22pyp2zkap1"; + sha256 = "10xxcnib7xkvrx7wma2vbya5fz5s5f6syc9dmr395c83lpcwpxs8"; + # The "Download" button is a .tar.gz, but there's a .tar.bz2 further down: url = "http://download.clipgrab.de/${name}.tar.bz2"; }; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 01d96542c2e7..0dbf42713831 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,49 +1,74 @@ -{ stdenv, fetchurl -, libmatroska -, flac -, libvorbis -, file -, boost -, xdg_utils -, expat -, withGUI ? true -, wxGTK -, zlib -, ruby -, gettext -, pkgconfig -, curl +{ stdenv, fetchurl, gettext, pkgconfig, ruby +, boost, expat, file, flac, libebml, libmatroska, libogg, libvorbis, xdg_utils, zlib +# pugixml (not packaged) +, buildConfig ? "all" +, withGUI ? false, qt5 ? null # Disabled for now until upstream issues are resolved +, legacyGUI ? true, wxGTK ? null +# For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the +# build system doesn't install desktop entries, icons, etc... }: -assert withGUI -> wxGTK != null; +let + inherit (stdenv.lib) enableFeature optional; +in + +assert withGUI -> qt5 != null; +assert legacyGUI -> wxGTK != null; stdenv.mkDerivation rec { - version = "7.8.0"; name = "mkvtoolnix-${version}"; + version = "7.9.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0m7y9115bkfsm95hv2nq0hnd9w73jymsm071jm798w11vdskm8af"; + sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r"; }; + patchPhase = '' + patchShebangs ./rake.d/ + patchShebangs ./Rakefile + # Force ruby encoding to use UTF-8 or else when enabling qt5 the Rakefile may + # fail with `invalid byte sequence in US-ASCII' due to UTF-8 characters + # This workaround replaces an arbitrary comment in the drake file + sed -e 's,#--,Encoding.default_external = Encoding::UTF_8,' -i ./drake + ''; + + configureFlags = [ + "--with-boost-libdir=${boost.lib}/lib" + "--without-curl" + ] ++ ( + if (withGUI || legacyGUI) then [ + "--with-mkvtoolnix-gui" + "--enable-gui" + (enableFeature withGUI "qt") + (enableFeature legacyGUI "wxwidgets") + ] else [ + "--disable-gui" + ] + ); + + nativeBuildInputs = [ gettext pkgconfig ruby ]; + buildInputs = [ - libmatroska flac libvorbis file boost xdg_utils - expat zlib ruby gettext pkgconfig curl - ] ++ stdenv.lib.optional withGUI wxGTK; + boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib + ] ++ optional withGUI qt5 + ++ optional legacyGUI wxGTK; + + enableParallelBuilding = true; - configureFlags = "--with-boost-libdir=${boost.lib}/lib"; buildPhase = '' - ruby ./drake + ./drake ''; installPhase = '' - ruby ./drake install + ./drake install ''; - meta = { + meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; homepage = http://www.bunkus.org/videotools/mkvtoolnix/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2; + maintainers = with maintainers; [ codyopel fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index e414a6e723a9..67f5e11de681 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz"; - sha256 = "198ymfdrg58i3by58fs68df835rkpnpagnvyzlilmn9ypvpa8h81"; + sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in"; }; buildInputs = [ cmake diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5b77ec916b08..743df2647f1a 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gobjectIntrospection clutter-gst clutter-gtk librsvg gnome3.gnome_desktop - hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas libnotify ] ++ (with gst; [ gstreamer gst-python gst-editing-services diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 6a1e9552d3c6..a404ba0d1a8a 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" + "--enable-dvdnav" ] ++ optional onlyLibVLC "--disable-vlc"; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix new file mode 100644 index 000000000000..4f32ec55a0e1 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake, + libmspack, openssl, pam, xercesc, icu, libdnet, procps, + x11, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm }: + +let + majorVersion = "9.10"; + minorVersion = "0"; + patchSet = "2476743"; + version = "${majorVersion}.${minorVersion}-${patchSet}"; + +in stdenv.mkDerivation { + name = "open-vm-tools-${version}"; + src = fetchurl { + url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz"; + sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1"; + }; + + buildInputs = + [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps + pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ]; + + patchPhase = '' + sed -i s,-Werror,,g configure.ac + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + ''; + + preConfigure = "autoreconf"; + configureFlags = "--without-kernel-modules --without-xmlsecurity"; + + meta = with stdenv.lib; { + homepage = "https://github.com/vmware/open-vm-tools"; + description = "Set of tools for VMWare guests to improve host-guest interaction"; + longDescription = '' + A set of services and modules that enable several features in VMware products for + better management of, and seamless user interactions with, guests. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ joamaki ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 69888e22a019..5b23e36af83a 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,70 +1,240 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls -, makeWrapper -, pulseSupport ? true, pulseaudio -, sdlSupport ? true, SDL -, vncSupport ? true, libjpeg, libpng -, spiceSupport ? true, spice, spice_protocol, usbredir -, x86Only ? false +{ stdenv, fetchurl, pkgconfig, libtool, python, perl, texinfo, flex, bison +, gettext, makeWrapper, glib, zlib, pixman + +# Optional Arguments +, SDL2 ? null, gtk ? null, gnutls ? null, cyrus_sasl ? null, libjpeg ? null +, libpng ? null, ncurses ? null, curl ? null, libcap ? null, attr ? null +, bluez ? null, libibverbs ? null, librdmacm ? null, libuuid ? null, vde2 ? null +, libaio ? null, libcap_ng ? null, spice ? null, spice_protocol ? null +, libceph ? null, libxfs ? null, nss ? null, nspr ? null, libusb ? null +, usbredir ? null, mesa ? null, lzo ? null, snappy ? null, bzip2 ? null +, libseccomp ? null, glusterfs ? null, libssh2 ? null, numactl ? null + +# Audio libraries +, libpulseaudio ? null, alsaLib ? null + +#, pixman ? null +#, python, zlib, glib, ncurses, perl +#, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +#, libseccomp, libaio, libcap_ng, gnutls +#, makeWrapper +#, pulseSupport ? true, pulseaudio +#, sdlSupport ? true, SDL +#, vncSupport ? true, libjpeg, libpng +#, spiceSupport ? true, spice, spice_protocol, usbredir + +# Extra options +, type ? "" }: with stdenv.lib; let - n = "qemu-2.2.1"; - audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," - + optionalString pulseSupport "pa," - + optionalString sdlSupport "sdl,"; + n = "qemu-2.3.0"; + + mkFlag = trueStr: falseStr: cond: name: val: + if cond == null then null else + "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}"; + mkEnable = mkFlag "enable-" "disable-"; + mkWith = mkFlag "with-" "without-"; + mkOther = mkFlag "" "" true; + + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + + optSDL2 = if type == "nix" then null else shouldUsePkg SDL2; + optGtk = if type == "nix" then null else shouldUsePkg gtk; + optLibcap = if type == "nix" then null else shouldUsePkg libcap; + optAttr = if type == "nix" then null else shouldUsePkg attr; + optGnutls = if type == "nix" then null else shouldUsePkg gnutls; + optCyrus_sasl = if type == "nix" then null else shouldUsePkg cyrus_sasl; + optLibjpeg = if type == "nix" then null else shouldUsePkg libjpeg; + optLibpng = if type == "nix" then null else shouldUsePkg libpng; + optNcurses = if type == "nix" then null else shouldUsePkg ncurses; + optCurl = if type == "nix" then null else shouldUsePkg curl; + optBluez = if type == "nix" then null else shouldUsePkg bluez; + optLibibverbs = if type == "nix" then null else shouldUsePkg libibverbs; + optLibrdmacm = if type == "nix" then null else shouldUsePkg librdmacm; + optLibuuid = if type == "nix" then null else shouldUsePkg libuuid; + optVde2 = if type == "nix" then null else shouldUsePkg vde2; + optLibaio = shouldUsePkg libaio; + optLibcap_ng = shouldUsePkg libcap_ng; + optSpice = if type == "nix" then null else shouldUsePkg spice; + optSpice_protocol = if type == "nix" then null else shouldUsePkg spice_protocol; + optLibceph = if type == "nix" then null else shouldUsePkg libceph; + optLibxfs = if type == "nix" then null else shouldUsePkg libxfs; + optNss = if type == "nix" then null else shouldUsePkg nss; + optNspr = if type == "nix" then null else shouldUsePkg nspr; + optLibusb = if type == "nix" then null else shouldUsePkg libusb; + optUsbredir = if type == "nix" then null else shouldUsePkg usbredir; + optMesa = if type == "nix" then null else shouldUsePkg mesa; + optLzo = if type == "nix" then null else shouldUsePkg lzo; + optSnappy = if type == "nix" then null else shouldUsePkg snappy; + optBzip2 = if type == "nix" then null else shouldUsePkg bzip2; + optLibseccomp = if type == "nix" then null else shouldUsePkg libseccomp; + optGlusterfs = if type == "nix" then null else shouldUsePkg glusterfs; + optLibssh2 = if type == "nix" then null else shouldUsePkg libssh2; + optNumactl = if type == "nix" then null else shouldUsePkg numactl; + + hasSDLAbi = if optSDL2 != null then true else null; + + hasVirtfs = stdenv.isLinux && optLibcap != null && optAttr != null; + + hasVnc = type != "nix"; + hasVncTls = hasVnc && optGnutls != null; + hasVncSasl = hasVnc && optCyrus_sasl != null; + hasVncJpeg = hasVnc && optLibjpeg != null; + hasVncPng = hasVnc && optLibpng != null; + hasVncWs = hasVnc && optGnutls != null; + + hasFdt = type != "nix"; + + hasRdma = optLibibverbs != null && optLibrdmacm != null; + + hasLinuxAio = stdenv.isLinux && optLibaio != null; + + hasSpice = optSpice != null && optSpice_protocol != null; + + hasNss = optNss != null && optNspr != null; + + optLibpulseaudio = if type == "nix" then null else shouldUsePkg libpulseaudio; + optAlsaLib = if type == "nix" then null else shouldUsePkg alsaLib; + audio = concatStringsSep "," ( + optional (optSDL2 != null) "sdl" + ++ optional (optLibpulseaudio != null) "pa" + ++ optional (optAlsaLib != null) "alsa" + ); + + systemBinary = if stdenv.system == "x86_64-linux" then "x86_64" + else if stdenv.system == "i686-linux" then "i386" + else null; + + targetList = if stdenv.system == "x86_64-linux" then "x86_64-softmmu,i386-softmmu" + else if stdenv.system == "i686-linux" then "i386-softmmu" + else null; in stdenv.mkDerivation rec { - name = n + (if x86Only then "-x86-only" else ""); + name = "${n}${optionalString (type != null && type != "") "-${type}"}"; src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; + sha256 = "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn"; }; - buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls - ] - ++ optionals pulseSupport [ pulseaudio ] - ++ optionals sdlSupport [ SDL ] - ++ optionals vncSupport [ libjpeg libpng ] - ++ optionals spiceSupport [ spice_protocol spice usbredir ] - ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; + nativeBuildInputs = [ pkgconfig libtool perl texinfo flex bison gettext makeWrapper ]; + + buildInputs = [ + python glib zlib pixman optSDL2 optGtk optNcurses optCurl optBluez optVde2 + optLibcap_ng optAttr optLibuuid optLibceph optLibxfs optLibusb optUsbredir + optMesa optLzo optSnappy optBzip2 optLibseccomp optGlusterfs optLibssh2 + optNumactl optLibpulseaudio optAlsaLib + ] ++ optionals (hasVncTls || hasVncWs) [ + optGnutls + ] ++ optionals hasVncSasl [ + optCyrus_sasl + ] ++ optionals hasVncJpeg [ + optLibjpeg + ] ++ optionals hasVncPng [ + optLibpng + ] ++ optionals hasVirtfs [ + optLibcap + ] ++ optionals hasRdma [ + optLibibverbs optLibrdmacm + ] ++ optionals hasLinuxAio [ + optLibaio + ] ++ optionals hasSpice [ + optSpice optSpice_protocol + ] ++ optionals hasNss [ + optNss optNspr + ]; enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ]; - - configureFlags = - [ "--enable-seccomp" - "--smbd=smbd" # use `smbd' from $PATH - "--audio-drv-list=${audio}" - "--sysconfdir=/etc" - "--localstatedir=/var" - ] - ++ optional spiceSupport "--enable-spice" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" - ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; - - postInstall = - '' - # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" - if [ -e "$p" ]; then - makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" - fi - ''; + configureFlags = [ + (mkOther "smbd" "smbd") + (mkOther "sysconfdir" "/etc") + (mkOther "localstatedir" "/var") + (mkEnable true "modules" null) + (mkEnable false "debug-tcg" null) + (mkEnable false "debug-info" null) + (mkEnable false "sparse" null) + (mkEnable false "werror" null) + (mkEnable (optSDL2 != null) "sdl" null) + (mkWith hasSDLAbi "sdlabi" "2.0") + (mkEnable (optGtk != null) "gtk" null) + (mkEnable hasVirtfs "virtfs" null) + (mkEnable hasVnc "vnc" null) + (mkEnable stdenv.isDarwin "cocoa" null) + (mkOther "audio-drv-list" audio) + (mkEnable false "xen" null) + (mkEnable false "xen-pci-passthrough" null) + (mkEnable false "brlapi" null) + (mkEnable hasVncTls "vnc-tls" null) + (mkEnable hasVncSasl "vnc-sasl" null) + (mkEnable hasVncJpeg "vnc-jpeg" null) + (mkEnable hasVncPng "vnc-png" null) + (mkEnable hasVncWs "vnc-ws" null) + (mkEnable (optNcurses != null) "curses" null) + (mkEnable (optCurl != null) "curl" null) + (mkEnable hasFdt "fdt" null) + (mkEnable (optBluez != null) "bluez" null) + (mkEnable stdenv.isLinux "kvm" null) + (mkEnable hasRdma "rdma" null) + (mkEnable (type != "nix") "system" null) + (mkEnable (type != "kvm-only") "user" null) + (mkEnable (type != "kvm-only") "guest-base" null) + (mkEnable true "pie" null) + (mkEnable (optLibuuid != null) "uuid" null) + (mkEnable (optVde2 != null) "vde" null) + (mkEnable false "netmap" null) # TODO(wkennington): Add Support + (mkEnable hasLinuxAio "linux-aio" null) + (mkEnable (optLibcap_ng != null) "cap-ng" null) + (mkEnable (optAttr != null) "attr" null) + (mkEnable (type != "nix") "docs" null) + (mkEnable stdenv.isLinux "vhost-net" null) + (mkEnable hasSpice "spice" null) + (mkEnable (optLibceph != null) "rbd" null) + (mkEnable false "libiscsi" null) # TODO(wkennington): Add support + (mkEnable false "libnfs" null) # TODO(wkennington): Add support + (mkEnable (optLibxfs != null) "xfsctl" null) + (mkEnable hasNss "smartcard-nss" null) + (mkEnable (optLibusb != null) "libusb" null) + (mkEnable (optUsbredir != null) "usb-redir" null) + (mkEnable (optMesa != null) "opengl" null) + (mkEnable (optLzo != null) "lzo" null) + (mkEnable (optSnappy != null) "snappy" null) + (mkEnable (optBzip2 != null) "bzip2" null) + (mkEnable true "guest-agent" null) + (mkEnable (optLibseccomp != null) "seccomp" null) + (mkEnable (optGlusterfs != null) "glusterfs" null) + (mkEnable false "archipelago" null) + (mkEnable true "tpm" null) + (mkEnable (optLibssh2 != null) "libssh2" null) + (mkEnable (optLibuuid != null) "vhdx" null) + (mkEnable (optGnutls != null) "quorum" null) + (mkEnable (optNumactl != null) "numa" null) + ] ++ optionals (type == "kvm-only") [ + (mkOther "target-list" targetList) + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "qemu_confdir=\${out}/etc/qemu" + "qemu_localstatedir=\${TMPDIR}" + ]; + + postInstall = optionalString (systemBinary != null) '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${systemBinary}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + fi + ''; meta = with stdenv.lib; { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric shlevy eelco ]; - platforms = platforms.linux; + maintainers = with maintainers; [ viric shlevy eelco wkennington ]; + platforms = if type == "kvm-only" then platforms.linux else platforms.all; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 842985dce5bb..158d99f64880 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let buildType = "release"; - version = "4.3.26"; # changes ./guest-additions as well + version = "4.3.28"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -35,13 +35,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "98988"; + extpackRevision = "100309"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce"; + sha256 = "72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -60,7 +60,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961"; + sha256 = "e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index e63f69ca2306..0d8560635220 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670"; + sha256 = "9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 3df41228ae59..37d2ad3a515b 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -100,19 +100,6 @@ index 95dc9a7..39170bc 100644 size_t cchBufLeft = strlen(szPath); szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; -diff --git a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -index 090018e..7dcfc7a 100644 ---- a/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -+++ b/src/VBox/Main/src-server/NATNetworkServiceRunner.cpp -@@ -75,7 +75,7 @@ int NATNetworkServiceRunner::start() - - /* get the path to the executable */ - char exePathBuf[RTPATH_MAX]; -- const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX); -+ const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX); - char *substrSl = strrchr(exePathBuf, '/'); - char *substrBs = strrchr(exePathBuf, '\\'); - char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp index e9e1ba62..4d1c1e1 100644 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp |