diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh new file mode 100755 index 000000000000..78678473a49f --- /dev/null +++ b/maintainers/scripts/debian-patches.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +# Download patches from debian project +# Usage $0 debian-patches.txt debian-patches.nix +# An example input and output files can be found in applications/graphics/xara/ + +DEB_URL=http://patch-tracker.debian.org/patch/series/dl +declare -a deb_patches +mapfile -t deb_patches < $1 + +prefix="${DEB_URL}/${deb_patches[0]}" + +if [[ -n "$2" ]]; then + exec 1> $2 +fi + +cat <&2 cat <&2 + exit 1 +fi + +release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \ + sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//') + +if [[ ${release##*.} -gt 50 ]]; then + stable="false" +else + stable="true" +fi + +echo "Detected release ${release}" >&2 + +declare -A hash +declare -A modules +declare -a packages +declare -a top_level + +# xsltproc output declares -A module +if [[ ! -f kde_projects.xml ]]; then + curl -O -J http://projects.kde.org/kde_projects.xml +fi +eval `xsltproc kde-submodules.xslt kde_projects.xml` + +module[kde-baseapps]=kde-baseapps + +print_sane() { + echo "Called print_sane $1" >&2 + sane="${1//[^a-z0-9_]/_}" + if [[ "$sane" != "$1" ]]; then + echo "Sane version is $sane" >&2 + echo -n "sane=\"$sane\";" + fi +} + +for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do + package=${i%-${release}.tar.bz2} + packages+=( "$package" ) + echo -n "${package}.. " >&2 + hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo -n ${hash[$package]} >&2 + + if [ -n "${module[$package]}" ]; then + m="${module[$package]}" + echo " (${m})" >&2 + modules[$m]=1 + else + top_level+=( "$package" ) + echo " (top-level)" >&2 + fi + #nix-store --add-fixed sha256 "${dir}/${i}" >&2 +done + + +print_pkg_hash() { + echo " {name=\"${1}\";value=\"${hash[$1]}\";}" +} + +print_hashes(){ + echo "hashes=builtins.listToAttrs[" + for p in "${packages[@]}"; do print_pkg_hash "$p"; done + echo "];" +} + +print_split_module(){ + echo -n "$1:" >&2 + echo -e "{\n module=\"$1\";" + print_sane "$1" + echo " split=true;" + echo " pkgs=[" + for p in "${packages[@]}"; do + if [[ "${module[$p]}" == "$1" ]]; then + echo -n " { name=\"$p\"; " + print_sane "$p" + echo " }" + echo -n " $p" >&2 + fi + done + echo " ];" + echo "}" + echo >&2 +} + +print_mono_module(){ + echo -en "{ module=\"$1\"; " + print_sane "$1" + echo -n "$1 ... " >&2 + echo -n " split=false;" + cml="$1-$release/CMakeLists.txt" + tar -xf "${dir}/$1-${release}.tar.bz2" "$cml" + if grep '^[^#]*add_subdirectory' $cml >/dev/null; then + if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then + echo " is monolithic (has unconditionally added subdirs)" >&2 + else + subdirs=( `grep '^[^#]*add_subdirectory' $cml | + sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | + grep -v '\(doc\|cmake\)'` ) + echo " seems splittable, subdirs: ${subdirs[*]}" >&2 + echo -e "\n pkgs=[" + for s in "${subdirs[@]}"; do + echo -en " {" + echo -n " name=\"${s//\//-}\"; " + print_sane "$s" + if [[ $s != "${s//\//-}" ]]; then + echo -n "subdir=\"$s\"; " + fi + echo "}" + done + echo -e " ];\n" + fi + else + echo " is monolithic (has no subdirs)" >&2 + fi + rm $cml + rmdir $1-$release + echo "}" +} + +print_modules(){ + echo "modules=[" + echo "Printing modules splitted by upstream" >&2 + for m in "${!modules[@]}"; do print_split_module "$m"; done + echo >&2 + echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 + for m in "${top_level[@]}"; do print_mono_module "$m"; done + echo "];" +} + +echo "Writing ${release}.nix" >&2 +exec > "${release}.nix" +echo "{stable=${stable};" +print_hashes +print_modules +echo "}" diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt new file mode 100644 index 000000000000..952a05a9d274 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-package/kde-submodules.xslt @@ -0,0 +1,22 @@ + + + + + + + + + declare -A module + + + + module[" + + "]=" + + " + + + + + diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix new file mode 100644 index 000000000000..96b6c3a1c784 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -0,0 +1,16 @@ +{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +, libcanberra, virtuoso, samba, ntrack +}: + +kde { + buildInputs = + [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + samba (libcanberra.override { gtk = null; }) ntrack + ]; + + passthru.propagatedUserEnvPackages = [ virtuoso ]; + + meta = { + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix new file mode 100644 index 000000000000..60298e567fbc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix @@ -0,0 +1,14 @@ +{ kde, kdelibs }: + +kde { + + buildInputs = [ kdelibs ]; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "29f4e8b24435ee8c64affdc6250f59ed9f78445118fe0a4e216d89969dd2006b"; + + meta = { + description = "Wallpapers for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix new file mode 100644 index 000000000000..55c243f60dd9 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -0,0 +1,32 @@ +{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, + lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, + consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + pykde4 +}: + +kde { + + buildInputs = + [ kdelibs qimageblitz libdbusmenu_qt pykde4 + xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst + xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp + xorg.libpthreadstubs + boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 + libusb python libqalculate consolekit kdepimlibs pam prison akonadi + ]; + + preConfigure = + '' + # Fix incorrect path to kde4-config. + substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config + + # Fix the path to the keyboard configuration files. + substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ + --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 + ''; + + meta = { + description = "KDE workspace components such as Plasma, Kwin and System Settings"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix new file mode 100644 index 000000000000..d38c80c4c36a --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/jovie.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, speechd }: + +kde { + buildInputs = [ kdelibs speechd ]; + + meta = { + description = "Text-to-speech synthesis daemon"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix new file mode 100644 index 000000000000..98fae7c983f8 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kaccessible.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, speechd }: + +kde { + buildInputs = [ kdelibs speechd ]; + + meta = { + description = "Bridge that provides accessibility services to applications"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix new file mode 100644 index 000000000000..f3b27dacf672 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kmag.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Screen magnifier for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix new file mode 100644 index 000000000000..42306049c5d5 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kmousetool.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libXtst }: + +kde { + buildInputs = [ kdelibs libXtst ]; + + meta = { + description = "A program that clicks the mouse for you"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix new file mode 100644 index 000000000000..4159501967cd --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeaccessibility/kmouth.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A type-and-say front end for speech synthesizers"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix new file mode 100644 index 000000000000..bada0c1cb108 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeadmin/kcron.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; +} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix new file mode 100644 index 000000000000..bada0c1cb108 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeadmin/ksystemlog.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; +} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix new file mode 100644 index 000000000000..571674a461ad --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeadmin/kuser.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs, kdepimlibs }: + +kde { + buildInputs = [ kdelibs kdepimlibs ]; +} diff --git a/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix b/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix new file mode 100644 index 000000000000..2c462f67c159 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeadmin/system-config-printer-kde.nix @@ -0,0 +1,33 @@ +{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer, + kdelibs, kdepimlibs, pykde4, cups, nettools }: + +let s_c_p = system_config_printer.override { withGUI = false; }; in +kde { + buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip + pygobject s_c_p ]; + + passthru = { system_config_printer = s_c_p; }; + + preConfigure = + '' + for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do + substituteInPlace $i \ + --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \ + --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \ + --replace /bin/hostname ${nettools}/bin/hostname + done + ''; + + postInstall = + '' + # Bake the required Python path into the printer configuration program. + res= + for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done + + sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \ + -e "1 a import sys\nsys.path = [$res] + sys.path" + + mkdir -p $out/nix-support + echo ${pykde4} > $out/nix-support/propagated-user-env-packages + ''; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix new file mode 100644 index 000000000000..acccf66976fc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/ColorSchemes.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-color-schemes"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE color schemes"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake new file mode 100644 index 000000000000..499ed75268e9 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/FindXscreensaver.cmake @@ -0,0 +1,73 @@ +#Macro to find xscreensaver directory + +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NOT XSCREENSAVER_FOUND) + FIND_PATH(XSCREENSAVER_DIR deco + HINTS + ${KDE4_INCLUDE_DIR} + PATHS + /usr + /usr/local + /opt/local + /usr/X11R6 + /opt/kde + /opt/kde3 + /usr/kde + /usr/local/kde + /usr/local/xscreensaver + /usr/openwin/lib/xscreensaver + /etc + PATH_SUFFIXES + lib${LIB_SUFFIX}/xscreensaver + lib${LIB_SUFFIX}/misc/xscreensaver + lib/xscreensaver + lib64/xscreensaver + lib/misc/xscreensaver + libexec/xscreensaver + bin/xscreensaver-hacks + hacks) + message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") + + FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml + PATHS + ${KDE4_INCLUDE_DIR} + /usr/ + /usr/local/ + /opt/local/ + /usr/X11R6/ + /opt/kde/ + /opt/kde3/ + /usr/kde/ + /usr/local/kde/ + /usr/openwin/lib/xscreensaver/ + /etc/ + PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config + ) + MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") + +endif(NOT XSCREENSAVER_FOUND) + +#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") +#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") + +# Need to fix hack +if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + set(XSCREENSAVER_FOUND TRUE) +endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + +if (XSCREENSAVER_FOUND) + if (NOT Xscreensaver_FIND_QUIETLY) + message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") + endif (NOT Xscreensaver_FIND_QUIETLY) +else (XSCREENSAVER_FOUND) + if (Xscreensaver_FIND_REQUIRED) + message(FATAL_ERROR "XScreenSaver not found") + endif (Xscreensaver_FIND_REQUIRED) +endif (XSCREENSAVER_FOUND) + + +MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix new file mode 100644 index 000000000000..edffca1562e1 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/HighResolutionWallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-wallpapers-high-resolution"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE wallpapers in high resolution"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix new file mode 100644 index 000000000000..43071e8bd142 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/IconThemes.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs }: + +kde { + name = "kdeartwork-icon-themes"; + + # Sources contain primary and kdeclassic as well but they're not installed + + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE nuvola and mono icon themes"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix new file mode 100644 index 000000000000..947e5e17ab0c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/WeatherWallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-weather-wallpapers"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE wallpapers (weather)"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix b/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix new file mode 100644 index 000000000000..4bce95217cc6 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/aurorae.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + name = "aurorae-themes"; + + buildInputs = [ kdelibs ]; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix new file mode 100644 index 000000000000..93dd361af738 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/desktopthemes.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-desktop-themes"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE desktop themes"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix new file mode 100644 index 000000000000..5ef9f78a7195 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/emoticons.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-emotion-icons"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE emotion icons (smiles)"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix new file mode 100644 index 000000000000..cc195c8de903 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/kscreensaver.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }: + +kde { + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ]; + + preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; + + cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; + + meta = { + description = "KDE screensavers"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix new file mode 100644 index 000000000000..b5d769b216db --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/kwin-styles.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kde_workspace }: + +kde { + buildInputs = [ kdelibs kde_workspace ]; + + meta = { + description = "Styles for KWin"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix new file mode 100644 index 000000000000..e98705da889e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/sounds.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-sounds"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "New login/logout sounds"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/styles.nix b/pkgs/desktops/kde-4.8/kdeartwork/styles.nix new file mode 100644 index 000000000000..6a1306c37100 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/styles.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-style-phase"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Phase, a widget style for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix new file mode 100644 index 000000000000..611c6a70f6bc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeartwork/wallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-wallpapers"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE wallpapers"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix new file mode 100644 index 000000000000..13c145f32753 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/perlqt.nix @@ -0,0 +1,10 @@ +{ kde, cmake, smokeqt, perl }: + +kde { + buildInputs = [ smokeqt perl ]; + buildNativeInputs = [ cmake ]; + + meta = { + description = "Perl bindings for Qt library"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch new file mode 100644 index 000000000000..dfc2c886bba3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c853e38..5df3253 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES( + ${QT_QTWEBKIT_INCLUDE_DIR} + ${KDE4_INCLUDE_DIR} + ${KDE4_INCLUDE_DIR}/solid +- ${KDE4_INCLUDE_DIR}/phonon ++ ${PHONON_INCLUDE_DIR}/phonon + ${KDE4_INCLUDE_DIR}/kio + ${KDE4_INCLUDE_DIR}/kdeprint + ${KDE4_INCLUDE_DIR}/kdeprint/lpr +@@ -232,7 +232,7 @@ _pkg_config = { + 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', + 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', + 'pykde_modules': '${PYKDE_MODULES}', +- 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4', ++ 'pykde_sip_dir': '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4', + 'pykde_version': kde_version_hex, + 'pykde_version_str': '${KDE_VERSION}' + } +@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES + + # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. + # (Don't forget the / at the end of sip/.) +-INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4 ++INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4 + PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want? + PATTERN ".svn" EXCLUDE + PATTERN "*.in" EXCLUDE) +diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt +index 41fa0fe..642d867 100644 +--- a/kpythonpluginfactory/CMakeLists.txt ++++ b/kpythonpluginfactory/CMakeLists.txt +@@ -3,7 +3,12 @@ + set(kpythonpluginfactory_SRCS + kpythonpluginfactory.cpp) + +-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) ++if(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) ++else(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++endif(HARDCODE_LIB_PYTHON_PATH) + ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") + ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) + diff --git a/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix new file mode 100644 index 000000000000..1ca6efe3b920 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/pykde4.nix @@ -0,0 +1,30 @@ +{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, + boost, lndir }: + +let pydir = "lib/python${python.majorVersion}"; in + +kde { + buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ]; + + propagatedBuildInputs = [ pyqt4 sip ]; + +#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon"; + + patches = [ ./pykde-purity.patch ]; + + cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON"; + + preConfigure = + '' + # Symlink PyQt into PyKDE. This is necessary because PyQt looks + # in its PyQt4/uic/widget-plugins directory for plugins, and KDE + # needs to install a plugin. + mkdir -pv $out/${pydir} + ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} + ''; + + meta = { + description = "Python bindings for KDE"; + kde.name = "pykde4"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix new file mode 100644 index 000000000000..df26eb2717eb --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/smokegen.nix @@ -0,0 +1,13 @@ +{ kde, qt4, cmake }: + +kde { + buildInputs = [ qt4 ]; + buildNativeInputs = [ cmake ]; + + patchPhase = "sed -e /RPATH/d -i CMakeLists.txt"; + + meta = { + description = "C++ parser used to generate language bindings for Qt/KDE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix new file mode 100644 index 000000000000..c49a77a48ed6 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/smokekde.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, smokeqt }: + +kde { + propagatedBuildInputs = [ kdelibs smokeqt ]; + + meta = { + description = "C++ parser used to generate language bindings for Qt/KDE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix new file mode 100644 index 000000000000..0d0aa816a941 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdebindings/smokeqt.nix @@ -0,0 +1,12 @@ +{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: + +kde { + propagatedBuildInputs = [ qt4 phonon qimageblitz ]; + buildNativeInputs = [ cmake ]; + propagatedBuildNativeInputs = [ smokegen ]; + + meta = { + description = "C++ parser used to generate language bindings for Qt/KDE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake b/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake new file mode 100644 index 000000000000..617eb4b24676 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/FindLibfacile.cmake @@ -0,0 +1,32 @@ +# - Try to find Libfacile +# Once done this will define +# +# LIBFACILE_FOUND - system has Libfacile +# LIBFACILE_INCLUDE_DIR - the Libfacile include directory +# LIBFACILE_LIBRARIES - Link these to use Libfacile +# +# Copyright (c) 2006, Carsten Niehaus, +# Copyright (c) 2006, Montel Laurent, +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +find_package(OCaml) + +if( OCAML_FOUND ) + find_library(LIBFACILE_LIBRARIES NAMES facile.a + HINTS ${OCAMLC_DIR} + PATH_SUFFIXES facile ocaml/facile + ) + find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi + HINTS ${OCAMLC_DIR} + PATH_SUFFIXES facile lib/ocaml/facile + ) +endif(OCAML_FOUND) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR + LIBFACILE_LIBRARIES OCAML_FOUND) + +# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view +mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES ) diff --git a/pkgs/desktops/kde-4.8/kdeedu/blinken.nix b/pkgs/desktops/kde-4.8/kdeedu/blinken.nix new file mode 100644 index 000000000000..cdf9728833c2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/blinken.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Memory Enhancement Game"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/cantor.nix b/pkgs/desktops/kde-4.8/kdeedu/cantor.nix new file mode 100644 index 000000000000..8b8bbc210c75 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/cantor.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libspectre }: +kde { + buildInputs = [ kdelibs libspectre ]; + + meta = { + description = "KDE Frontend to Mathematical Software"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix new file mode 100644 index 000000000000..f1a190332cdc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kalgebra.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu, readline }: +kde { + buildInputs = [ kdelibs libkdeedu readline ]; + + meta = { + description = "2D and 3D Graph Calculator"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch b/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch new file mode 100644 index 000000000000..3c054e8d60ab --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium-feature-log.patch @@ -0,0 +1,15 @@ +commit d96c6e70400dcd4e3514065e607388b80f96d6a1 +Author: Yury G. Kudryashov +Date: Mon Aug 15 00:53:16 2011 +0400 + + Display feature log + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 132934c..eec6942 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,3 +47,4 @@ add_subdirectory(src) + add_subdirectory(data) + add_subdirectory(plasmoid) + add_subdirectory(libscience) ++macro_display_feature_log() diff --git a/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix new file mode 100644 index 000000000000..d7d9b403b1a4 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kalzium.nix @@ -0,0 +1,15 @@ +{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }: +kde { + buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; + + prePatch = '' + cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake + sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake + ''; + + patches = [ ./kalzium-feature-log.patch ]; + + meta = { + description = "Periodic Table of Elements"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix new file mode 100644 index 000000000000..8759c96d78c4 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kanagram.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu }: +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "Letter Order Game"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix new file mode 100644 index 000000000000..dc50f1e85a37 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kbruch.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Practice Fractions"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix new file mode 100644 index 000000000000..bd8d27c8d6e2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kgeography.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Geography Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/khangman.nix b/pkgs/desktops/kde-4.8/kdeedu/khangman.nix new file mode 100644 index 000000000000..997b50e906a2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/khangman.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu }: +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "KDE hangman game"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kig.nix b/pkgs/desktops/kde-4.8/kdeedu/kig.nix new file mode 100644 index 000000000000..bd5ef67529cc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kig.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, boost, python}: +kde { + buildInputs = [ kdelibs boost python ]; + + cmakeFlags = '' + -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix} + -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1 + ''; + meta = { + description = "KDE Interactive Geometry"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kiten.nix b/pkgs/desktops/kde-4.8/kdeedu/kiten.nix new file mode 100644 index 000000000000..939b7a9f77a2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kiten.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Japanese Reference/Study Tool"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/klettres.nix b/pkgs/desktops/kde-4.8/kdeedu/klettres.nix new file mode 100644 index 000000000000..7a0fa83078e3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/klettres.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE alphabet tutorial"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix new file mode 100644 index 000000000000..18458cf6f0bf --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kmplot.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE mathematical function plotter"; + kde = { + name = "kmplot"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kstars.nix b/pkgs/desktops/kde-4.8/kdeedu/kstars.nix new file mode 100644 index 000000000000..5b5a2d621de7 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kstars.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, eigen, xplanet, indilib }: + +kde { + buildInputs = [ kdelibs eigen xplanet indilib ]; + + meta = { + description = "A KDE graphical desktop planetarium"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix new file mode 100644 index 000000000000..768be6f4367c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/ktouch.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Touch Typing Tutor"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix new file mode 100644 index 000000000000..1e1922b1410d --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kturtle.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Educational Programming Environment"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix new file mode 100644 index 000000000000..1b33ba2e469f --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/kwordquiz.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libkdeedu }: + +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "Flash Card Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix new file mode 100644 index 000000000000..def6c85fefe2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/libkdeedu.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Libraries used by KDE Education applications"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/marble.nix b/pkgs/desktops/kde-4.8/kdeedu/marble.nix new file mode 100644 index 000000000000..8bd86c91094e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/marble.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, gpsd }: + +kde { + buildInputs = [ kdelibs gpsd ]; + + meta = { + description = "Marble Virtual Globe"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/parley.nix b/pkgs/desktops/kde-4.8/kdeedu/parley.nix new file mode 100644 index 000000000000..eccd40a598f0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/parley.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libkdeedu, libxml2, attica }: + +kde { + buildInputs = [ kdelibs libkdeedu libxml2 attica ]; + + meta = { + description = "Vocabulary Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/rocs.nix b/pkgs/desktops/kde-4.8/kdeedu/rocs.nix new file mode 100644 index 000000000000..91976b840011 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/rocs.nix @@ -0,0 +1,14 @@ +{ kde, kdelibs, boost }: + +kde { + buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ]; + + NIX_CFLAGS_COMPILE = "-fexceptions"; + + meta = { + description = "A KDE graph theory viewer"; + kde = { + name = "rocs"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeedu/step.nix b/pkgs/desktops/kde-4.8/kdeedu/step.nix new file mode 100644 index 000000000000..fac9974baf18 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeedu/step.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, gsl, libqalculate, eigen }: + +kde { + buildInputs = [ kdelibs gsl libqalculate eigen ]; + + meta = { + description = "A KDE interactive physical simulator"; + kde = { + name = "step"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegames.nix b/pkgs/desktops/kde-4.8/kdegames.nix new file mode 100644 index 000000000000..3378a99d9e79 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegames.nix @@ -0,0 +1,18 @@ +{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4, + openal, libsndfile, qhull }: + +kde rec { + buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython + openal libsndfile qhull ] ++ pythonPath; + + pythonPath = [ pythonPackages.twisted pykde4 ]; + + # TODO: ggz + + postInstall = "wrapPythonPrograms"; + + meta = { + description = "KDE Games"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix new file mode 100644 index 000000000000..efc2707e7d69 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/gwenview.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }: + +kde { + + buildInputs = + [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ]; + + meta = { + description = "Gwenview, the KDE image viewer"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix new file mode 100644 index 000000000000..70904b17c232 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kamera.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libgphoto2 }: + +kde { + buildInputs = [ kdelibs libgphoto2 ]; + + meta = { + description = "KDE camera interface library"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix new file mode 100644 index 000000000000..58528cb186bb --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kcolorchooser.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A small utility to select a color"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix new file mode 100644 index 000000000000..6001a5f363db --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Strigi analyzers for various graphics file formats"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix new file mode 100644 index 000000000000..55bf8309b2a9 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-thumbnailers.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libkexiv2, libkdcraw }: + +kde { + buildInputs = [ kdelibs libkexiv2 libkdcraw ]; + + meta = { + description = "Thumbnailers for various graphics file formats"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix new file mode 100644 index 000000000000..28d9252187e0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kgamma.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libXxf86vm }: + +kde { + buildInputs = [ kdelibs libXxf86vm ]; + + meta = { + description = "KDE monitor calibration tool"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix new file mode 100644 index 000000000000..5276ec09f462 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kolourpaint.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, qimageblitz }: + +kde { + buildInputs = [ kdelibs qimageblitz ]; + + meta = { + description = "KDE paint program"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix new file mode 100644 index 000000000000..c5c2c6e05d7c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/kruler.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE screen ruler"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix new file mode 100644 index 000000000000..1381ed7dd266 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/ksaneplugin.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libksane }: + +kde { + buildInputs = [ kdelibs libksane ]; + + meta = { + description = "A KScan plugin that implements the scanning through libksane"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix new file mode 100644 index 000000000000..f01a609e20de --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/ksnapshot.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libkipi }: + +kde { + buildInputs = [ kdelibs libkipi ]; + + meta = { + description = "KDE screenshot utility"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix new file mode 100644 index 000000000000..9d31cc763f21 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/libkdcraw.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Library for decoding RAW images"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix new file mode 100644 index 000000000000..096b0a6e957b --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/libkexiv2.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, exiv2 }: + +kde { + buildInputs = [ kdelibs exiv2 ]; + + meta = { + description = "Exiv2 support library"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix new file mode 100644 index 000000000000..6b16265e7a3e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/libkipi.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Interface library to kipi-plugins"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix new file mode 100644 index 000000000000..b539eab38992 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/libksane.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, saneBackends }: + +kde { + buildInputs = [ kdelibs saneBackends ]; + + meta = { + description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix b/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix new file mode 100644 index 000000000000..2c2ba3796a2c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, okular }: + +kde { + buildInputs = [ kdelibs okular ]; + + meta = { + description = "A collection of plugins to handle mobipocket files"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/okular.nix b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix new file mode 100644 index 000000000000..c322767eb433 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/okular.nix @@ -0,0 +1,12 @@ +{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +, qimageblitz }: + +kde { + buildInputs = + [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz ]; + + meta = { + description = "Okular, the KDE document viewer"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix new file mode 100644 index 000000000000..a344cc4b4b46 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdegraphics/svgpart.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "SVG KPart"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix new file mode 100644 index 000000000000..d4383b3e93a2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -0,0 +1,39 @@ +{ kde, gcc, cmake, perl +, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper +, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 +, getopt, udev, herqq, phonon, libjpeg +}: + +kde { + buildInputs = + [ + acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper + libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 + shared_desktop_ontologies udev xz libxml2 libjpeg + ]; + + propagatedBuildInputs = [ qt4 soprano strigi phonon ]; + + propagatedBuildNativeInputs = [ automoc4 cmake perl shared_mime_info ]; + + # TODO: make sonnet plugins (dictionaries) really work. + # There are a few hardcoded paths. + # Let kdelibs find openexr + # Split plugins from libs? + + patches = [ ./files/polkit-install.patch ]; + + # cmake fails to find acl.h because of C++-style comment + # TODO: OpenEXR + cmakeFlags = [ + "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" + "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" + ]; + + meta = { + description = "KDE libraries"; + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdemultimedia.nix b/pkgs/desktops/kde-4.8/kdemultimedia.nix new file mode 100644 index 000000000000..b4ca7a8d2da7 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdemultimedia.nix @@ -0,0 +1,16 @@ +{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg, + libmusicbrainz3, libtunepimp }: + +kde { + + buildInputs = + # Note: kdemultimedia can use xine-lib, but it doesn't seem useful + # without the Phonon Xine backend. + [ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg + flac lame ]; + + meta = { + description = "KDE multimedia programs such as a movie player and volume utility"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake new file mode 100644 index 000000000000..c40b0bed3105 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/FindmsiLBC.cmake @@ -0,0 +1,19 @@ +# cmake macro to test msiLBC + +# Copyright (c) 2009-2010 Pali Rohár +# +# MSILBC_FOUND +# MSILBC_LIBRARY + +include ( FindPackageHandleStandardArgs ) + +if ( MSILBC_LIBRARY ) + set ( MSILBC_FOUND true ) + set ( msiLBC_FIND_QUIETLY true ) +else ( MSILBC_LIBRARY ) + find_library ( MSILBC_LIBRARY NAMES msilbc + PATH_SUFFIXES mediastreamer/plugins) +endif ( MSILBC_LIBRARY ) + +find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY ) +mark_as_advanced ( MSILBC_LIBRARY ) diff --git a/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix new file mode 100644 index 000000000000..2f32f4d6b2cd --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/filesharing.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch new file mode 100644 index 000000000000..ebadbfad9bac --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kdenetwork.patch @@ -0,0 +1,24 @@ +diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt +--- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 ++++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 +@@ -28,7 +28,8 @@ + set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) + endif (WIN32) + +-find_package(KdepimLibs REQUIRED) ++macro_optional_find_package(KdepimLibs) ++macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") + # find_package(X11VidMode) not used at this time + + # NX support is not ready for KDE 4.2; disabled (uwolfer) +@@ -79,7 +80,9 @@ + macro_optional_add_subdirectory(kfile-plugins) + macro_optional_add_subdirectory(kget) + +-macro_optional_add_subdirectory(kopete) ++if(KDEPIMLIBS_FOUND) ++ macro_optional_add_subdirectory(kopete) ++endif(KDEPIMLIBS_FOUND) + + if(Q_WS_X11) + macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix new file mode 100644 index 000000000000..2f32f4d6b2cd --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kdnssd.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix new file mode 100644 index 000000000000..f90fd3560796 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kfile-plugins.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, boost }: + +kde { + name = "strigi-analyzer-torrent"; + + buildInputs = [ kdelibs boost ]; + + preConfigure = "mv -v strigi-analyzer kfile-plugins"; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kget.nix b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix new file mode 100644 index 000000000000..33d9ec1ca012 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kget.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, + shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: + +kde { + buildInputs = + [ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs + kde_baseapps gpgme boost libmms qca2 + ]; + + KDEDIRS = libktorrent; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix new file mode 100644 index 000000000000..a4b01c5f9a63 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kopete.nix @@ -0,0 +1,21 @@ +{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, + jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib, + libgadu, boost, qca2, gpgme }: + +kde { + buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent + jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2 + gpgme ]; + + buildNativeInputs = [ pkgconfig ]; + + KDEDIRS = libktorrent; + + patchPhase = "cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake"; + + cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; + + meta = { + description = "A KDE multi-protocol IM client"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix new file mode 100644 index 000000000000..2f32f4d6b2cd --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/kppp.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix new file mode 100644 index 000000000000..664b1bc45a73 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/krdc.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libvncserver }: + +kde { + buildInputs = [ kdelibs libvncserver ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix new file mode 100644 index 000000000000..80013f430d3c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/krfb.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libvncserver, libXdamage, libXtst }: + +kde { + buildInputs = [ kdelibs libvncserver libXdamage libXtst]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff b/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff new file mode 100644 index 000000000000..6770dd399e33 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff @@ -0,0 +1,60 @@ +--- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400 ++++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400 +@@ -53,21 +53,20 @@ + add_subdirectory(desktop) + add_subdirectory(plasma) + +-# find kworkspace library to allow the shutdown after downloads completed option +-find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +-if(KDE4_KWORKSPACE_LIBRARY) +- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY}) ++macro_optional_find_package(KDE4Workspace) ++macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") ++if(KDE4WORKSPACE_FOUND) + add_definitions(-DHAVE_KWORKSPACE) +- set(KWORKSPACE_FOUND true) +-endif(KDE4_KWORKSPACE_LIBRARY) ++ include_directories(${KDE4WORKSPACE_INCLUDE_DIR}) ++endif(KDE4WORKSPACE_FOUND) + + # find libkonq to allow actions and open with options in the context menu of a transfer +-find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +-if(KDE4_KONQUEROR_LIBRARY) +- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY}) ++macro_optional_find_package(LibKonq) ++macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer") ++if(LIBKONQ_FOUND) + add_definitions(-DHAVE_KONQUEROR) +- set(KONQUEROR_FOUND true) +-endif(KDE4_KONQUEROR_LIBRARY) ++ include_directories(${LIBKONQ_INCLUDE_DIR}) ++endif(LIBKONQ_FOUND) + + + include_directories( +@@ -142,9 +141,9 @@ + + target_link_libraries(kgetcore ${KDE4_KIO_LIBS}) + +-if (KWORKSPACE_FOUND) +- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS}) +-endif (KWORKSPACE_FOUND) ++if (KDE4WORKSPACE_FOUND) ++ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS}) ++endif (KDE4WORKSPACE_FOUND) + + if (HAVE_NEPOMUK) + target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) +@@ -294,9 +293,9 @@ + target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) + endif (HAVE_NEPOMUK) + +-if (KONQUEROR_FOUND) +- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS}) +-endif (KONQUEROR_FOUND) ++if (LIBKONQ_FOUND) ++ target_link_libraries(kget ${LIBKONQ_LIBRARY}) ++endif (LIBKONQ_FOUND) + + if (QGPGME_FOUND) + target_link_libraries(kget ${QGPGME_LIBRARIES}) diff --git a/pkgs/desktops/kde-4.8/kdepim-runtime.nix b/pkgs/desktops/kde-4.8/kdepim-runtime.nix new file mode 100644 index 000000000000..ef637f3f075b --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdepim-runtime.nix @@ -0,0 +1,12 @@ +{ kde, fetchurl, cmake, kdelibs, libxml2, libxslt, boost, kdepimlibs, akonadi +, shared_desktop_ontologies }: + +kde { + buildInputs = [ kdepimlibs akonadi boost shared_desktop_ontologies libxml2 + libxslt ]; + + meta = { + description = "KDE PIM runtime"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdepim.nix b/pkgs/desktops/kde-4.8/kdepim.nix new file mode 100644 index 000000000000..9b95d491a447 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdepim.nix @@ -0,0 +1,21 @@ +{ kde, boost, gpgme, libassuan, libxml2, libxslt, kdepimlibs, kdepim_runtime +, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee }: + +kde { + + buildInputs = + [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2 + libxslt cyrus_sasl gpgme libassuan grantlee + ]; + + passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; + + meta = { + description = "KDE PIM tools"; + longDescription = '' + Contains various personal information management tools for KDE, such as an organizer. + ''; + license = "GPL"; + homepage = http://pim.kde.org; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdepimlibs.nix b/pkgs/desktops/kde-4.8/kdepimlibs.nix new file mode 100644 index 000000000000..736508eaf0f3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdepimlibs.nix @@ -0,0 +1,16 @@ +{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info +, kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }: + +kde { + buildInputs = + [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt + openldap cyrus_sasl akonadi prison + ]; + + propagatedBuildInputs = [ kdelibs ]; + + meta = { + description = "KDE PIM libraries"; + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeplasma-addons.nix b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix new file mode 100644 index 000000000000..de2cabf20e4f --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeplasma-addons.nix @@ -0,0 +1,18 @@ +{ kde, kdelibs, marble, shared_desktop_ontologies +, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz +, kdepimlibs, libkexiv2, libqalculate, libXtst }: +# TODO: qwt, scim + +kde { + + KDEDIRS=marble; + + buildInputs = [ kdelibs boost eigen kde_workspace + attica python qca2 qimageblitz kdepimlibs + libqalculate libXtst shared_desktop_ontologies marble libkexiv2]; + + meta = { + description = "KDE Plasma Addons"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix new file mode 100644 index 000000000000..1dabe46cd429 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/cervisia.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE CVS frontend"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix new file mode 100644 index 000000000000..df4a0856c6b0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-git.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Git plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix new file mode 100644 index 000000000000..8032b89ff54c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/dolphin-plugins-svn.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch new file mode 100644 index 000000000000..61cb49b308f2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/find-svn.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake +index 59bcb96..2eac05d 100644 +--- a/cmake/modules/FindSVN.cmake ++++ b/cmake/modules/FindSVN.cmake +@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS + FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS + /usr/local/apr/bin + ) ++find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS ++ /usr/local/apr/bin ++) + + if(SVNCONFIG_EXECUTABLE) + +@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) + else(APRCONFIG_EXECUTABLE) + FIND_PATH(_INCLUDES apr_pools.h +- ${SVN_INCLUDES}/apr-0/ +- ${SVN_INCLUDES}/apr-1/ +- ${SVN_INCLUDES}/apr-1.0/ +- /usr/include/apr-0/ +- /usr/include/apr-1/ +- /usr/include/apr-1.0/ +- /usr/local/include/apr-0/ +- /usr/local/include/apr-1/ +- /usr/local/include/apr-1.0/ ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) +@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_FOUND FALSE) # no apr == can't compile! + endif(_INCLUDES) + endif(APRCONFIG_EXECUTABLE) ++ ++ # Use apu-config if it exists ++ if(APUCONFIG_EXECUTABLE) ++ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) ++ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) ++ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(APUCONFIG_EXECUTABLE) ++ FIND_PATH(_INCLUDES apu.h ++ HINTS ${SVN_INCLUDES} ++ PATHS /usr /usr/local ++ SUFFIXES apr-0 apr-1 apr-1.0 ++ ) ++ if(_INCLUDES) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(_INCLUDES) ++ set(SVN_FOUND FALSE) # no apr == can't compile! ++ endif(_INCLUDES) ++ endif(APUCONFIG_EXECUTABLE) + FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) + if(SVN_LIBRARIES) + FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix new file mode 100644 index 000000000000..391536248dd3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kapptemplate.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE 4 project template generator"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix new file mode 100644 index 000000000000..65d410cca48d --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kcachegrind.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Frontend for Callgrind/Cachegrind"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix new file mode 100644 index 000000000000..7e170ca2a2c2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kdeaccounts-plugin.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kdepimlibs }: + +kde { + buildInputs = [ kdelibs kdepimlibs ]; + + meta = { + description = "KDE accounts akonadi agent"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix new file mode 100644 index 000000000000..6a10bdf7c4bc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kioslave-perldoc.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, perl }: + +kde { + buildInputs = [ kdelibs perl ]; + + cmakeFlags = [ "-DBUILD_perldoc=ON" ]; + + meta = { + description = "perldoc: kioslave"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix new file mode 100644 index 000000000000..db0bd27094b5 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kioslave-svn.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, subversionClient, apr, aprutil }: + +kde { + buildInputs = [ kdelibs subversionClient apr aprutil ]; + + patches = [ ./find-svn.patch ]; + + meta = { + description = "Subversion kioslave"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix b/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix new file mode 100644 index 000000000000..d580f7fb6911 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kmtrace.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, gcc }: + +kde { + buildInputs = [ kdelibs ]; + + preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; + + meta = { + description = "KDE mtrace-based malloc debugger"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kompare.nix b/pkgs/desktops/kde-4.8/kdesdk/kompare.nix new file mode 100644 index 000000000000..1ddb4b8ea5b9 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kompare.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A program to view the differences between files and optionally generate a diff"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix b/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix new file mode 100644 index 000000000000..e7790d33c90c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kpartloader.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A test application for KParts"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix b/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix new file mode 100644 index 000000000000..5a6693f2f5d8 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kprofilemethod.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A macro for profiling using QTime"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix b/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix new file mode 100644 index 000000000000..0c8259cd31f5 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kstartperf.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libtool }: + +kde { + buildInputs = [ kdelibs libtool ]; + + meta = { + description = "Measures start up time of a KDE application"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix b/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix new file mode 100644 index 000000000000..7c5089dcd37f --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/kuiviewer.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Displays Qt Designer's UI files"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix new file mode 100644 index 000000000000..1565426eb1fc --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/lokalize.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, hunspell }: + +kde { + buildInputs = [ kdelibs hunspell ]; + + meta = { + description = "KDE 4 Computer-aided translation system"; + longDescription = '' + Computer-aided translation system. + Do not translate what had already been translated. + ''; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/okteta.nix b/pkgs/desktops/kde-4.8/kdesdk/okteta.nix new file mode 100644 index 000000000000..1b53a0e03dc4 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/okteta.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, qca2 }: + +kde { + buildInputs = [ kdelibs qca2 ]; + +# TODO: Look what does -DBUILD_mobile add + + meta = { + description = "KDE byte editor"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff b/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff new file mode 100644 index 000000000000..f67e1f4cdd8e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff @@ -0,0 +1,39 @@ +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 63cdef8..0c5b50a 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -3,22 +3,30 @@ if( UNIX ) + add_subdirectory(cervisia) + endif() + endif( UNIX ) +-add_subdirectory(kapptemplate) ++if(BUILD_kapptemplate) ++ add_subdirectory(kapptemplate) ++endif() + if(BUILD_kbugbuster) + add_subdirectory(kbugbuster) + endif() + if(BUILD_kcachegrind) + add_subdirectory(kcachegrind) + endif() +-add_subdirectory(kmtrace) ++if(BUILD_kmtrace) ++ add_subdirectory(kmtrace) ++endif() + if(BUILD_kompare) + add_subdirectory(kompare) + endif() + if(BUILD_lokalize) + add_subdirectory(lokalize) + endif() +-add_subdirectory(poxml) +-add_subdirectory(scripts) ++if(BUILD_poxml) ++ add_subdirectory(poxml) ++endif() ++if(BUILD_scripts) ++ add_subdirectory(scripts) ++endif() + + if(LIBXSLT_FOUND AND LIBXML2_FOUND) + if(BUILD_umbrello) diff --git a/pkgs/desktops/kde-4.8/kdesdk/poxml.nix b/pkgs/desktops/kde-4.8/kdesdk/poxml.nix new file mode 100644 index 000000000000..1ab9ed49df56 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/poxml.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, antlr }: + +kde { + buildInputs = [ kdelibs antlr ]; + + meta = { + description = "Po<->xml tools"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/scripts.nix b/pkgs/desktops/kde-4.8/kdesdk/scripts.nix new file mode 100644 index 000000000000..df81145e5d60 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/scripts.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Various scripts to ease KDE development"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix new file mode 100644 index 000000000000..0ad48c8cfdee --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/strigi-analyzer.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Strigi analyzers for diff, po and ts"; + kde = { + name = "strigi-analyzer"; + module = "kdesdk"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix new file mode 100644 index 000000000000..e83a2d9a901b --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdesdk/umbrello.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libxml2, libxslt, boost }: + +kde { + buildInputs = [ kdelibs libxml2 libxslt boost ]; + + meta = { + description = "Umbrello UML modeller"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdetoys/amor.nix b/pkgs/desktops/kde-4.8/kdetoys/amor.nix new file mode 100644 index 000000000000..936d63d544a9 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdetoys/amor.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE creature for your desktop"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix new file mode 100644 index 000000000000..dacf54def4b0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdetoys/kteatime.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE utility for making a fine cup of tea"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdetoys/ktux.nix b/pkgs/desktops/kde-4.8/kdetoys/ktux.nix new file mode 100644 index 000000000000..108f9be7c722 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdetoys/ktux.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kde_workspace }: + +kde { + buildInputs = [ kdelibs kde_workspace ]; + + meta = { + description = "Tux Screen Saver"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix new file mode 100644 index 000000000000..4449dd8228f2 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/ark.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }: + +kde { + buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ]; + + meta = { + description = "KDE Archiving Tool"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/filelight.nix b/pkgs/desktops/kde-4.8/kdeutils/filelight.nix new file mode 100644 index 000000000000..25ecabed27ce --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/filelight.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Tool to visualise file and directory sizes"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix new file mode 100644 index 000000000000..08b202e8f0e8 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kcalc.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, gmp }: + +kde { + buildInputs = [ kdelibs gmp ]; + + meta = { + description = "KDE Calculator"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix new file mode 100644 index 000000000000..d4c9c06f483d --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kcharselect.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE character selection utility"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kdf.nix b/pkgs/desktops/kde-4.8/kdeutils/kdf.nix new file mode 100644 index 000000000000..3f9da58d0a62 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kdf.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE free disk space utility"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix new file mode 100644 index 000000000000..2434a4fa671f --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kfloppy.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Floppy disk formatting utility"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix new file mode 100644 index 000000000000..f3b00a5b968c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kgpg.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kdepimlibs }: + +kde { + buildInputs = [ kdelibs kdepimlibs ]; + + meta = { + description = "Simple KDE GUI for GPG"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix new file mode 100644 index 000000000000..fef516e478d3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kremotecontrol.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kde_workspace, libXtst }: + +kde { + buildInputs = [ kdelibs kde_workspace libXtst ]; + + meta = { + description = "KDE remote control"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix new file mode 100644 index 000000000000..5700977349e3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/ktimer.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Timer"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix new file mode 100644 index 000000000000..9ec0e6c0396c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/kwallet.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Wallet (password storage) management tool"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix b/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix new file mode 100644 index 000000000000..2d937b3a4db7 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/printer-applet.nix @@ -0,0 +1,28 @@ +{ kde, kdelibs +, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer +, pythonDBus, makeWrapper }: + +let s_c_p = system_config_printer.override { withGUI = false; }; in + +kde rec { + buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython + ] ++ pythonPath; + + pythonPath = [ pyqt4 pykde4 pycups s_c_p ]; + + passthru.propagatedUserEnvPackages = [ s_c_p ]; + + postInstall = + '' + wrapPythonPrograms + + # ‘system-config-printer’ supplies some D-Bus policy that we need. + mkdir -p $out/nix-support + echo ${s_c_p} > $out/nix-support/propagated-user-env-packages + ''; + + meta = { + description = "KDE printer applet"; + longDescription = "Applet to view current print jobs and configure new printers"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix new file mode 100644 index 000000000000..1475ab041ac3 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/superkaramba.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, qimageblitz }: + +kde { + buildInputs = [ kdelibs qimageblitz ]; + + cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBULD_plasma=TRUE" ]; + + meta = { + description = "A KDE Eye-candy Application"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix new file mode 100644 index 000000000000..78d56c7df30e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdeutils/sweeper.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Helps clean unwanted traces the user leaves on the system"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix new file mode 100644 index 000000000000..c3f6129d7e5c --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdewebdev/kfilereplace.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libxml2, libxslt }: + +kde { + buildInputs = [ kdelibs libxml2 libxslt ]; + + meta = { + description = "Batch search and replace tool"; + homepage = http://www.kdewebdev.org; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix new file mode 100644 index 000000000000..bececea7797e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdewebdev/kimagemapeditor.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libxml2, libxslt }: + +kde { + buildInputs = [ kdelibs libxml2 libxslt ]; + + meta = { + description = "An HTML imagemap editor"; + homepage = http://www.nongnu.org/kimagemap/; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix new file mode 100644 index 000000000000..94adbb7fd6e0 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdewebdev/klinkstatus.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, libxml2, libxslt, kdepimlibs +, boost, htmlTidy }: + +kde { + buildInputs = + [ kdelibs libxml2 libxslt kdepimlibs boost htmlTidy ]; + + meta = { + description = "A KDE link checker"; + homepage = http://klinkstatus.kdewebdev.org; + }; +} diff --git a/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix new file mode 100644 index 000000000000..6a870e563033 --- /dev/null +++ b/pkgs/desktops/kde-4.8/kdewebdev/kommander.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libxml2, libxslt }: + +kde { + buildInputs = [ kdelibs libxml2 libxslt ]; + + meta = { + description = "A graphical editor of scripted dialogs"; + }; +} diff --git a/pkgs/desktops/kde-4.8/kipi-plugins.nix b/pkgs/desktops/kde-4.8/kipi-plugins.nix new file mode 100644 index 000000000000..ea237a5d718e --- /dev/null +++ b/pkgs/desktops/kde-4.8/kipi-plugins.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, kdelibs, qt4, automoc4, phonon, libkexiv2 +, libkdcraw, libkipi, gettext, libxml2, libxslt, qjson, qca2 +, kdepimlibs }: + +stdenv.mkDerivation rec { + name = "kipi-plugins-1.9.0"; + + src = fetchurl { + url = "mirror://sourceforge/kipi/${name}.tar.bz2"; + sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m"; + }; + + buildInputs = + # Some dependencies are missing because they are very big (OpenCV, + # GTK). + [ cmake kdelibs qt4 automoc4 phonon libkexiv2 libkdcraw libkipi + gettext libxml2 libxslt qjson qca2 kdepimlibs + ]; + + enableParallelBuilding = true; + + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.kipi-plugins.org; + inherit (kdelibs.meta) platforms; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + }; +} diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix new file mode 100644 index 000000000000..144968f66727 --- /dev/null +++ b/pkgs/desktops/kde-4.8/l10n/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, kdelibs, gettext, release }: + +let + + inherit (stdenv.lib) attrByPath singleton; + + kdeL10nDerivation = + { lang, saneName, sha256 }: + + stdenv.mkDerivation rec { + name = "kde-l10n-${saneName}-${release}"; + + src = fetchurl { + url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; + name = "${name}.tar.bz2"; + inherit sha256; + }; + + buildInputs = [ gettext kdelibs ]; + + cmakeFlags = "-Wno-dev"; + + meta = { + description = "KDE translation for ${lang}"; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms homepage; + }; + }; + + kdeL10nRelease = + builtins.listToAttrs ( + map ({lang, saneName, sha256}: + { + name = saneName; + value = kdeL10nDerivation { inherit lang saneName sha256; }; + } + ) (import (./manifest + "-${release}.nix")) + ); + +in +{ + inherit kdeL10nDerivation; + recurseForDerivations = true; +} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh new file mode 100755 index 000000000000..cc0eec20aaaf --- /dev/null +++ b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +# Usage: download kde-l10n to $dir, then run +# $0 $dir + +dir=$1 + +if [[ ! -d "${dir}" ]]; then + echo "${dir} is not a directory (or doesn't exist)!" >&2 + exit 1 +fi + +release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \ + sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//') + +echo "Detected release ${release}" >&2 + +exec > "manifest-${release}.nix" +echo "[" +for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do + lang=${i%-${release}.tar.bz2} + lang=${lang#kde-l10n-} + echo -n "${lang}.. " >&2 + hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo "{" + echo " lang = \"${lang}\";" + echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" + echo " sha256 = \"${hash}\";" + echo "}" + echo $hash >&2 +done +echo "]" diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix new file mode 100644 index 000000000000..0ed6019de7a6 --- /dev/null +++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix @@ -0,0 +1,272 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "0x1d9zp9vb33qs88xvc1hf4rinbhxicvzzmp1d3jj25k1ra938kp"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "0mzfbjhq0lv3dr28nc0wrhrngl3idzpak6nbnsya32zpbrwgrzlz"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "0f5xxjgnasdnjfb6ksii9i44cia0vh2icwwgg8vdj0b62bdbd5n6"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "1b4xk6izq74c7blhdb0ws2nsw4i3q62jcr7w91r8b4j76bhpgif4"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0rrf2gv8mn1bmzsqkgxgxn0gjikvzrcxbsyfs3dx9s42brwknn3s"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "1wr85m902jfk0ykvl6z7pbb4v852f35c9gjw4x7md9v899k6lc4g"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "0bn4gnm8zljji5av7jvc5jypwr9kqcbc7fdcjljm7sd0v2fg32m3"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "19hmsm49lk446425gf4ffiz8hywv9fgnwfrc0i6s0409sfm64jb2"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1ck8ga9zyag24wl03qf9kfawpf1a163d2may3g0cs9iircg0fwxh"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "15q25dnyxafgk2glcyk7zxfv5mg2s0cj8440clfj2xxhrkhghlij"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "066xw4n8vhq8zdqhwi7pf3n9iyvn1i0lrwiyc3pc0ji98sdfyv29"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "103lvb2snik42g933dsl713ik0h853r082a82dm0b11qjgj9qcni"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "1jnnsj192qflwi2n0b2f01qprhxr7f41nn4iqw7iw0vy11hsy41a"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "1lk4why9cfbzlj0kb5n2q9hhlhk9cj5i8h88abni4crzdgg5wrfk"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "10z0rn2gmq3cyjwab9in6c7s57rhyhri3pg30nhbfpvh6jsph36j"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "0xipq67yjriqy32shlp70kkvnmsjz60j6pjyqk9hvmivsawdvxd6"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1c60xbbg03r9laclwnbrxixj8mvang5mcz51szd2s5kml6b4nqb6"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "181153rrxdxdhcqqczyjw5vwk5lm7dyd46xzvk2k6n38zcvmxklj"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1ivwj638m6izg8v9zdhlgpwihwkc0zcbsklb149ar9az88zmafvm"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1z945ccxa0k4adfczb9yz1zws368mgm7j5lq1rvhipkqy82vyfmq"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1l6w0d0r09d992vsvv217rq4j9viv681xgpfx9mawvlv81qf6ksx"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "0bx27j8rlzwd6zn2plps9nb1nwpziyj5gbjqlrd7z1bga957mnis"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1kslyfxf0isigrlwh4rr7n7pivs6cv35bvwwvn7qrz8x513x1n8l"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1am2qlgdww8knqj5lp1b4hvsx8anyncig6mf8iws855lkrbffaci"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1fs8hjz25ryivxs191pvld0ckys8dbfs9kkhq6fv2d9f88igwbgv"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "0f5crpnqaqyi9x5j4s86iibg28kxsrbagd1i6h0p0lwrfr9yymqf"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "10r7qjvmpz6bl8j7wj755z69cik540ybfhm8mwbgcaafhfxgl1na"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "0lv0d8bcva00g5ydcirmz8r6ki0014v97grk1x39f1rmq08zba9b"; +} +{ + lang = "kn"; + saneName = "kn"; + sha256 = "0qpxzngv556rrdlhn8fxb5qar5gvfx4vgmpkc1s1qzfn8kxq6ggz"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "0v0kpbh7brrfqjv40f05gqjf54azfpcar1rrm5fa2gzji38zj6q3"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "0clzy04vj1dyj52qfszjmfjlwf0r43ffmsskwmy8xi82249pclg0"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "00id3nf7r56s9yfwgkykin99rikg1kkrj9c9d9ncl16vgz68yzv3"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1l76kqb9n7n59krskn9j823h57hxqzdzs7kqa4vcm04in31a9za0"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1hgwxm8pn34dp33r7kwdk0vw3ic4ahg39ydqg2mj62h35la3w1sm"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "1kna3i596mynijrjznqh4b8gqkd66s776yipzjgpg3zlcc21165f"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "0rkribndan830wd7s1zl0hq4jfgnixfsv61hi5r6l6r8bbn9fl2p"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "16bbiqxafhffwi8l94vrj22gji5k861pb5dkpnws1n20lk87j5kx"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "137xb660khkb5k9j0aq6yhn8bcmi7yr3lfmcbchx3xq81cp02v9m"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "0c5ixw2bkr9kr7xl83s2zvbp5ax8353bhaz7l89w98dshhvdlbsj"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "00jhrccv5ikn939c7pric5f3hs698by2s8aksfhczgqh29bwmkk3"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "07pyl2kmf994dzg9nw4xvby1cqza1lwpn29wjrqrpvjw96m1nm8y"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "0d1syrbxbnwfph3lq02jhw0422yivan7v3b35rfk07zvc13nzx0l"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "0dbkdp5fq4421s4m4lfgj6jhi7wa9xbgf2v17pd2bkyd91jixr2s"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "0f320v7y68dfdnlx9dpa4719rvil0b4qvnmgpha2mfvagql29hxm"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1fii0px1r5b1v3q812955qmr3w3cqczh8x2qqcr73x68bk839i8v"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "01v0nwshak7wlgpcalh6ificsyx85zvn4g4j7fz12f5y0189sdyb"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "1cz6xdjraskh4ri8bi8j9pf87g03y18hn22jk03y7z9xrzy30lz8"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "0bqfk0kvj64gbcgr84ygbvpwrh7lwkpi33lirncrc5yvf4lddqmd"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "0g83in6ahf5lni206fiz90lmai9fih77bsaa1i8x4iyzddxrysv0"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0401g7bz852rj86gipslcw713dq74p58wk8zkmh17xxyqis4n82m"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "0q2z4klq42cyh1czcyd0f9105a90dxl6diw5bhlw85v3n72i0bl5"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "1by2804w8gxv3l655ga5mfw9363saq02s7vfbc7kc4vqpjxvbk8s"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0x8l280ymdxf9w7rklf1wh4bl7mskdbq2hwgm2rsjvm2cvqifjil"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "0iv36yi2zjlqnhs6n65b7j4yjh01mdbr3lg35a17awg2a22a8gs0"; +} +] diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix new file mode 100644 index 000000000000..f2a5e666232d --- /dev/null +++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix @@ -0,0 +1,15 @@ +{ kde, cmake }: + +kde { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0c12c72bcf41cfaf03f85fc1ae27e44d8cecac3deb504ab1de4c30f4fc9e3cd0"; + + buildNativeInputs = [ cmake ]; + + meta = { + description = "KDE Oxygen theme icons"; + longDescription = "Icons for KDE's default theme"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix new file mode 100644 index 000000000000..38ec7f859076 --- /dev/null +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }: + +stdenv.mkDerivation rec { + name = "akonadi-1.6.1"; + + src = fetchurl { + url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; + sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra"; + }; + + buildInputs = [ qt4 soprano libxslt boost ]; + + buildNativeInputs = [ cmake automoc4 shared_mime_info ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "KDE PIM Storage Service"; + license = "LGPL"; + homepage = http://pim.kde.org/akonadi; + maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 377a7377a322..8c6b4ee50cf3 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "epic"; - version = "0.9"; - sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0"; + version = "0.9.2"; + sha256 = "1irvfk8xf627bfzsgbqa56816jkc99rrxpml9ycg2grq7razp9fw"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/development/libraries/atk/1.24.x.nix b/pkgs/development/libraries/atk/1.24.x.nix deleted file mode 100644 index 213c3ef72a45..000000000000 --- a/pkgs/development/libraries/atk/1.24.x.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib }: - -stdenv.mkDerivation rec { - name = "atk-1.24.0"; - - src = fetchurl { - url = "mirror://gnome/sources/atk/1.24/${name}.tar.bz2"; - sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803"; - }; - - buildNativeInputs = [perl]; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [glib]; - - meta = { - description = "ATK, the accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = http://library.gnome.org/devel/atk/; - - license = "LGPLv2+"; - }; - -} diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix index 45737aad3190..8f49532c025e 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl_gnome, pkgconfig, perl, glib, xz }: +{ stdenv, fetchurl, pkgconfig, perl, glib, xz }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "atk-2.2.0"; - src = fetchurl_gnome { - project = "atk"; - major = "2"; minor = "2"; patchlevel = "0"; extension = "xz"; + src = fetchurl { + url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz; sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 348edb226326..66237c4c7b99 100644 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl_gnome, atk, glibmm, pkgconfig }: +{ stdenv, fetchurl, atk, glibmm, pkgconfig }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "atkmm-2.22.6"; - src = fetchurl_gnome { - project = "atkmm"; - major = "2"; minor = "22"; patchlevel = "5"; - sha256 = "0v5ynws5pc4qdgrr8hrl8wajl3xxh3kgljchj7cqyb4mcxg3xq31"; + src = fetchurl { + url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz; + sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; }; propagatedBuildInputs = [ atk glibmm ]; diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 95de0834f292..6d53ff303beb 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, cmake, qt4 }: stdenv.mkDerivation rec { - name = "attica-0.2.0"; + name = "attica-0.3.0"; src = fetchurl { url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a"; + sha256 = "1wfd37mvskn77ppzjdh3x6cb5p9na81ibh05ardfvbwqqn523gd0"; }; - buildInputs = [ cmake qt4 ]; + buildInputs = [ qt4 ]; + buildNativeInputs = [ cmake ]; meta = with stdenv.lib; { description = "A library to access Open Collaboration Service providers"; license = "LGPL"; maintainers = [ maintainers.sander maintainers.urkud ]; - platforms = qt4.meta.platforms; + inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e7ee38162106..6b517b918102 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl_gnome, pkgconfig, mesa, glib, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf , pangoSupport ? true, pango, cairo , libXfixes, libXcomposite, libXdamage, xz }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "cogl-1.8.2"; - src = fetchurl_gnome { - project = "cogl"; - major = "1"; minor = "8"; patchlevel = "0"; extension = "xz"; - sha256 = "0b0arg0sjky5y4ypgh8dpznd9f1azhi1d5rhf4zbcw2mkl91qmdi"; + src = fetchurl { + url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz; + sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; }; buildNativeInputs = [ xz pkgconfig ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix index d6483ba36dec..596e645c686c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs -, xz, jasper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs, xz +, jasper }: -stdenv.mkDerivation rec { - name = src.pkgname; +stdenv.mkDerivation { + name = "gdk-pixbuf-2.24.1"; - src = fetchurl_gnome { - project = "gdk-pixbuf"; - major = "2"; minor = "24"; patchlevel = "0"; extension = "xz"; - sha256 = "19r89nxqlpmd0ykmklz2z99dvad9svr5ndiclk7c2h84lhx1vhb7"; + src = fetchurl { + url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz; + sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. diff --git a/pkgs/development/libraries/glib/2.20.x.nix b/pkgs/development/libraries/glib/2.20.x.nix deleted file mode 100644 index c7a92a00b42c..000000000000 --- a/pkgs/development/libraries/glib/2.20.x.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl }: - -stdenv.mkDerivation rec { - name = "glib-2.20.1"; - - src = fetchurl { - url = "mirror://gnome/sources/glib/2.20/${name}.tar.bz2"; - sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav"; - }; - - buildNativeInputs = [perl]; - buildInputs = [pkgconfig gettext]; - - # The nbd package depends on a static version of this library; hence - # the default configure flag --disable-static is switched off. - dontDisableStatic = true; - configureFlags = "--enable-static --enable-shared"; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index 25f8abfeb0a5..a0d8ac0eff7b 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi , python }: # TODO: @@ -12,12 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation rec { - name = src.pkgname; + name = "glib-2.30.2"; - src = fetchurl_gnome { - project = "glib"; - major = "2"; minor = "30"; patchlevel = "0"; extension = "xz"; - sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n"; + src = fetchurl { + url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz; + sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix deleted file mode 100644 index 2c81ecc84e02..000000000000 --- a/pkgs/development/libraries/gtk+/2.16.x.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, perl, jasper, x11, glib, atk, pango -, libtiff, libjpeg, libpng, cairo, xlibs -, xineramaSupport ? true -}: - -stdenv.mkDerivation rec { - name = "gtk+-2.16.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2"; - sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3"; - }; - - buildNativeInputs = [ perl ]; - buildInputs = [ pkgconfig jasper ]; - - propagatedBuildInputs = [ - x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr - ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama; - - meta = { - description = "A multi-platform toolkit for creating graphical user interfaces"; - - longDescription = '' - GTK+ is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK+ it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK+ is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK+ without any license fees or - royalties. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index b52031d4ac69..e3908b2ba371 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs , gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -7,13 +7,12 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; -stdenv.mkDerivation rec { - name = src.pkgname; - - src = fetchurl_gnome { - project = "gtk+"; - major = "2"; minor = "24"; patchlevel = "6"; extension = "xz"; - sha256 = "1jpgxycxgz1g5yd7spxyc2i8zvn8swm275dkd4d0ryn1bma6n0la"; +stdenv.mkDerivation { + name = "gtk+-2.24.8"; + + src = fetchurl { + url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.8.tar.xz; + sha256 = "0g5rj25qrgkwrnvpb76a8c2cinryf9kb1drdx8pgag4kczv2jfwa"; }; patches = diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 752894593854..f7dd889c6735 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.0.0.2"; - sha256 = "1fngrlly5q2l0j3fil4cx3zj2h4sxnh20i0r84l4qhl8s0x5ba5z"; + version = "0.0.1"; + sha256 = "1klbwiqic6qgvzsxgb9x4hrfn0d3y679ml4f2qjdgx6p33gsyzns"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 9a2ac22721c7..105c7803c448 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -2,24 +2,21 @@ , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate , conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase , monadControl, network, text, tls, tlsExtra, transformers -, transformersBase, utf8String, zlibConduit, zlibEnum +, transformersBase, utf8String, zlibConduit }: cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.0.0.1"; - sha256 = "0yag65ariakvbvsrr3kd16bags4caw8n3qlcwpzrblprgjrv06vm"; - isLibrary = true; - isExecutable = true; + version = "1.1.0.1"; + sha256 = "0jlj727rs8f1yxy6ms2gi3ryj4di5la0pgn2hw5flglflacj8wb6"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cprngAes dataDefault failure httpTypes liftedBase monadControl network text tls tlsExtra transformers transformersBase utf8String zlibConduit - zlibEnum ]; meta = { - homepage = "http://github.com/snoyberg/http-enumerator"; + homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index c29489e1d9fe..4e60042dc306 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.2.2"; - sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf"; + version = "0.7.2.3"; + sha256 = "1f66dnqm67qzg76w47kqvpv7ssandmf8md838mdzrsg88x54dar7"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index 148cf3474b1c..07b2d52e17c5 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "iteratee"; - version = "0.8.7.5"; - sha256 = "182bxdnj7k4dkmrbnkzy93axq8hwpq3xdbkyf93hbzzp4vhdvjnl"; + version = "0.8.7.6"; + sha256 = "05zhw44zycwllvyrkxz1mkn5mkylrdz9ynh27k17gsm9mjml3cab"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index f9d7f68eaf63..1344f7759af6 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,12 +1,12 @@ -{ cabal, text }: +{ cabal, parsec, text }: cabal.mkDerivation (self: { pname = "maude"; - version = "0.2.1"; - sha256 = "10igixljxfrpns2ffvk4g5dsv2pr8p1f7hc65z5x91n6x8zd01vi"; - buildDepends = [ text ]; + version = "0.3.0"; + sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg"; + buildDepends = [ parsec text ]; meta = { - homepage = "https://code.google.com/p/maude-hs/"; + homepage = "https://github.com/davidlazar/maude-hs"; description = "An interface to the Maude rewriting system"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/unix-compat/0.3.nix b/pkgs/development/libraries/haskell/unix-compat/0.3.nix deleted file mode 100644 index da13c9313ac2..000000000000 --- a/pkgs/development/libraries/haskell/unix-compat/0.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "unix-compat"; - version = "0.3"; - sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7"; - meta = { - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix similarity index 81% rename from pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix rename to pkgs/development/libraries/haskell/unix-compat/default.nix index 34cbd4072f6e..83b670ee2c27 100644 --- a/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.2.2.1"; - sha256 = "009dg6mxjmdkcmr2d1qq9r3f4qfx4d362lyxj9vvgwrzcdnsgzqi"; + version = "0.3.0.1"; + sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 4e81d54979b4..b747179b0f37 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.9.4"; - sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g"; + version = "0.9.4.1"; + sha256 = "048xc8dshwpaxirz8wvk3ra0qs99wx1i145nfj7n3i6kw8qkfnz6"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession cookie dataObject dataObjectYaml enumerator failure fastLogger diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index e0614d3bd393..e271e9661809 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,25 +1,28 @@ {stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, - libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib, - libimobiledevice, python, pygobject, mutagen, swig }: + libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, + libimobiledevice, python, pygobject, mutagen }: stdenv.mkDerivation rec { - name = "libgpod-0.7.94"; + name = "libgpod-0.8.2"; src = fetchurl { - url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; - sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4"; + url = "mirror://sourceforge/gtkpod/${name}.tar.bz2"; + sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00"; }; - patchPhase = ''sed -e "s,udevdir=,&$out," -i configure''; + preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; configureFlags = "--without-hal --enable-udev"; - propagatedBuildInputs = [ glib libxml2 sqlite libplist libusb1 zlib sg3_utils - gtk taglib libimobiledevice python pygobject mutagen ]; + propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils + gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; - buildInputs = [ gettext perlXMLParser intltool pkgconfig perl swig ]; + buildNativeInputs = [ gettext perlXMLParser intltool pkgconfig perl + libimobiledevice.swig ]; meta = { homepage = http://gtkpod.sourceforge.net/; description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; + platforms = stdenv.lib.platforms.gnu; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a417f63cdd9f..3f6de4cfb1d7 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,18 +1,19 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, glib, gettext, intltool, bzip2 +, glib, gettext, intltool, bzip2, xz , gnome_vfs, libbonobo, python }: stdenv.mkDerivation rec { - name = "libgsf-1.14.16"; + name = "libgsf-1.14.22"; src = fetchurl { - url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2"; - sha256 = "0249n2hgrcnzphinaxng0cpn7afchg84l4ka4wka9kyv3g58zz8i"; + url = mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz; + sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; }; + buildNativeInputs = [ xz intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ]; + [ perl perlXMLParser gettext bzip2 gnome_vfs python ]; propagatedBuildInputs = [ glib libxml2 libbonobo ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 8af6b2d611af..b4bb3b47a35e 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt, +{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt, libtasn1, libplist, readline }: stdenv.mkDerivation rec { - name = "libimobiledevice-1.0.2"; + name = "libimobiledevice-1.0.6"; - buildInputs = [ python swig pkgconfig readline ]; + buildNativeInputs = [ python libplist.swig pkgconfig ]; + buildInputs = [ readline ]; propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ]; - configureFlags = "--enable-dev-tools"; + patchPhase = ''sed -e 's@1\.3\.21@@' -i configure''; + passthru.swig = libplist.swig; src = fetchurl { url = "${meta.homepage}/downloads/${name}.tar.bz2"; - sha256 = "1wbx0hr0q1dhw1p7326qm3dvzacykhc4w005q5wp2gkxa68dnw5s"; + sha256 = "0r5gjprrnwgad5zsidn41w01gihramagcpl8cwi540qiwq43svqi"; }; meta = { diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 4c4abe0557f3..816269599387 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, cmake, libxml2, glib, swig, python }: +{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }: stdenv.mkDerivation rec { name = "libplist-1.3"; - buildInputs = [ cmake swig ]; + buildNativeInputs = [ cmake swig2 ]; patches = [ ./swig.patch ]; propagatedBuildInputs = [ libxml2 glib python ]; + passthru.swig = swig2; + src = fetchurl { url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2"; sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q"; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 78487a9f3237..dc3f8b5352de 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }: +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }: -stdenv.mkDerivation { - name = "libwpd-0.8.14"; +stdenv.mkDerivation rec { + name = "libwpd-0.9.4"; src = fetchurl { - url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz; - sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; + url = "mirror://sourceforge/libwpd/${name}.tar.xz"; + sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy"; }; - buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ]; + buildInputs = [ glib libgsf libxml2 ]; + + buildNativeInputs = [ pkgconfig xz ]; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 14c34eaf4199..3da153c3dc5a 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libwpd }: +{ stdenv, fetchurl, pkgconfig, libwpd, xz }: stdenv.mkDerivation rec { - name = "libwpg-0.1.3"; + name = "libwpg-0.2.1"; src = fetchurl { - url = "mirror://sourceforge/libwpg/${name}.tar.bz2"; - sha256 = "086mgy36mia76mpfa2qgn0q44b3aigvvng9snzrxh60v3v9wixa7"; + url = "mirror://sourceforge/libwpg/${name}.tar.xz"; + sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d"; }; - buildInputs = [ pkgconfig libwpd ]; + buildInputs = [ libwpd ]; + buildNativeInputs = [ pkgconfig xz ]; meta = { homepage = http://libwpg.sourceforge.net; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix new file mode 100644 index 000000000000..743314d18154 --- /dev/null +++ b/pkgs/development/libraries/newt/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, slang, popt }: + +stdenv.mkDerivation rec { + name = "newt-0.52.14"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz"; + sha256 = "13lp815zwldbw917wxmjy90gp608n3zlk4p3ybfqh0x6p9c4y3zp"; + }; + + patchPhase = '' + sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile + ''; + + buildInputs = [ slang popt ]; + + crossAttrs = { + makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; + }; + + meta = { + homepage = https://fedorahosted.org/newt/; + description = "Library for color text mode, widget based user interfaces"; + + license = "LGPLv2"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.viric ]; + }; +} diff --git a/pkgs/development/libraries/openssl/cert-file-path-max.patch b/pkgs/development/libraries/openssl/cert-file-path-max.patch new file mode 100644 index 000000000000..50621c5cb820 --- /dev/null +++ b/pkgs/development/libraries/openssl/cert-file-path-max.patch @@ -0,0 +1,34 @@ +This patch, to be applied after `cert-file.patch', fixes compilation +on GNU/Hurd where `PATH_MAX' is not defined. + +diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c +--- openssl-1.0.0e/crypto/x509/x509_def.c.orig 2012-01-06 00:08:48.000000000 +0100 ++++ openssl-1.0.0e/crypto/x509/x509_def.c 2012-01-06 00:11:29.000000000 +0100 +@@ -58,6 +58,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo + + const char *X509_get_default_cert_file(void) + { +- static char buf[PATH_MAX] = X509_CERT_FILE; ++ static char *buf; + static int init = 0; + if (!init) { + init = 1; + char * s = getenv("OPENSSL_X509_CERT_FILE"); + if (s && getuid() == geteuid()) { +- strncpy(buf, s, sizeof(buf)); +- buf[sizeof(buf) - 1] = 0; ++ buf = strdup(s); ++ } ++ if (!s) { ++ buf = strdup(X509_CERT_FILE); + } + } + return buf; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index dd5e03c33f92..633e43ac6a68 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,6 +6,25 @@ let opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) stdenv.cross; + + patchesCross = isCross: + [ # Allow the location of the X509 certificate file (the CA + # bundle) to be set through the environment variable + # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the + # default location ($out/ssl/cert.pem) doesn't exist, and + # hardcoding something like /etc/ssl/cert.pem is impure and + # cannot be overriden per-process. For security, the + # environment variable is ignored for setuid binaries. + ./cert-file.patch + ] + + ++ (stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86") + [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually + ./gnu.patch # submitted upstream + ]) + + ++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch); + in stdenv.mkDerivation { @@ -16,17 +35,7 @@ stdenv.mkDerivation { sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3"; }; - patches = - [ # Allow the location of the X509 certificate file (the CA - # bundle) to be set through the environment variable - # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the - # default location ($out/ssl/cert.pem) doesn't exist, and - # hardcoding something like /etc/ssl/cert.pem is impure and - # cannot be overriden per-process. For security, the - # environment variable is ignored for setuid binaries. - ./cert-file.patch - ] - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + patches = patchesCross false; buildNativeInputs = [ perl ]; @@ -49,6 +58,8 @@ stdenv.mkDerivation { ''; # */ crossAttrs = { + patches = patchesCross true; + preConfigure='' # It's configure does not like --build or --host export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch new file mode 100644 index 000000000000..3cc6d049c944 --- /dev/null +++ b/pkgs/development/libraries/openssl/gnu.patch @@ -0,0 +1,25 @@ +Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD. + +--- openssl-1.0.0e/Configure 2012-01-06 00:39:49.000000000 +0100 ++++ openssl-1.0.0e/Configure 2012-01-06 00:39:51.000000000 +0100 +@@ -563,7 +563,7 @@ my %table=( + "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", + + ##### GNU Hurd +-"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", ++"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + ##### OS/2 EMX + "OS2-EMX", "gcc::::::::", + +--- openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:05:47.000000000 +0100 ++++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:21:05.000000000 +0100 +@@ -60,7 +60,7 @@ + that handle _GNU_SOURCE and other similar macros. Defining it later + is simply too late, because those headers are protected from re- + inclusion. */ +-#ifdef __linux ++#if defined __linux || defined __GNU__ || defined __GLIBC__ + # ifndef _GNU_SOURCE + # define _GNU_SOURCE /* make sure dladdr is declared */ + # endif diff --git a/pkgs/development/libraries/pango/1.24.x.nix b/pkgs/development/libraries/pango/1.24.x.nix deleted file mode 100644 index b2e61e6cae4e..000000000000 --- a/pkgs/development/libraries/pango/1.24.x.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - name = "pango-1.24.1"; - - src = fetchurl { - url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2"; - sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370"; - }; - - buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []); - - propagatedBuildInputs = [x11 glib cairo libpng]; - - meta = { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 59b6eca64d37..5cd4744fed38 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl_gnome, pkgconfig, pango, glibmm, cairomm, libpng }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { - name = src.pkgname; + name = "pangomm-2.28.4"; - src = fetchurl_gnome { - project = "pangomm"; - major = "2"; minor = "28"; patchlevel = "2"; - sha256 = "13yq5zwxzliiss4ladaa7di2b3s965p3zbz7s0ccz9ddbqj9f7gc"; + src = fetchurl { + url = mirror://gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz; + sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 8b257d299bf3..913f4acdc7dd 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -31,4 +31,11 @@ stdenv.mkDerivation { ensureDir $out/lib/qt4/plugins/script cp -av plugins/script/* $out/lib/qt4/plugins/script ''; + + meta = { + description = "QtScript bindings generator"; + homepage = http://code.google.com/p/qtscriptgenerator/; + inherit (qt4.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index f7833bd773c4..de0c7ba2b754 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl, cmake, taglib}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; src = fetchurl { - url = http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz; + url = "http://www.kollide.net/~jefferai/${name}.tar.gz"; sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; - buildInputs = [ cmake taglib ]; + buildInputs = [ taglib ]; + buildNativeInputs = [ cmake ]; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 39e2b88b85e9..d0ba30fff507 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,19 +1,22 @@ {stdenv, fetchurl, zlib, cmake}: stdenv.mkDerivation rec { - name = "taglib-1.7.0"; + name = "taglib-1.7"; src = fetchurl { - url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz"; + url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz"; sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9"; }; cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON"; - buildInputs = [zlib cmake]; + buildInputs = [zlib]; + buildNativeInputs = [cmake]; meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; description = "A library for reading and editing the meta-data of several popular audio formats"; + inherit (cmake.meta) platforms; + maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix deleted file mode 100644 index 710400ab0941..000000000000 --- a/pkgs/development/libraries/wxGTK-2.6/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, compat22 ? false, compat24 ? true, unicode ? true -}: - -stdenv.mkDerivation { - name = "wxGTK-2.6.4"; - - src = fetchurl { - url = mirror://sourceforge/wxwindows/wxGTK-2.6.4.tar.gz; - sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x"; - }; - - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ]; - - buildNativeInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-gtk2" - (if compat22 then "--enable-compat22" else "--disable-compat22") - (if compat24 then "--enable-compat24" else "--disable-compat24") - "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") - ]; - - # This variable is used by configure to find some dependencies. - SEARCH_INCLUDE = - "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; - - # Work around a bug in configure. - NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1"; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace /usr /no-such-path - "; - - postBuild = "(cd contrib/src && make)"; - postInstall = " - (cd contrib/src && make install) - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = {inherit gtk compat22 compat24 unicode;}; -} diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index a01a5fb3796e..6254b955a239 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,17 +1,69 @@ -{stdenv, fetchurl, m4}: +{stdenv, fetchurl, m4, zlib, bzip2, xz, bison, flex, gettext}: +# TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { - name = "elfutils-0.148"; + name = "elfutils-${version}"; + version = "0.152"; src = fetchurl { urls = [ - "https://fedorahosted.org/releases/e/l/elfutils/0.143/${name}.tar.bz2" + "https://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa"; + sha256 = "19mlgxyzcwiv64ynj2cibgkiw4qkm3n37kizvy6555dsmlaqfybq"; }; - buildInputs = [m4]; + patches = [ + (fetchurl { + url = https://fedorahosted.org/releases/e/l/elfutils/0.152/elfutils-portability.patch; + sha256 = "0q318w4cvvqv9ps4xcwphapj1gl31isgjyya4y9sm72qj68n61p0"; + }) ]; + + # We need bzip2 in NativeInputs because otherwise we can't unpack the src, + # as the host-bzip2 will be in the path. + buildNativeInputs = [m4 bison flex gettext bzip2]; + buildInputs = [zlib bzip2 xz]; + + crossAttrs = { + + /* Having bzip2 will harm, because anything using elfutils + as buildInput cross-building, will not be able to run 'bzip2' */ + propagatedBuildInputs = [ zlib.hostDrv ]; + + # This program does not cross-build fine. So I only cross-build some parts + # I need for the linux perf tool. + # On the awful cross-building: + # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005 + # + # I wrote this testing for the nanonote. + buildPhase = '' + pushd libebl + make + popd + pushd libelf + make + popd + pushd libdwfl + make + popd + pushd libdw + make + popd + ''; + + installPhase = '' + pushd libelf + make install + popd + pushd libdwfl + make install + popd + pushd libdw + make install + popd + cp version.h $out/include + ''; + }; dontAddDisableDepTrack = true; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix new file mode 100644 index 000000000000..2b85260e82ae --- /dev/null +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, python, libxml2Python }: + +stdenv.mkDerivation rec { + name = "itstool-1.1.1"; + + src = fetchurl { + url = "http://files.itstool.org/itstool/${name}.tar.bz2"; + sha256 = "1jchgcgxvqwkhr61q0j08adl1k8hw86dzbl207gzmns9fa7vmzqg"; + }; + + buildInputs = [ python ]; + + patchPhase = + '' + sed -e '/import libxml2/i import sys\ + sys.path.append("${libxml2Python}/lib/${python.libPrefix}/site-packages")' \ + -i itstool.in + ''; + + meta = { + homepage = http://itstool.org/; + description = "XML to PO and back again"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix new file mode 100644 index 000000000000..bd67941de6d7 --- /dev/null +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pcre }: + +stdenv.mkDerivation rec { + name = "swig-2.0.4"; + + src = fetchurl { + url = "mirror://sourceforge/swig/${name}.tar.gz"; + sha256 = "12pcw4whi36vd41c43v8c62bn7vnq331hmvzsrg8wvyj61vi2fkn"; + }; + + buildInputs = [ pcre ]; + + meta = { + description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + + longDescription = '' + SWIG is an interface compiler that connects programs written in C and + C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It + works by taking the declarations found in C/C++ header files and using + them to generate the wrapper code that scripting languages need to + access the underlying C/C++ code. In addition, SWIG provides a variety + of customization features that let you tailor the wrapping process to + suit your application. + ''; + + homepage = http://swig.org/; + + # Licensing is a mess: http://www.swig.org/Release/LICENSE . + license = "BSD-style"; + + maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; + }; +} diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index bed61567d4b3..1fe925e31b6a 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -19,10 +19,19 @@ stdenv.mkDerivation { patches = [ ./0001-fix-VSFile-constructor.patch ]; + preConfigure = '' + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" + ''; + + installPhase = '' + ensureDir $out/bin + cp vegastrike $out/bin + cp vegaserver $out/bin + ''; + meta = { homepage = http://privateer.sourceforge.net/; longDescription = ""; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix new file mode 100644 index 000000000000..23513d2bf885 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/ralink/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchsvn }: + +# Upstream is http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git + +stdenv.mkDerivation { + name = "ralink-fw-r17279"; + + src = fetchsvn { + url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/ralink; + rev = 17279; + sha256 = "06nc6w3xcrxzcai7gaf27k0v8k2xbq3imzpgc02rbxv5q5flxh65"; + }; + + unpackPhase = "true"; + + buildPhase = "true"; + + # Installation copies the firmware AND the license. The license + # says: "Your rights to redistribute the Software shall be + # contingent upon your installation of this Agreement in its + # entirety in the same directory as the Software." + installPhase = '' + ensureDir $out + cp $src/*.bin $out + cp $src/LICENSE $out/ralink.LICENSE + ''; + + meta = { + description = "Firmware for the Ralink wireless cards"; + homepage = http://www.ralinktech.com/; + license = "non-free"; + }; +} diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix new file mode 100644 index 000000000000..ba32362b6e8b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -0,0 +1,37 @@ +{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +, docbook_xsl, docbook_xml_dtd_45, libxslt }: + +stdenv.mkDerivation { + name = "perf-linux-${kernel.version}"; + + inherit (kernel) src; + + preConfigure = '' + cd tools/perf + sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile + export makeFlags="DESTDIR=$out $makeFlags" + ''; + + # perf refers both to newt and slang + buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + buildInputs = [ elfutils python perl newt slang ]; + + installFlags = "install install-man ASCIIDOC8=1"; + + inherit elfutils; + + crossAttrs = { + /* I don't want cross-python or cross-perl - + I don't know if cross-python even works */ + propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ]; + makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; + elfutils = elfutils.hostDrv; + }; + + meta = { + homepage = https://perf.wiki.kernel.org/; + description = "Linux tools to profile with performance counters"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index f2ce1b452cdf..9e7e3a16e01c 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation { buildInputs = [ libuuid lzo zlib acl ]; + crossAttrs = { + makeFlags = "CC=${stdenv.cross.config}-gcc"; + }; + meta = { description = "Tools for MTD filesystems"; license = "GPLv2+"; diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 52e1fb22feda..98e5d5c25af5 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { ''; homepage = http://www.jedsoft.org/most/index.html; license = "GPLv2"; + platforms = stdenv.lib.platforms.gnu; # random choice }; } diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 1b7c78369213..c4b412493558 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }: stdenv.mkDerivation rec { - name = "usbmuxd-1.0.5"; + name = "usbmuxd-1.0.7"; src = fetchurl { url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2"; - sha256 = "130h5hk2qhki5xflcindx0prrgm5h7aqhbygrpasvr6030k6bkiv"; + sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840"; }; - buildInputs = [ cmake pkgconfig ]; + buildNativeInputs = [ cmake pkgconfig ]; propagatedBuildInputs = [ libusb1 libplist ]; - patchPhase = "sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt"; + patchPhase = + '' + sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt + sed -e 's,/bin/echo,echo,g' -i Modules/describe.sh + ''; + cmakeFlags = ''-DLIB_SUFFIX=''; meta = { @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { usbmuxd: USB Multiplex Daemon. This bit of software is in charge of talking to your iPhone or iPod Touch over USB and coordinating access to its services by other applications.''; - inherit (libusb1.meta) platforms; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 63f5470aa9ec..410c0ab93a18 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -2,15 +2,15 @@ , gccCross ? null }: let - version = "2011-03-08"; + version = "2011-12-26"; in stdenv.mkDerivation { name = "xburst-tools-${version}"; src = fetchgit { url = git://projects.qi-hardware.com/xburst-tools.git; - rev = "a3a38cabf1e854667d90f49f0b4487e28974a3a6"; - sha256 = "ac5671708cf9d18de79207530335f6781fa4bedf55288069786f4ecb971c4658"; + rev = "c71ce8e15db25fe49ce8702917cb17720882e341"; + sha256 = "abe4c4591183f2bc5ca6363451d1cd7d966c080b4f5bfb0fedf7e9a4f70267a4"; }; preConfigure = '' diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index c5164d627708..b17894edfabc 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "WWAN modem manager, part of NetworkManager"; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = [ stdenv.lib.platforms.linux ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd293e4adc00..e2da9fe27dfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2978,6 +2978,8 @@ let ired = callPackage ../development/tools/analysis/radare/ired.nix { }; + itstool = callPackage ../development/tools/misc/itstool { }; + jam = callPackage ../development/tools/build-managers/jam { }; jikespg = callPackage ../development/tools/parsing/jikespg { }; @@ -3064,6 +3066,8 @@ let swig = callPackage ../development/tools/misc/swig { }; + swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; + swigWithJava = swig; swftools = callPackage ../tools/video/swftools { }; @@ -3621,27 +3625,13 @@ let }); - gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in { - - glib = callPackage ../development/libraries/glib/2.20.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.24.x.nix { }; - - cairo = callPackage ../development/libraries/cairo { }; - - pango = callPackage ../development/libraries/pango/1.24.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { }; - - }); - gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { glib = callPackage ../development/libraries/glib/2.28.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { }; - atk = callPackage ../development/libraries/atk/1.32.x.nix { }; + atk = callPackage ../development/libraries/atk/2.2.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; @@ -3678,6 +3668,8 @@ let gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; + gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + # Let hydra build gtk-3.x but do not show this to users yet recurseForRelease = true; }; @@ -4316,6 +4308,8 @@ let nettle = callPackage ../development/libraries/nettle { }; + newt = callPackage ../development/libraries/newt { }; + nspr = callPackage ../development/libraries/nspr { }; nss = callPackage ../development/libraries/nss { }; @@ -4685,10 +4679,6 @@ let wxGTK = wxGTK28; - wxGTK26 = callPackage ../development/libraries/wxGTK-2.6 { - inherit (gtkLibs216) gtk; - }; - wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { inherit (gtkLibs) gtk; }; @@ -5821,6 +5811,8 @@ let stdenv = overrideGCC stdenv gcc34; }; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + # State Nix snix = callPackage ../tools/package-management/snix { @@ -6021,6 +6013,8 @@ let rfkill = callPackage ../os-specific/linux/rfkill { }; + ralink_fw = callPackage ../os-specific/linux/firmware/ralink { }; + rt2860fw = callPackage ../os-specific/linux/firmware/rt2860 { }; rt2870fw = callPackage ../os-specific/linux/firmware/rt2870 { }; @@ -6213,6 +6207,8 @@ let cacert = callPackage ../data/misc/cacert { }; + cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { @@ -6272,6 +6268,8 @@ let miscfiles = callPackage ../data/misc/miscfiles { }; + mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; oldstandard = callPackage ../data/fonts/oldstandard { }; @@ -7621,9 +7619,7 @@ let inherit gsl aalib zlib libpng intltool gettext perl; }; - xara = callPackage ../applications/graphics/xara { - wxGTK = wxGTK26; - }; + xara = callPackage ../applications/graphics/xara { }; xawtv = callPackage ../applications/video/xawtv { }; @@ -8052,6 +8048,8 @@ let kde47 = kdePackagesFor pkgs.kde47 "4.7"; + kde48 = kdePackagesFor pkgs.kde48 "4.8"; + kdePackagesFor = self: version: let callPackageOrig = callPackage; in let @@ -8070,6 +8068,8 @@ let bangarang = callPackage ../applications/video/bangarang { }; + basket = callPackage ../applications/office/basket { }; + bluedevil = callPackage ../tools/bluetooth/bluedevil { }; digikam = callPackage ../applications/graphics/digikam { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4fdbe463297..f123b1193401 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -915,7 +915,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); logfloat = callPackage ../development/libraries/haskell/logfloat {}; - maude = callPackage ../development/libraries/haskell/maude {}; + maude = callPackage ../development/libraries/haskell/maude { + parsec = self.parsec3; + }; MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; @@ -1315,9 +1317,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); uniqueid = callPackage ../development/libraries/haskell/uniqueid {}; - unixCompat_0_2_2_1 = callPackage ../development/libraries/haskell/unix-compat/0.2.2.1.nix {}; - unixCompat_0_3 = callPackage ../development/libraries/haskell/unix-compat/0.3.nix {}; - unixCompat = self.unixCompat_0_2_2_1; + unixCompat = callPackage ../development/libraries/haskell/unix-compat {}; unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {}; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 37af65437216..3e3cb3e32297 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -203,6 +203,7 @@ in { libunistring.hostDrv = nativePlatforms; lsh.hostDrv = nativePlatforms; nixUnstable.hostDrv = nativePlatforms; + openssl.hostDrv = nativePlatforms; # dependency of Nix patch.hostDrv = nativePlatforms; zile.hostDrv = nativePlatforms; };