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

Merge remote-tracking branch 'upstream/master' into stdenv-updates

Browse source
This commit is contained in:
Shea Levy 2013-02-17 08:19:40 -05:00
parent 1eca5325eb 9885d04033
commit c42d77aa35
19 changed files with 203 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/audio/hydrogen/default.nix
View file

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
'';
# why doesn't scons find librdf?

12
pkgs/applications/networking/instant-messengers/linphone/default.nix
View file

@ -1,18 +1,22 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
, speex, readline, mediastreamer }:
, speex, readline, mediastreamer, libsoup }:
stdenv.mkDerivation rec {
name = "linphone-3.5.0";
name = "linphone-3.5.2";
src = fetchurl {
url = "mirror://savannah/linphone/3.5.x/sources/${name}.tar.gz";
sha256 = "1jrgsyx2mn6y50hjfx79fzqhp42r78cjr63w3bfjdl258zy2f6ix";
sha256 = "0830iam7kgqphgk3q6qx93kp5wrf0gnm5air82jamy7377jxadys";
};
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex ];
patches = [ ./fix-deprecated.patch ];
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup ];
nativeBuildInputs = [ intltool pkgconfig ];
preConfigure = "rm -r mediastreamer2 oRTP";
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
meta = {

35
pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch Normal file
View file

@ -0,0 +1,35 @@
diff --git a/gtk/main.c b/gtk/main.c
index 7079bc8..f076127 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){
GdkPixbuf *pbuf;
const char *app_name="Linphone";
- g_thread_init(NULL);
+ g_type_init();
gdk_threads_init();
progpath = strdup(argv[0]);
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 1c54fca..45c9091 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
- g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
+ g_thread_new (NULL, check_username_availability, (void*)w);
}
else {
if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){
ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
- g_thread_init (NULL);
+ g_type_init ();
gdk_threads_init ();
GtkWidget *p1=create_intro();

2
pkgs/desktops/e17/embryo/default.nix
View file

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
untouched.
'';
homepage = http://enlightenment.org/;
license = with stdenv.lib.licenses; [ bsd2 bsd3 ]; # not sure
license = with stdenv.lib.licenses; [ bsd2.shortName bsd3.shortName ]; # not sure
};
}

10
pkgs/development/interpreters/pure/default.nix
View file

@ -1,5 +1,5 @@
x@{builderDefsPackage
, llvm, gmp, mpfr, readline
, llvm, gmp, mpfr, readline, bison, flex
, ...}:
builderDefsPackage
(a :
@ -12,11 +12,11 @@ let
sourceInfo = rec {
baseName="pure";
project="pure-lang";
version="0.49";
version="0.56";
name="${baseName}-${version}";
extension="tar.gz";
url="http://${project}.googlecode.com/files/${name}.${extension}";
hash="0kkrcmmqks82g3qlkvs3cd23v6b5948rw3xsdadd1jidh74jg33x";
hash="1ll29j31lp7ymp1kq57328q8md7pkp8jmwsadp67j4cdlzc3zdhj";
};
in
rec {
@ -29,7 +29,9 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
patches = [ ./new-gcc.patch ];
meta = {
description = "A purely functional programming language based on term rewriting";

62
pkgs/development/interpreters/pure/new-gcc.patch Normal file
View file

@ -0,0 +1,62 @@
diff --git a/runtime.cc b/runtime.cc
index 04cbc40..54a0b43 100644
--- a/runtime.cc
+++ b/runtime.cc
@@ -13121,39 +13121,6 @@ unsigned int sleep(unsigned int secs)
}
#endif
-/* Horrible kludge to get round, trunc and the inverse hyperbolic functions
- from libmingwex.a (these are in C99, but not in the Windows system
- libraries, and LLVM doesn't know how to get them either). */
-
-extern "C"
-double __round(double x)
-{
- return round(x);
-}
-
-extern "C"
-double __trunc(double x)
-{
- return trunc(x);
-}
-
-extern "C"
-double __asinh(double x)
-{
- return asinh(x);
-}
-
-extern "C"
-double __acosh(double x)
-{
- return acosh(x);
-}
-
-extern "C"
-double __atanh(double x)
-{
- return atanh(x);
-}
/* File type bits. */
diff --git a/util.hh b/util.hh
index ae95b79..eab3330 100644
--- a/util.hh
+++ b/util.hh
@@ -58,13 +58,6 @@ char *default_encoding();
double my_strtod(const char *nptr, char **endptr);
char *my_formatd(char *buffer, const char *format, double d);
-/* Windows doesn't have strptime, so we provide a suitable replacement from
- GNU libc (see strptime.c). */
-
-#ifndef HAVE_STRPTIME
-extern "C"
-char *strptime(const char *s, const char *format, struct tm *tm);
-#endif
/* Windows doesn't have mkstemp, so we provide a suitable replacement. */

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

@ -2,11 +2,11 @@
libv4l, libtheora, intltool, libvpx, gsm }:
stdenv.mkDerivation rec {
name = "mediastreamer-2.8.0";
name = "mediastreamer-2.8.2";
src = fetchurl {
url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
sha256 = "0h1qda2mjc76xirldlvpmzf57vcbgr113a9b0kw1xm5i58s0w34f";
sha256 = "0csg9a4mwfw5j475q9d5klhy82jnpcqfrlbvw81nxnqki40bnbm6";
};
# TODO: make it load plugins from *_PLUGIN_PATH

11
pkgs/development/libraries/vmime/default.nix
View file

@ -1,13 +1,14 @@
{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1 }:
{stdenv, fetchurl, gsasl, gnutls, pkgconfig, zlib, libtasn1, libgcrypt }:
stdenv.mkDerivation {
name = "vmime-0.9.1";
name = "vmime-0.9.2svn";
src = fetchurl {
url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2;
sha256 = "1bninkznn07zhl7gc3jnigzvb0x1sclwqwgjy47ahzdwv5vcnriv";
url = http://download.zarafa.com/community/final/7.0/7.0.5-31880/sourcecode/libvmime-0.9.2+svn603.tar.bz2;
#url = mirror://sourceforge/vmime/libvmime-0.9.1.tar.bz2;
sha256 = "1jhxiy8c2cgzfjps0z4q40wygdpgm8jr7jn727cbzrscj2c48kxx";
};
buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 ];
buildInputs = [ gsasl gnutls pkgconfig zlib libtasn1 libgcrypt ];
meta = {
homepage = http://www.vmime.org/;

23
pkgs/development/libraries/wayland/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
stdenv.mkDerivation rec {
name = "wayland-1.0.5";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "130n7v5i7rfsrli2n8vdzfychlgd8v7by7sfgp8vfqdlss5km34w";
};
buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
meta = {
description = "The reference implementation of the Wayland protocol";
homepage = http://wayland.freedesktop.org;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

67
pkgs/games/urbanterror/default.nix
View file

@ -1,72 +1,49 @@
{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }:
stdenv.mkDerivation rec {
name = "urbanterror-${version}";
version = "4.1";
src1 = fetchurl {
url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/UrbanTerror_41_FULL.zip";
sha256 = "0pr6xpwq8zllc0xsdxl8cfd0zz5fhggw5fsbrizygr6hhdvra1jp";
};
src2 = fetchurl {
url = "http://ftp.snt.utwente.nl/pub/games/urbanterror/iourbanterror/source/complete/ioUrbanTerrorSource_2007_12_20.zip";
sha256 = "1s1wq9m7shhvvk7s4400yrmz7dys501i4c9ln1mglc9dhmi8dmcn";
};
version = "4.2.009";
srcs =
[ (fetchurl {
url = "http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip";
sha256 = "0m423zy6l1z4kxz55knlh1ypnqq58ghh08i8ziv4lm00ygm6mx2i";
})
(fetchurl {
url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz";
sha256 = "1299j0i94697m2bbcgraxfbb7q1g6nc43l1xqlgqvcsjp799mwwn";
})
];
buildInputs = [ unzip SDL mesa openal curl ];
unpackPhase = ''
mkdir urbanterror
cd urbanterror
unzip $src1
unzip $src2
'';
patches = [ ./l_script.patch ];
patchPhase = ''
for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
do
cd "$d"
patch -p 0 < "''${patches[0]}"
cd ..
done
'';
sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.007";
configurePhase = ''
cd ioUrbanTerrorClientSource
echo "USE_OPENAL = 1" > Makefile.local
echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
echo "USE_CURL = 1" >> Makefile.local
echo "USE_CURL_DLOPEN = 0" >> Makefile.local
substituteInPlace code/tools/asm/Makefile --replace -Werror ""
cd ..
'';
buildPhase = ''
for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource
do
cd $d
make
cd ..
done
'';
installPhase = ''
destDir="$out/opt/urbanterror"
mkdir -p "$destDir"
mkdir -p "$out/bin"
cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \
"$destDir/ioUrbanTerror"
cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \
"$destDir/ioUrTded"
cp -rv UrbanTerror/q3ut4 "$destDir"
cp -v build/release-linux-*/Quake3-UrT.* \
"$destDir/Quake3-UrT"
cp -v build/release-linux-*/Quake3-UrT-Ded.* \
"$destDir/Quake3-UrT-Ded"
cp -rv ../UrbanTerror42/q3ut4 "$destDir"
cat << EOF > "$out/bin/urbanterror"
#!/bin/sh
#! ${stdenv.shell}
cd "$destDir"
exec ./ioUrbanTerror "\$@"
exec ./Quake3-UrT "\$@"
EOF
chmod +x "$out/bin/urbanterror"
cat << EOF > "$out/bin/urbanterror-ded"
#!/bin/sh
#! ${stdenv.shell}
cd "$destDir"
exec ./ioUrTded "\$@"
exec ./Quake3-UrT-Ded "\$@"
EOF
chmod +x "$out/bin/urbanterror-ded"
'';
postFixup = ''
p=$out/opt/urbanterror/ioUrbanTerror
p=$out/opt/urbanterror/Quake3-UrT
cur_rpath=$(patchelf --print-rpath $p)
patchelf --set-rpath $cur_rpath:${mesa}/lib $p
'';

21
pkgs/games/urbanterror/l_script.patch
View file

@ -1,21 +0,0 @@
diff -ur code/botlib/l_script.c kode/botlib/l_script.c
--- code/botlib/l_script.c 2007-10-09 02:47:26.000000000 +0400
+++ kode/botlib/l_script.c 2012-04-16 02:02:55.170360236 +0400
@@ -1118,7 +1118,7 @@
{
if (*string == '\"')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string) - 1);
} //end if
if (string[strlen(string)-1] == '\"')
{
@@ -1135,7 +1135,7 @@
{
if (*string == '\'')
{
- strcpy(string, string+1);
+ memmove(string, string+1, strlen(string) - 1);
} //end if
if (string[strlen(string)-1] == '\'')
{

3
pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
View file

@ -4,7 +4,8 @@ stdenv.mkDerivation rec {
name = "iwlwifi-4965-ucode-228.57.1.21";
src = fetchurl {
url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz";
url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
name = "${name}.tgz";
sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
};

2
pkgs/os-specific/linux/x86info/default.nix
View file

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y";
};
preConfigure = "patchShebangs .";
buildInputs = [ pciutils python ];
installPhase = ''

1
pkgs/tools/X11/x11vnc/default.nix
View file

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
--replace '"/bin/true"' '"${coreutils}/bin/true"'
substituteInPlace x11vnc/ssltools.h \
--replace /bin/su /var/setuid-wrappers/su \
--replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo
'';

2
pkgs/tools/backup/rsnapshot/default.nix
View file

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "rsnapshot-1.3.0";
src = fetchurl {
url = "mirrors://sourceforge/rsnapshot/${name}.tar.gz";
url = "mirror://sourceforge/rsnapshot/${name}.tar.gz";
sha256 = "19p35ycm73a8vd4ccjpah18h5jagvcr11rqca6ya87sg8k0a5h9z";
};

4
pkgs/tools/graphics/pngcrush/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.7.22";
name = "pngcrush-1.7.50";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp";
sha256 = "1xabqjgvwsyazs0hw7bzzm256zbd7v33alwzp0lbawm521m3m651";
};
configurePhase = ''

6
pkgs/tools/networking/httpie/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildPythonPackage }:
{ stdenv, fetchurl, pythonPackages }:
buildPythonPackage {
pythonPackages.buildPythonPackage {
name = "httpie-0.3.1";
namePrefix = "";
@ -9,6 +9,8 @@ buildPythonPackage {
sha256 = "0abjkwcirmp6qa190qgbgj5fmmkmk5aa3fdiyayl2indh6304x7a";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests014 ];
doCheck = false;
meta = {

22
pkgs/tools/networking/minidlna/default.nix
View file

@ -1,18 +1,23 @@
{stdenv, fetchurl, libav, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }:
{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite }:
let version = "1.0.25"; in
stdenv.mkDerivation rec {
name = "minidlna-1.0.24";
name = "minidlna-${version}";
src = fetchurl {
url = mirror://sourceforge/project/minidlna/minidlna/1.0.24/minidlna_1.0.24_src.tar.gz;
sha256 = "0hmrrrq7d8940rckwj93bcdpdxxy3qfkjl17j5k31mi37hqc42l4";
url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna_${version}_src.tar.gz";
sha256 = "0l987x3bx2apnlihnjbhywgk5b2g9ysiapwclz5vphj2w3xn018p";
};
patches = [ ./config.patch ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libav}/include/libavutil -I${libav}/include/libavcodec -I${libav}/include/libavformat"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ffmpeg}/include/libavutil -I${ffmpeg}/include/libavcodec -I${ffmpeg}/include/libavformat"
export makeFlags="INSTALLPREFIX=$out"
'';
buildInputs = [ libav flac libvorbis libogg libid3tag libexif libjpeg sqlite ];
patches = [ ./config.patch ];
buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ];
meta = {
description = "MiniDLNA Media Server";
@ -22,7 +27,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://sourceforge.net/projects/minidlna/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
platforms = stdenv.lib.platforms.linux;
};
}

10
pkgs/top-level/all-packages.nix
View file

@ -5009,6 +5009,8 @@ let
libpng = libpng12;
};
wayland = callPackage ../development/libraries/wayland { };
webkit =
builderDefsPackage ../development/libraries/webkit {
inherit (gnome) gtkdoc libsoup;
@ -8322,10 +8324,10 @@ let
enlightenment = callPackage ../desktops/enlightenment { };
# e17 = recurseIntoAttrs (
# let callPackage = newScope pkgs.e17; in
# import ../desktops/e17 { inherit callPackage pkgs; }
# );
e17 = recurseIntoAttrs (
let callPackage = newScope pkgs.e17; in
import ../desktops/e17 { inherit callPackage pkgs; }
);
gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2;