public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

Browse Source 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
This commit is contained in:
Vladimír Čunát
2013-05-08 13:46:46 +02:00
parent d4561be1cb 0c020c98f9
commit 1278859d31
153 changed files with 1505 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/stdenv.xml
+5
View File
@@ -568,6 +568,11 @@ nothing.</para>
<variablelist>
<title>Variables controlling the build phase</title>
<varlistentry>
<term><varname>dontBuild</varname></term>
<listitem><para>Set to true to skip the build phase.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>makefile</varname></term>
<listitem><para>The file name of the Makefile.</para></listitem>
pkgs/applications/audio/mopidy/default.nix
+2 -2
View File
@@ -5,12 +5,12 @@
pythonPackages.buildPythonPackage rec {
name = "mopidy-${version}";
version = "0.12.0";
version = "0.14.1";
src = fetchgit {
url = "https://github.com/mopidy/mopidy.git";
rev = "refs/tags/v${version}";
sha256 = "18b1gsyq1ph1a8gl6m4jmhkvq1gyyhbkbb6rrr3qr4rb5prl1fyi";
sha256 = "0lgd8dpiri9m6sigpf1g1qzvz25lkb38lskgwvb8j7x64y104z0v";
};
propagatedBuildInputs = with pythonPackages; [
pkgs/applications/audio/spotify/default.nix
+8 -8
View File
@@ -2,16 +2,16 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let
version = "0.8.8.323";
qt4webkit =
let
version = "0.9.0.133";
qt4webkit =
if stdenv.system == "i686-linux" then
fetchurl {
name = "libqtwebkit4_2.2_i386.deb";
url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb;
sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924";
}
else
else
fetchurl {
name = "libqtwebkit4_2.2_amd64.deb";
url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb;
@@ -25,13 +25,13 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_i386.deb";
sha256 = "13q803qlvq16yrr7f95izp9mqqdb8kpcsyrb5gc5i2pya68ra906";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_i386.deb";
sha256 = "15kbwll63pm99262f7xq1z0c5bwmk5cz46pkh8xd5xsqxlsvvv1n";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd143501.250-1_amd64.deb";
sha256 = "0ny3z499wks1dhrd3qq4d6cp0zd33198z9vak8ffgm5x24sdpghf";
url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.gd18ed58.259-1_amd64.deb";
sha256 = "0l3nikhf4hyj6z7639s668kd806730va005rwqcxvymxddcbcp03";
}
else throw "Spotify not supported on this platform.";
pkgs/applications/editors/emacs-modes/proofgeneral/default.nix
+7
View File
@@ -17,6 +17,13 @@ stdenv.mkDerivation (rec {
-e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
s|/sbin/install-info|install-info|g"
# Workaround for bug #458
# ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90
# http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
sed -i "Makefile" \
-e "s|(setq byte-compile-error-on-warn t)||g"
sed -i "bin/proofgeneral" -e's/which/type -p/g'
# @image{ProofGeneral} fails, so remove it.
pkgs/applications/misc/k3b/default.nix
+3 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
, kdelibs, kdemultimedia, automoc4, phonon
, kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null
}:
stdenv.mkDerivation rec {
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
flac libsamplerate libdvdread lame libsndfile
libmad gettext stdenv.gcc.libc
kdelibs kdemultimedia automoc4 phonon
libkcddb
];
enableParallelBuilding = true;
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "CD/DVD Burning Application for KDE";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sander maintainers.urkud ];
maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
platforms = with stdenv.lib.platforms; linux;
};
}
pkgs/applications/misc/pstree/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "pstree-2.33";
name = "pstree-2.36";
src = fetchurl {
url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
sha256 = "1vx4fndmkkx3bmcv71rpzjjbn24hlfs10pl99dsfhbx16a2d41cx";
};
unpackPhase = "unpackFile \$src; sourceRoot=.";
pkgs/applications/misc/xmobar/default.nix
+2 -3
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "xmobar";
version = "0.16";
sha256 = "1dx4kwygzp4c5j4jj4lsfgjfvhh863v68s106lmwc86a30h60p8i";
version = "0.17";
sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -13,7 +13,6 @@ cabal.mkDerivation (self: {
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";
patches = [ ./add-freeration-variable.patch ];
meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";
pkgs/applications/networking/browsers/konq-plugins/default.nix
-23
View File
@@ -1,23 +0,0 @@
{ stdenv, fetchurl, kdelibs, cmake, qt4, automoc4, phonon, kde_baseapps, gettext }:
stdenv.mkDerivation rec {
name = "konq-plugins-${version}";
version = "4.4.0";
src = fetchurl {
url = http://ftp.riken.go.jp/pub/FreeBSD/distfiles/KDE/extragear/konq-plugins-4.4.0.tar.bz2;
sha256 = "1hn722rcdcwmhfnn89rnvp2b4d8gds4nm483ps3jkk83d7f2xmbi";
};
buildInputs = [ cmake kdelibs qt4 automoc4 phonon kde_baseapps gettext ];
patches = [ ./qt47.patch ];
meta = with stdenv.lib; {
description = "Various plugins for Konqueror";
license = "GPL";
homepage = http://kde.org/;
maintainers = [ maintainers.phreedom ];
platforms = kdelibs.meta.platforms;
};
}
pkgs/applications/networking/browsers/konq-plugins/qt47.patch
-11
View File
@@ -1,11 +0,0 @@
--- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000
+++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100
@@ -300,7 +300,7 @@
// ----------------------------------------------------------------------------
AdElement::AdElement() :
- m_url(0), m_category(0), m_type(0), m_blocked(false) {}
+ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {}
AdElement::AdElement(const QString &url, const QString &category,
const QString &type, bool blocked, const DOM::Node&node) :
pkgs/applications/networking/mailreaders/notmuch/default.nix
+10 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1,
{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg,
pkgconfig, talloc, xapian
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56";
};
buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ];
buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ];
patchPhase = ''
(cd test && for prg in \
@@ -55,6 +55,14 @@ stdenv.mkDerivation rec {
substituteInPlace "$prg" \
--replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
done)
for src in \
crypto.c \
emacs/notmuch-crypto.el
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg2\"
done
'';
# XXX: emacs tests broken
pkgs/applications/office/calligra/default.nix
+3 -1
View File
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ];
patches = [ ./fix-kde4.10-build.patch ];
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A Qt/KDE office suite, formely known as koffice";
homepage = http://calligra.org;
maintainers = [ stdenv.lib.maintainers.urkud ];
maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
inherit (kdelibs.meta) platforms;
};
}
pkgs/applications/office/calligra/fix-kde4.10-build.patch
+36
View File
@@ -0,0 +1,36 @@
From: Andre Woebbeking <Woebbeking@kde.org>
Date: Sun, 13 Jan 2013 15:10:38 +0000
Subject: compile with kdelibs 4.10 (tests are enabled by default)
X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=39fdda6757cbbb35480dec98eac419eb1879cb31
---
compile with kdelibs 4.10 (tests are enabled by default)
---
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,11 +96,6 @@
set(SHOULD_BUILD_ACTIVE FALSE)
ENDIF()
-if(KDE4_BUILD_TESTS)
- # only with this definition will the FOO_TEST_EXPORT macro do something
- add_definitions(-DCOMPILING_TESTS)
-endif(KDE4_BUILD_TESTS)
-
########################
#########################
## Look for KDE and Qt ##
@@ -146,6 +141,11 @@
endif(NOT ${KDE_VERSION} VERSION_GREATER 4.6.4)
macro_ensure_out_of_source_build("Compiling Calligra inside the source directory is not possible. Please refer to the build instruction http://community.kde.org/Calligra/Building/Building_Calligra")
+
+if(KDE4_BUILD_TESTS)
+ # only with this definition will the FOO_TEST_EXPORT macro do something
+ add_definitions(-DCOMPILING_TESTS)
+endif(KDE4_BUILD_TESTS)
###########################
############################
pkgs/applications/office/hledger-interest/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hledger-interest";
version = "1.4.2";
sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v";
version = "1.4.3";
sha256 = "1nj50zi4p6rs0nl4656rr0vkbh7kdi49z1l53nypfqs3rmjgicsn";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal hledgerLib mtl time ];
pkgs/applications/office/koffice/default.nix
-44
View File
@@ -1,44 +0,0 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg, giflib, libgsf
, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon
, qimageblitz, qca2, eigen, soprano , kdegraphics}:
stdenv.mkDerivation rec {
name = "koffice-2.2.2";
src = fetchurl {
url = "mirror://kde/stable/${name}/${name}.tar.bz2";
sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75";
};
patchFlags = "-p0";
patches =
let
urlBase = "http://kexi-project.org/download/patches/2.2.2/";
in
[
(fetchurl {
url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch";
sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd";
})
(fetchurl {
url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch";
sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
})
./wpd.patch
./krita-exiv-0.21.diff
];
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf
stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon
qimageblitz qca2 eigen openjpeg soprano kdegraphics ];
meta = {
description = "KDE integrated Office Suite";
license = "GPL";
homepage = http://www.koffice.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
# doesn't build, seems dead and superseded by calligra
#inherit (kdelibs.meta) platforms;
};
}
pkgs/applications/office/koffice/krita-exiv-0.21.diff
-81
View File
@@ -1,81 +0,0 @@
commit 7f6b2f2b9b2be1e4f257582a04b194c69f705bc7
Author: Casper Boemann <cbr@boemann.dk>
Date: Sat Dec 4 10:44:02 2010 +0000
------------------------------------------------------------------------
r1203267 | rempt | 2010-12-03 14:20:03 +0100 (Fri, 03 Dec 2010) | 1 line
Changed paths:
M /trunk/koffice/krita/ui/kis_aboutdata.h
correct url for animtim
------------------------------------------------------------------------
r1203281 | uzak | 2010-12-03 14:43:32 +0100 (Fri, 03 Dec 2010) | 2 lines
Changed paths:
M /trunk/koffice/filters/kpresenter/powerpoint/pptstyle.cpp
PPT: Fine tuned processing of the TextCFException structure for MS Office 2007.
------------------------------------------------------------------------
r1203296 | danders | 2010-12-03 15:44:01 +0100 (Fri, 03 Dec 2010) | 3 lines
Changed paths:
M /trunk/koffice/kplato/libs/kernel/kptaccount.cpp
Fix data loss on xml load.
BUG: 258685
------------------------------------------------------------------------
r1203344 | bero | 2010-12-03 18:08:24 +0100 (Fri, 03 Dec 2010) | 2 lines
Changed paths:
M /trunk/koffice/krita/ui/kisexiv2/kis_exif_io.cpp
Fix build with exiv2 0.21
svn path=/branches/work/koffice-essen/; revision=1203491
diff krita/ui/kisexiv2/kis_exif_io.cpp krita/ui/kisexiv2/kis_exif_io.cpp
index 6eb7f30..c85da65 100644
--- krita/ui/kisexiv2/kis_exif_io.cpp
+++ krita/ui/kisexiv2/kis_exif_io.cpp
@@ -406,7 +406,11 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
v = kmdIntOrderedArrayToExifArray(entry.value());
} else if (exivKey == "Exif.Image.Artist") { // load as dc:creator
KisMetaData::Value creator = entry.value().asArray()[0];
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
+#endif
} else if (exivKey == "Exif.Photo.OECF") {
v = kmdOECFStructureToExifOECF(entry.value());
} else if (exivKey == "Exif.Photo.DeviceSettingDescription") {
@@ -419,13 +423,25 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
if (langArr.contains("x-default")) {
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
+#endif
} else if (langArr.size() > 0) {
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
+#endif
}
} else {
dbgFile << exifKey.tag();
+#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
+#else
+ v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
+#endif
}
if (v && v->typeId() != Exiv2::invalidTypeId) {
dbgFile << "Saving key" << exivKey; // << " of KMD value" << entry.value();
pkgs/applications/office/koffice/wpd.patch
-24
View File
@@ -1,24 +0,0 @@
diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake
index 9bd788c..927785a 100644
--- cmake/modules/FindWPD.cmake
+++ cmake/modules/FindWPD.cmake
@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
if(NOT WIN32)
INCLUDE(FindPkgConfig)
- pkg_check_modules(WPD libwpd-0.8)
+ pkg_check_modules(PKG_WPD libwpd-0.8)
endif(NOT WIN32)
FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
- ${WPD_INCLUDE_DIR}
+ ${PKG_WPD_INCLUDE_DIRS}
/usr/include/libwpd-0.8
)
+ FIND_LIBRARY(WPD_LIBRARIES wpd-0.8
+ ${PKG_WPD_LIBRARY_DIRS}
+ )
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR WPD_LIBRARIES )
pkgs/applications/science/spyder/default.nix
+55
View File
@@ -0,0 +1,55 @@
{ stdenv, fetchurl, unzip, buildPythonPackage, makeDesktopItem
# mandatory
, pyside
# recommended
, pyflakes ? null, rope ? null, sphinx ? null, numpy ? null, scipy ? null, matplotlib ? null
# optional
, ipython ? null, pylint ? null, pep8 ? null
}:
buildPythonPackage rec {
name = "spyder-2.1.13.1";
namePrefix = "";
src = fetchurl {
url = "https://spyderlib.googlecode.com/files/${name}.zip";
sha256 = "1sg88shvw6k2v5428k13mah4pyqng43856rzr6ypz5qgwn0677ya";
};
buildInputs = [ unzip ];
propagatedBuildInputs =
[ pyside pyflakes rope sphinx numpy scipy matplotlib ipython pylint pep8 ];
# There is no test for spyder
doCheck = false;
desktopItem = makeDesktopItem {
name = "Spyder";
exec = "spyder";
icon = "spyder";
comment = "Scientific Python Development Environment";
desktopName = "Spyder";
genericName = "Python IDE";
categories = "Application;Development;Editor;IDE;";
};
# Create desktop item
postInstall = ''
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications/
mkdir -p $out/share/icons
cp spyderlib/images/spyder.svg $out/share/icons/
'';
meta = {
description = "Scientific PYthon Development EnviRonment (SPYDER)";
longDescription = ''
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.
'';
homepage = https://code.google.com/p/spyderlib/;
license = stdenv.lib.licenses.mit;
};
}
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+2 -2
View File
@@ -10,14 +10,14 @@
}:
let
version = "4.20130405";
version = "4.20130501";
in
stdenv.mkDerivation {
name = "git-annex-${version}";
src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n";
sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv";
name = "git-annex-${version}.tar.gz";
};
pkgs/applications/version-management/subversion/default.nix
+2 -2
View File
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
version = "1.7.8";
version = "1.7.9";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion//${name}.tar.bz2";
sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2";
sha1 = "453757bae78a800997559f2232483ab99238ec1e";
};
buildInputs = [ zlib apr aprutil sqlite ]
pkgs/applications/video/kdenlive/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "kdenlive-${version}";
version = "0.9.4";
version = "0.9.6";
src = fetchurl {
url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
sha256 = "1l3axf3y83gdfr6yc1lmy296h09gypkpqsc01w7pprg0y19rrfif";
sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x";
};
buildInputs =
pkgs/build-support/fetchurl/mirrors.nix
+1
View File
@@ -154,6 +154,7 @@ rec {
ftp://ftp.nl.uu.net/pub/CPAN/
http://ftp.funet.fi/pub/CPAN/
http://cpan.perl.org/
http://backpan.perl.org/ # for old releases
];
# Debian.
pkgs/build-support/vm/deb/deb-closure.pl
+18 -8
View File
@@ -46,17 +46,27 @@ sub getDeps {
}
# Process the "Provides" fields to be able to resolve virtual dependencies.
# Process the "Provides" and "Replaces" fields to be able to resolve
# virtual dependencies.
my %provides;
foreach my $cdata (values %packages) {
next unless defined $cdata->{Provides};
my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides}));
foreach my $name (@provides) {
#die "conflicting provide: $name\n" if defined $provides{$name};
#warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n";
next if defined $packages{$name};
$provides{$name} = $cdata->{Package};
if (defined $cdata->{Provides}) {
my @provides = getDeps(Dpkg::Deps::deps_parse($cdata->{Provides}));
foreach my $name (@provides) {
#die "conflicting provide: $name\n" if defined $provides{$name};
#warn "provide by $cdata->{Package} conflicts with package with the same name: $name\n";
next if defined $packages{$name};
$provides{$name} = $cdata->{Package};
}
}
# Treat "Replaces" like "Provides".
if (defined $cdata->{Replaces}) {
my @replaces = getDeps(Dpkg::Deps::deps_parse($cdata->{Replaces}));
foreach my $name (@replaces) {
next if defined $packages{$name};
$provides{$name} = $cdata->{Package};
}
}
}
pkgs/build-support/vm/default.nix
+57
View File
@@ -1322,6 +1322,40 @@ rec {
packages = commonDebPackages ++ [ "diffutils" ];
};
ubuntu1304i386 = {
name = "ubuntu-13.04-raring-i386";
fullName = "Ubuntu 13.04 Raring (i386)";
packagesLists =
[ (fetchurl {
url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2;
sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181";
})
(fetchurl {
url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2;
sha256 = "1db19982fc3689b00a918e2cdbb936dfccebbac2ed82f81bb0164a3d51039012";
})
];
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
ubuntu1304x86_64 = {
name = "ubuntu-13.04-raring-amd64";
fullName = "Ubuntu 13.04 Raring (amd64)";
packagesList =
[ (fetchurl {
url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2;
sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356";
})
(fetchurl {
url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2;
sha256 = "0caf561bad359e8a82a987a076c0f1cb7a43412a5de053c105b160477c192978";
})
];
urlPrefix = mirror://ubuntu;
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
};
debian40i386 = {
name = "debian-4.0r9-etch-i386";
fullName = "Debian 4.0r9 Etch (i386)";
@@ -1388,6 +1422,28 @@ rec {
packages = commonDebianPackages;
};
debian70i386 = {
name = "debian-7.0.0-wheezy-i386";
fullName = "Debian 7.0.0 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "712939639e2cc82615c85bdf81edf31edef0fda003ac2b32998e438aee403ab8";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian70x86_64 = {
name = "debian-7.0.0-wheezy-amd64";
fullName = "Debian 7.0.0 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "e79132f7db6655013be1f75feb9812b071386525246d8639679b322487d2732a";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
};
@@ -1451,6 +1507,7 @@ rec {
"bzip2"
"tar"
"grep"
"sed"
"findutils"
"g++"
"make"
pkgs/desktops/kde-4.10/applications/kate.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ kde, kdelibs, kactivities, qjson, pyqt4, sip }:
{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }:
kde {
#todo: PythonLibrary, SIP, PyQt4, PyKDE4
buildInputs = [ kdelibs kactivities qjson pyqt4 sip ];
buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4];
meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
pkgs/desktops/kde-4.10/default.nix
+6 -6
View File
@@ -25,12 +25,12 @@ let
kdesdk = [
{ name="cervisia"; }
{ name="lokalize"; }
{ name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; }
{ name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; }
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
{ name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; }
{ name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; }
{ name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins"; }
{ name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins"; }
{ name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins"; }
{ name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins"; }
{ name="kcachegrind"; }
{ name="kapptemplate"; }
{ name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";}
pkgs/desktops/kde-4.10/kde-runtime.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
, networkmanager, nepomuk_core, kactivities, kdepimlibs
, networkmanager, kactivities, kdepimlibs
}:
kde {
buildInputs = [
kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack
kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
networkmanager kactivities kdepimlibs
#todo: add openslp, openexr
pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ kde, kdelibs, kdepimlibs, nepomuk_core }:
{ kde, kdelibs, kdepimlibs }:
kde {
buildInputs = [ kdelibs kdepimlibs nepomuk_core];
buildInputs = [ kdelibs kdepimlibs ];
}
pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
+9 -7
View File
@@ -1,19 +1,21 @@
{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
boost, lndir }:
polkit_qt_1, boost, lndir, pkgconfig }:
let pydir = "lib/python${python.majorVersion}"; in
kde {
#todo: doesn't build
buildInputs = [ python kdepimlibs
# shared_desktop_ontologies boost
];
# todo: polkit isn't found by the build system
buildInputs = [
python kdepimlibs shared_desktop_ontologies
boost polkit_qt_1 pkgconfig
];
propagatedBuildInputs = [ pyqt4 sip ];
# patches = [ ./pykde4-hardcode-lib-python.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
# cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
preConfigure =
''
pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
, shared_desktop_ontologies, attica, nepomuk_core }:
, shared_desktop_ontologies, attica }:
kde {
# attica, akonadi and kdepimlibs are disabled due to smokegen crash
pkgs/desktops/kde-4.10/kdeedu/kstars.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ kde, kdelibs, eigen, xplanet, indilib }:
kde {
#todo:wcslib, doesn't build
#todo:wcslib
buildInputs = [ kdelibs eigen xplanet indilib ];
meta = {
pkgs/desktops/kde-4.10/kdegames/kajongg.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }:
kde rec {
#todo: doesn't build
buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib,
libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies,
libjpeg, nepomuk_core, libmms }:
libjpeg, libmms }:
kde {
#todo: libmeanwhile, xmms
buildInputs = [
kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer
kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr
libxslt libidn speex nepomuk_core boost libmms msilbc
libxslt libidn speex boost libmms msilbc
];
nativeBuildInputs = [ pkgconfig ];
pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ kde, kdelibs, libvncserver, libjpeg }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
pkgs/desktops/kde-4.10/kdepim-runtime.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi
, shared_desktop_ontologies, nepomuk_core }:
, shared_desktop_ontologies }:
kde {
buildInputs = [
kdepimlibs akonadi boost shared_desktop_ontologies
libxslt nepomuk_core
libxslt
];
#todo: libkgapi, libkolab, libkolabxml
meta = {
pkgs/desktops/kde-4.10/kdepim.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
, nepomuk_core, nepomuk_widgets, dblatex }:
, nepomuk_widgets, dblatex }:
kde {
#todo: update grantlee to 0.3
buildInputs =
[ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_core nepomuk_widgets
[ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex
];
pkgs/desktops/kde-4.10/kdepimlibs.nix
+2 -2
View File
@@ -4,11 +4,11 @@
kde {
buildInputs =
[ boost gpgme libical libxslt nepomuk_core qjson
[ boost gpgme libical libxslt qjson
openldap cyrus_sasl akonadi shared_desktop_ontologies
];
propagatedBuildInputs = [ kdelibs ];
propagatedBuildInputs = [ kdelibs nepomuk_core ];
meta = {
description = "KDE PIM libraries";
pkgs/desktops/kde-4.10/kdeplasma-addons.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
, qjson, qoauth, nepomuk_core }:
, qjson, qoauth }:
# TODO: qwt, scim, ibus
kde {
@@ -9,7 +9,7 @@ kde {
KDEDIRS=marble;
buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
eigen qca2 libXtst qimageblitz nepomuk_core
eigen qca2 libXtst qimageblitz
libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
];
pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
+6 -2
View File
@@ -1,11 +1,15 @@
{ kde, kdelibs, kde_baseapps }:
kde {
#todo: doesn't build
# Needs kdebase for libkonq
buildInputs = [ kdelibs kde_baseapps ];
patchPhase = ''
sed -i 's@macro_optional_add_subdirectory(bazaar)@add_subdirectory(bazaar)@' dolphin-plugins/CMakeLists.txt
'';
meta = {
description = "Svn plugin for dolphin";
description = "Bazaar plugin for dolphin";
};
}
pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
+5 -1
View File
@@ -1,10 +1,14 @@
{ kde, kdelibs, kde_baseapps }:
kde {
#todo: doesn't build
# Needs kdebase for libkonq
buildInputs = [ kdelibs kde_baseapps ];
patchPhase = ''
sed -i 's@macro_optional_add_subdirectory(git)@add_subdirectory(git)@' dolphin-plugins/CMakeLists.txt
'';
meta = {
description = "Git plugin for dolphin";
};
pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
+6 -2
View File
@@ -1,11 +1,15 @@
{ kde, kdelibs, kde_baseapps }:
kde {
#todo: doesn't build
# Needs kdebase for libkonq
buildInputs = [ kdelibs kde_baseapps ];
patchPhase = ''
sed -i 's@macro_optional_add_subdirectory(hg)@add_subdirectory(hg)@' dolphin-plugins/CMakeLists.txt
'';
meta = {
description = "Svn plugin for dolphin";
description = "Mercurial plugin for dolphin";
};
}
pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
+5 -1
View File
@@ -1,10 +1,14 @@
{ kde, kdelibs, kde_baseapps }:
kde {
#todo: doesn't build
# Needs kdebase for libkonq
buildInputs = [ kdelibs kde_baseapps ];
patchPhase = ''
sed -i 's@macro_optional_add_subdirectory(svn)@add_subdirectory(svn)@' dolphin-plugins/CMakeLists.txt
'';
meta = {
description = "Svn plugin for dolphin";
};
pkgs/desktops/kde-4.10/kdesdk/find-svn.patch
-57
View File
@@ -1,57 +0,0 @@
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,8 @@ 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}
+ SUFFIXES apr-0 apr-1 apr-1.0
)
if(_INCLUDES)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
@@ -72,6 +69,24 @@ 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}
+ 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)
pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
+3 -1
View File
@@ -1,9 +1,11 @@
{ kde, kdelibs, gettext }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs gettext ];
patches = [ ./thumbnailers-add-subdirectory.patch ];
meta = {
description = "PO file format thumbnailer";
};
pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ kde, kdelibs, perl }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs perl ];
cmakeFlags = [ "-DBUILD_perldoc=ON" ];
pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
+1 -3
View File
@@ -1,10 +1,8 @@
{ kde, kdelibs, subversionClient, apr, aprutil }:
kde {
#todo: doesn't build
buildInputs = [ kdelibs subversionClient apr aprutil ];
patches = [ ./find-svn.patch ];
buildInputs = [ kdelibs subversionClient apr aprutil ];
meta = {
description = "Subversion kioslave";
pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Naur kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt
--- kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt 2013-05-02 21:05:56.446226846 -0430
+++ kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt 2013-05-02 21:09:58.504053136 -0430
@@ -9,7 +9,7 @@
macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" "www.gnu.org/software/gettext" FALSE "" "Required to build the PO thumbnailer")
if(GETTEXTPO_FOUND)
-macro_optional_add_subdirectory(po_thumbnailer)
+add_subdirectory(po_thumbnailer)
endif(GETTEXTPO_FOUND)
macro_display_feature_log()
pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ kde, kdelibs, kdepimlibs, nepomuk_core }:
{ kde, kdelibs, kdepimlibs }:
kde {
buildInputs = [ kdelibs kdepimlibs nepomuk_core ];
buildInputs = [ kdelibs kdepimlibs ];
meta = {
description = "Simple KDE GUI for GPG";
pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ kde, kdelibs
, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
, pythonPackages, cups, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
, pythonDBus, makeWrapper }:
let s_c_p = system_config_printer.override { withGUI = false; }; in
@@ -8,7 +8,7 @@ kde rec {
buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
] ++ pythonPath;
pythonPath = [ pyqt4 pykde4 pycups s_c_p ];
pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
passthru.propagatedUserEnvPackages = [ s_c_p ];
pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ kde, kdelibs, libxml2, libxslt, kdepimlibs, nepomuk_core, htmlTidy, boost }:
{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
kde {
#todo: ruby is not found. needed for some example scripts
buildInputs =
[ kdelibs kdepimlibs htmlTidy nepomuk_core boost ];
[ kdelibs kdepimlibs htmlTidy boost ];
meta = {
description = "A KDE link checker";
pkgs/desktops/kde-4.7/kdebindings/pykde4-new-sip.patch
+91
View File
@@ -0,0 +1,91 @@
commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
Author: Luca Beltrame <lbeltrame@kde.org>
Date: Mon Oct 1 20:47:56 2012 +0200
Remove duplicated QVector<int> definition, since it's in PyQt now.
Simon, if you have time, please review if everything is OK.
CCMAIL: simon@simonzone.com
diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
index 5a0a080..73dad01 100644
--- a/sip/kdecore/typedefs.sip
+++ b/sip/kdecore/typedefs.sip
@@ -951,77 +951,3 @@ template <TYPE1>
%End
};
-%MappedType QVector<int>
-{
-%TypeHeaderCode
-#include <qvector.h>
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- for (int i = 0; i < sipCpp->size(); ++i)
- {
- int t = (sipCpp->at(i));
-
-#if PY_MAJOR_VERSION >= 3
- PyObject *tobj = PyLong_FromLong(t);
-#else
- PyObject *tobj = PyInt_FromLong(t);
-#endif
-
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- {
- if (!PyList_Check(sipPy))
- return 0;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-#if PY_MAJOR_VERSION >= 3
- if (!PyNumber_Check(tobj))
-#else
- if (!PyInt_Check(tobj))
-#endif
- return 0;
- }
- return 1;
- }
-
- QVector<int> *qv = new QVector<int>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
- #if PY_MAJOR_VERSION >= 3
- int t = PyLong_AsLong (tobj);
-#else
- int t = PyInt_AS_LONG (tobj);
-#endif
-
- if (*sipIsErr)
- {
- delete qv;
- return 0;
- }
-
- qv->append(t);
- }
-
- *sipCppPtr = qv;
-
- return sipGetState(sipTransferObj);
-%End
-};
pkgs/desktops/kde-4.7/kdebindings/pykde4.nix
+1 -1
View File
@@ -10,7 +10,7 @@ kde {
#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
patches = [ ./pykde-purity.patch ];
patches = [ ./pykde-purity.patch ./pykde4-new-sip.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
pkgs/desktops/kde-4.8/kdebindings/pykde4-new-sip.patch
+91
View File
@@ -0,0 +1,91 @@
commit 017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
Author: Luca Beltrame <lbeltrame@kde.org>
Date: Mon Oct 1 20:47:56 2012 +0200
Remove duplicated QVector<int> definition, since it's in PyQt now.
Simon, if you have time, please review if everything is OK.
CCMAIL: simon@simonzone.com
diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
index 5a0a080..73dad01 100644
--- a/sip/kdecore/typedefs.sip
+++ b/sip/kdecore/typedefs.sip
@@ -951,77 +951,3 @@ template <TYPE1>
%End
};
-%MappedType QVector<int>
-{
-%TypeHeaderCode
-#include <qvector.h>
-%End
-
-%ConvertFromTypeCode
- // Create the list.
- PyObject *l;
-
- if ((l = PyList_New(sipCpp->size())) == NULL)
- return NULL;
-
- // Set the list elements.
- for (int i = 0; i < sipCpp->size(); ++i)
- {
- int t = (sipCpp->at(i));
-
-#if PY_MAJOR_VERSION >= 3
- PyObject *tobj = PyLong_FromLong(t);
-#else
- PyObject *tobj = PyInt_FromLong(t);
-#endif
-
- PyList_SET_ITEM(l, i, tobj);
- }
-
- return l;
-%End
-
-%ConvertToTypeCode
- // Check the type if that is all that is required.
- if (sipIsErr == NULL)
- {
- if (!PyList_Check(sipPy))
- return 0;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-#if PY_MAJOR_VERSION >= 3
- if (!PyNumber_Check(tobj))
-#else
- if (!PyInt_Check(tobj))
-#endif
- return 0;
- }
- return 1;
- }
-
- QVector<int> *qv = new QVector<int>;
-
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
- {
- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
- #if PY_MAJOR_VERSION >= 3
- int t = PyLong_AsLong (tobj);
-#else
- int t = PyInt_AS_LONG (tobj);
-#endif
-
- if (*sipIsErr)
- {
- delete qv;
- return 0;
- }
-
- qv->append(t);
- }
-
- *sipCppPtr = qv;
-
- return sipGetState(sipTransferObj);
-%End
-};
pkgs/desktops/kde-4.8/kdebindings/pykde4.nix
+1 -1
View File
@@ -8,7 +8,7 @@ kde {
propagatedBuildInputs = [ pyqt4 sip ];
patches = [ ./pykde4-hardcode-lib-python.patch ];
patches = [ ./pykde4-hardcode-lib-python.patch ./pykde4-new-sip.patch ];
cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
pkgs/development/compilers/go/1.1.nix
+4 -4
View File
@@ -7,11 +7,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.1beta2";
name = "go-1.1rc1";
src = fetchurl {
url = http://go.googlecode.com/files/go1.1beta2.src.tar.gz;
sha1 = "70d7642a6ea065a23458b9ea28e370b19912e52d";
url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz;
sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3";
};
buildInputs = [ bison glibc bash makeWrapper ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
# Disable the hostname test
sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
# Disable a failing icmp test
sed -i '/ip[46]:icmp.*nil/d' src/pkg/net/ipraw_test.go
sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go
'';
patches = [ ./cacert.patch ];
pkgs/development/compilers/llvm/clang.nix
+5 -1
View File
@@ -1,6 +1,9 @@
{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }:
let version = "3.2"; in
let
version = "3.2";
gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
in
stdenv.mkDerivation {
name = "clang-${version}";
@@ -13,6 +16,7 @@ stdenv.mkDerivation {
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_TARGETS_TO_BUILD=all"
"-DGCC_INSTALL_PREFIX=${gccReal}"
] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
"-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
];
pkgs/development/compilers/sbcl/default.nix
+4 -4
View File
@@ -4,11 +4,11 @@ let
s= # Generated upstream information
rec {
baseName="sbcl";
version="1.1.6";
version="1.1.7";
name="${baseName}-${version}";
hash="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.6/sbcl-1.1.6-source.tar.bz2";
sha256="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2";
hash="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.7/sbcl-1.1.7-source.tar.bz2";
sha256="1g2z1p1qk9pdz1p2fbmy3bhwqq0li5vwy0vymkkxcwrhqnw5h8n8";
};
buildInputs = with a; [
clisp makeWrapper
pkgs/development/interpreters/clisp/2.44.1.nix
+9 -3
View File
@@ -14,16 +14,22 @@ stdenv.mkDerivation rec {
buildInputs =
[ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
zlib libXpm xproto libXext xextproto libffi libffcall ];
patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo
# First, replace port 9090 (rather low, can be used)
# with 64237 (much higher, IANA private area, not
# anything rememberable).
patchPhase = ''
# Also remove reference to a type that disappeared from recent glibc
# (seems the correct thing to do, found no reference to any solution)
postPatch = ''
sed -e 's@9090@64237@g' -i tests/socket.tst
sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
'';
substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
'';
configureFlags =
''
--with-readline builddir --with-dynamic-ffi
pkgs/development/interpreters/cython/default.nix
+1
View File
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
meta = {
description = "An interpreter to help writing C extensions for Python";
platforms = stdenv.lib.platforms.all;
};
}
pkgs/development/interpreters/php/5.4.nix
+1 -1
View File
@@ -90,7 +90,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
gd = {
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
configureFlags = ["--with-gd=shared --with-freetype-dir=${freetype} --with-png-dir=${libpng}"];
configureFlags = ["--with-gd --with-freetype-dir=${freetype} --with-png-dir=${libpng}"];
buildInputs = [ libpng libjpeg freetype ];
};
pkgs/development/libraries/haskell/DAV/default.nix
+7 -7
View File
@@ -1,17 +1,17 @@
{ cabal, caseInsensitive, cmdargs, httpConduit, httpTypes, lens
, liftedBase, mtl, network, resourcet, transformers, xmlConduit
, xmlHamlet
{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase
, mtl, network, optparseApplicative, resourcet, transformers
, xmlConduit, xmlHamlet
}:
cabal.mkDerivation (self: {
pname = "DAV";
version = "0.3.1";
sha256 = "0ql6sf61gq55iyn189papnid91n4ab5s2i24zvkqrgixjz7998rd";
version = "0.4.1";
sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c";
isLibrary = true;
isExecutable = true;
buildDepends = [
caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl
network resourcet transformers xmlConduit xmlHamlet
caseInsensitive httpConduit httpTypes lens liftedBase mtl network
optparseApplicative resourcet transformers xmlConduit xmlHamlet
];
meta = {
homepage = "http://floss.scru.org/hDAV";
pkgs/development/libraries/haskell/asn1-types/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "asn1-types";
version = "0.1.0";
sha256 = "1520jq65fzlpi4jfrqwry3dg4lajdk6pssb7cqbrmplda0zi2d12";
version = "0.1.3";
sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg";
buildDepends = [ time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1-types";
pkgs/development/libraries/haskell/authenticate-oauth/default.nix
+1
View File
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl
random resourcet RSA SHA time transformers
];
jailbreak = true;
meta = {
homepage = "http://github.com/yesodweb/authenticate";
description = "Library to authenticate with OAuth for Haskell web applications";
pkgs/development/libraries/haskell/basic-prelude/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "basic-prelude";
version = "0.3.4.0";
sha256 = "0layc06df7df4mf4zafj87c4klsvkxbhi69dkv4ag9fkzvs62sz6";
version = "0.3.5.0";
sha256 = "1nrfibvvh5vzzr2jz5hipsj29b7ml6d90ijlr917n9aq200w14ar";
buildDepends = [
hashable liftedBase ReadArgs systemFilepath text transformers
unorderedContainers vector
pkgs/development/libraries/haskell/binary-shared/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "binary-shared";
version = "0.8.2";
sha256 = "05cqdpclb4xc6ydwdpxfi3bvaaw7syxlmb5r9kxjcp3f6fji5rm2";
version = "0.8.3";
sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
buildDepends = [ binary mtl ];
meta = {
homepage = "http://www.leksah.org";
pkgs/development/libraries/haskell/binary/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "binary";
version = "0.7.0.1";
sha256 = "16srrp0qx9hsr7820b2q3sp9wp8y8sxxi8rvsh63n48w4l3canxq";
version = "0.7.1.0";
sha256 = "16cb94z57ijw0q3h5p8jbvrv1vmnchsfjhrzvh3gdm3wf75fy8ln";
testDepends = [
Cabal filepath HUnit QuickCheck random testFramework
testFrameworkQuickcheck2
pkgs/development/libraries/haskell/case-insensitive/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "case-insensitive";
version = "1.0.0.1";
sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
version = "1.0.0.2";
sha256 = "11cczwg11y6pfsidj1i052rhri98sgg2qzf0ixgjq1gywakjx5f2";
buildDepends = [ deepseq hashable text ];
testDepends = [ HUnit testFramework testFrameworkHunit text ];
meta = {
pkgs/development/libraries/haskell/certificate/default.nix
+2 -3
View File
@@ -4,14 +4,13 @@
cabal.mkDerivation (self: {
pname = "certificate";
version = "1.3.6";
sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m";
version = "1.3.7";
sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya";
isLibrary = true;
isExecutable = true;
buildDepends = [
asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time
];
jailbreak = true;
meta = {
homepage = "http://github.com/vincenthz/hs-certificate";
description = "Certificates and Key Reader/Writer";
pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix
+14
View File
@@ -0,0 +1,14 @@
{ cabal, mtl, network, parsec, xhtml }:
cabal.mkDerivation (self: {
pname = "cgi";
version = "3001.1.7.5";
sha256 = "1zdgdzkrzclf492pb9px5a490mxfxl5c1099axcxxm9wlpmf49ji";
buildDepends = [ mtl network parsec xhtml ];
meta = {
homepage = "http://andersk.mit.edu/haskell/cgi/";
description = "A library for writing CGI programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix → pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix
+4 -8
View File
@@ -1,14 +1,10 @@
{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network
, parsec, xhtml
}:
{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }:
cabal.mkDerivation (self: {
pname = "cgi";
version = "3001.1.8.3";
sha256 = "1pacv0qxfs7l71xvf9amd7qsw5g725qbrm8r6fgdb2awyl925sf4";
buildDepends = [
extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml
];
version = "3001.1.8.4";
sha256 = "1h0ynrrda18g5pn1sw2n94rhhp3k39nb7wmx53b52dhxkp2izlgn";
buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ];
meta = {
homepage = "http://andersk.mit.edu/haskell/cgi/";
description = "A library for writing CGI programs";
pkgs/development/libraries/haskell/conduit/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.4.2";
sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159";
version = "1.0.5";
sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65";
buildDepends = [
liftedBase mmorph monadControl resourcet text transformers
transformersBase void
pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix
+4 -3
View File
@@ -1,9 +1,10 @@
{ cabal }:
{ cabal, asn1Types }:
cabal.mkDerivation (self: {
pname = "crypto-pubkey-types";
version = "0.2.0";
sha256 = "1arzkyxcm1ffnwk7imxkwvyi20dp8n960vzj7cbl7fhv3j04c9xq";
version = "0.3.2";
sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h";
buildDepends = [ asn1Types ];
meta = {
homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
description = "Generic cryptography Public keys algorithm types";
pkgs/development/libraries/haskell/crypto-pubkey/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "crypto-pubkey";
version = "0.1.2";
sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5";
version = "0.1.3";
sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g";
buildDepends = [
cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi
];
pkgs/development/libraries/haskell/cryptocipher/default.nix
+5 -6
View File
@@ -1,17 +1,16 @@
{ cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash
, cryptoPubkeyTypes, entropy, primitive, QuickCheck, tagged
, testFramework, testFrameworkQuickcheck2, vector
, entropy, primitive, QuickCheck, testFramework
, testFrameworkQuickcheck2, vector
}:
cabal.mkDerivation (self: {
pname = "cryptocipher";
version = "0.4.0";
sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0";
version = "0.5.0";
sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd";
isLibrary = true;
isExecutable = true;
buildDepends = [
cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes
primitive tagged vector
cereal cipherAes cipherRc4 cpu cryptoApi primitive vector
];
testDepends = [
cryptoApi cryptohash entropy QuickCheck testFramework
pkgs/development/libraries/haskell/diagrams/core.nix
+1
View File
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Core libraries for diagrams EDSL";
pkgs/development/libraries/haskell/diagrams/lib.nix
+2 -3
View File
@@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "0.6.0.2";
sha256 = "0jxpbggwgbjnl2yx7y0zcjs2fls7y1wm33wllq5j9snkiz1n81hb";
version = "0.6.0.3";
sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
buildDepends = [
active colour dataDefault diagramsCore monoidExtras newtype
NumInstances semigroups vectorSpace
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Embedded domain-specific language for declarative graphics";
pkgs/development/libraries/haskell/doctest/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "doctest";
version = "0.9.6";
sha256 = "0gw13pm4hg69v60swsv6w4iwzgdj5f4pkcyfmgzfp1dx399p6hyl";
version = "0.9.7";
sha256 = "0d3aywm5v3kx16c1i6cb4inr7hdnmsl8qawxp27g0yng03wdra5l";
isLibrary = true;
isExecutable = true;
buildDepends = [ deepseq filepath ghcPaths syb transformers ];
pkgs/development/libraries/haskell/dual-tree/default.nix
+1
View File
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1.0.2";
sha256 = "0ys50m8yjksxi33qyk6ql4ldpdzb0fvxqvywi3y46xi16w5yrkb0";
buildDepends = [ monoidExtras newtype semigroups ];
jailbreak = true;
meta = {
description = "Rose trees with cached and accumulating monoidal annotations";
license = self.stdenv.lib.licenses.bsd3;
pkgs/development/libraries/haskell/ghc-vis/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-vis";
version = "0.6.1.1";
sha256 = "1fg8bxkhw2s3y8w0ljnnqbf8f5ld17p70v4aikc26ybmb0938yl6";
version = "0.7.0.1";
sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w";
buildDepends = [
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot
pkgs/development/libraries/haskell/hashable/1.2.0.6.nix → pkgs/development/libraries/haskell/hashable/1.2.0.7.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hashable";
version = "1.2.0.6";
sha256 = "0kd0vk87pgrir5zx7b30dvv2lsjjiykqi1gpalkgmgbvhals4p9z";
version = "1.2.0.7";
sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630";
buildDepends = [ text ];
testDepends = [
HUnit QuickCheck random testFramework testFrameworkHunit
pkgs/development/libraries/haskell/haxr/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "haxr";
version = "3000.9.0.1";
sha256 = "106hw8ysjx12dvwij4ld6n54mxj2yl1p7iihp2fwz50v50mz6102";
version = "3000.9.1";
sha256 = "0m716ncb81y245vviz04089nlrvkca9cvjvj2qphkdhhmxsqw8fc";
buildDepends = [
base64Bytestring blazeBuilder HaXml HTTP mtl network time
utf8String
pkgs/development/libraries/haskell/hledger-lib/default.nix
+6 -6
View File
@@ -1,14 +1,14 @@
{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe
, split, time, transformers, utf8String
{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
, regexCompat, regexpr, safe, split, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "hledger-lib";
version = "0.19.3";
sha256 = "1wn72ycy1hvcn2ikaplq446hggpkbabyj1d8201vajwn862waxra";
version = "0.20.0.1";
sha256 = "1skm2jii7d8b6a6i98xwxckxwhikgj44823wqzdk8f3bq9zlwhcg";
buildDepends = [
cmdargs csv filepath HUnit mtl parsec regexpr safe split time
transformers utf8String
cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat
regexpr safe split time transformers utf8String
];
meta = {
homepage = "http://hledger.org";
pkgs/development/libraries/haskell/hledger-web/default.nix
+11 -15
View File
@@ -1,30 +1,26 @@
{ cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib
, httpConduit, HUnit, ioStorage, monadControl, networkConduit
, parsec, regexpr, safe, shakespeareCss, shakespeareJs
, shakespeareText, text, time, transformers, wai, waiExtra, warp
, yaml, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, yesodTest
, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr
, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time
, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest
}:
cabal.mkDerivation (self: {
pname = "hledger-web";
version = "0.19.3";
sha256 = "1kx5mn6drm90clz132vrd2lkssm73hlwvxb9cxg6z82i5qa9jqn9";
version = "0.20.0.1";
sha256 = "0fq3wfsy2ykyplr66ac91yd2vwzfw3ji8mq9q4jn58nnh6bgxfa1";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
hamlet hjsmin hledger hledgerLib httpConduit HUnit ioStorage
monadControl networkConduit parsec regexpr safe shakespeareCss
shakespeareJs shakespeareText text time transformers wai waiExtra
warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic
hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl
networkConduit parsec regexpr safe shakespeareCss shakespeareJs
shakespeareText text time transformers wai waiExtra
waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm
yesodStatic
];
testDepends = [ yesodCore yesodDefault yesodTest ];
patchPhase = ''
sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal
'';
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://hledger.org";
pkgs/development/libraries/haskell/hledger/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hledger";
version = "0.19.3";
sha256 = "1kxkv2dwl5ir2vqvbi1ppbwns8mw1lkg5lkfdkdwwbjj7dq0ysr6";
version = "0.20.0.1";
sha256 = "0sdsxdydpmnarxz94py8rlbcffpan7l299ff7j9gn4f42z3sarw7";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/lifted-base/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.2.0.4";
sha256 = "0ljqa56gd4760x7x32v75n6a4h8f03p2g4xajaj3917w4w2rf5rp";
version = "0.2.0.5";
sha256 = "1an7wlz31szccbypbrh59i3py210mh7jbfi0zaizd32q0im1573r";
buildDepends = [
baseUnicodeSymbols monadControl transformersBase
];
pkgs/development/libraries/haskell/pool-conduit/default.nix
+6 -4
View File
@@ -1,10 +1,12 @@
{ cabal, resourcePool, resourcet, transformers }:
{ cabal, monadControl, resourcePool, resourcet, transformers }:
cabal.mkDerivation (self: {
pname = "pool-conduit";
version = "0.1.1";
sha256 = "1gaj0gwwbr950jkxhpl326py758j2mvh557xz737js9qcs9g3cg1";
buildDepends = [ resourcePool resourcet transformers ];
version = "0.1.2";
sha256 = "10lvq18pk9d4la5irr1qv1c9y4qbwlglmzgs7bz1d0g5232w3rv8";
buildDepends = [
monadControl resourcePool resourcet transformers
];
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Resource pool allocations via ResourceT";
pkgs/development/libraries/haskell/reflection/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "reflection";
version = "1.2.0.1";
sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6";
version = "1.3.1";
sha256 = "0d81zvyg846jp0xkdkj4220w6hbrnzf46zcxs5qb5frm41rwcsj8";
buildDepends = [ tagged ];
meta = {
homepage = "http://github.com/ekmett/reflection";
pkgs/development/libraries/haskell/skein/default.nix
+2 -3
View File
@@ -2,11 +2,10 @@
cabal.mkDerivation (self: {
pname = "skein";
version = "1.0.2";
sha256 = "1wzy586lcr0pxsdf4lvqhbzq8bsm26gm71jlmv64i22f99n5s9h2";
version = "1.0.3";
sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam";
buildDepends = [ cereal cryptoApi tagged ];
testDepends = [ cereal cryptoApi filepath hspec tagged ];
jailbreak = true;
meta = {
homepage = "https://github.com/meteficha/skein";
description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
pkgs/development/libraries/haskell/snap/snap.nix
+6 -6
View File
@@ -1,22 +1,22 @@
{ cabal, aeson, attoparsec, cereal, clientsession, comonad
, configurator, directoryTree, dlist, errors, filepath, hashable
, heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, tagged
, text, time, transformers, unorderedContainers, vector
, vectorAlgorithms, xmlhtml
, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text
, time, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.11.2.2";
sha256 = "1fwm60rx2ginlphi00kn3ghs9rxdx4br8p4f3prpfmhvjikwgv8n";
version = "0.11.3.1";
sha256 = "0hlwpzrckq89wpa8603j7p3aghlqshrp3kzsdrryf44k24q3vgrj";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson attoparsec cereal clientsession comonad configurator
directoryTree dlist errors filepath hashable heist lens logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix
snapCore snapServer stm syb tagged text time transformers
snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;
pkgs/development/libraries/haskell/texmath/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "texmath";
version = "0.6.1.3";
sha256 = "1f2hka9jwlrm9dvw7z3896yfpdzxs2vaw0vbcmj5p401mvzc8w05";
version = "0.6.1.4";
sha256 = "0cw3lzadk8cx5h26b18i50hvs1vk8vbd0dxmmcszj4a8a0rbpmd9";
isLibrary = true;
isExecutable = true;
buildDepends = [ parsec syb xml ];
pkgs/development/libraries/haskell/text/0.11.3.1.nix
+25
View File
@@ -0,0 +1,25 @@
{ cabal, deepseq, HUnit, QuickCheck, random, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "text";
version = "0.11.3.1";
sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn";
buildDepends = [ deepseq ];
testDepends = [
deepseq HUnit QuickCheck random testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "https://github.com/bos/text";
description = "An efficient packed Unicode text type";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})
pkgs/development/libraries/haskell/uuid/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "uuid";
version = "1.2.11";
sha256 = "0fr91w8jahb7ryhgl8dm6w8jg9sykn3m1jnfvyrfdpkpwkc0kpxx";
version = "1.2.12";
sha256 = "023954gx1hqf1v4qlzwy3nlxwn9yll0642p16w3vayrahcm27ljb";
buildDepends = [ binary cryptohash maccatcher random time ];
testDepends = [
criterion deepseq HUnit mersenneRandomPure64 QuickCheck random
pkgs/development/libraries/haskell/vector-binary-instances/default.nix
+14
View File
@@ -0,0 +1,14 @@
{ cabal, binary, cereal, vector }:
cabal.mkDerivation (self: {
pname = "vector-binary-instances";
version = "0.2.1.0";
sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l";
buildDepends = [ binary cereal vector ];
meta = {
homepage = "https://github.com/bos/vector-binary-instances";
description = "Instances of Data.Binary and Data.Serialize for vector";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/yaml/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.2.3";
sha256 = "1ds6969gbkxgkm2fha0ifmssjl7by9glgix165v0h8i7fx9wx3wa";
version = "0.8.2.4";
sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector
pkgs/development/libraries/indilib/default.nix
+5 -3
View File
@@ -1,13 +1,15 @@
{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }:
stdenv.mkDerivation {
name = "indilib-0.8";
name = "indilib-0.9.6";
src = fetchurl {
url = mirror://sourceforge/indi/libindi_0.8.tar.gz;
sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65";
url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz;
sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4";
};
patches = [ ./link-zlib.patch ./udev-dir.patch ];
propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ];
meta = {
pkgs/development/libraries/indilib/link-zlib.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt
--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430
+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430
@@ -169,7 +169,7 @@
# To link with main() and indibase classes ######
##################################################
add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS})
-target_link_libraries(indidriver ${LIBUSB_LIBRARIES})
+target_link_libraries(indidriver z ${LIBUSB_LIBRARIES})
if (NOVA_FOUND)
target_link_libraries(indidriver ${NOVA_LIBRARIES})
endif(NOVA_FOUND)
pkgs/development/libraries/indilib/udev-dir.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt
--- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430
+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430
@@ -13,7 +13,7 @@
set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/")
set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include")
-set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d")
+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d")
IF(APPLE)
set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup")
pkgs/development/libraries/javascript/jquery-ui/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jquery-ui-1.10.2";
src = fetchurl {
url = "http://jqueryui.com/download/${name}.custom.zip";
url = "http://jqueryui.com/resources/download/${name}.custom.zip";
sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl";
};
pkgs/development/libraries/kerberos/krb5.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
pname = "krb5";
version = "1.10";
version = "1.10.5";
name = "${pname}-${version}";
webpage = http://web.mit.edu/kerberos/;
in
@@ -12,7 +12,7 @@ stdenv.mkDerivation (rec {
src = fetchurl {
url = "${webpage}/dist/krb5/1.10/${name}-signed.tar";
sha256 = "1pa4m6538drb51gsqxbbxlsnc9fm9ccid9m2s3pv3di5l0a7l8bg";
sha256 = "1nf195j9s8g55sh5dzbhy2l21kcdwgpn4acxrbwkvngdz9mv7g4k";
};
buildInputs = [ perl ncurses yacc ];
@@ -23,7 +23,9 @@ stdenv.mkDerivation (rec {
cd ${name}/src
'';
meta = {
enableParallelBuilding = true;
meta = {
description = "MIT Kerberos 5";
homepage = webpage;
license = "MPL";
pkgs/development/libraries/libevent/default.nix
+1
View File
@@ -25,5 +25,6 @@ stdenv.mkDerivation {
'';
license = "mBSD";
platforms = stdenv.lib.platforms.all;
};
}
pkgs/development/libraries/libgphoto2/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }:
stdenv.mkDerivation rec {
name = "libgphoto2-2.5.1.1";
name = "libgphoto2-2.5.2";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl";
sha256 = "0f1818l1vs5fbmrihzyv3qasddbqi3r01jik5crrxddwalsi2bd3";
};
nativeBuildInputs = [ pkgconfig gettext ];

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