alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

svn merge ^/nixpkgs/trunk

Browse source 
svn path=/nixpkgs/branches/libpng15/; revision=31718
This commit is contained in:
Yury G. Kudryashov 2012-01-19 21:00:43 +00:00
parent 13c81f6c79 b94fef3cba
commit a525fdb18d
131 changed files with 1460 additions and 595 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/emacs-modes/org/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, emacs, texinfo, which }:
stdenv.mkDerivation rec {
name = "org-7.5";
name = "org-7.8";
src = fetchurl {
url = "http://orgmode.org/${name}.tar.gz";
sha256 = "978822bc4c5f9f67450fbaa8572f1d4217406b7e28551278c9f23f7e9515cd4b";
sha256 = "0idxsxdr5p0bvnjmhvpdkfwhlpkxmihnaljf43k0311g9z3k22qz";
};
buildInputs = [ emacs texinfo ];

53
pkgs/applications/editors/jedit/default.nix
View file

@ -1,28 +1,53 @@
{ stdenv, fetchurl, ant }:
{ stdenv, fetchurl, ant, jre }:
stdenv.mkDerivation {
name = "jedit-4.2";
name = "jedit-4.4.2";
src = fetchurl {
url = mirror://sf/jedit/jedit42source.tar.gz;
sha256 = "1ckqghsw2r30kfkqfgjl4k47gdwpz8c1h85haw0y0ymq4rqh798j";
url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
};
phases = "unpackPhase buildPhase";
setSourceRoot = ''
sourceRoot=jEdit
'';
buildPhase = "
sed -i 's/\\<SplashScreen\\>/org.gjt.sp.jedit.gui.SplashScreen/g' org/gjt/sp/jedit/GUIUtilities.java
ant dist
ensureDir $out/lib
cp jedit.jar $out/lib
ensureDir \$out/lib/modes
cp modes/catalog \$out/lib/modes
";
buildPhase = ''
ant build
'';
installPhase = ''
ensureDir $out/share/jEdit
cp build/jedit.jar $out/share/jEdit
ensureDir $out/share/jEdit/modes
cp -r modes/* $out/share/jEdit/modes
ensureDir $out/share/jEdit/icons
cp -r icons/* $out/share/jEdit/icons
ensureDir $out/share/jEdit/macros
cp -r macros/* $out/share/jEdit/macros
ensureDir $out/share/jEdit/doc
cp -r doc/* $out/share/jEdit/doc
sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
ensureDir $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
patch package-files/linux/jedit << EOF
5a6,8
> # specify the correct JAVA_HOME
> JAVA_HOME=${jre}
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
ensureDir $out/bin
cp package-files/linux/jedit $out/bin/jedit
chmod +x $out/bin/jedit
'';
buildInputs = [ ant ];
meta = {
description = "really nice programmers editor written in Java. Give it a try";
description = "Mature programmer's text editor (Java based)";
homepage = http://www.jedit.org;
license = "GPL";
};

4
pkgs/applications/editors/zile/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
name = "zile-2.4.2";
name = "zile-2.4.3";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
sha256 = "0rygkc3i9bngzn49kq9fnrbz80d8pa2yjy8iz7vjlc4ayc2akvc3";
};
buildInputs = [ ncurses boehmgc ];

24
pkgs/applications/graphics/digikam/default.nix
View file

@ -1,28 +1,26 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble }:
shared_desktop_ontologies, marble, clapack, mysql }:
stdenv.mkDerivation rec {
name = "digikam-2.4.1";
name = "digikam-2.5.0";
src = fetchurl {
url = "mirror://sourceforge/digikam/${name}.tar.bz2";
sha256 = "0fyyhc26syd1d1m8jqyg2i66hwd523mh419ln8y944jkrjj6gadc";
sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam";
};
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
pkgconfig qjson libkdcraw opencv libkexiv2 libkipi boost shared_desktop_ontologies
marble ];
buildNativeInputs = [ cmake automoc4 pkgconfig ];
KDEDIRS=kdeedu;
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
# Make digikam find some FindXXXX.cmake
preConfigure = ''
cp ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules;
cp ${marble}/share/apps/cmake/modules/FindMarble.cmake cmake/modules;
'';
KDEDIRS="${marble}:${qjson}";
patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ];
meta = {
description = "Photo Management Program";

68
pkgs/applications/graphics/digikam/ftbfs-libkipi.patch Normal file
View file

@ -0,0 +1,68 @@
commit 25cc9c9876a5233bd630105d0110319892d4e18c
Author: Gilles Caulier <caulier.gilles@gmail.com>
Date: Tue Jan 3 15:16:37 2012 +0100
enable checkall and clearall buttons only with libkipi version 1.4.0
BUGS: 290496
diff --git a/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
index 0f4030a..b8efb35 100644
--- a/core/utilities/setup/setupplugins.cpp
+++ b/core/utilities/setup/setupplugins.cpp
@@ -6,8 +6,8 @@
* Date : 2004-01-02
* Description : setup Kipi plugins tab.
*
- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
panel->setLayout(mainLayout);
+#if KIPI_VERSION < 0x010400
+ d->checkAllBtn->setVisible(false);
+ d->clearBtn->setVisible(false);
+#endif
+
initPlugins();
// --------------------------------------------------------
@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
void SetupPlugins::slotCheckAll()
{
QApplication::setOverrideCursor(Qt::WaitCursor);
+#if KIPI_VERSION >= 0x010400
d->kipiConfig->slotCheckAll();
+#endif
QApplication::restoreOverrideCursor();
}
void SetupPlugins::slotClear()
{
QApplication::setOverrideCursor(Qt::WaitCursor);
+#if KIPI_VERSION >= 0x010400
d->kipiConfig->slotClear();
+#endif
QApplication::restoreOverrideCursor();
}
diff --git a/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
index 271a569..114e0fa 100644
--- a/core/utilities/setup/setupplugins.h
+++ b/core/utilities/setup/setupplugins.h
@@ -6,8 +6,8 @@
* Date : 2004-01-02
* Description : setup Kipi plugins tab.
*
- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General

33
pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch Normal file
View file

@ -0,0 +1,33 @@
commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de
Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
Date: Wed Jan 18 05:07:13 2012 +0400
Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR
Some projects (e.g., digikam) include snapshots of this library into their
release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR.
diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt
index f19b28b..4310a74 100644
--- a/extra/libkvkontakte/CMakeLists.txt
+++ b/extra/libkvkontakte/CMakeLists.txt
@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include )
# === Closer to the code, close to the body ===
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include(MacroLibrary)
@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http:
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
${KDE4_INCLUDES}
${QJSON_INCLUDE_DIR}
)

16
pkgs/applications/networking/instant-messengers/vacuum/default.nix
View file

@ -12,11 +12,11 @@ let
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
version="1.1.1";
version="1.1.2";
baseName="vacuum-im";
name="${baseName}-${version}";
url="http://vacuum-im.googlecode.com/files/${name}.tar.xz";
hash="b4b3472bf83173f6be1bbe69520bf6cab97e24cf9fd8a7b60e4ffdc1cb43b1dc";
url="http://vacuum-im.googlecode.com/files/vacuum-${version}.tar.xz";
hash="451dde9b3587503b035fa1ddd2c99f2052a0b17a603491c59e8c47a8bcd4746d";
};
in
rec {
@ -29,12 +29,7 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["addInputs" "preBuild" "doQMake" "doMakeInstall"];
preBuild = a.fullDepEntry (''
echo "Fixing a name collision with a function added in Qt 4.7"
sed -re 's/qHash[(][a-z ]*QUrl/vacuum_obsolete_&/' -i src/plugins/dataforms/dataforms.cpp
'') ["minInit" "doUnpack"];
phaseNames = ["addInputs" "doQMake" "doMakeInstall"];
doQMake = a.fullDepEntry (''
qmake INSTALL_PREFIX=$out -recursive vacuum.pro
@ -48,6 +43,9 @@ rec {
];
platforms = with a.lib.platforms;
linux;
license = with a.lib.licenses;
gpl3;
homepage = "http://code.google.com/p/vacuum-im/";
};
passthru = {
updateInfo = {

115
pkgs/applications/networking/mailreaders/thunderbird/9.x.nix Normal file
View file

@ -0,0 +1,115 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
, libnotify, cairo, pixman, fontconfig
, libjpeg
, # If you want the resulting program to call itself "Thunderbird"
# instead of "Shredder", enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false
}:
let version = "9.0.1";
# This patch may become necessary when we use a more recent version of libpng
# for now, it's actually not needed
# pngPatch = fetchurl {
# url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
# sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
# };
in
stdenv.mkDerivation {
name = "thunderbird-${version}";
src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
sha256 = "4fc392915e22b81ef0bd08e6e2d8d0348e66f0930f35bf8ac47eb49f64453e2d";
};
enableParallelBuilding = true;
buildInputs =
[ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
libnotify cairo pixman fontconfig yasm mesa /* nss */
libjpeg
];
# fix some paths in pngPatch
# prePatch = ''
# substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
# '';
patches = [
# "png.patch" # produced by postUnpack
# Fix weird dependencies such as a so file which depends on "-lpthread".
# ./thunderbird-build-deps.patch
];
configureFlags =
[ "--enable-application=mail"
"--enable-optimize"
"--with-pthreads"
"--disable-debug"
"--enable-strip"
"--with-pthreads"
"--with-system-jpeg"
# "--with-system-png" # png 1.5.x not merged in nixpkgs yet
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--enable-system-cairo"
"--disable-crashreporter"
"--disable-necko-wifi"
"--disable-webm"
"--disable-tests"
"--enable-calendar"
]
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
# The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
# prefix, and PREFIX in some places where they are not set. In
# particular, there are some linker flags like
# `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to
# `-rpath-link=/bin', the build fails due to the purity checks in
# the ld wrapper. So disable the purity check for now.
preBuild = "NIX_ENFORCE_PURITY=0";
# This doesn't work:
#makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
postInstall =
''
# Fix some references to /bin paths in the Xulrunner shell script.
substituteInPlace $out/lib/thunderbird-*/thunderbird \
--replace /bin/pwd "$(type -tP pwd)" \
--replace /bin/ls "$(type -tP ls)"
# Create a desktop item.
ensureDir $out/share/applications
cat > $out/share/applications/thunderbird.desktop <<EOF
[Desktop Entry]
Type=Application
Exec=$out/bin/thunderbird
Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
Name=Thunderbird
GenericName=Mail Reader
Categories=Application;Network;
EOF
'';
meta = with stdenv.lib; {
description = "Mozilla Thunderbird, a full-featured email client";
homepage = http://www.mozilla.org/thunderbird/;
license =
# Official branding implies thunderbird name and logo cannot be reuse,
# see http://www.mozilla.org/foundation/licensing.html
if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
maintainers = with maintainers; [ pierron ];
platforms = with platforms; linux;
};
}

15
pkgs/applications/networking/p2p/gnunet/default.nix
View file

@ -7,11 +7,11 @@
assert gtkSupport -> (gtk != null) && (libglade != null);
stdenv.mkDerivation rec {
name = "gnunet-0.9.0";
name = "gnunet-0.9.1";
src = fetchurl {
url = "mirror://gnu/gnunet/${name}.tar.gz";
sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
sha256 = "0ipx027lzcgdv70adfk8f4h0zrzm9mlhy3vj9cgc0ck8x52llfpq";
};
buildInputs = [
@ -41,9 +41,18 @@ stdenv.mkDerivation rec {
done
'';
# XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
doCheck = false;
/* FIXME: Tests must be run this way, but there are still a couple of
failures.
postInstall =
'' export GNUNET_PREFIX="$out"
export PATH="$out/bin:$PATH"
make -k check
'';
*/
meta = {
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";

6
pkgs/applications/networking/p2p/ktorrent/default.nix
View file

@ -5,14 +5,14 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "ktorrent";
version = "4.1.1";
version = "4.1.3";
src = fetchurl {
url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
sha256 = "1h0fqh344sfwfbvnwhn00k8czb14568flapjf4754zss6bxpw4g4";
sha256 = "0ih68bml6ic3mxk5l4ypgmxwyg9mglp57gw5igrnm5yszm7jz19g";
};
patches = [ ./find-workspace.diff ];
patches = [ ./find-workspace.diff ./drop-taskmanager-dependency.patch ];
KDEDIRS = libktorrent;

175
pkgs/applications/networking/p2p/ktorrent/drop-taskmanager-dependency.patch Normal file
View file

@ -0,0 +1,175 @@
commit 6d4a6ae51692966862ccb20d17cb217717519d40
Author: Joris Guisson <joris.guisson@gmail.com>
Date: Wed Nov 23 20:17:08 2011 +0100
Use dbus to show ktorrent window from plasma applet. This removes the dependency on libtaskmanager.
BUG: 287309
Changelog removed by Yury G. Kudryashov
diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
index 3a72241..4307cf2 100644
--- a/plasma/applet/CMakeLists.txt
+++ b/plasma/applet/CMakeLists.txt
@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK)
else(NOT QT_VERSION_OK)
- set(TASKMANAGER_FOUND FALSE)
- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
- FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-
- if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
- set(TASKMANAGER_FOUND TRUE)
- message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
- include_directories(${TASKMANAGER_INCLUDE_DIR})
- set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
-
- kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
-
- kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
- target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
-
- install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
-
- macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
+
+ set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
+
+ kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+
+ kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+ target_link_libraries(plasma_applet_ktorrent ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore)
+
+ install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
endif(NOT QT_VERSION_OK)
diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp
index 59e7191..bf09479 100644
--- a/plasma/applet/applet.cpp
+++ b/plasma/applet/applet.cpp
@@ -21,6 +21,9 @@
#include "applet.h"
#include <QFile>
#include <QGraphicsLinearLayout>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusMessage>
#include <KConfigDialog>
#include <KLocale>
#include <KRun>
@@ -31,12 +34,11 @@
#include <Plasma/IconWidget>
#endif
#include <Plasma/Label>
-#include <taskmanager/taskmanager.h>
-#include <taskmanager/task.h>
#include <util/functions.h>
#include "chunkbar.h"
#include "fadingnavigationwidget.h"
+
using namespace bt;
namespace ktplasma
@@ -174,7 +176,8 @@ namespace ktplasma
}
}
- void Applet::updateNavigation() {
+ void Applet::updateNavigation()
+ {
navigation->setEnabled(connected_to_app && !sources.empty()
&& (sources.count() > 1 || !sources.contains(current_source)));
}
@@ -193,12 +196,14 @@ namespace ktplasma
}
}
- void Applet::updateSources() {
+ void Applet::updateSources()
+ {
sources = engine->sources();
sources.removeOne("core");
}
- void Applet::setSource(QString source) {
+ void Applet::setSource(QString source)
+ {
if (!current_source.isEmpty())
engine->disconnectSource(current_source,this);
clearData();
@@ -340,20 +345,39 @@ namespace ktplasma
void Applet::iconClicked()
{
- TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks();
- for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++)
+ QDBusConnection session_bus = QDBusConnection::sessionBus();
+ QDBusConnectionInterface* dbus_service = session_bus.interface();
+ if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent"))
{
- if (i.value()->className() == "ktorrent")
- {
- KWindowSystem::activateWindow(i.key());
- return;
- }
+ // can't find the window, try launching it
+ KUrl::List empty;
+ KRun::run("ktorrent", empty, 0);
+ }
+ else
+ {
+ QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId");
+ QDBusPendingCall call = session_bus.asyncCall(msg, 5000);
+ QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this);
+ connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*)));
}
-
- // can't find the window, try launching it
- KUrl::List empty;
- KRun::run("ktorrent", empty, 0);
}
+
+ void Applet::dbusCallFinished(QDBusPendingCallWatcher* self)
+ {
+ if (self->isError())
+ {
+ // call failed, try launching it
+ KUrl::List empty;
+ KRun::run("ktorrent", empty, 0);
+ }
+ else
+ {
+ QDBusPendingReply<qlonglong> reply = *self;
+ KWindowSystem::activateWindow(reply.value());
+ }
+ self->deleteLater();
+ }
+
void Applet::clearData()
{
diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h
index 29b3265..d396118 100644
--- a/plasma/applet/applet.h
+++ b/plasma/applet/applet.h
@@ -27,6 +27,7 @@
#include "fadingnavigationwidget.h"
class QGraphicsLinearLayout;
+class QDBusPendingCallWatcher;
namespace Plasma
{
@@ -68,6 +69,7 @@ namespace ktplasma
void iconClicked();
void selectPrev();
void selectNext();
+ void dbusCallFinished(QDBusPendingCallWatcher* self);
private:
void updateTorrentCombo();

17
pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
View file

@ -1,19 +1,4 @@
Fix finding taskmanager.h and kworkspace.h
diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
index 3a72241..69b1205 100644
--- a/plasma/applet/CMakeLists.txt
+++ b/plasma/applet/CMakeLists.txt
@@ -6,7 +6,9 @@ if(NOT QT_VERSION_OK)
else(NOT QT_VERSION_OK)
set(TASKMANAGER_FOUND FALSE)
- FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
+ FIND_PATH(TASKMANAGER_INCLUDE_DIR
+ NAMES taskmanager/taskmanager.h
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
Fix finding kworkspace.h
diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
index 59e5470..5b932ff 100644
--- a/plugins/shutdown/CMakeLists.txt

14
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -1,29 +1,36 @@
{ stdenv
, fetchurl
, cmake
, openssl
, printerSupport ? true, cups
, pkgconfig
, zlib
, libX11
, libXcursor
, libXdamage
, libXext
, alsaLib
}:
assert printerSupport -> cups != null;
stdenv.mkDerivation rec {
name = "freerdp-0.8.2";
name = "freerdp-${version}";
version = "1.0.0";
src = fetchurl {
url = "mirror://sourceforge/freerdp/${name}.tar.gz";
sha256 = "1q9hhwyc4hk49hsmd2kghrfsawxcc7gy7vcmhdf91l8v95xp16iq";
url = "https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${version}.tar.gz";
sha256 = "1h7b2ykgsp1b04p67syb3p2xgpsb45i6zl1jvm09h0dr5an85awd";
};
buildInputs = [
cmake
openssl
pkgconfig
zlib
libX11
libXcursor
libXdamage
libXext
alsaLib
] ++ stdenv.lib.optional printerSupport cups;
@ -46,4 +53,3 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.shlevy ];
};
}

13
pkgs/applications/networking/sync/rsync/default.nix
View file

@ -1,17 +1,26 @@
{ stdenv, fetchurl, perl
, enableACLs ? true, acl ? null
, enableCopyDevicesPatch ? false
}:
assert enableACLs -> acl != null;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "rsync-3.0.9";
src = fetchurl {
mainSrc = fetchurl {
url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
};
patchesSrc = fetchurl {
url = http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz;
sha256 = "0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9";
};
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
buildInputs = stdenv.lib.optional enableACLs acl;
buildNativeInputs = [perl];

6
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -4,14 +4,14 @@
}:
let
version = "3.20120106";
version = "3.20120113";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "60735d8b036aa8ac44e1838724d9b4da1fceb2f1547ce7f39b2069a8c3605438";
sha256 = "060s96d5a6vx5alwkfgzsvwx1k9m81l6hbx4rnak9iy5iy28zd0z";
};
buildInputs = [
@ -32,7 +32,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://git-annex.branchable.com/";
description = "Manage files with git without checking them into git";
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
Git-annex allows managing files with git, without checking the

35
pkgs/applications/version-management/gource/default.nix Normal file
View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
let
name = "gource-0.37";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://gource.googlecode.com/files/${name}.tar.gz";
sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
};
buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
meta = {
homepage = "http://code.google.com/p/gource/";
description = "software version control visualization tool";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
Software projects are displayed by Gource as an animated tree with
the root directory of the project at its centre. Directories
appear as branches with files as leaves. Developers can be seen
working on the tree at the times they contributed to the project.
Currently Gource includes built-in log generation support for Git,
Mercurial and Bazaar and SVN. Gource can also parse logs produced
by several third party tools for CVS repositories.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

40
pkgs/desktops/kde-4.8/kdebindings/pykde-purity.patch
View file

@ -1,40 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c853e38..5df3253 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)

18
pkgs/desktops/kde-4.8/kdebindings/pykde4-hardcode-lib-python.patch Normal file
View file

@ -0,0 +1,18 @@
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)

7
pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
View file

@ -8,11 +8,9 @@ kde {
propagatedBuildInputs = [ pyqt4 sip ];
#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
patches = [ ./pykde4-hardcode-lib-python.patch ];
patches = [ ./pykde-purity.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
preConfigure =
''
@ -21,6 +19,7 @@ kde {
# needs to install a plugin.
mkdir -pv $out/${pydir}
${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
'';
meta = {

35
pkgs/desktops/kde-4.8/kdenetwork/FindJasper.cmake
View file

@ -1,35 +0,0 @@
# - Try to find the Jasper JPEG2000 library
# Once done this will define
#
# JASPER_FOUND - system has Jasper
# JASPER_INCLUDE_DIR - the Jasper include directory
# JASPER_LIBRARIES - The libraries needed to use Jasper
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
# Copyright 2006 Alexander Neundorf <neundorf@kde.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PACKAGE(JPEG)
FIND_PATH(JASPER_INCLUDE_DIR jasper/jasper.h)
FIND_LIBRARY(JASPER_LIBRARY NAMES jasper libjasper)
SET(JASPER_LIBRARIES ${JASPER_LIBRARY})
# handle the QUIETLY and REQUIRED arguments and set JASPER_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper DEFAULT_MSG JASPER_LIBRARIES JASPER_INCLUDE_DIR)
MARK_AS_ADVANCED(JASPER_INCLUDE_DIR JASPER_LIBRARY)

1
pkgs/desktops/kde-4.8/kdenetwork/kopete.nix
View file

@ -14,7 +14,6 @@ kde {
patchPhase =
''
cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
cp -v ${./FindJasper.cmake} kopete/cmake/modules/FindJasper.cmake
'';
cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];

60
pkgs/desktops/kde-4.8/kdenetwork/log-feature.diff
View file

@ -1,60 +0,0 @@
--- 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})

6
pkgs/desktops/kde-4.8/kdesdk/find-svn.patch
View file

@ -12,7 +12,7 @@ index 59bcb96..2eac05d 100644
if(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
else(APRCONFIG_EXECUTABLE)
FIND_PATH(_INCLUDES apr_pools.h
@ -26,12 +26,11 @@ index 59bcb96..2eac05d 100644
- /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)
@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_FOUND FALSE) # no apr == can't compile!
endif(_INCLUDES)
endif(APRCONFIG_EXECUTABLE)
@ -45,7 +44,6 @@ index 59bcb96..2eac05d 100644
+ 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)

39
pkgs/desktops/kde-4.8/kdesdk/optional-docs.diff
View file

@ -1,39 +0,0 @@
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)

12
pkgs/desktops/xfce-4.8/applications/ristretto.nix
View file

@ -2,20 +2,18 @@
, exo, dbus_glib, libxfce4util, libxfce4ui, xfconf }:
stdenv.mkDerivation rec {
name = "ristretto-0.0.93";
name = "ristretto-0.2.3";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.bz2";
sha1 = "c71acaad169633faffe26609f9cc671b04ff52d3";
url = "http://archive.xfce.org/src/apps/ristretto/0.2/${name}.tar.bz2";
sha1 = "5a34b865cb9013b67467b0e8d51970f0a1e977d1";
};
buildInputs =
[ pkgconfig intltool libexif gtk thunar exo dbus_glib
libxfce4util libxfce4ui xfconf
[ pkgconfig intltool libexif gtk dbus_glib libxfce4util
libxfce4ui xfconf
];
NIX_LDFLAGS = "-lX11";
meta = {
homepage = http://goodies.xfce.org/projects/applications/ristretto;
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";

8
pkgs/desktops/xfce-4.8/core/garcon.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib }:
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util }:
stdenv.mkDerivation rec {
name = "garcon-0.1.8";
name = "garcon-0.1.9";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/garcon/0.1/${name}.tar.bz2";
sha1 = "e5eac6a13208c81ccad0941656c01e7a69530f03";
sha1 = "2eeab19bc10747a40b44afd4598a2f555eb69952";
};
buildInputs = [ pkgconfig intltool glib ];
buildInputs = [ pkgconfig intltool glib libxfce4util ];
meta = {
homepage = http://www.xfce.org/;

4
pkgs/desktops/xfce-4.8/core/libxfce4ui.nix
View file

@ -2,11 +2,11 @@
, libstartup_notification }:
stdenv.mkDerivation rec {
name = "libxfce4ui-4.8.0";
name = "libxfce4ui-4.8.1";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/libxfce4ui/4.8/${name}.tar.bz2";
sha1 = "107f9d8e3e583f3cf5330074e89ea72eb2a82888";
sha1 = "408645581e589135aa03d2e9b84f4eede68596b2";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/libxfce4util.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool }:
stdenv.mkDerivation rec {
name = "libxfce4util-4.8.1";
name = "libxfce4util-4.8.2";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/libxfce4util/4.8/${name}.tar.bz2";
sha1 = "4d26aea58413603e2c163ff0374a6e32fc47bc4c";
sha1 = "e7498c2e5fca2c89dfef89e0788f10eebbd020c3";
};
buildInputs = [ pkgconfig glib intltool ];

7
pkgs/desktops/xfce-4.8/core/thunar.nix
View file

@ -2,11 +2,12 @@
, dbus_glib, libstartup_notification, xfconf, xfce4panel, udev, libnotify }:
stdenv.mkDerivation rec {
name = "thunar-1.2.2";
version = "1.2.3";
name = "thunar-${version}";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-1.2.2.tar.bz2";
sha1 = "314e3d53ec7be1ea578da4d842ecc8dc5958b1bd";
url = "http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-${version}.tar.bz2";
sha1 = "a05d0e14515d70c5ad94cca881822a707d366863";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/xfce-utils.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui }:
stdenv.mkDerivation rec {
name = "xfce-utils-4.8.2";
name = "xfce-utils-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce-utils/4.8/${name}.tar.bz2";
sha1 = "c9358f47f57b961fc51008cf6752d2761b4c4f25";
sha1 = "159d445b689ebbf73462a4b4baf5cce4e04afaab";
};
configureFlags = "--with-xsession-prefix=$(out)/share/xsessions --with-vendor-info=NixOS.org";

24
pkgs/desktops/xfce-4.8/core/xfce4-appfinder.nix Normal file
View file

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
, libxfce4ui, garcon, xfconf }:
stdenv.mkDerivation rec {
name = "xfce4-appfinder-4.8.0";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-appfinder/4.8/${name}.tar.bz2";
sha1 = "444bbcbded8d2346f9b9beb57ec7adaf556811c9";
};
buildInputs =
[ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
enableParallelBuilding = true;
meta = {
homepage = http://www.xfce.org/;
description = "Xfce application finder, a tool to locate and launch programs on your system";
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
}

4
pkgs/desktops/xfce-4.8/core/xfce4-panel.nix
View file

@ -2,11 +2,11 @@
, libxfce4ui, xfconf, libwnck, exo }:
stdenv.mkDerivation rec {
name = "xfce4-panel-4.8.5";
name = "xfce4-panel-4.8.6";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-panel/4.8/${name}.tar.bz2";
sha1 = "67b9d5bc422663f60f5a05e7cfd7ca67b4542813";
sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/xfce4-session.nix
View file

@ -2,11 +2,11 @@
, libwnck, dbus_glib, xfconf, xorg, xfce4panel }:
stdenv.mkDerivation rec {
name = "xfce4-session-4.8.1";
name = "xfce4-session-4.8.2";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-session/4.8/${name}.tar.bz2";
sha1 = "a33534e53fa36a38a1f9bd164469a9fb62c765a7";
sha1 = "636c2983552861a959225e554898675152a4d812";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/xfce4-settings.nix
View file

@ -2,11 +2,11 @@
, xfconf, xorg, libnotify, libxklavier }:
stdenv.mkDerivation rec {
name = "xfce4-settings-4.8.2";
name = "xfce4-settings-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfce4-settings/4.8/${name}.tar.bz2";
sha1 = "402afe308944a315c385d2b1ed567f997d016b61";
sha1 = "98431633ba3ec2a4a10182bc7266904d9256949b";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/xfconf.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
stdenv.mkDerivation rec {
name = "xfconf-4.8.0";
name = "xfconf-4.8.1";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfconf/4.8/${name}.tar.bz2";
sha1 = "3f560b11d618171805bfb9e6a8290185c7ee5dcd";
sha1 = "aeab124f7c548e387b37a5476e594ef559515533";
};
buildInputs = [ pkgconfig intltool glib libxfce4util ];

4
pkgs/desktops/xfce-4.8/core/xfdesktop.nix
View file

@ -2,11 +2,11 @@
, libxfce4ui, libwnck, xfconf, garcon, libnotify, exo }:
stdenv.mkDerivation rec {
name = "xfdesktop-4.8.2";
name = "xfdesktop-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfdesktop/4.8/${name}.tar.bz2";
sha1 = "fe7d71bb502197b0353b952947826a5a50ab13bc";
sha1 = "b3af72a69627f860f22b37d021efd81e4e37eb55";
};
buildInputs =

4
pkgs/desktops/xfce-4.8/core/xfwm4.nix
View file

@ -2,11 +2,11 @@
, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
stdenv.mkDerivation rec {
name = "xfwm4-4.8.1";
name = "xfwm4-4.8.3";
src = fetchurl {
url = "http://archive.xfce.org/src/xfce/xfwm4/4.8/${name}.tar.bz2";
sha1 = "4075a689f572ae157ed80ab3ce5be85f09dac766";
sha1 = "6d27deca383e0c2fba0cede0bbe0e9aee18e9257";
};
buildInputs =

5
pkgs/desktops/xfce-4.8/default.nix
View file

@ -5,6 +5,7 @@ rec {
#### SUPPORT
# The useful bits from ‘gnome-disk-utility’.
libgdu = callPackage ./support/libgdu.nix { };
# Gvfs is required by Thunar for the trash feature and for volume
@ -57,9 +58,9 @@ rec {
gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
# !!! Add xfce4-appfinder
xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { };
#### APPLICATIONS
terminal = callPackage ./applications/terminal.nix {

21
pkgs/development/compilers/gwt/2.4.0.nix Normal file
View file

@ -0,0 +1,21 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation {
name = "gwt-java-2.4.0";
src = fetchurl {
url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
};
buildInputs = [unzip];
installPhase = ''
ensureDir $out
unzip $src
mv gwt-2.4.0 $out/bin
'';
meta = {
homepage = http://code.google.com/webtoolkit/;
description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
};
}

13
pkgs/development/compilers/idris/default.nix
View file

@ -1,16 +1,17 @@
{ cabal, binary, epic, happy, ivor, mtl, parsec, readline }:
{ cabal, binary, epic, happy, haskeline, mtl, parsec, transformers
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.1.7.1";
sha256 = "1449fy7ld2p6ksn43bvhpa5z7j8vx4wc2szwq85wzpwfaw10d8wb";
isLibrary = true;
version = "0.9.0";
sha256 = "03zbdcl3v90zv0ibzq9fa8z2qrrdsilh5m509mczwrcmlzbzsmrl";
isLibrary = false;
isExecutable = true;
buildDepends = [ binary epic ivor mtl parsec readline ];
buildDepends = [ binary epic haskeline mtl parsec transformers ];
buildTools = [ happy ];
noHaddock = true;
meta = {
homepage = "http://www.cs.st-andrews.ac.uk/~eb/Idris/";
homepage = "http://www.idris-lang.org/";
description = "Dependently Typed Functional Programming Language";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/compilers/uhc/default.nix
View file

@ -3,7 +3,7 @@
}:
let
revision = "2381";
revision = "2399";
in
stdenv.mkDerivation {
name = "uhc-svn-${revision}";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchsvn {
url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
rev = revision;
sha256 = "37598f49cda8ff67b0b4d1c75b0bf50bfcd29a92b08ea427c5071080e368c4bc";
sha256 = "f4e87dbf95f90b021994b0840f27e042dd4e785df7efedcf567f3e2c7ce32621";
};
propagatedBuildInputs = [mtl network binary fgl syb];

24
pkgs/development/interpreters/jruby/default.nix
View file

@ -1,18 +1,30 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation {
name = "jruby-1.1.6";
name = "jruby-1.6.5.1";
src = fetchurl {
url = http://dist.codehaus.org/jruby/1.1.6RC1/jruby-bin-1.1.6RC1.tar.gz;
sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz;
sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd";
};
installPhase = '' ensureDir $out; cp -r * $out '';
buildInputs = [ makeWrapper ];
installPhase = ''
ensureDir $out
mv * $out
rm $out/bin/*.{bat,dll,exe,sh}
mv $out/README $out/docs
for i in $out/bin/*; do
wrapProgram $i \
--set JAVA_HOME ${jre}
done
'';
meta = {
description = "Ruby interpreter written in Java";
homepage = http://jruby.codehaus.org/;
homepage = http://jruby.org/;
license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
};
}

30
pkgs/development/interpreters/ruby/generated.nix
View file

@ -20,14 +20,14 @@ g: # Get dependencies from patched gems
hike = g.hike_1_2_1;
hoe = g.hoe_2_3_3;
i18n = g.i18n_0_6_0;
json = g.json_1_6_4;
json_pure = g.json_pure_1_6_4;
json = g.json_1_6_5;
json_pure = g.json_pure_1_6_5;
mail = g.mail_2_3_0;
mime_types = g.mime_types_1_17_2;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_0_4;
net_sftp = g.net_sftp_2_0_4;
net_ssh = g.net_ssh_2_2_2;
net_ssh = g.net_ssh_2_3_0;
nix = g.nix_0_1_1;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_4_0;
@ -339,16 +339,16 @@ See class rdoc for help. Hint: ri Hoe'';
requiredGems = [ ];
sha256 = ''1pgmfhmh2wv409g7kla30mkp8jpslvp25vcmmim1figl87wpn3j0'';
};
json_1_6_4 = {
json_1_6_5 = {
basename = ''json'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation as a Ruby extension in C.'';
};
name = ''json-1.6.4'';
name = ''json-1.6.5'';
requiredGems = [ ];
sha256 = ''1adka4y7z9v4lmd2zqyap21ghqdnjaivr1ghnqcnw3dmsdrgf39l'';
sha256 = ''0zmdzxbczpciyra7zskn7ayfi0z43p2f3n060gsjgjiqcb5bvz75'';
};
json_pure_1_4_3 = {
basename = ''json_pure'';
@ -361,16 +361,16 @@ See class rdoc for help. Hint: ri Hoe'';
requiredGems = [ ];
sha256 = ''1xw357gkmk6712c94lhpsrq8j9v91mgc2nxlr1m6n20yl6sz2g9r'';
};
json_pure_1_6_4 = {
json_pure_1_6_5 = {
basename = ''json_pure'';
meta = {
description = ''JSON Implementation for Ruby'';
homepage = ''http://flori.github.com/json'';
longDescription = ''This is a JSON implementation in pure Ruby.'';
};
name = ''json_pure-1.6.4'';
name = ''json_pure-1.6.5'';
requiredGems = [ ];
sha256 = ''12i95k265gx4vy2cpxrb3z4slc4czsh3srgky2a6d5h3q6c1kvbf'';
sha256 = ''09s5qymc4y9q0376zjiwf5bjm69fcivr75ar8ji0kmhjkk2rwc55'';
};
mail_2_3_0 = {
basename = ''mail'';
@ -438,7 +438,7 @@ Copyright:: 2002 - 2011, Austin Ziegler
longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
};
name = ''net-sftp-2.0.4'';
requiredGems = [ g.net_ssh_2_2_2 ];
requiredGems = [ g.net_ssh_2_3_0 ];
sha256 = ''1f0ml1z7kjnd79avn42fmys8j0w2995j5lk30ak5n40bq805yvky'';
};
net_ssh_2_0_23 = {
@ -452,16 +452,16 @@ Copyright:: 2002 - 2011, Austin Ziegler
requiredGems = [ ];
sha256 = ''1fllf6mgwc213m5mn266qwhl65zc84wl8rq9m3lvbggw9mh5ynrr'';
};
net_ssh_2_2_2 = {
net_ssh_2_3_0 = {
basename = ''net_ssh'';
meta = {
description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
homepage = ''http://github.com/net-ssh/net-ssh'';
longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
};
name = ''net-ssh-2.2.2'';
name = ''net-ssh-2.3.0'';
requiredGems = [ ];
sha256 = ''11rlcb6w534g21x1g1jz1v1lvyj3zv6s621pf9cwl1aqbl6zh711'';
sha256 = ''1q1fznl4nk2963czpzfby4m9jw9rs37k1rzgbjad5r1n7r6dv0sv'';
};
nix_0_1_1 = {
basename = ''nix'';
@ -640,7 +640,7 @@ documentation.
See RDoc for a description of RDoc's markup and basic use.'';
};
name = ''rdoc-3.12'';
requiredGems = [ g.json_1_6_4 ];
requiredGems = [ g.json_1_6_5 ];
sha256 = ''0cd4hrkba7zr675m62yb87l7hpf0sp2qw8ccc2s0y2fa2fxdxdkp'';
};
rjb_1_3_3 = {
@ -726,7 +726,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.'';
};
name = ''rubyforge-2.0.3'';
requiredGems = [ g.json_pure_1_6_4 ];
requiredGems = [ g.json_pure_1_6_5 ];
sha256 = ''1ck9hkad55dy25819v4gd1nmnpvcrb3i4np3hc03h1j6q8qpxg5p'';
};
rubyforge_2_0_4 = {

28
pkgs/development/libraries/ftgl/default.nix
View file

@ -1,13 +1,31 @@
{stdenv, fetchurl, freetype, mesa}:
stdenv.mkDerivation {
let
name = "ftgl-2.1.3-rc5";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = mirror://sourceforge/ftgl/files/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz ;
url = "mirror://sourceforge/ftgl/${name}.tar.gz";
sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
};
buildInputs = [freetype mesa];
meta = {
homepage = "http://sourceforge.net/apps/mediawiki/ftgl/";
description = "font rendering library for OpenGL applications";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
FTGL is a free cross-platform Open Source C++ library that uses
Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
and extruded polygon rendering modes.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [];
};
}

4
pkgs/development/libraries/gnutls/default.nix
View file

@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
stdenv.mkDerivation rec {
name = "gnutls-3.0.8";
name = "gnutls-3.0.11";
src = fetchurl {
url = "mirror://gnu/gnutls/${name}.tar.xz";
sha256 = "0qcp7jm8c2fyk5kdb4fgyrv9hb745mcf066vwmlb8dchx15ijkms";
sha256 = "1l8k96hms7891zl43qjd7lngjh23kxdq22l6ahm1ham7fyhhrh9r";
};
configurePhase = ''

6
pkgs/development/libraries/haskell/aeson-native/default.nix
View file

@ -4,15 +4,15 @@
cabal.mkDerivation (self: {
pname = "aeson-native";
version = "0.3.3.1";
sha256 = "15733f5ivymkbwvqgbd8scynl9adva3fnid4bzlr9l4sb3yvcz9p";
version = "0.3.3.2";
sha256 = "1s5i88r8sdd7ayrpjw6f18273k6r0igk0sswb503hzvjagzmzffh";
buildDepends = [
attoparsec blazeBuilder blazeTextualNative deepseq hashable mtl syb
text time unorderedContainers vector
];
meta = {
homepage = "http://github.com/mailrank/aeson";
description = "Fast JSON parsing and encoding";
description = "Fast JSON parsing and encoding (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/attoparsec-conduit/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-conduit";
version = "0.0.0.1";
sha256 = "1z6v2j08j3fl329npiz9klbz5gbcl0q8vgz3drmrmyhn31a6cvsf";
version = "0.0.1";
sha256 = "04r3ywzjm39rmd0pka8537c8n6d4l6scgzkqzplmi6nb0kikgb6i";
buildDepends = [ attoparsec conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

4
pkgs/development/libraries/haskell/base64-bytestring/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "base64-bytestring";
version = "0.1.0.3";
sha256 = "0d4j8b1d8z9qr1y446bfkj764xgilk8gw2frj0wn0717y8knvmx3";
version = "0.1.1.0";
sha256 = "0vdmwajxg6w924pcsls45bz4bn29xgl3sgvdp2g1jb8f7qb58r7i";
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and deconding for ByteStrings";

4
pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "blaze-builder-conduit";
version = "0.0.0";
sha256 = "022j78sj9cs4xcbvxz0f2lga0rhxcwaj1mkxn0019rbx3lix1nh3";
version = "0.0.1";
sha256 = "1k9is6dknfqjnkqrvxs9z8cx0ffnnz4q02is9plndyg8pccgjfa9";
buildDepends = [ blazeBuilder conduit text transformers ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

6
pkgs/development/libraries/haskell/blaze-textual-native/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "blaze-textual-native";
version = "0.2.1";
sha256 = "12cnl76qld19x6zlhxcsx2b27mfr9v7sc2xq6af9h77wqb98fkvn";
version = "0.2.1.1";
sha256 = "1q3gdf4ljc5xhw8f72qkvi6insk2nwdfk28a00y1b58jmk8003sd";
buildDepends = [ blazeBuilder text time vector ];
meta = {
homepage = "http://github.com/mailrank/blaze-textual";
description = "Fast rendering of common datatypes";
description = "Fast rendering of common datatypes (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/cereal/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cereal";
version = "0.3.5.0";
sha256 = "0bqkb9al8mr0dzik17bcrjdsk414x78wfc919jb17ihcg7gnvrg8";
version = "0.3.5.1";
sha256 = "1a9ri0fs0vh75c9llpjyvqp6qkjciqri6adpyn7hbqrn2z1h0l5n";
meta = {
description = "A binary serialization library";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/colour/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "colour";
version = "2.3.2";
sha256 = "1j0y8cfdzhzjid1hg50qvh5nsa6kfnxcwxaizxyk73z60dn8g9b6";
version = "2.3.3";
sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
meta = {
homepage = "http://www.haskell.org/haskellwiki/Colour";
description = "A model for human colour/color perception";

6
pkgs/development/libraries/haskell/conduit/default.nix
View file

@ -4,14 +4,14 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.0.3";
sha256 = "149xj6i2whpjf6jqsgfgvpbwni5r0v3qrg7g42i78bd6n40xma72";
version = "0.0.4";
sha256 = "1sc14nh21ba85azm4my5qnllnlbmsq5j6h1yd1mdsk2z3fb0x5zz";
buildDepends = [
liftedBase monadControl text transformers transformersBase
];
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "A pull-based approach to streaming data";
description = "Streaming data processing library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

6
pkgs/development/libraries/haskell/control-monad-attempt/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "control-monad-attempt";
version = "0.3.0";
sha256 = "1l0bqb5h2fs7vx2r8nd6kscyyrrqc0gshnxwdz9p6clfnknyqbqw";
version = "0.3.0.1";
sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
buildDepends = [ attempt transformers ];
meta = {
homepage = "http://github.com/snoyberg/control-monad-attempt";
description = "Monad transformer for attempt";
description = "Monad transformer for attempt. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

6
pkgs/development/libraries/haskell/convertible-text/default.nix
View file

@ -2,14 +2,14 @@
cabal.mkDerivation (self: {
pname = "convertible-text";
version = "0.4.0.1";
sha256 = "0m252ml2zgw0jxfs678m1wp9ivy6gvi9w50qw7zi9ycxnzj9j6r2";
version = "0.4.0.2";
sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
isLibrary = true;
isExecutable = true;
buildDepends = [ attempt text time ];
meta = {
homepage = "http://github.com/snoyberg/convertible/tree/text";
description = "Typeclasses and instances for converting between types";
description = "Typeclasses and instances for converting between types (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-template";
version = "0.2.1.8";
sha256 = "0bx0w4vkigq20pa31sdygj4idi3iywkpclbllrw38ma1j19033zk";
version = "0.2.1.9";
sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc";
buildDepends = [ dataAccessor utilityHt ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";

6
pkgs/development/libraries/haskell/data-object/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "data-object";
version = "0.3.1.8";
sha256 = "0v7kn6rv71fhf2l7ll7plzr90irm2fyp25lskv2zwazp4swhw52x";
version = "0.3.1.9";
sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
buildDepends = [ failure text time ];
meta = {
homepage = "http://github.com/snoyberg/data-object/tree/master";
description = "Represent hierachichal structures, called objects in JSON";
description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

4
pkgs/development/libraries/haskell/enumerator/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "enumerator";
version = "0.4.17";
sha256 = "009h9phdgnkbvz5fri81b895y2hbmw5x7z67rnn31j87khbhnfz9";
version = "0.4.18";
sha256 = "0xqgcn3xs0i7kdy73lizfhs4dzj8crf2x9pmb9d37kqrhdgznl9d";
buildDepends = [ text transformers ];
meta = {
homepage = "https://john-millikin.com/software/enumerator/";

5
pkgs/development/libraries/haskell/ghc-events/default.nix
View file

@ -2,11 +2,12 @@
cabal.mkDerivation (self: {
pname = "ghc-events";
version = "0.3.0.1";
sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla";
version = "0.4.0.0";
sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary mtl ];
noHaddock = true;
meta = {
description = "Library and tool for parsing .eventlog files from GHC";
license = self.stdenv.lib.licenses.bsd3;

30
pkgs/development/libraries/haskell/ghc-mod/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacs, emacs23Packages }:
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.0.6";
sha256 = "c075314de03209827a0e59ee3e63a4d21bc8edb024a1e36721eea248805b38ba";
buildDepends = [
attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
];
# buildTools = [emacs emacs23];
propagatedBuildInputs = [emacs emacs23Packages.haskellMode];
isExecutable = true;
postInstall = ''
cd $out/share/$pname-$version
make
rm Makefile
cd ..
ensureDir "$out/share/emacs"
mv $pname-$version emacs/site-lisp
'';
meta = {
description = "Happy Haskell programming on Emacs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.bluescreen303
];
};
})

4
pkgs/development/libraries/haskell/hamlet/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "0.10.6";
sha256 = "0ai00jwbq5nnrgcfhz3sxm2jm2jvz7qbj56lr0wlc3z818a22ams";
version = "0.10.7.1";
sha256 = "0ll9pp0qnvw903ncpfgrc67jg385jzla3j9l0yfm9qqnn38sqhqv";
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];

9
pkgs/development/libraries/haskell/http-conduit/default.nix
View file

@ -1,19 +1,20 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
, monadControl, network, text, tls, tlsExtra, transformers
, monadControl, network, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.1.0.1";
sha256 = "0jlj727rs8f1yxy6ms2gi3ryj4di5la0pgn2hw5flglflacj8wb6";
version = "1.1.2.2";
sha256 = "049gidxmrw4zri2zkibl2298glhapzzh1kg001dn563594bbiccz";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cprngAes
dataDefault failure httpTypes liftedBase monadControl network text
tls tlsExtra transformers transformersBase utf8String zlibConduit
time tls tlsExtra transformers transformersBase utf8String
zlibConduit
];
meta = {
homepage = "http://www.yesodweb.com/book/http-conduit";

4
pkgs/development/libraries/haskell/http-enumerator/default.nix
View file

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "http-enumerator";
version = "0.7.2.3";
sha256 = "1f66dnqm67qzg76w47kqvpv7ssandmf8md838mdzrsg88x54dar7";
version = "0.7.2.5";
sha256 = "1sck3z1x73qbak6p11745bywxwz91nk635jvv4wmgq4ifyfkbabb";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/iteratee/default.nix
View file

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "iteratee";
version = "0.8.7.6";
sha256 = "05zhw44zycwllvyrkxz1mkn5mkylrdz9ynh27k17gsm9mjml3cab";
version = "0.8.8.1";
sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz";
isLibrary = true;
isExecutable = true;
buildDepends = [

6
pkgs/development/libraries/haskell/jsonEnumerator/default.nix
View file

@ -4,15 +4,15 @@
cabal.mkDerivation (self: {
pname = "json-enumerator";
version = "0.0.1.1";
sha256 = "0k94x9vwwaprqbc8gay5l0vg6hjmjpjp852yncncb8kr0r344z7l";
version = "0.0.1.2";
sha256 = "08gwrm15pvvhhrkrncy6wr4fi5v55fdhc8byfrw5zd62hmx8xm9d";
buildDepends = [
blazeBuilder blazeBuilderEnumerator enumerator jsonTypes text
transformers
];
meta = {
homepage = "http://github.com/snoyberg/json-enumerator";
description = "Pure-Haskell utilities for dealing with JSON with the enumerator package";
description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

18
pkgs/development/libraries/haskell/math-functions/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, erf, vector }:
cabal.mkDerivation (self: {
pname = "math-functions";
version = "0.1.1.0";
sha256 = "0qb0hbfzd1g8cz3dkm8cs2wknz08b63vn7nljmynk794y64b1klp";
buildDepends = [ erf vector ];
meta = {
homepage = "https://github.com/bos/math-functions";
description = "Special functions and Chebyshev polynomials";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

6
pkgs/development/libraries/haskell/neither/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "neither";
version = "0.3.0";
sha256 = "0lak4y0k4cisr27vw2bnpd0pa1kkgv8r96z7vf19wg7brzarx71l";
version = "0.3.0.1";
sha256 = "1vr8zap3vp28dr48s510lfrbfhw5yz25vng6wyk20582lv4j2mz8";
buildDepends = [ failure transformers ];
meta = {
homepage = "http://github.com/snoyberg/neither";
description = "Provide versions of Either with good monad and applicative instances";
description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

8
pkgs/development/libraries/haskell/random-shuffle/default.nix
View file

@ -1,10 +1,10 @@
{ cabal, random }:
{ cabal, MonadRandom, random }:
cabal.mkDerivation (self: {
pname = "random-shuffle";
version = "0.0.2";
sha256 = "1csq0ffsqbbv6ymf707nzfb7c9bmykwk9bcgj21mxmh6khlqn9jp";
buildDepends = [ random ];
version = "0.0.3";
sha256 = "120yh2k1n57vc9mi4dlnvv9dr79qaz4dsbvl3qp3y82mdz8maifw";
buildDepends = [ MonadRandom random ];
meta = {
description = "Random shuffle implementation";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/shakespeare-css/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "0.10.5";
sha256 = "1cnv9qgp1llrrvcqp64mq207wdsxpqza9yq5nzlsgrh6qlzvm4hs";
version = "0.10.6";
sha256 = "18hcrsmw7xg2cdzyb413rc1bg507y4kr6q1l3mbxgnzqnffik6d7";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

4
pkgs/development/libraries/haskell/tls/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
version = "0.8.4";
sha256 = "1xd6cax4ldvahjjs5kdhcjmy4rx1ywp6r3alaifxbk2397zi7p1v";
version = "0.8.5";
sha256 = "07xz81ny9a1rcflqiqxkmx5kj62rssxw1gr6vnlg76xr21j8mam9";
isLibrary = true;
isExecutable = true;
buildDepends = [

17
pkgs/development/libraries/haskell/vault/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "vault";
version = "0.1.0.0";
sha256 = "02gki0g9mwmvvizxhk6myfg3dmlqpcjjiz5c8693a060hkr0grqq";
meta = {
homepage = "https://github.com/HeinrichApfelmus/vault";
description = "a typed, persistent store for values of arbitrary types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

6
pkgs/development/libraries/haskell/web-routes-quasi/default.nix
View file

@ -2,14 +2,14 @@
cabal.mkDerivation (self: {
pname = "web-routes-quasi";
version = "0.7.1";
sha256 = "0m5p21kbiawjpcs5c83aaypmpmx4avjcj0kzkn95zgdkqcz5kr12";
version = "0.7.1.1";
sha256 = "1rqbymi0n7kdhl272qfjhx9s3gspd5k0bjrhclj9l8mjf033vdmf";
isLibrary = true;
isExecutable = true;
buildDepends = [ pathPieces text ];
meta = {
homepage = "http://docs.yesodweb.com/web-routes-quasi/";
description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL";
description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [

12
pkgs/development/libraries/haskell/web-routes/default.nix
View file

@ -1,10 +1,14 @@
{ cabal, mtl, network, parsec, utf8String }:
{ cabal, blazeBuilder, httpTypes, mtl, network, parsec, text
, utf8String
}:
cabal.mkDerivation (self: {
pname = "web-routes";
version = "0.25.3";
sha256 = "09bqz7vn2050jr67m3rrqi0krfxa9n1fxm9rgi3c837g522nb4kk";
buildDepends = [ mtl network parsec utf8String ];
version = "0.26.2";
sha256 = "0v7vkd53jf9zf2m0lbiq10qp39ghlnxwafs1hixbz2qfcgsns10j";
buildDepends = [
blazeBuilder httpTypes mtl network parsec text utf8String
];
meta = {
description = "Library for maintaining correctness and composability of URLs within an application";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/xml-conduit/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "0.5.0.1";
sha256 = "0n30mk3dmdwxjw4vgfmlj7dzbiah9vj4hlg258qkvy5likzz1j5n";
version = "0.5.1.2";
sha256 = "0ww018aj4fy0hngjsj1lc5m7sw36kdc1z2p8nxp4pgsmhj0ccm36";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure systemFilepath text transformers

5
pkgs/development/libraries/haskell/xml-types/default.nix
View file

@ -2,10 +2,11 @@
cabal.mkDerivation (self: {
pname = "xml-types";
version = "0.3";
sha256 = "0d0x7s865ca7bscskp6s7zyzpzd22nkd61wzwg11v6h0q5dilly7";
version = "0.3.1";
sha256 = "0ffmmidb9a1hqfbmvjxjvij2wfrqqlyjc7m7n81czrcrrsmyc1kc";
buildDepends = [ text ];
meta = {
homepage = "https://john-millikin.com/software/haskell-xml/";
description = "Basic types for representing XML";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/xml/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xml";
version = "1.3.10";
sha256 = "0mmibqzbbqmw4a8gc4f2yy144nx48gpfwj3iqq6dydvcikajxav2";
version = "1.3.12";
sha256 = "1lmqnzna0zy297y4q6qviv7a4966zz9mhfhk6anrp66cz890whai";
buildDepends = [ text ];
meta = {
homepage = "http://code.galois.com";

4
pkgs/development/libraries/haskell/yaml/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.5.1.1";
sha256 = "1l3f1rbdajdf9944kwbf90a1wxv00g2jcgjkg54k6c3iqbx956w2";
version = "0.5.1.2";
sha256 = "0xmx58h47prpmgbf63bsy7ar74h0d968wyd2yg3bgvwmnd83iz7d";
buildDepends = [
aeson attoparsec conduit text transformers unorderedContainers
vector

4
pkgs/development/libraries/haskell/zlib-conduit/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "zlib-conduit";
version = "0.0.0";
sha256 = "1nqcw809xqlycggn4nqys205gv3kjwws16910xlx2b8b9f8ayxjg";
version = "0.0.1";
sha256 = "19bxw5maiff213jsbw889pwhmkwh1qnxrv377icwsqa619dx4k1y";
buildDepends = [ conduit transformers zlibBindings ];
meta = {
homepage = "http://github.com/snoyberg/conduit";

7
pkgs/development/libraries/hwloc/default.nix
View file

@ -9,7 +9,12 @@ stdenv.mkDerivation rec {
};
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
buildInputs = [ pkgconfig cairo expat ncurses libX11 ];
buildNativeInputs = [ pkgconfig ];
# Filter out `null' inputs. This allows users to `.override' the
# derivation and set optional dependencies to `null'.
buildInputs = stdenv.lib.filter (x: x != null)
[ cairo expat ncurses libX11 ];
doCheck = true;

3
pkgs/development/libraries/jasper/default.nix
View file

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
};
buildInputs = [unzip libjpeg];
buildNativeInputs = [unzip];
propagatedBuildInputs = [ libjpeg ];
configureFlags = "--enable-shared";

4
pkgs/development/libraries/libassuan/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, pth, libgpgerror }:
stdenv.mkDerivation rec {
name = "libassuan-2.0.2";
name = "libassuan-2.0.3";
src = fetchurl {
url = "mirror://gnupg/libassuan/${name}.tar.bz2";
sha256 = "1n5lfpafq9sjb3r06lw7vrrjmbs3p035zfakx7ff5bfb7niwpq31";
sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
};
propagatedBuildInputs = [ pth libgpgerror ];

29
pkgs/development/libraries/libdrm/default.nix
View file

@ -1,28 +1,31 @@
{stdenv, fetchurl, pkgconfig, libpthreadstubs}:
{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}:
stdenv.mkDerivation (rec {
name = "libdrm-2.4.24";
stdenv.mkDerivation rec {
name = "libdrm-2.4.29";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7";
sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2";
};
buildInputs = [ pkgconfig libpthreadstubs ];
buildNativeInputs = [ pkgconfig ];
buildInputs = [ libpthreadstubs libpciaccess cairo udev ];
patches = [ ./libdrm-apple.patch ];
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
preConfigure = ''
# General case: non intel.
if test -n "$crossConfig"; then
configureFlags="$configureFlags --disable-intel";
fi
'' + stdenv.lib.optionalString stdenv.isDarwin
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ]
++ stdenv.lib.optional stdenv.isDarwin "-C";
crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
meta = {
homepage = http://dri.freedesktop.org/libdrm/;
description = "Library for accessing the kernel's Direct Rendering Manager";
license = "bsd";
maintainers = [ stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.linux;
};
} // (stdenv.lib.optionalAttrs stdenv.isDarwin { configureFlags = [ "-C" ]; }))
}

2
pkgs/development/libraries/libdrm/libdrm-apple.patch
View file

@ -2,9 +2,9 @@ diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel
--- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400
+++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400
@@ -51,6 +51,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <stdbool.h>
+#include <sys/time.h>
#include "errno.h"

4
pkgs/development/libraries/libidn/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libidn-1.23";
name = "libidn-1.24";
src = fetchurl {
url = "mirror://gnu/libidn/${name}.tar.gz";
sha256 = "0sjy1k35x3r5vfkd5j21gy0xdlzg9svm74wn3hpfbfhyhmsjvd15";
sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys";
};
doCheck = ! stdenv.isDarwin;

14
pkgs/development/libraries/libktorrent/default.nix
View file

@ -1,18 +1,22 @@
{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
, phonon, libgcrypt }:
let
mp_ = "1.3";
version = "1.${mp_}";
version4 = "4.${mp_}";
in
stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "libktorrent";
version = "1.1.1";
src = fetchurl {
url = "http://ktorrent.org/downloads/4.1.1/${name}.tar.bz2";
sha256 = "06d93xpshxawz49hqh6pvypir4ygm1f781hs7yim5k6b7shivfs1";
url = "http://ktorrent.org/downloads/${version4}/${name}.tar.bz2";
sha256 = "0mvvx6mdfy0pyhk6lwwmmbd3pd2ai6n2rf5kdjqhpkm9wbrck85n";
};
buildInputs =
[ cmake kdelibs qt4 automoc4 phonon gmp qca2 boost libgcrypt gettext ];
buildNativeInputs = [ cmake automoc4 gettext ];
buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ];
enableParallelBuilding = true;

30
pkgs/development/libraries/mesa/default.nix
View file

@ -1,37 +1,39 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, x11, xlibs, libdrm, file, expat
{ stdenv, fetchurl, flex, bison, pkgconfig, libdrm, file, expat, makedepend
, libXxf86vm, libXfixes, libXdamage, glproto, dri2proto, libX11, libxcb, libXext
, libXt, udev, enableTextureFloats ? false
, python, libxml2Python, lipo ? null }:
if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
let version = "7.10.3"; in
let version = "7.11.2"; in
stdenv.mkDerivation {
name = "mesa-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "1h451vgsfsp0h0wig66spqgxmjalsy28gvd9viynfwmq7741yw0y";
sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p";
};
patches = [ ./swrast-settexbuffer.patch ];
postPatch = ''
find . -name "*.py" -exec sed -i -e "s|#! */usr/bin/env python|#! ${python}/bin/python|" {} +
'';
prePatch = "patchShebangs .";
# r300
configureFlags =
" --with-driver=dri --enable-gl-osmesa --enable-gles1"
+ " --enable-gallium --enable-gallium-r600 --enable-gles2"
+ " --enable-gallium-swrast --enable-gallium-egl --disable-glx-tls"
+ " --enable-xcb --enable-egl --disable-glut";
+ " --with-gallium-drivers=i915,i965,nouveau,r600,svga,swrast"
+ " --enable-gles2 --enable-gallium-egl --disable-glx-tls"
+ " --enable-xcb --enable-egl --disable-glut"
# Texture floats are patented, see docs/patents.txt
+ stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";
buildInputs =
[ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto
xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto
lipo file python libxml2Python flex bison
];
buildInputs = [ expat libdrm libXxf86vm libXfixes libXdamage glproto dri2proto
libxml2Python libX11 libXext libxcb lipo libXt udev ];
buildNativeInputs = [ pkgconfig python makedepend file flex bison ];
enableParallelBuilding = true;

6
pkgs/development/libraries/ucommon/default.nix
View file

@ -1,11 +1,11 @@
{ fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
stdenv.mkDerivation rec {
name = "ucommon-5.0.7";
name = "ucommon-5.1.2";
src = fetchurl {
url = mirror://gnu/commoncpp/ucommon-5.0.7.tar.gz;
sha256 = "0zr4zjwb62dpq7aa88vclhv2y8j7glkq693kwmb8agfx0fv8nkny";
url = mirror://gnu/commoncpp/ucommon-5.1.2.tar.gz;
sha256 = "1a6wfvrqpkk4w3l33jx5bdj38ljlyr92041aakvwmajpkczjf2q3";
};
buildInputs = [ pkgconfig gnutls zlib ];

35
pkgs/development/libraries/v8/default.nix
View file

@ -1,35 +1,36 @@
{ stdenv, fetchsvn, python, scons, makeWrapper }:
{ stdenv, fetchsvn, python, scons, readline, makeWrapper }:
assert readline != null;
let
system = stdenv.system;
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else "";
arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" then "x64" else "";
version = "3.6.6.17";
in
assert system == "i686-linux" || system == "x86_64-linux";
stdenv.mkDerivation rec {
name = "v8-r${toString src.rev}";
name = "v8-${version}";
src = fetchsvn {
url = http://v8.googlecode.com/svn/trunk ;
sha256 = "1p51zh1l9c2gq3g4qk713n6qki9by3llx4p46inncvqfrimgshxb";
rev = 5865;
url = "http://v8.googlecode.com/svn/tags/${version}";
sha256 = "7080d53b9d3aefc591c2e181dcf97d538ce36177284fc658eca6420ea36a926f";
};
buildInputs = [python scons makeWrapper];
buildInputs = [python scons readline makeWrapper];
buildPhase = ''
export CXX=`type -p g++`
scons snapshot=on importenv=PATH arch=${arch}
scons snapshot=on library=shared importenv=PATH arch=${arch}
scons sample=shell snapshot=on importenv=PATH arch=${arch}
export CPPPATH=${readline}/include
export LIBPATH=${readline}/lib
scons snapshot=on console=readline library=shared importenv=PATH arch=${arch} library d8
'';
installPhase = ''
ensureDir $out/bin
ensureDir $out/lib
cp -v libv8.* $out/lib
cp -v shell $out/bin/v8-shell
cp -v d8 $out/bin/d8
cp -vR include $out/
wrapProgram $out/bin/v8-shell --set LD_LIBRARY_PATH $out/lib
wrapProgram $out/bin/d8 --set LD_LIBRARY_PATH $out/lib
'';
}

6
pkgs/development/ocaml-modules/batteries/default.nix
View file

@ -5,11 +5,11 @@ let
in
stdenv.mkDerivation {
name = "ocaml-batteries-1.4.0";
name = "ocaml-batteries-1.4.1";
src = fetchurl {
url = https://forge.ocamlcore.org/frs/download.php/643/batteries-1.4.0.tar.gz;
sha256 = "1qyhiyanlhpbj0dv0vyqak87qfadjzg2pb8q93iybmg59akaxl15";
url = http://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz;
sha256 = "bdca7deba290d83c66c0a5001da52b2d7f2af58b7b7e7d9303d4363aaafe9c30";
};
buildInputs = [ocaml findlib camomile ounit];

23
pkgs/development/ocaml-modules/extlib/default.nix Normal file
View file

@ -0,0 +1,23 @@
{stdenv, fetchurl, ocaml, findlib}:
stdenv.mkDerivation {
name = "ocaml-extlib-1.5.2";
src = fetchurl {
url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz";
sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa";
};
buildInputs = [ocaml findlib];
createFindlibDestdir = true;
configurePhase = "true";
meta = {
homepage = "http://code.google.com/p/ocaml-extlib/";
description = "Enhancements to the OCaml Standard Library modules";
license = "LGPL";
platforms = ocaml.meta.platforms;
};
}

20
pkgs/development/ocaml-modules/ocamlmake/default.nix Normal file
View file

@ -0,0 +1,20 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "ocaml-make-6.33.0";
src = fetchurl {
url = "http://www.ocaml.info/ocaml_sources/ocaml-make-6.33.0.tar.gz";
sha256 = "3054303ba04e4bbbe038e08310fabc3e5a0e3899bbba33d9ac5ed7a1b9d1e05a";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = "cp OCamlMakefile $out";
meta = {
homepage = "http://www.ocaml.info/home/ocaml_sources.html";
description = "Generic OCaml Makefile for GNU Make";
license = "LGPL";
};
}

9
pkgs/development/ocaml-modules/pcre/default.nix
View file

@ -2,16 +2,15 @@
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
version = "6.1.0";
version = "6.2.5";
in
stdenv.mkDerivation {
name = "ocaml-pcre-${version}";
src = fetchurl {
url = "http://hg.ocaml.info/release/pcre-ocaml/archive/" +
"release-${version}.tar.bz2";
sha256 = "1lj9mzabi1crxwvb2ly1l10h4hlx0fw20nbnq76bbzzkzabjs4ll";
url = "http://www.ocaml.info/ocaml_sources/pcre-ocaml-${version}.tar.gz";
sha256 = "f1774028a4525d22d1f4cf4ce0121c99d85a75aed7a498c3e8ab0f5e39888e47";
};
buildInputs = [pcre ocaml findlib];
@ -21,7 +20,7 @@ stdenv.mkDerivation {
configurePhase = "true"; # Skip configure phase
meta = {
homepage = "http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml";
homepage = "http://www.ocaml.info/home/ocaml_sources.html";
description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
license = "LGPL";
platforms = ocaml.meta.platforms;

51
pkgs/development/ocaml-modules/pycaml/default.nix Normal file
View file

@ -0,0 +1,51 @@
{stdenv, fetchurl, ocaml, findlib, python, ocaml_make}:
# The actual version of pycaml is unclear, as it is the original
# 0.82 version with some patches applied in order to use it for
# the kompostilo type setter (see README). Apparently, some of
# the patches provide Python 3.1 support.
# This version also differs from the Debian version, which
# is also a heavily patched 0.82.
# Therefore, we may at some point try to find out what is
# actually the "real" version (if the library is still alive).
stdenv.mkDerivation {
name = "pycaml-0.82";
src = fetchurl {
name = "pycaml.tar.gz";
url = "http://github.com/chemoelectric/pycaml/tarball/master";
sha256 = "ff6d863c42b4ef798f50ff5eff77b47b77b5c0d28b6f65364e8a436a216dc591";
};
buildInputs = [ocaml findlib python];
createFindlibDestdir = true;
phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
# fix some paths to the appropriate store paths.
patchPhase = ''
sed -i "Makefile" -e's|/usr/include/OCamlMakefile|${ocaml_make}|g'
sed -i "Makefile" -e's|/usr|${python}|g'
'';
buildPhase = ''
make -f Makefile -j1 PYVER=`python -c 'import sys; print("{0}.{1}".format(sys.version_info.major, sys.version_info.minor));'`
'';
# the Makefile is not shipped with an install target, hence we do it ourselves.
installPhase = ''
ocamlfind install pycaml \
dllpycaml_stubs.so* libpycaml_stubs.a pycaml.a pycaml.cma \
pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa pycaml.ml pycaml.mli \
pycaml.o pycaml_stubs.c pycaml_stubs.h pycaml_stubs.o META
'';
meta = {
homepage = "http://github.com/chemoelectric/pycaml";
description = "Bindings for python and ocaml";
license = "LGPL";
platforms = ocaml.meta.platforms;
};
}

26
pkgs/development/ocaml-modules/sexplib/default.nix Normal file
View file

@ -0,0 +1,26 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
# note: only works with ocaml>3.12
# use version 5.2.0 if you still want an 3.11 version...
stdenv.mkDerivation {
name = "ocaml-sexplib-7.0.4";
src = fetchurl {
url = "http://forge.ocamlcore.org/frs/download.php/699/sexplib-7.0.4.tar.gz";
sha256 = "83c6c771f423d91bebc4f57202066358adf3775fb000dd780079f51436045a43";
};
buildInputs = [ocaml findlib ocaml_typeconv];
createFindlibDestdir = true;
configurePhase = "true";
meta = {
homepage = "http://forge.ocamlcore.org/projects/sexplib/";
description = "Library for serializing OCaml values to and from S-expressions.";
license = "LGPL";
platforms = ocaml.meta.platforms;
};
}

25
pkgs/development/ocaml-modules/typeconv/default.nix Normal file
View file

@ -0,0 +1,25 @@
{stdenv, fetchurl, ocaml, findlib}:
# note: works only with ocaml >3.12
stdenv.mkDerivation {
name = "ocaml-typeconv-3.0.4";
src = fetchurl {
url = "http://forge.ocamlcore.org/frs/download.php/697/ocaml-type-conv-3.0.4.tar.gz";
sha256 = "63b6f2872d29fb4c0b1448343bb5ec0649365126756128049d45a81238b59f12";
};
buildInputs = [ocaml findlib ];
createFindlibDestdir = true;
configurePhase = "true";
meta = {
homepage = "http://forge.ocamlcore.org/projects/type-conv/";
description = "Support library for OCaml preprocessor type conversions";
license = "LGPL";
platforms = ocaml.meta.platforms;
};
}

20
pkgs/development/tools/build-managers/leiningen/builder.sh Normal file
View file

@ -0,0 +1,20 @@
#!/bin/bash
set -e
source $stdenv/setup
mkdir -pv $out/bin $out/lib
out_bin=$out/bin/lein
cp -v $src $out_bin
cp -v $jarsrc $out/lib
cp -v $clojuresrc $out/lib
patch --verbose $out_bin -p0 < $patches
chmod -v 755 $out_bin
echo "Testing out \"lein version\"..."
$out_bin version
echo "Success."

36
pkgs/development/tools/build-managers/leiningen/default.nix Normal file
View file

@ -0,0 +1,36 @@
{stdenv, fetchurl, openjdk}:
stdenv.mkDerivation rec {
pname = "leiningen";
version = "1.6.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://raw.github.com/technomancy/leiningen/stable/bin/lein-pkg";
sha256 = "e177a493ed0c4a7874f1391d5cc72cc1e541e55ed3d6e075feec87b5da6f8277";
};
jarsrc = fetchurl {
url = "https://github.com/downloads/technomancy/leiningen/leiningen-1.6.2-standalone.jar";
sha256 = "e35272556ece82d9a6a54b86266626da1b5f990ff556639dd7dd1025d6ed4226";
};
clojuresrc = fetchurl {
url = "http://build.clojure.org/releases/org/clojure/clojure/1.2.1/clojure-1.2.1.jar";
sha256 = "b38853254a2df9138b2e2c12be0dca3600fa7e2a951fed05fc3ba2d9141a3fb0";
};
patches = [ ./lein.patch ];
builder = ./builder.sh;
propagatedBuildInputs = [ openjdk ];
meta = {
homepage = https://github.com/technomancy/leiningen;
description = "Project automation for Clojure";
license = "EPL";
platforms = stdenv.lib.platforms.unix;
};
}

36
pkgs/development/tools/build-managers/leiningen/lein.patch Normal file
View file

@ -0,0 +1,36 @@
--- lein-pkg 2012-01-09 20:47:44.000000000 -0800
+++ lein-pkg-nix 2012-01-09 20:45:01.000000000 -0800
@@ -70,7 +70,7 @@
LEIN_PLUGIN_PATH="$(echo "$DEV_PLUGINS" | tr \\n :)"
LEIN_USER_PLUGIN_PATH="$(echo "$(unique_user_plugins)" | tr \\n :)"
CLASSPATH="$CLASSPATH:$LEIN_PLUGIN_PATH:$LEIN_USER_PLUGIN_PATH:test/:src/:resources/"
-CLOJURE_JAR="/usr/share/java/clojure-1.2.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar"
+CLOJURE_JAR="$(dirname $0)/../lib/*clojure-1.2.1.jar"
NULL_DEVICE=/dev/null
# apply context specific CLASSPATH entries
@@ -78,23 +78,7 @@
CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
fi
-SHARE_JARS="ant ant-launcher classworlds clojure-1.2 clojure-contrib \
-lucene-memory maven-ant-tasks maven-artifact maven-artifact-manager \
-maven-error-diagnostics maven-model maven-settings maven-project maven-profile \
-maven-repository-metadata plexus-container-default-alpha plexus-interpolation \
-plexus-utils wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api \
-xml-apis lucene-core lucene-highlighter clucy robert-hooke lancet \
-backport-util-concurrent" # NFI why that last one is necessary
-for JAR in $SHARE_JARS; do
- CLASSPATH="$CLASSPATH":"/usr/share/java/$JAR.jar"
-done
-
-# Do not use installed leiningen jar during self-compilation
-if ! { [ "$1" = "compile" ] &&
- grep -qsE 'defproject leiningen[[:space:]]+"[[:digit:].]+"' \
- project.clj ;}; then
- CLASSPATH="$CLASSPATH":/usr/share/java/leiningen-$LEIN_VERSION.jar
-fi
+CLASSPATH="$CLASSPATH:$(dirname $0)/../lib/*"
if [ $DEBUG ]; then
echo $CLASSPATH

13
pkgs/development/tools/haskell/threadscope/default.nix
View file

@ -1,14 +1,19 @@
{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }:
{ cabal, binary, cairo, deepseq, ghcEvents, glib, gtk, mtl, pango
, time
}:
cabal.mkDerivation (self: {
pname = "threadscope";
version = "0.2.0";
sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k";
version = "0.2.1";
sha256 = "08s9fbwg33rgbqjdx7n90q83livfay9khr2ddjwj8brw8k1wkmxg";
isLibrary = false;
isExecutable = true;
buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ];
buildDepends = [
binary cairo deepseq ghcEvents glib gtk mtl pango time
];
configureFlags = "--ghc-options=-rtsopts";
meta = {
homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
description = "A graphical tool for profiling parallel Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

6
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
stdenv.mkDerivation rec {
name = "automake-1.11.1";
name = "automake-1.11.2";
# TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
# available upstream; see
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.bz2";
sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
};
buildInputs = [perl autoconf makeWrapper];
@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
# "fixed" path in generated files!
dontPatchShebangs = true;
patches = [ ./more-robust-silent-tests.patch ];
meta = {
homepage = http://www.gnu.org/software/automake/;
description = "GNU Automake, a GNU standard-compliant makefile generator";

Some files were not shown because too many files have changed in this diff Show more