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

Merge branch 'master' into x-updates

Browse Source 
Needed that to fix the tarball.
This commit is contained in:
Vladimír Čunát 2013-04-11 23:31:33 +02:00
commit 8249695b61
110 changed files with 1361 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/applications/audio/distrho/default.nix
View File

@ -2,23 +2,19 @@
, libxslt, lv2, pkgconfig, premake, xlibs }:
let
rev = "7815b3545978e";
rev = "99efbf0b";
in
stdenv.mkDerivation rec {
name = "distrho-${rev}";
src = fetchgit {
url = "git://distrho.git.sf.net/gitroot/distrho/distrho";
url = "https://github.com/falkTX/DISTRHO.git";
inherit rev;
sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844";
sha256 = "ed26a6edca19ebb8260b3dc042f69c32162e1d91179fb9d22da42ec7131936f9";
};
patchPhase = ''
sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \
-i ports/hybridreverb2/source/SystemConfig.cpp
sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
buildInputs = [
@ -31,9 +27,6 @@ stdenv.mkDerivation rec {
sh ./scripts/premake-update.sh linux
make standalone
make lv2
# generate lv2 ttl
sh scripts/generate-ttl.sh
'';
installPhase = ''
@ -41,12 +34,6 @@ stdenv.mkDerivation rec {
cp bin/standalone/* $out/bin/
mkdir -p $out/lib/lv2
cp -a bin/lv2/* $out/lib/lv2/
# HybridReverb2 data
mkdir -p $out/etc/HybridReverb2
cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/
mkdir -p $out/share
cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/
'';
meta = with stdenv.lib; {
@ -55,8 +42,8 @@ stdenv.mkDerivation rec {
longDescription = ''
Includes:
3BandEQ bitmangler drowaudio-distortion drowaudio-flanger
drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay
TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
drowaudio-tremolo eqinox juce_pitcher sDelay TAL-Filter
TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim
Wolpertinger argotlunar capsaicin drowaudio-distortionshaper
drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan
TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex

2
pkgs/applications/audio/flac/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches =
[ # Fix for building on GCC 4.3.
(fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/flac/files/flac-1.2.1-gcc-4.3-includes.patch?rev=1.1";
url = "http://sourceforge.net/p/flac/patches/_discuss/thread/9d4c7504/d8ea/attachment/flac-1.2.1-gcc-4.3-includes.patch";
sha256 = "1m6ql5vyjb2jlp5qiqp6w0drq1m6x6y3i1dnl5ywywl3zd36k0mr";
})
];

1
pkgs/applications/audio/gmpc/default.nix
View File

@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
description = "A GTK2 frontend for Music Player Daemon";
license = licenses.gpl2;
maintainers = [ maintainers.rickynils ];
platforms = platforms.linux;
};
}

25
pkgs/applications/audio/mid2key/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xextproto }:
stdenv.mkDerivation rec {
name = "mid2key-r1";
src = fetchurl {
url = "http://mid2key.googlecode.com/files/${name}.tar.gz";
sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904";
};
unpackPhase = "tar xvzf $src";
buildInputs = [ alsaLib libX11 libXi libXtst xextproto ];
buildPhase = "make";
installPhase = "mkdir -p $out/bin && mv mid2key $out/bin";
meta = with stdenv.lib; {
homepage = http://code.google.com/p/mid2key/;
description = "A simple tool which maps midi notes to simulated keystrokes";
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
};
}

21
pkgs/applications/audio/puredata/default.nix
View File

@ -1,24 +1,31 @@
{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib,
libX11, libtool, tcl, tk }:
{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib
, jackaudio, libX11, libtool, makeWrapper, pkgconfig, tcl, tk
}:
stdenv.mkDerivation rec {
name = "puredata-${version}";
version = "0.43-0";
version = "0.44-0";
src = fetchurl {
url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz";
sha256 = "1qfq7x8vj12kr0cdrnbvmxfhc03flicc6vcc8bz6hwrrakwciyz2";
sha256 = "031bvqfnlpfx0y5n0l5rmslziqc6jgmk99x1prgh1rmhjhjdnijw";
};
buildInputs = [ alsaLib autoconf automake fftw gettext glib libX11
libtool tcl tk ];
buildInputs = [
alsaLib autoconf automake fftw gettext glib jackaudio libX11
libtool makeWrapper pkgconfig tcl tk
];
preConfigure = ''
./autogen.sh
'';
postInstall = ''
wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
'';
meta = with stdenv.lib; {
description = ''Real-time graphical programming environment for
description = ''A real-time graphical programming environment for
audio, video, and graphical processing'';
homepage = http://puredata.info;
license = licenses.bsd3;

8
pkgs/applications/editors/emacs-modes/cedet/default.nix
View File

@ -1,14 +1,14 @@
{ fetchurl, stdenv, emacs }:
{ fetchurl, stdenv, emacs, python }:
stdenv.mkDerivation rec {
name = "cedet-1.0pre6";
name = "cedet-1.1";
src = fetchurl {
url = "mirror://sourceforge/cedet/${name}.tar.gz";
sha256 = "0pvd54rjlba12cxgqibm8v4i8x43r5c239z891lgcbafjvkzpdxb";
sha256 = "0p2bwlpwwa019axvgj09xkxbr53j0pq23d46s4la9jfhl47nbh22";
};
buildInputs = [ emacs ];
buildInputs = [ emacs python ];
doCheck = true;
checkPhase = "make utest";

53
pkgs/applications/graphics/darktable/1.2rc1.nix
View File

@ -1,53 +0,0 @@
{ stdenv, fetchurl
, GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
, libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2
, lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
, openexr, pixman, pkgconfig, sqlite, bash, libxslt }:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.2rc1";
name = "darktable-${version}";
src = fetchurl {
url = "http://tinyurl.com/bmwdztq";
name = "${name}-${version}.tar.xz";
sha256 = "0l3gl49bmaljrrl4zfaivvj7apxa2jm934ylq24gcms3b2whv70m";
};
buildInputs =
[ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
'';
cmakeFlags = [
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
"-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
"-DCMAKE_BUILD_TYPE=Release"
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
];
meta = with stdenv.lib; {
description = "Virtual lighttable and darkroom for photographers";
homepage = http://darktable.sourceforge.net;
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}

6
pkgs/applications/graphics/darktable/default.nix
View File

@ -8,12 +8,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "1.1.4";
version = "1.2";
name = "darktable-${version}";
src = fetchurl {
url = "mirror://sourceforge/darktable/darktable/1.1/darktable-${version}.tar.xz";
sha256 = "1bzcxh8zm0xxrpifkkksv9k4xagjrzlam00yja9v9cbjlvawfszv";
url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
sha256 = "0l2lrly46nda7b2y4gskqqxaajia34g487bgjcpd5ysxbhmmhlnw";
};
buildInputs =

7
pkgs/applications/graphics/pinta/default.nix
View File

@ -1,11 +1,12 @@
{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
stdenv.mkDerivation {
name = "pinta-0.5";
name = "pinta-1.4";
src = fetchurl {
url = http://github.com/downloads/jpobst/Pinta/pinta-0.5.tar.gz;
sha256 = "0qv95zswi488bkbck9b9yhmczj1sgqc96nzn4f5rwfqz516kilrl";
url = "https://github.com/PintaProject/pinta/tarball/3f7ccfa93d";
name = "pinta-1.4.tar.gz";
sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
};
buildInputs = [mono gtksharp pkgconfig];

9
pkgs/applications/misc/taskwarrior/default.nix
View File

@ -1,13 +1,14 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation {
name = "taskwarrior-2.1.2";
stdenv.mkDerivation rec {
name = "taskwarrior-${version}";
version = "2.2.0";
enableParallelBuilding = true;
src = fetchurl {
url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
sha256 = "057fh50qp9bd5s08rw51iybpamn55v5nhn3s6ds89g76hp95vqir";
};
nativeBuildInputs = [ cmake ];

12
pkgs/applications/networking/browsers/chromium/sources.nix
View File

@ -1,14 +1,14 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "27.0.1448.0";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1448.0.tar.xz";
sha256 = "03sarp8drf9a6likk4m73lgk2i4nhqqri8ja9h8qiglqc4sf2hn0";
version = "27.0.1453.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.12.tar.xz";
sha256 = "1b2vkcynljl799m41aabdsj9k2plchiga6bi4ah3hc0mwyj0lyl7";
};
beta = {
version = "26.0.1410.43";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.43.tar.xz";
sha256 = "110x9cs88gqvqya71bqspx2s7ph6ca0als7sp5fbf911cj0iy0ii";
version = "27.0.1453.15";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.15.tar.xz";
sha256 = "19y9pbipi4y61avrsgb7y4b1xl8d29v34l403xdghk0d3z2rg65m";
};
stable = {
version = "26.0.1410.43";

176
pkgs/applications/networking/browsers/firefox/20.0.nix Normal file
View File

@ -0,0 +1,176 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, 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
}:
assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "20.0";
xulVersion = "20.0"; # this attribute is used by other packages
src = fetchurl {
urls = [
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
};
commonConfigureFlags =
[ "--enable-optimize"
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
# "--with-system-jpeg" # Too old in nixpkgs
"--with-system-zlib"
"--with-system-bz2"
"--with-system-nspr"
"--with-system-nss"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
# "--enable-system-cairo" # <-- doesn't build
"--enable-system-sqlite"
"--disable-crashreporter"
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer"
"--disable-updater"
];
xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}";
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
];
configureFlags =
[ "--enable-application=xulrunner"
"--disable-javaxpcom"
] ++ commonConfigureFlags;
enableParallelBuilding = true;
preConfigure =
''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
mkdir ../objdir
cd ../objdir
configureScript=../mozilla-release/configure
''; # */
#installFlags = "SKIP_GRE_REGISTRATION=1";
postInstall = ''
# Fix run-mozilla.sh search
libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*)
echo libDir: $libDir
test -n "$libDir"
cd $out/bin
rm xulrunner
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")";
fi;
done
for i in $out/lib/$libDir/*.so; do
patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
done
for i in $out/lib/$libDir/{plugin-container,xulrunner,xulrunner-stub}; do
wrapProgram $i --prefix LD_LIBRARY_PATH ':' "$out/lib/$libDir"
done
rm -f $out/bin/run-mozilla.sh
''; # */
meta = {
description = "Mozilla Firefox XUL runner";
homepage = http://www.mozilla.com/en-US/firefox/;
};
passthru = { inherit gtk; version = xulVersion; };
};
firefox = stdenv.mkDerivation rec {
name = "firefox-${firefoxVersion}";
inherit src;
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
];
propagatedBuildInputs = [xulrunner];
configureFlags =
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
"--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
makeFlags = [
"SYSTEM_LIBXUL=1"
];
# Hack to work around make's idea of -lbz2 dependency
preConfigure =
''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
'';
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
cd "$out/lib/"firefox-*
rm firefox
echo -e '#!${stdenv.shell}\nexec ${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox
''; # */
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
inherit gtk xulrunner nspr;
isFirefox3Like = true;
};
};
}

63
pkgs/applications/networking/instant-messengers/hipchat/default.nix Normal file
View File

@ -0,0 +1,63 @@
{ stdenv
, fetchurl
, libtool
, libXext
, libSM
, libICE
, libX11
, libXft
, libXau
, libXdmcp
, libXrender
, freetype
, fontconfig
, openssl
}:
let
version = "1.94.407";
rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc
stdenv.gcc.gcc
libtool
libXext
libSM
libICE
libX11
libXft
libXau
libXdmcp
libXrender
freetype
fontconfig
openssl
];
src = fetchurl {
url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
};
in stdenv.mkDerivation {
name = "hipchat-${version}";
buildCommand = ''
tar xf ${src}
mkdir -p $out
mv opt/HipChat/lib $out
mv opt/HipChat/bin $out
mv usr/share $out
patchShebangs $out/bin
for file in $(find $out/lib -type f); do
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
patchelf --set-rpath ${rpath}:$out/lib $file || true
done
'';
meta = {
description = "HipChat Desktop Client";
homepage = http://www.hipchat.com;
license = stdenv.lib.licenses.proprietary;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

148
pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch Normal file
View File

@ -0,0 +1,148 @@
From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001
From: jlh <jlh@gmx.ch>
Date: Fri, 16 Oct 2009 17:40:54 +0200
Subject: [PATCH] Rudimentary support for recording hosted conference calls
---
call.cpp | 37 +++++++++++++++++++++++++++++++++++--
call.h | 11 ++++++++++-
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/call.cpp b/call.cpp
index c2b02f2..663c1c1 100644
--- a/call.cpp
+++ b/call.cpp
@@ -90,9 +90,10 @@ void AutoSync::reset() {
// Call class
-Call::Call(QObject *p, Skype *sk, CallID i) :
- QObject(p),
+Call::Call(CallHandler *h, Skype *sk, CallID i) :
+ QObject(h),
skype(sk),
+ handler(h),
id(i),
status("UNKNOWN"),
writer(NULL),
@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) :
debug(QString("Call %1: cannot get partner display name").arg(id));
displayName = "Unnamed Caller";
}
+
+ // Skype does not properly send updates when the CONF_ID property
+ // changes. since we need this information, check it now on all calls
+ handler->updateConfIDs();
+ // this call isn't yet in the list of calls, thus we need to
+ // explicitely check its CONF_ID
+ updateConfID();
}
Call::~Call() {
@@ -134,6 +142,10 @@ Call::~Call() {
// QT takes care of deleting servers and sockets
}
+void Call::updateConfID() {
+ confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong();
+}
+
bool Call::okToDelete() const {
// this is used for checking whether past calls may now be deleted.
// when a past call hasn't been decided yet whether it should have been
@@ -270,6 +282,11 @@ void Call::startRecording(bool force) {
if (isRecording)
return;
+ if (handler->isConferenceRecording(confID)) {
+ debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id));
+ return;
+ }
+
if (force) {
emit showLegalInformation();
} else {
@@ -589,6 +606,22 @@ CallHandler::~CallHandler() {
delete legalInformationDialog;
}
+void CallHandler::updateConfIDs() {
+ QList<Call *> list = calls.values();
+ for (int i = 0; i < list.size(); i++)
+ list.at(i)->updateConfID();
+}
+
+bool CallHandler::isConferenceRecording(CallID id) const {
+ QList<Call *> list = calls.values();
+ for (int i = 0; i < list.size(); i++) {
+ Call *c = list.at(i);
+ if (c->getConfID() == id && c->getIsRecording())
+ return true;
+ }
+ return false;
+}
+
void CallHandler::callCmd(const QStringList &args) {
CallID id = args.at(0).toInt();
diff --git a/call.h b/call.h
index cb8396d..b746f46 100644
--- a/call.h
+++ b/call.h
@@ -43,6 +43,8 @@ class QTcpServer;
class QTcpSocket;
class LegalInformationDialog;
+class CallHandler;
+
typedef int CallID;
class AutoSync {
@@ -68,18 +70,21 @@ private:
class Call : public QObject {
Q_OBJECT
public:
- Call(QObject *, Skype *, CallID);
+ Call(CallHandler *, Skype *, CallID);
~Call();
void startRecording(bool = false);
void stopRecording(bool = true);
+ void updateConfID();
bool okToDelete() const;
void setStatus(const QString &);
QString getStatus() const { return status; }
bool statusDone() const;
bool statusActive() const;
CallID getID() const { return id; }
+ CallID getConfID() const { return confID; }
void removeFile();
void hideConfirmation(int);
+ bool getIsRecording() const { return isRecording; }
signals:
void startedCall(int, const QString &);
@@ -99,10 +104,12 @@ private:
private:
Skype *skype;
+ CallHandler *handler;
CallID id;
QString status;
QString skypeName;
QString displayName;
+ CallID confID;
AudioFileWriter *writer;
bool isRecording;
int stereo;
@@ -140,6 +147,8 @@ class CallHandler : public QObject {
public:
CallHandler(QObject *, Skype *);
~CallHandler();
+ void updateConfIDs();
+ bool isConferenceRecording(CallID) const;
void callCmd(const QStringList &);
signals:
--
1.6.5.GIT

27
pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }:
stdenv.mkDerivation {
name = "skype-call-recorder-0.8";
src = fetchurl {
url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
};
# Keep an rpath reference to the used libogg
prePatch = ''
sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
'';
# Better support for hosted conferences
patches = [ ./conference.patch ];
buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
meta = {
homepage = http://atdot.ch/scr/;
description = "Open source tool to record your Skype calls on Linux";
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

4
pkgs/applications/networking/offrss/default.nix
View File

@ -9,6 +9,10 @@ stdenv.mkDerivation {
'';
crossAttrs = {
propagatedBuildInputs = [ curl.crossDrv libmrss.crossDrv ];
preConfigure = ''
sed 's/^PDF/#PDF/' -i Makefile
'';
makeFlags = "CC=${stdenv.cross.config}-gcc";
};

2
pkgs/applications/search/recoll/default.nix
View File

@ -3,6 +3,8 @@
, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
, ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconvOrLibc }:
assert stdenv.system != "powerpc-linux";
stdenv.mkDerivation rec {
ver = "1.18.1";
name = "recoll-${ver}";

3
pkgs/applications/taxes/aangifte-2012/default.nix
View File

@ -27,7 +27,8 @@ stdenv.mkDerivation {
''
mkdir -p $out
cp -prvd * $out/
wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin
wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
--prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1
'';
meta = {

6
pkgs/applications/version-management/meld/default.nix
View File

@ -1,8 +1,8 @@
{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }:
let
minor = "1.5";
version = "${minor}.2";
minor = "1.6";
version = "${minor}.1";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.gnome.org/pub/gnome/sources/meld/${minor}/meld-${version}.tar.xz";
sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx";
sha256 = "00rsff0yl5qwzh0igkdns6ry2xsbxad70avpqpkbd2bldi94v76y";
};
buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ];

4
pkgs/applications/version-management/rcs/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "rcs-5.8.1";
name = "rcs-5.8.2";
src = fetchurl {
url = "mirror://gnu/rcs/${name}.tar.gz";
sha256 = "1b1y6s4gy3miv2bvx0z01kvnv58h35sw766lccdkxkalk43cml04";
sha256 = "1p4kqqrvc7plc3n6ls4xwp6d3mw1jcx9p36pilwd65q31mgbs07a";
};
doCheck = true;

26
pkgs/applications/video/avxsynth/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, ffmpeg, autoconf, automake, libtool, pkgconfig, log4cpp
, pango, cairo, python, libjpeg, ffms
, enableQt ? true, qt4}:
stdenv.mkDerivation rec {
name = "avxsynth-4.0-e153e672bf";
src = fetchurl {
url = https://github.com/avxsynth/avxsynth/tarball/e153e672bf;
name = "${name}.tar.gz";
sha256 = "16l2ld8k1nfsms6jd9d9r4l247xxbncsak66w87icr20yzyhs14s";
};
buildInputs = [ ffmpeg autoconf automake libtool pkgconfig log4cpp pango cairo python
libjpeg ffms ]
++ stdenv.lib.optional enableQt qt4;
preConfigure = "autoreconf -vfi";
meta = {
homepage = https://github.com/avxsynth/avxsynth/wiki;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

8
pkgs/applications/video/mplayer2/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? true, alsaLib ? null
@ -17,7 +17,7 @@
, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null);
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
@ -74,11 +74,13 @@ stdenv.mkDerivation rec {
prePatch = ''
sed -i /^_install_strip/d configure
sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c
'';
buildInputs = with stdenv.lib;
[ freetype pkgconfig ffmpeg libass docutils which ]
++ optionals x11Support [ libX11 libXext mesa ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora

4
pkgs/applications/video/vlc/default.nix
View File

@ -5,7 +5,7 @@
, libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
, mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
}:
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394
libdc1394 libraw1394 libopus
];
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses, perl, pixman }:
stdenv.mkDerivation rec {
name = "qemu-1.3.1";
name = "qemu-1.4.0";
src = fetchurl {
url = "http://wiki.qemu.org/download/${name}.tar.bz2";
sha256 = "1bqfrb5dlsxm8gxhkksz8qzi5fhj3xqhxyfwbqcphhcv1kpyfwip";
sha256 = "1a7d11vjs1p6i1ck2ff9annmkhpkbjl73hl9i1cbg3s0fznrfqh6";
};
buildInputs = [ python zlib pkgconfig glib SDL ncurses perl pixman ];

36
pkgs/applications/window-managers/dwm/confnotify-6.0.patch Normal file
View File

@ -0,0 +1,36 @@
Fix SDL fullscreen problems when the resolution changes:
https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J
diff -r ec4baab78314 dwm.c
--- a/dwm.c Mon Dec 19 15:38:30 2011 +0100
+++ b/dwm.c Sat Jan 14 12:35:50 2012 +0100
@@ -397,9 +397,10 @@
showhide(m->stack);
else for(m = mons; m; m = m->next)
showhide(m->stack);
- if(m)
+ if(m) {
arrangemon(m);
- else for(m = mons; m; m = m->next)
+ restack(m);
+ } else for(m = mons; m; m = m->next)
arrangemon(m);
}
@@ -408,7 +409,6 @@
strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
if(m->lt[m->sellt]->arrange)
m->lt[m->sellt]->arrange(m);
- restack(m);
}
void
@@ -1827,6 +1827,8 @@
.event_mask = ButtonPressMask|ExposureMask
};
for(m = mons; m; m = m->next) {
+ if (m->barwin)
+ continue;
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);

7
pkgs/applications/window-managers/dwm/default.nix
View File

@ -1,7 +1,10 @@
{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
stdenv.mkDerivation rec {
let
name = "dwm-6.0";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://dl.suckless.org/dwm/${name}.tar.gz";
@ -13,7 +16,7 @@ stdenv.mkDerivation rec {
prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
# Allow users set their own list of patches
inherit patches;
patches = [ ./confnotify-6.0.patch ] ++ patches;
buildPhase = " make ";

2
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -57,7 +57,7 @@ stdenv.mkDerivation {
crossAttrs = {
shell = shell.crossDrv + shell.crossDrv.shellPath;
libc = libc.crossDrv;
libc = stdenv.gccCross.libc;
coreutils = coreutils.crossDrv;
binutils = binutils.crossDrv;
gcc = gcc.crossDrv;

1
pkgs/desktops/e17/default.nix
View File

@ -36,6 +36,7 @@ rec {
#### APPLICATIONS
terminology = callPackage ./terminology { };

1
pkgs/desktops/e17/e_dbus/default.nix
View File

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
propagatedBuildInputs = [ dbus_libs ];
setupHook = ./setup-hook.sh;
configureFlags = ''
--disable-edbus-test
--disable-edbus-test-client

8
pkgs/desktops/e17/e_dbus/setup-hook.sh Normal file
View File

@ -0,0 +1,8 @@
addDbusIncludePath () {
if test -d "$1/include/dbus-1.0"
then
export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include"
fi
}
envHooks=(${envHooks[@]} addDbusIncludePath)

4
pkgs/desktops/e17/emotion/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje }:
{ stdenv, fetchurl, pkgconfig, ecore, evas, eet, eina, edje, vlc }:
stdenv.mkDerivation rec {
name = "emotion-${version}";
version = "1.7.5";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "1sfw8kpj2fcqymzd6q7p51xxib1n2arvjl1hnwhqkvwhlsq2b4sw";
};
buildInputs = [ pkgconfig ecore evas eet eina edje ];
buildInputs = [ pkgconfig ecore evas eet eina edje vlc ];
meta = {
description = "A library to easily integrate media playback into EFL applications";
longDescription = ''

7
pkgs/desktops/e17/ethumb/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet }:
{ stdenv, fetchurl, pkgconfig, eina, evas, ecore, edje, eet, e_dbus, emotion, libexif }:
stdenv.mkDerivation rec {
name = "ethumb-${version}";
version = "1.7.5";
@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
url = "http://download.enlightenment.org/releases/${name}.tar.bz2";
sha256 = "0prka3knz8p2n46dfrzgwn55khhhrhjny4vvnzkjcwmhvz7kgc9l";
};
buildInputs = [ pkgconfig eina evas ecore edje eet ];
buildInputs = [ pkgconfig eina evas ecore edje eet emotion libexif ];
propagatedBuildInputs = [ e_dbus libexif ];
meta = {
description = "A thumbnail generation library";
longDescription = ''
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
* create thumbnails with a predefined frame (possibly an edje frame);
* have an option to create fdo-like thumbnails;
* have a client/server utility;
* TODO: make thumbnails from edje backgrounds, icons and themes;
* TODO: make thumbnails from edje backgrounds, icons and themes;
'';
homepage = http://enlightenment.org/;
license = stdenv.lib.licenses.lgpl21;

17
pkgs/desktops/e17/terminology/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, fetchurl, pkgconfig, elementary, eina, eet, evas, edje, emotion, ecore, ethumb, efreet }:
stdenv.mkDerivation rec {
name = "terminology-${version}";
version = "0.3.0";
src = fetchurl {
url = "http://download.enlightenment.org/releases/${name}.tar.gz";
sha256 = "1dn5bjswqgnqza7bngc6afqza47yh27xfwf5qg2kzfgs008hp1bp";
};
buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ];
meta = {
description = "Terminology, the E17 terminal emulator";
homepage = http://www.enlightenment.org/p.php?p=about/terminology;
license = stdenv.lib.licenses.bsd2; # not sure
};
}

1
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -333,6 +333,7 @@ stdenv.mkDerivation ({
crossAttrs = {
patches = patches ++ [ ./hurd-sigrtmin.patch ];
postPatch = "";
AR = "${stdenv.cross.config}-ar";
LD = "${stdenv.cross.config}-ld";
CC = "${stdenv.cross.config}-gcc";

8
pkgs/development/compilers/mono/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:
stdenv.mkDerivation {
name = "mono-2.10.8.1";
stdenv.mkDerivation rec {
name = "mono-2.11.4";
src = fetchurl {
url = http://download.mono-project.com/sources/mono/mono-2.10.8.1.tar.gz;
sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
sha256 = "0wv8pnj02mq012sihx2scx0avyw51b5wb976wn7x86zda0vfcsnr";
};
buildInputs = [bison pkgconfig glib gettext perl libgdiplus];

4
pkgs/development/interpreters/php/5.3.nix
View File

@ -9,7 +9,7 @@ in
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
version = "5.3.18";
version = "5.3.24";
name = "php-${version}";
@ -196,7 +196,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
src = fetchurl {
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
sha256 = "0bqsdwil13m1r449c4rhrc8cmx2a09k8h2g107qqxfwanzndwrgh";
sha256 = "00sphz1y6bjb2qshbcbadh5f2xvhfy82rfdc62qjfn6337gwlfzw";
name = "php-${version}.tar.bz2";
};

4
pkgs/development/interpreters/python/3.3/default.nix
View File

@ -17,7 +17,7 @@ with stdenv.lib;
let
majorVersion = "3.3";
version = "${majorVersion}.1rc1";
version = "${majorVersion}.1";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
@ -29,7 +29,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.python.org/ftp/python/3.3.1/Python-${version}.tar.bz2";
sha256 = "1pnsbdzbd3750jcy32sv1760lv7am4x3f33jn1kmdmd82za279gv";
sha256 = "0mm7nvdd85p6b26jwshy2dhicf0b06mb5lrl564i3c5q7jgs1vll";
};
preConfigure = ''

11
pkgs/development/libraries/aterm/2.8.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl}:
let
let
isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
in
stdenv.mkDerivation ( {
@ -15,7 +15,12 @@ stdenv.mkDerivation ( {
# Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
./max-long.patch
] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] );
# The test programs stress, randgen, fib, and testsafio all fail with
# segmentation faults when compiled with GCC 4.8.x, and the code itself many
# warnings, complaining "cast from pointer to integer of different size".
# This looks really bad. I leave the test suite enabled, because those issue
# feel too serious to just ignore.
doCheck = true;
meta = {
@ -23,4 +28,4 @@ stdenv.mkDerivation ( {
license = "LGPL";
description = "Library for manipulation of term data structures in C";
};
} // ( if isMingw then { dontStrip = true; } else {}) )
} // ( if isMingw then { dontStrip = true; } else {}) )

8
pkgs/development/libraries/ffmpeg/1.1.nix → pkgs/development/libraries/ffmpeg/1.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
@ -29,11 +29,11 @@ assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null;
stdenv.mkDerivation rec {
name = "ffmpeg-1.1.3";
name = "ffmpeg-1.2";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
sha256 = "1bssxbn4p813xlgb8whg4b60j90yzfy92x70b4q8j35fgp0gnfcs";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora

20
pkgs/development/libraries/ffms/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
stdenv.mkDerivation {
name = "ffms-2.17";
src = fetchurl {
url = http://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2;
sha256 = "0gb42hrwnldz3zjlk4llx85dvxysxlfrdf5yy3fay8r8k1vpl7wr";
};
NIX_CFLAGS_COMPILE = "-fPIC";
buildInputs = [ zlib ffmpeg pkgconfig ];
meta = {
homepage = http://code.google.com/p/ffmpegsource/;
description = "Libav/ffmpeg based source library for easy frame accurate access";
license = "MIT";
};
}

1
pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix
View File

@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
extensibleExceptions filepath HUnit QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "A framework for packaging Haskell software";

14
pkgs/development/libraries/haskell/asn1-types/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, time }:
cabal.mkDerivation (self: {
pname = "asn1-types";
version = "0.1.0";
sha256 = "1520jq65fzlpi4jfrqwry3dg4lajdk6pssb7cqbrmplda0zi2d12";
buildDepends = [ time ];
meta = {
homepage = "http://github.com/vincenthz/hs-asn1-types";
description = "ASN.1 types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/cmdargs/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
version = "0.10.2";
sha256 = "0vn7c569akyabij2bh9myyvnx08w67dwdvx5g5q36b3ixzp0lrg4";
version = "0.10.3";
sha256 = "1cglfbkmgbsv3k32vdfg4xk6b5g5c2z8pm0xgbmdb4bbg765lrh6";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];

12
pkgs/development/libraries/haskell/crypto-conduit/default.nix
View File

@ -1,15 +1,15 @@
{ cabal, cereal, conduit, cryptoApi, cryptocipher, cryptohash
, hspec, skein, transformers
{ cabal, cereal, conduit, cryptoApi, cryptocipher
, cryptohashCryptoapi, hspec, skein, transformers
}:
cabal.mkDerivation (self: {
pname = "crypto-conduit";
version = "0.5.0";
sha256 = "0mlf2l784w0wyfjqsxzfdwmn1wb0z1s6mb8kdhw8x1z4a8gy9a92";
version = "0.5.1";
sha256 = "04z8z7bipa40xnjr8civ1sj3df2iyvlv929ibkrdqv87gj0qv2dp";
buildDepends = [ cereal conduit cryptoApi transformers ];
testDepends = [
cereal conduit cryptoApi cryptocipher cryptohash hspec skein
transformers
cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec
skein transformers
];
doCheck = false;
meta = {

14
pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, cereal, cryptoApi, cryptohash, tagged }:
cabal.mkDerivation (self: {
pname = "cryptohash-cryptoapi";
version = "0.1.0";
sha256 = "06b62ddwx2mp71dzaj8h88vw2c6nv3rj8n6d3d9vmqa7cws3mjkx";
buildDepends = [ cereal cryptoApi cryptohash tagged ];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
description = "Crypto-api interfaces for cryptohash";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/cryptohash/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.8.4";
sha256 = "0h58apxcrvpkyj3s2c7l68g7biv80snkn53g6jya1s687xff8fmn";
version = "0.9.0";
sha256 = "0ipzrp83pz33qc7gmn9bmhbmc1f0hfvagyfr5bnmhgrh6lgy9s7l";
buildDepends = [ cereal cryptoApi tagged ];
testDepends = [
HUnit QuickCheck testFramework testFrameworkHunit

4
pkgs/development/libraries/haskell/fsnotify/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "fsnotify";
version = "0.0.6";
sha256 = "0ib6ansj3vaq9hxxbsq5jw14w2b61wp4jfahzb3c3x46mdb1bqw5";
version = "0.0.7.1";
sha256 = "1hrnhp22s8pcj525m2vi9b7k3pp5qrv44qhqh6c8n0bgilqwg4yd";
buildDepends = [ hinotify systemFileio systemFilepath text time ];
testDepends = [
Cabal Glob hinotify hspec QuickCheck random systemFileio

3
pkgs/development/libraries/haskell/hakyll/default.nix
View File

@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
testFrameworkQuickcheck2 text time
];
doCheck = false;
patchPhase = ''
sed -i -e 's|cryptohash .*,|cryptohash,|' hakyll.cabal
'';
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";

3
pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
View File

@ -7,7 +7,7 @@ cabal.mkDerivation (self : {
pname = "haskell-platform";
version = "2010.2.0.0";
src = fetchurl {
url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz";
sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0";
};
propagatedBuildInputs = [
@ -21,4 +21,3 @@ cabal.mkDerivation (self : {
maintainers = [self.stdenv.lib.maintainers.andres];
};
})

6
pkgs/development/libraries/haskell/hopenssl/default.nix
View File

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "hopenssl";
version = "1.6.1";
sha256 = "75ba42c5e9b02c09057c5aa25f577bdfe5214533fbd2921ac555897ade85958a";
version = "1.6.2";
sha256 = "0b9xdm7jgkadx53vwszjnisyblzsqk99s3zqppgp0iqqf9955s4w";
buildDepends = [ mtl ];
extraLibraries = [ openssl ];
meta = {
homepage = "http://gitorious.org/hopenssl";
homepage = "http://github.com/peti/hopenssl";
description = "FFI bindings to OpenSSL's EVP digest interface";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

6
pkgs/development/libraries/haskell/hsemail/default.nix
View File

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "hsemail";
version = "1.7.5";
sha256 = "0ls6y48bndwgb7ng29wxim4h36rs6b07dqi6ic4hqgbb7lg6fma4";
version = "1.7.6";
sha256 = "0v4c6ljrzc7680i85wyxq7fkfs2j00941ps3rn8r16x3x2r8di04";
buildDepends = [ mtl parsec ];
testDepends = [ doctest hspec parsec ];
meta = {
homepage = "http://gitorious.org/hsemail";
homepage = "http://github.com/peti/hsemail";
description = "Internet Message Parsers";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/hspec-meta/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hspec-meta";
version = "1.5.2";
sha256 = "1kzlppbp8ralkpi89qrfdm5yrr72b9iq4nrvmblyjrb67h9412q0";
version = "1.5.3";
sha256 = "13yzk3qgqbb5jlrvy1mdq5782jzjllhnfi6ylrv8zix192y8v1mh";
isLibrary = true;
isExecutable = true;
buildDepends = [

6
pkgs/development/libraries/haskell/hspec/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.5.2";
sha256 = "1bndznbq7qyqr4j4mnsxf3dabmjyzah0bsiyynrc00ay1pf033l8";
version = "1.5.3";
sha256 = "138qjfw3kq87dvmb2ig1nsnrjpyqayvbqrjkmswn0sg8qh5cgbgb";
isLibrary = true;
isExecutable = true;
buildDepends = [
@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
hspecMeta HUnit QuickCheck quickcheckIo random setenv silently time
transformers
];
doCheck = self.stdenv.system == "x86_64-linux";
doCheck = false;
meta = {
homepage = "http://hspec.github.com/";
description = "Behavior-Driven Development for Haskell";

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.2.2";
sha256 = "16njcgdnzs2la5xvs1pqs3zcjyzqlk3yfis89h9x7qg2w8hq8pxf";
version = "1.9.3";
sha256 = "03c08jj6941kxl5iw60n8s8qnxp2rsfgfmf7m761iy7i7hsj1rkk";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

4
pkgs/development/libraries/haskell/multiarg/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "multiarg";
version = "0.12.0.2";
sha256 = "0f90dsa5ya55lrc0x0ziz01fjvaq85q4f8zsfci1w1rgxa9m7naa";
version = "0.14.0.0";
sha256 = "05zibar3yqwz2k2ihpby8jdfr4qniz2cz2989sxjf72hqih0g9pb";
buildDepends = [ explicitException utf8String ];
meta = {
homepage = "https://github.com/massysett/multiarg";

18
pkgs/development/libraries/haskell/polyparse/1.7.nix
View File

@ -1,18 +0,0 @@
{ cabal, text }:
cabal.mkDerivation (self: {
pname = "polyparse";
version = "1.7";
sha256 = "de8ed0ce54f1f81bb0783dd97b7b22eca28df4a238684a26b37c5af2d17a364b";
buildDepends = [ text ];
meta = {
homepage = "http://code.haskell.org/~malcolm/polyparse/";
description = "A variety of alternative parser combinator libraries";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

0
pkgs/development/libraries/haskell/polyparse/1.8.nix → pkgs/development/libraries/haskell/polyparse/default.nix
View File

17
pkgs/development/libraries/haskell/primitive/0.4.1.nix
View File

@ -1,17 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "primitive";
version = "0.4.1";
sha256 = "06999i59xhvjwfdbnr1n09zkvg7lnim64nqxqlvk0x6slkidb7f6";
meta = {
homepage = "http://code.haskell.org/primitive";
description = "Wrappers for primitive operations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

17
pkgs/development/libraries/haskell/primitive/0.5.nix
View File

@ -1,17 +0,0 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "primitive";
version = "0.5";
sha256 = "0m2gv7lac7q24cy02bbc7hq41awjxzs8dcjc6j2nv8xiq14cp3mk";
meta = {
homepage = "http://code.haskell.org/primitive";
description = "Primitive memory-related operations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

5
pkgs/development/libraries/haskell/repa/default.nix
View File

@ -2,10 +2,9 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.2.3.1";
sha256 = "0r5z781h9v6ri2m3ih7jbymvc3i2m26qaf29pxwmaks0sdlp4qmr";
version = "3.2.3.2";
sha256 = "0xwaqkir4gjlhnvd1r69ycswg4p65ig38d2np69hv195zr47pmvh";
buildDepends = [ QuickCheck vector ];
jailbreak = true;
meta = {
homepage = "http://repa.ouroborus.net";
description = "High performance, regular, shape polymorphic parallel arrays";

4
pkgs/development/libraries/haskell/shakespeare-js/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
version = "1.1.2.1";
sha256 = "049nn0p236wbm2majkih87n2c7h65xrnf6gydsi7najxccjl7y8z";
version = "1.1.3";
sha256 = "091yygp2gfp290m76iwpjddzgn7qjq1h5f8ma8sd3lvy6pv2pzcz";
buildDepends = [ aeson shakespeare text ];
testDepends = [ aeson hspec HUnit shakespeare text ];
meta = {

4
pkgs/development/libraries/haskell/shakespeare/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "1.0.3.1";
sha256 = "08w1g19k9v9dvdy45j32kdic8vjhc10ad4g20q5ya0id4cd13qfs";
version = "1.0.4";
sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb";
buildDepends = [ parsec text ];
testDepends = [ hspec parsec text ];
meta = {

4
pkgs/development/libraries/haskell/stm-conduit/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "stm-conduit";
version = "1.0.0";
sha256 = "1kkx3x3qdqw5jp9vn9kxbxmmb8x0wdbp8jch08azw45pwjh3ga7v";
version = "1.1.0";
sha256 = "1b5v3vf9izzpw3vaslskhdxqnc1zmag1f3x50dh8r1nl318ndkf7";
buildDepends = [ conduit resourcet stm stmChans transformers ];
testDepends = [
conduit HUnit QuickCheck stm stmChans testFramework

6
pkgs/development/libraries/haskell/streamproc/default.nix
View File

@ -2,10 +2,10 @@
cabal.mkDerivation (self: {
pname = "streamproc";
version = "1.6";
sha256 = "0bb1rdzzpjggw7dk4q3hwa1j1bvkfqhz6vrd45shcp57ixqlp6ws";
version = "1.6.2";
sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
meta = {
homepage = "http://gitorious.org/streamproc";
homepage = "http://github.com/peti/streamproc";
description = "Stream Processer Arrow";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/utility-ht/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "utility-ht";
version = "0.0.8";
sha256 = "02sm1xj5xa65hpkvl2yk89d9dlg3c2ap8qcviq9zj10asmsbzyd8";
version = "0.0.9";
sha256 = "1m5mjxwf51jd00swp1f4cimaqaral6827y1sidbq61qkw7l6ss8r";
testDepends = [ QuickCheck ];
meta = {
description = "Various small helper functions for Lists, Maybes, Tuples, Functions";

4
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.6";
sha256 = "0g6ik3qvjnpyfbr2fciz53l62q44zi7ipil8v7hy56808n5y6i4i";
version = "1.1.7";
sha256 = "0vsgpvmsmdzbwj5l862bzm21ld3adkmbwgkffbpjr4yylbvvyvrn";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup fileEmbed hamlet
httpConduit httpTypes liftedBase mimeMail network persistent

2
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches =
[ (fetchurl {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch?revision=1.1;
url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch";
sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
})
];

13
pkgs/development/libraries/libmspack/default.nix
View File

@ -1,9 +1,16 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "libmspack-0.0.20040308alpha";
name = "libmspack-0.3alpha";
src = fetchurl {
url = http://www.kyz.uklinux.net/downloads/libmspack-0.0.20040308alpha.tar.gz;
md5 = "4d8e967649df0f6ade83df7da4b7511c";
url = http://www.cabextract.org.uk/libmspack/libmspack-0.3alpha.tar.gz;
sha256 = "03rlzhvzd3qm7sb029gs14syq1z6xjmczvwb9kbz5sl20sjngidh";
};
meta = {
description = "A de/compression library for various Microsoft formats";
homepage = http://www.cabextract.org.uk/libmspack;
license = "LGPL2";
};
}

16
pkgs/development/libraries/log4cpp/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "log4cpp-1.1";
src = fetchurl {
url = "mirror://sourceforge/log4cpp/${name}.tar.gz";
sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2";
};
meta = {
homepage = http://log4cpp.sourceforge.net/;
description = "A logging framework for C++ patterned after Apache log4j";
license = "LGPLv2.1+";
};
}

4
pkgs/development/libraries/nspr/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl }:
let version = "4.9.5"; in
let version = "4.9.6"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha1 = "03885e992607e2be975f6525c6764c2167fe2eff";
sha256 = "1yf6sr21fisr0mlh4cq0ymcfp8nsvjskmx8dlm9mvhaw7kfzv4vn";
};
preConfigure = "cd mozilla/nsprpub";

9
pkgs/development/libraries/openal-soft/default.nix
View File

@ -1,15 +1,16 @@
{ stdenv, fetchurl, cmake, alsaLib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
#The current release is still in a testing phase, though it should be stable
# (neither the ABI or API will break). Please try it out and let me know how it
# works. :-)
name = "openal-soft-1.1.93";
version = "1.15.1";
name = "openal-soft-${version}";
src = fetchurl {
url = http://kcat.strangesoft.net/openal-releases/openal-soft-1.1.93.tar.bz2;
sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7";
url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f";
};
buildInputs = [ cmake alsaLib ];

7
pkgs/development/libraries/podofo/default.nix
View File

@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
nativeBuildInputs = [ cmake ];
buildInputs = [ lua5 stdenv.gcc.libc ];
crossAttrs = {
propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv
libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv
lua5.crossDrv stdenv.gccCross.libc ];
};
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
meta = {

6
pkgs/development/libraries/sqlite/default.nix
View File

@ -3,11 +3,11 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
name = "sqlite-3.7.14.1";
name = "sqlite-3.7.16.1";
src = fetchurl {
url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz;
sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc";
url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz;
sha1 = "b0d9b3e2ca3c50f72e5921e9532130787871b7ae";
};
buildInputs = [ readline ncurses ];

4
pkgs/development/perl-modules/DBD-SQLite/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
buildPerlPackage rec {
name = "DBD-SQLite-1.35";
name = "DBD-SQLite-1.37";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz";
sha256 = "0zdwnj0jmkaqb2grkh451g1jc8nsdy4sf6lhn8xd0my0a3pd227z";
sha256 = "0197kvlziaj2wfdbzlhdlqmzvb29fmfyy6y2isbbwlg0b0f7ccd1";
};
propagatedBuildInputs = [ DBI ];

6
pkgs/development/tools/gnulib/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation {
name = "gnulib-0.0-7899-g34f8464";
name = "gnulib-0.0-7901-g076ac82";
src = fetchgit {
url = "http://git.savannah.gnu.org/r/gnulib.git";
rev = "34f84640cd015eee3d9aed3b1eddf6f361576890";
sha256 = "9267827d6b3f0eb97957eae7851afd4e5ac8aa714a83e3be52e7b660cc27851d";
rev = "076ac82d1d7f4df54630f1b4917b3c14f227f032";
sha256 = "023q3gqjrs8zdk31d81d3bcv9n5770nns0h5vq31saa5391qbpvn";
};
buildPhase = ":";

4
pkgs/development/tools/haskell/cabal2nix/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.48";
sha256 = "0175bprjisjzs0y1xga1xqcy5jx6xlbrvsw6095j12xvyrvzrggr";
version = "1.49";
sha256 = "1zrxgaw1lqnnyk4xd0skdc72yq3xfx3vfg1sfgrs3235njraa20i";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

6
pkgs/development/tools/misc/elfutils/default.nix
View File

@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [m4 bison flex gettext bzip2];
buildInputs = [zlib bzip2];
configureFlags = "--disable-werror";
crossAttrs = {
/* Having bzip2 will harm, because anything using elfutils
/* Having bzip2 will harm, because anything using elfutils
as buildInput cross-building, will not be able to run 'bzip2' */
propagatedBuildInputs = [ zlib.crossDrv ];
@ -64,7 +66,7 @@ stdenv.mkDerivation rec {
cp version.h $out/include
'';
};
dontAddDisableDepTrack = true;
meta = {

23
pkgs/games/d1x-rebirth/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }:
stdenv.mkDerivation rec {
name = "d1x-rebirth-0.57.3";
src = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.57.3-src.tar.gz";
sha256 = "07dbjza5flsczdsas0adb5xhn13gmhlpixa8ycp8hjm20y9kw1za";
};
buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ];
installPhase = ''
scons prefix=$out install
'';
meta = {
homepage = http://www.dxx-rebirth.com/;
description = "Source Port of the Descent 1 engine";
license = "BSD"; # Parallax license, like BSD I think
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

23
pkgs/games/d2x-rebirth/default.nix Normal file
View File

@ -0,0 +1,23 @@
{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, physfs, SDL_mixer }:
stdenv.mkDerivation rec {
name = "d2x-rebirth-0.57.3";
src = fetchurl {
url = "http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.57.3-src.tar.gz";
sha256 = "0yyandmxz12bbpnd746nddjlqh5i7dylwm006shixis3w3giz77c";
};
buildInputs = [ scons pkgconfig SDL mesa physfs SDL_mixer ];
installPhase = ''
scons prefix=$out install
'';
meta = {
homepage = http://www.dxx-rebirth.com/;
description = "Source Port of the Descent 2 engine";
license = "BSD"; # Parallax license, like BSD I think
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [viric];
};
}

33
pkgs/games/dhewm3/default.nix Normal file
View File

@ -0,0 +1,33 @@
{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
, openalSoft, curl }:
stdenv.mkDerivation rec {
hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
name = "dhewm3-20130113-${hash}";
src = fetchurl {
url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
};
# Add mesa linking
patchPhase = ''
sed -i 's/\<idlib\()\?\)$/idlib GL\1/' CMakeLists.txt
'';
unpackPhase = ''
unzip ${src}
cd */neo
'';
buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft
curl ];
enableParallelBuilding = true;
meta = {
homepage = https://github.com/dhewm/dhewm3;
description = "Doom 3 port to SDL";
license = "GPLv3";
};
}

67
pkgs/games/openlierox/default.nix
View File

@ -1,56 +1,39 @@
a :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, libX11, xproto, gd, SDL, SDL_image, SDL_mixer, zlib
, libxml2, pkgconfig, curl, cmake, libzip }:
version = a.lib.attrByPath ["version"] "0.57beta8" a;
buildInputs = with a; [
libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2
pkgconfig
];
stdenv.mkDerivation {
name = "openlierox-0.58rc3";
in
rec {
src = fetchurl {
url = "http://downloads.sourceforge.net/project/openlierox/openlierox/OpenLieroX%200.57%20Beta8/OpenLieroX_0.57_beta8.src.tar.bz2";
sha256 = "1a3p03bi5v2mca7323mrckab9wsj83fjfcr6akrh9a6nlljcdn8d";
url = "mirror://sourceforge/openlierox/OpenLieroX_0.58_rc3.src.tar.bz2";
sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z";
};
inherit buildInputs;
configureFlags = [];
NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2";
/* doConfigure should be removed if not needed */
phaseNames = ["doInstall"];
# The breakpad fails to build on x86_64, and it's only to report bugs upstream
cmakeFlags = [ "-DBREAKPAD=0" ];
setParams = a.noDepEntry (''
export SYSTEM_DATA_DIR="$out/share"
export BIN_DIR="$out/bin"
export DOC_DIR="$out/share/doc"
export PIXMAP_DIR="$out/share/pixmap"
preConfigure = ''
cmakeFlags="$cmakeFlags -DSYSTEM_DATA_DIR=$out/share"
'';
export HAWKNL_BUILTIN=1
export LIBZIP_BUILTIN=1
export X11=1
export DEBUG=1
'');
doBuild=a.fullDepEntry (''
sed -re 's/ -1/ 255 /g' -i *.sh
patchPhase = ''
sed -i s,curl/types.h,curl/curl.h, include/HTTP.h src/common/HTTP.cpp
'';
source functions.sh
export INCLUDE_PATH=$(echo $NIX_CFLAGS_COMPILE | grep_param -I)
bash compile.sh
'') ["doUnpack" "addInputs" "setParams"];
installPhase = ''
ensureDir $out/bin $out/share/OpenLieroX
cp bin/* $out/bin
cp -R ../share/gamedir/* $out/share/OpenLieroX
'';
buildInputs = [ libX11 xproto gd SDL SDL_image SDL_mixer zlib libxml2
pkgconfig curl cmake libzip ];
doInstall = a.fullDepEntry (''
mkdir -p $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR
bash install.sh
'') ["doBuild" "addInputs" "setParams" "defEnsureDir"];
name = "openlierox-" + version;
meta = {
homepage = http://openlierox.net;
description = "Real-time game with Worms-like shooting";
maintainers = [
];
license = "LGPLv2+";
};
}

11
pkgs/lib/customisation.nix
View File

@ -33,17 +33,14 @@ rec {
overrideDerivation = drv: f:
let
# Filter out special attributes.
drop = [ "meta" "passthru" "outPath" "drvPath" "crossDrv" "nativeDrv" "type" "override" "deepOverride" "origArgs" "drvAttrs" "outputName" "all" "out" ]
# also drop functions such as .merge .override etc
++ lib.filter (n: isFunction (getAttr n drv)) (attrNames drv);
attrs = removeAttrs drv drop;
newDrv = derivation (attrs // (f drv));
newDrv = derivation (drv.drvAttrs // (f drv));
in newDrv //
{ meta = if drv ? meta then drv.meta else {};
{ meta = drv.meta or {};
passthru = if drv ? passthru then drv.passthru else {};
}
//
(drv.passthru or {})
//
(if (drv ? crossDrv && drv ? nativeDrv)
then {
crossDrv = overrideDerivation drv.crossDrv f;

2
pkgs/os-specific/linux/firmware/radeon-r700/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://people.freedesktop.org/~agd5f/radeon_ucode/R700_rlc.bin";
sha256 = "1lbgrlbhqijizg16z0g0qa6ggznpdy844cawnwdp1b0fkwhrbkga";
sha256 = "1sbpq39cvjnpfp1iamhq9k9266jkaaywnm8d2pw95ayw56a77976";
};
unpackPhase = "true";

2
pkgs/os-specific/linux/iproute/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap";
};
patches = [ ./vpnc.patch ];
patches = [ ./vpnc.patch ./no-werror.patch ];
preConfigure =
''

12
pkgs/os-specific/linux/iproute/no-werror.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile
--- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200
+++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200
@@ -30,7 +30,7 @@
HOSTCC = gcc
DEFINES += -D_GNU_SOURCE
CCOPTS = -O2
-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
WFLAGS += -Wmissing-declarations -Wold-style-definition
CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -231,7 +231,7 @@ in
import ./generic.nix (
rec {
version = "3.0.70";
version = "3.0.72";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -239,7 +239,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0hxb457mixpcq43dg0lnbkfdjnzqw4ajfcfkyyfgdzn5496li6va";
sha256 = "17whpcxibn6z1i1zjwx0vim33al9vgjp3jlvmam06qlxrl4i2q6w";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -245,7 +245,7 @@ in
import ./generic.nix (
rec {
version = "3.4.37";
version = "3.4.39";
testing = false;
preConfigure = ''
@ -254,7 +254,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0f7gbspi28a29vvvv0x2818pwhyjry4wzdm5d1nknf3a0cdi8an7";
sha256 = "16k1ssink1ka3593vgr1nzywc8laag58k0qz4hx0ad0sa0f7kz38";
};
config = configWithPlatform stdenv.platform;

4
pkgs/os-specific/linux/kernel/linux-3.8.nix
View File

@ -252,7 +252,7 @@ in
import ./generic.nix (
rec {
version = "3.8.5";
version = "3.8.6";
testing = false;
preConfigure = ''
@ -261,7 +261,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "1f1b6e09cb6ba656b28a41eb9e16e11576879f14574c0cb861b24734f3c5899f";
sha256 = "036i1hx2b49ssymw3xv73dz628n5yxbsngbfvsp4l7ww6brria5g";
};
config = configWithPlatform stdenv.platform;

2
pkgs/os-specific/linux/qemu-kvm/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
ncurses python glib libaio mesa texinfo perl
] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ];
patches = [ ./fix-librt-check.patch ];
patches = [ ./fix-librt-check.patch ./fix-usb-passthrough.patch ];
postPatch = ''
patchShebangs .

45
pkgs/os-specific/linux/qemu-kvm/fix-usb-passthrough.patch Normal file
View File

@ -0,0 +1,45 @@
https://bugs.launchpad.net/qemu/+bug/1033727
From: Hans de Goede <hdegoede@redhat.com>
Date: Wed, 12 Sep 2012 13:08:40 +0000 (+0200)
Subject: uhci: Don't queue up packets after one with the SPD flag set
X-Git-Tag: v1.3.0-rc0~483^2
X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=72a04d0c178f01908d74539230d9de64ffc6da19
Bug-Debian: http://bugs.debian.org/683983
uhci: Don't queue up packets after one with the SPD flag set
Don't queue up packets after a packet with the SPD (short packet detect)
flag set. Since we won't know if the packet will actually be short until it
has completed, and if it is short we should stop the queue.
This fixes a miniature photoframe emulating a USB cdrom with the windows
software for it not working.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c7c8786..cdc8bc3 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -1000,6 +1000,9 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
}
assert(ret == TD_RESULT_ASYNC_START);
assert(int_mask == 0);
+ if (ptd.ctrl & TD_CTRL_SPD) {
+ break;
+ }
plink = ptd.link;
}
}
@@ -1097,7 +1100,7 @@ static void uhci_process_frame(UHCIState *s)
case TD_RESULT_ASYNC_START:
trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf);
- if (is_valid(td.link)) {
+ if (is_valid(td.link) && !(td.ctrl & TD_CTRL_SPD)) {
uhci_fill_queue(s, &td);
}
link = curr_qh ? qh.link : td.link;

12
pkgs/servers/sql/postgresql/9.2.x.nix
View File

@ -14,17 +14,15 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
LC_ALL = "C";
makeFlags = [ "world" ];
postInstall =
''
mkdir -p $out/share/man
cp -rvd doc/src/sgml/man1 $out/share/man
'';
installTargets = [ "install-world" ];
LC_ALL = "C";
passthru = {
inherit readline;
psqlSchema = "9.1";
psqlSchema = "9.2";
};
meta = {

4
pkgs/servers/squid/squids.nix
View File

@ -11,7 +11,7 @@ rec {
sha256 = "3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4";
};
configureFlags = ["--enable-ipv6"];
configureFlags = ["--enable-ipv6" "--disable-strict-error-checking"];
meta = {
description = "http-proxy";
@ -27,7 +27,6 @@ rec {
url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.bz2;
sha256 = "1300f44dd4783697bacc262a7a9b32dbc9f550367fe82b70262864fdff715a35";
};
configureFlags = ["--enable-ipv6"];
};
squid32 = squid30.merge rec {
@ -36,7 +35,6 @@ rec {
url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l";
};
configureFlags = ["--enable-ipv6"];
buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2
libtool openssl];
};

17
pkgs/shells/bash-completion/default.nix
View File

@ -1,18 +1,13 @@
{ stdenv, fetchgit, autoconf, automake }:
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "bash-completion-2.0-95-gd08b9f2";
stdenv.mkDerivation rec {
name = "bash-completion-2.1";
src = fetchgit {
url = "http://anonscm.debian.org/git/bash-completion/bash-completion.git";
rev = "d08b9f233559b3dced20050ba312b08fe0de53b4";
sha256 = "0jybaib2bmpk5qd80y1l6wmfcd0b95cmf1l3hcb0ckpj0pjff0bn";
src = fetchurl {
url = "http://bash-completion.alioth.debian.org/files/${name}.tar.bz2";
sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b";
};
buildInputs = [ autoconf automake ];
preConfigure = "autoreconf -i";
doCheck = true;
meta = {

4
pkgs/tools/X11/xpra/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, buildPythonPackage
, python, cython, pkgconfig
, xorg, gtk, glib, pango, cairo, gdk_pixbuf, pygtk, atk, pygobject, pycairo
, ffmpeg_1_1, x264, libvpx, pil, libwebp }:
, ffmpeg_1, x264, libvpx, pil, libwebp }:
buildPythonPackage rec {
name = "xpra-0.8.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
pango cairo gdk_pixbuf atk gtk glib
ffmpeg_1_1 libvpx x264 libwebp
ffmpeg_1 libvpx x264 libwebp
];
propagatedBuildInputs = [

34
pkgs/tools/backup/bup/default.nix
View File

@ -6,26 +6,21 @@ assert par2Support -> par2cmdline != null;
with stdenv.lib;
stdenv.mkDerivation {
name = "bup-0.25git20121224";
name = "bup-0.25-rc1-107-g96c6fa2";
src = fetchgit {
url = "https://github.com/bup/bup.git";
sha256 = "f0e0c835ab83f00b28920d493e4150d2247113aad3a74385865c2a8c6f1ba7b8";
rev = "458e92da32ddd3c18fc1c3e52a76e9f0b48b832f";
rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58";
sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n";
};
buildInputs = [ python git ];
nativeBuildInputs = [ pandoc perl makeWrapper ];
buildInputs = [ python git ];
postInstall = optionalString (elem stdenv.system platforms.linux) ''
wrapProgram $out/bin/bup --prefix PYTHONPATH : \
${stdenv.lib.concatStringsSep ":"
(map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
'';
patchPhase = ''
for f in cmd/* lib/tornado/* lib/tornado/test/* t/* wvtest.py main.py; do
substituteInPlace Makefile --replace "-Werror" ""
for f in "cmd/"* "lib/tornado/"* "lib/tornado/test/"* "t/"* wvtest.py main.py; do
test -f $f || continue
substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python"
done
substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl"
@ -33,6 +28,8 @@ stdenv.mkDerivation {
substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'"
'';
dontAddPrefix = true;
makeFlags = [
"MANDIR=$(out)/share/man"
"DOCDIR=$(out)/share/doc/bup"
@ -40,11 +37,20 @@ stdenv.mkDerivation {
"LIBDIR=$(out)/lib/bup"
];
postInstall = optionalString (elem stdenv.system platforms.linux) ''
wrapProgram $out/bin/bup --prefix PYTHONPATH : \
${stdenv.lib.concatStringsSep ":"
(map (path: "$(toPythonPath ${path})") [ pyxattr pylibacl setuptools fuse ])}
'';
meta = {
description = ''
homepage = "https://github.com/bup/bup";
description = "efficient file backup system based on the git packfile format";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''
Highly efficient file backup system based on the git packfile format.
Capable of doing *fast* incremental backups of virtual machine images.
'';
homepage = "https://github.com/bup/bup";
};
}

14
pkgs/tools/filesystems/unionfs-fuse/default.nix
View File

@ -5,12 +5,24 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://podgorny.cz/unionfs-fuse/releases/${name}.tar.xz";
sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d";
};
buildInputs = [ cmake fuse ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do:
# mount -t unionfs-fuse none /dest -o dirs=/source1=RW,/source2=RO
#
# This must be done in preConfigure because the build process removes
# helper from the source directory during the build.
preConfigure = ''
ensureDir $out/sbin
cp -a mount.unionfs $out/sbin/mount.unionfs-fuse
substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse
substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs
'';
meta = {
description = "FUSE UnionFS implementation";
homepage = http://podgorny.cz/moin/UnionFsFuse;

115
pkgs/tools/misc/coreutils/default.nix
View File

@ -6,57 +6,74 @@
assert aclSupport -> acl != null;
assert selinuxSupport -> libselinux != null && libsepol != null;
stdenv.mkDerivation rec {
name = "coreutils-8.21";
let
self = stdenv.mkDerivation rec {
name = "coreutils-8.21";
src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz";
sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
};
src = fetchurl {
url = "mirror://gnu/coreutils/${name}.tar.xz";
sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
};
nativeBuildInputs = [ perl ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
++ stdenv.lib.optional selinuxSupport libsepol;
crossAttrs = {
nativeBuildInputs = [ perl ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl.crossDrv
++ stdenv.lib.optional selinuxSupport libselinux.crossDrv
++ stdenv.lib.optional selinuxSupport libsepol.crossDrv
++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.crossDrv;
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
++ stdenv.lib.optional selinuxSupport libsepol;
# Needed for fstatfs()
# I don't know why it is not properly detected cross building with glibc.
configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
doCheck = false;
crossAttrs = {
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl.crossDrv
++ stdenv.lib.optional selinuxSupport libselinux.crossDrv
++ stdenv.lib.optional selinuxSupport libsepol.crossDrv
++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.crossDrv;
buildPhase = ''
make || (
pushd man
for a in *.x; do
touch `basename $a .x`.1
done
popd; make )
'';
postInstall = ''
rm $out/share/man/man1/*
cp ${self}/share/man/man1/* $out/share/man/man1
'';
# Needed for fstatfs()
# I don't know why it is not properly detected cross building with glibc.
configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
doCheck = false;
};
# The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
doCheck = stdenv ? glibc;
enableParallelBuilding = true;
NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
meta = {
homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
longDescription = ''
The GNU Core Utilities are the basic file, shell and text
manipulation utilities of the GNU operating system. These are
the core utilities which are expected to exist on every
operating system.
'';
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
};
# The tests are known broken on Cygwin
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
doCheck = stdenv ? glibc;
enableParallelBuilding = true;
NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol";
meta = {
homepage = http://www.gnu.org/software/coreutils/;
description = "The basic file, shell and text manipulation utilities of the GNU operating system";
longDescription = ''
The GNU Core Utilities are the basic file, shell and text
manipulation utilities of the GNU operating system. These are
the core utilities which are expected to exist on every
operating system.
'';
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
in
self

6
pkgs/tools/misc/grub/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation {
name = "grub-0.97-patch-1.12";
src = fetchurl {
url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
md5 = "cd3f3eb54446be6003156158d51f4884";
@ -27,10 +27,10 @@ stdenv.mkDerivation {
# shell. KDE uses this to allow rebooting into a non-default
# entry.
(fetchurl {
url = http://cvs.mandriva.com/cgi-bin/viewvc.cgi/SPECS/grub/grub-0.97-once.patch?revision=1.3;
url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch";
sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8";
})
] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch);
# Autoconf/automake required for the splashimage patch.

4
pkgs/tools/misc/hdf5/default.nix
View File

@ -5,8 +5,8 @@
stdenv.mkDerivation {
name = "hdf5";
src = fetchurl {
url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5-patch1.tar.gz ;
sha256 = "919bb52a08fc5560c49fdc5ebd693b10b1e03eebbf44ad2e142c2e6cfd81f2b0";
url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";
};
buildInputs = [] ;

10
pkgs/tools/networking/httpie/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage {
name = "httpie-0.3.1";
pythonPackages.buildPythonPackage rec {
name = "httpie-0.4.1";
namePrefix = "";
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/httpie/httpie-0.3.1.tar.gz";
sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a";
url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz";
sha256 = "1qd03vd4657vdvkfhbd2wnlz4xh6hyw75m7wmfhgac5m2028y3cv";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests014 ];
propagatedBuildInputs = with pythonPackages; [ pygments requests ];
doCheck = false;

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