svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
This commit is contained in:
commit
900c6e18cd
|
@ -84,20 +84,10 @@ sha256=`nix-hash --to-base32 --type sha256 $sha256`
|
|||
echo "Chosen ${ext_pref}, hash is ${sha256}" >&2
|
||||
|
||||
cat <<EOF
|
||||
src = fetchurl_gnome {
|
||||
project = "${project}";
|
||||
EOF
|
||||
echo -n " major = \"`echo ${version} | cut -d. -f1`\";"
|
||||
echo -n " minor = \"`echo ${version} | cut -d. -f2`\";"
|
||||
patchlevel=`echo ${version} | cut -d. -f3`
|
||||
if [ -n "$patchlevel" ]; then
|
||||
echo -n " patchlevel = \"${patchlevel}\";"
|
||||
fi
|
||||
if [ "$ext_pref" != "bz2" ]; then
|
||||
echo -n " extension = \"${ext_pref}\";"
|
||||
fi
|
||||
echo
|
||||
cat <<EOF
|
||||
name = "${project}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/${project}/${baseVersion}/${project}-${version}.tar.${ext_pref};
|
||||
sha256 = "${sha256}";
|
||||
};
|
||||
EOF
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup,
|
||||
glib_networking}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "vimprobable2-0.9.11.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.11.2.tar.bz2";
|
||||
sha256 = "017qwhndchmpsn2g38v85rjx00fss69aa1nmgj3v85k5zskv7z65";
|
||||
};
|
||||
buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
|
||||
installPhase = ''
|
||||
make PREFIX=/ DESTDIR=$out install
|
||||
wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \
|
||||
${glib_networking}/lib/gio/modules
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = ''
|
||||
Vimprobable is a web browser that behaves like the Vimperator plugin
|
||||
available for Mozilla Firefox
|
||||
'';
|
||||
longDescription = ''
|
||||
Vimprobable is a web browser that behaves like the Vimperator plugin
|
||||
available for Mozilla Firefox. It is based on the WebKit engine (using
|
||||
GTK bindings). The goal of Vimprobable is to build a completely
|
||||
keyboard-driven, efficient and pleasurable browsing-experience. Its
|
||||
featureset might be considered "minimalistic", but not as minimalistic as
|
||||
being completely featureless.
|
||||
'';
|
||||
homepage = "http://sourceforge.net/apps/trac/vimprobable";
|
||||
license = "MIT";
|
||||
maintainers = ["Alexander Foremny <alexanderforemny@googlemail.com>"];
|
||||
};
|
||||
}
|
||||
|
23
pkgs/applications/office/basket/default.nix
Normal file
23
pkgs/applications/office/basket/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl, cmake, gettext, kdelibs, qimageblitz, kdepimlibs, gpgme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "basket-1.81";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://basket.kde.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0";
|
||||
};
|
||||
|
||||
KDEDIRS = kdepimlibs;
|
||||
|
||||
buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
|
||||
|
||||
buildNativeInputs = [ cmake gettext ];
|
||||
|
||||
meta = {
|
||||
description = "A multi-purpose note-taking application";
|
||||
homepage = http://basket.kde.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
inherit (kdelibs.meta) platforms;
|
||||
};
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dwm-5.9";
|
||||
name = "dwm-6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/dwm/${name}.tar.gz";
|
||||
sha256 = "0cp25zqgaqj5k1mlvgxnc5jqi252chqjc5v0fzpqbhrklaidbk9d";
|
||||
sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama ];
|
||||
|
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
homepage = "www.suckless.org";
|
||||
description = "dynamic window manager for X";
|
||||
license="MIT";
|
||||
description = "Dynamic window manager for X";
|
||||
license = "MIT";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
|
|
23
pkgs/data/misc/mobile-broadband-provider-info/default.nix
Normal file
23
pkgs/data/misc/mobile-broadband-provider-info/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "20110511";
|
||||
pname = "mobile-broadband-provider-info";
|
||||
name = "${pname}-${version}";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.bz2";
|
||||
sha256 = "0cny8bd6kdwvabnwdr00f4wp4xjbc8ynp0kcdg72c1q9186kdikj";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Mobile broadband service provider database";
|
||||
homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = "CC-PD";
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
|
||||
, policykit, intltool, dbus_libs }:
|
||||
, polkit, intltool, dbus_libs }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "GConf-2.26.2";
|
||||
name = "GConf-2.28.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2;
|
||||
sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki";
|
||||
url = mirror://gnome/sources/GConf/2.28/GConf-2.28.1.tar.bz2;
|
||||
sha256 = "001h9gngz31gnvs6mjyazdibhdqmw1wwk88n934b0mv013wpgi2k";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig ORBit2 dbus_libs dbus_glib libxml2 policykit intltool ];
|
||||
buildInputs = [ pkgconfig ORBit2 dbus_libs dbus_glib libxml2 polkit intltool ];
|
||||
propagatedBuildInputs = [ glib ];
|
||||
}
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
{stdenv, fetchurl}:
|
||||
{stdenv, fetchurl, xz, alsaLib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "audiofile-0.2.6";
|
||||
name = "audiofile-0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/audiofile/0.2/audiofile-0.2.6.tar.bz2;
|
||||
sha256 = "1d00w9hxx3flfs6cjyja99y8vpj1qwa34zfdj96dpa54drd9da62";
|
||||
url = mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz;
|
||||
sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ xz ];
|
||||
|
||||
buildInputs = [ alsaLib ];
|
||||
}
|
||||
|
|
|
@ -15,6 +15,8 @@ stdenv.mkDerivation {
|
|||
# To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
|
||||
dontDisableStatic = true;
|
||||
|
||||
# In fact I think this line does not help at all to what I
|
||||
# wanted to achieve: have mono to find libgdiplus automatically
|
||||
configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so";
|
||||
|
||||
# Attempt to fix this error when running "mcs --version":
|
||||
|
@ -27,4 +29,12 @@ stdenv.mkDerivation {
|
|||
makeFlagsArray=(INSTALL=`type -tp install`)
|
||||
patchShebangs ./
|
||||
";
|
||||
|
||||
meta = {
|
||||
homepage = http://mono-project.com/;
|
||||
description = "Cross platform, open source .NET development framework";
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
license = "free"; # Combination of LGPL/X11/GPL ?
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,19 +1,20 @@
|
|||
{ stdenv, fetchurl, cmake, qt4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "attica-0.2.0";
|
||||
name = "attica-0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/attica/${name}.tar.bz2";
|
||||
sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
|
||||
sha256 = "1wfd37mvskn77ppzjdh3x6cb5p9na81ibh05ardfvbwqqn523gd0";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake qt4 ];
|
||||
buildInputs = [ qt4 ];
|
||||
buildNativeInputs = [ cmake ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library to access Open Collaboration Service providers";
|
||||
license = "LGPL";
|
||||
maintainers = [ maintainers.sander maintainers.urkud ];
|
||||
platforms = qt4.meta.platforms;
|
||||
inherit (qt4.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,7 +4,8 @@ let
|
|||
fetchurl = args.fetchurl;
|
||||
fullDepEntry = args.fullDepEntry;
|
||||
|
||||
version = lib.attrByPath ["version"] "4.1.0" args;
|
||||
version = lib.attrByPath ["version"] "6.0.3" args;
|
||||
majorVersion = lib.attrByPath ["majorVersion"] "6" args;
|
||||
buildInputs = with args; [
|
||||
cmake freeglut mesa
|
||||
libX11 xproto inputproto libXi libXmu
|
||||
|
@ -12,8 +13,8 @@ let
|
|||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${version}.tgz";
|
||||
sha256 = "0ry17lf4kdcac91bpavks2cswch3izsmmam0yhczk7rayj9cvqsh";
|
||||
url = "http://files.slembcke.net/chipmunk/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
|
||||
sha256 = "c6f550454bc1c63a2a63e0ff8febecb4781a528ab6d6b657a17933a6f567541a";
|
||||
};
|
||||
|
||||
inherit buildInputs;
|
||||
|
@ -28,7 +29,7 @@ rec {
|
|||
|
||||
demoInstall = fullDepEntry(''
|
||||
ensureDir $out/bin
|
||||
cp chipmunk_demos $out/bin
|
||||
cp Demo/chipmunk_demos $out/bin
|
||||
'') ["doMakeInstall" "defEnsureDir"];
|
||||
|
||||
name = "chipmunk-" + version;
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
From 9df489c765921d8d3ff96a13c01592d9209431bb Mon Sep 17 00:00:00 2001
|
||||
From: Florian Friesdorf <flo@chaoflow.net>
|
||||
Date: Wed, 4 Jan 2012 23:12:44 +0100
|
||||
Subject: [PATCH] remove typedefs now living in mesa
|
||||
|
||||
---
|
||||
progs/demos/smooth_opengl3/smooth_opengl3.c | 20 --------------------
|
||||
1 files changed, 0 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/progs/demos/smooth_opengl3/smooth_opengl3.c b/progs/demos/smooth_opengl3/smooth_opengl3.c
|
||||
index abbdfb5..1172615 100755
|
||||
--- a/progs/demos/smooth_opengl3/smooth_opengl3.c
|
||||
+++ b/progs/demos/smooth_opengl3/smooth_opengl3.c
|
||||
@@ -98,26 +98,6 @@ typedef char ourGLchar;
|
||||
#define APIENTRY
|
||||
#endif
|
||||
|
||||
-typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
|
||||
-typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
|
||||
-typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage);
|
||||
-typedef GLuint (APIENTRY *PFNGLCREATESHADERPROC) (GLenum type);
|
||||
-typedef void (APIENTRY *PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const ourGLchar **string, const GLint *length);
|
||||
-typedef void (APIENTRY *PFNGLCOMPILESHADERPROC) (GLuint shader);
|
||||
-typedef GLuint (APIENTRY *PFNGLCREATEPROGRAMPROC) (void);
|
||||
-typedef void (APIENTRY *PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
|
||||
-typedef void (APIENTRY *PFNGLLINKPROGRAMPROC) (GLuint program);
|
||||
-typedef void (APIENTRY *PFNGLUSEPROGRAMPROC) (GLuint program);
|
||||
-typedef void (APIENTRY *PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
|
||||
-typedef void (APIENTRY *PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
|
||||
-typedef void (APIENTRY *PFNGLGETPROGRAMIVPROC) (GLenum target, GLenum pname, GLint *params);
|
||||
-typedef void (APIENTRY *PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, ourGLchar *infoLog);
|
||||
-typedef GLint (APIENTRY *PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const ourGLchar *name);
|
||||
-typedef void (APIENTRY *PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
|
||||
-typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
|
||||
-typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name);
|
||||
-typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
|
||||
-
|
||||
PFNGLGENBUFFERSPROC gl_GenBuffers;
|
||||
PFNGLBINDBUFFERPROC gl_BindBuffer;
|
||||
PFNGLBUFFERDATAPROC gl_BufferData;
|
||||
--
|
||||
1.7.8
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
{stdenv, fetchurl, x11, mesa}:
|
||||
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "freeglut-2.4.0";
|
||||
name = "freeglut-2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz;
|
||||
sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6";
|
||||
url = mirror://sourceforge/freeglut/freeglut-2.8.0.tar.gz;
|
||||
sha256 = "197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05";
|
||||
};
|
||||
|
||||
configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings";
|
||||
|
||||
buildInputs = [x11 mesa];
|
||||
patches = ./freeglut-gcc-4.2.patch;
|
||||
buildInputs = [ libXi libXrandr libXxf86vm mesa x11 ];
|
||||
patches = [ ./0001-remove-typedefs-now-living-in-mesa.patch ];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
|
||||
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
|
||||
, python }:
|
||||
|
||||
# TODO:
|
||||
|
@ -12,12 +12,11 @@
|
|||
# $out/bin/gtester-report' to postInstall if this is solved
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = src.pkgname;
|
||||
name = "glib-2.30.2";
|
||||
|
||||
src = fetchurl_gnome {
|
||||
project = "glib";
|
||||
major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
|
||||
sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n";
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz;
|
||||
sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
|
||||
};
|
||||
|
||||
# configure script looks for d-bus but it is only needed for tests
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "0.0.0.1";
|
||||
sha256 = "0l3q9jj0dpbn2ixjx6d9m6ss92dmfgd5xc7wgfpb9d0kfk2li0sv";
|
||||
version = "0.0.0.2";
|
||||
sha256 = "1fngrlly5q2l0j3fil4cx3zj2h4sxnh20i0r84l4qhl8s0x5ba5z";
|
||||
buildDepends = [
|
||||
liftedBase monadControl text transformers transformersBase
|
||||
];
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "continued-fractions";
|
||||
version = "0.9.1.0";
|
||||
sha256 = "07g6ms68xfzd25zr2k2fpg4f4pynmq4mn7djkzrg3gbfh9gfq37q";
|
||||
version = "0.9.1.1";
|
||||
sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
|
||||
meta = {
|
||||
homepage = "/dev/null";
|
||||
description = "Continued fractions";
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "gamma";
|
||||
version = "0.9.0.1";
|
||||
sha256 = "02s9m2vlrnfg26c7921x60xxmawzzk27y3czcnvs8hlk01mb1xv7";
|
||||
version = "0.9.0.2";
|
||||
sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq";
|
||||
buildDepends = [ continuedFractions converge vector ];
|
||||
meta = {
|
||||
homepage = "https://github.com/mokus0/gamma";
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "haskeline";
|
||||
version = "0.6.4.5";
|
||||
sha256 = "1blhbh53p6di3q3gldzmg3i8f4w3ahipai3di49i4rdcnjry0j5b";
|
||||
version = "0.6.4.6";
|
||||
sha256 = "136h71rb50sypkdbnk849mbcgfzx3y4hfxmx2c7kf90zpmsx5wmj";
|
||||
buildDepends = [ extensibleExceptions mtl terminfo utf8String ];
|
||||
meta = {
|
||||
homepage = "http://trac.haskell.org/haskeline";
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-conduit";
|
||||
version = "1.0.0";
|
||||
sha256 = "1ix2qx6zqp8g7hjg2ygwivzg4hhz2ac22rbybh9adzvzw0q2yvgk";
|
||||
version = "1.0.0.1";
|
||||
sha256 = "0yag65ariakvbvsrr3kd16bags4caw8n3qlcwpzrblprgjrv06vm";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-enumerator";
|
||||
version = "0.7.2.1";
|
||||
sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
|
||||
version = "0.7.2.2";
|
||||
sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
{ cabal, nonNegative, parsec, QuickCheck, random, storableRecord
|
||||
, utilityHt
|
||||
{ cabal, deepseq, nonNegative, parsec, QuickCheck, random
|
||||
, storableRecord, utilityHt
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "numeric-prelude";
|
||||
version = "0.2.2.1";
|
||||
sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da";
|
||||
version = "0.3";
|
||||
sha256 = "0zxqfsgyg7gf051qjzv57bb1cvrbzlvvyyl2d3gmikyy6h3pis1f";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
nonNegative parsec QuickCheck random storableRecord utilityHt
|
||||
deepseq nonNegative parsec QuickCheck random storableRecord
|
||||
utilityHt
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "primitive";
|
||||
version = "0.3.1";
|
||||
sha256 = "1903hx88ax4dgyyx00a0k86jy4mkqrprpn7arfy19dqqyfpb2ikj";
|
||||
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
|
||||
];
|
||||
};
|
||||
})
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "random-fu";
|
||||
version = "0.2.1.0";
|
||||
sha256 = "0jm91xjrlzj25f3giiv2ka5r8bn1ircj56d5lpqixi7c7r9dc804";
|
||||
version = "0.2.1.1";
|
||||
sha256 = "034pnmagly3akmmcli018258fnyqlyz79av21dqqklfixvw3yja7";
|
||||
buildDepends = [
|
||||
erf gamma monadLoops mtl randomShuffle randomSource rvar syb
|
||||
transformers vector
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "sendfile";
|
||||
version = "0.7.3";
|
||||
sha256 = "0xa5ryyznw7cizdqjnisvyhirdljw5z7aydwv5m9lv9hkx3bs6l0";
|
||||
version = "0.7.4";
|
||||
sha256 = "1h02fjdivsb3divdn3wg2skmw3jcd0n4axhlpgmrrbf92c3m35rq";
|
||||
buildDepends = [ network ];
|
||||
meta = {
|
||||
homepage = "http://patch-tag.com/r/mae/sendfile";
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
{ cabal, primitive }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vector";
|
||||
version = "0.9";
|
||||
sha256 = "0m8sfp924sw5dwr9a63jgsbj98qm9nyy903842x6ii4ljb1cpynz";
|
||||
buildDepends = [ primitive ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/vector";
|
||||
description = "Efficient Arrays";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
};
|
||||
})
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vector";
|
||||
version = "0.7.1";
|
||||
sha256 = "1cdbkabw49pgc1j5h96inpmhn8ly230885d22smmynrq369pmg07";
|
||||
version = "0.9.1";
|
||||
sha256 = "1m6p9dy48fwh2y21y7r6svhzs86a1yijkjil7ch1mdn86gv0f9as";
|
||||
buildDepends = [ primitive ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/vector";
|
|
@ -5,15 +5,15 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-enumerator";
|
||||
version = "0.4.4";
|
||||
sha256 = "1xz37gzk3kk9sqkcbyspcdyz7rk3afkv33g7q45ih5fbd7zkd5gm";
|
||||
version = "0.4.4.1";
|
||||
sha256 = "0vwn6s7x626970b8lgyhmngkqv5n5kvv0qikrvi9sjzq5rjyx1zj";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
|
||||
dataDefault enumerator failure text transformers xmlTypes
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://github.com/snoyberg/xml";
|
||||
description = "Pure-Haskell utilities for dealing with XML with the enumerator package";
|
||||
description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
|
|
|
@ -1,25 +1,28 @@
|
|||
{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
|
||||
libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib,
|
||||
libimobiledevice, python, pygobject, mutagen, swig }:
|
||||
libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib,
|
||||
libimobiledevice, python, pygobject, mutagen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgpod-0.7.94";
|
||||
name = "libgpod-0.8.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
|
||||
sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4";
|
||||
url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
|
||||
sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00";
|
||||
};
|
||||
|
||||
patchPhase = ''sed -e "s,udevdir=,&$out," -i configure'';
|
||||
preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";
|
||||
configureFlags = "--without-hal --enable-udev";
|
||||
|
||||
propagatedBuildInputs = [ glib libxml2 sqlite libplist libusb1 zlib sg3_utils
|
||||
gtk taglib libimobiledevice python pygobject mutagen ];
|
||||
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
|
||||
gdk_pixbuf taglib libimobiledevice python pygobject mutagen ];
|
||||
|
||||
buildInputs = [ gettext perlXMLParser intltool pkgconfig perl swig ];
|
||||
buildNativeInputs = [ gettext perlXMLParser intltool pkgconfig perl
|
||||
libimobiledevice.swig ];
|
||||
|
||||
meta = {
|
||||
homepage = http://gtkpod.sourceforge.net/;
|
||||
description = "Library used by gtkpod to access the contents of an ipod";
|
||||
license = "LGPL";
|
||||
platforms = stdenv.lib.platforms.gnu;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,19 @@
|
|||
{ stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
|
||||
{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
|
||||
libtasn1, libplist, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libimobiledevice-1.0.2";
|
||||
name = "libimobiledevice-1.0.6";
|
||||
|
||||
buildInputs = [ python swig pkgconfig readline ];
|
||||
buildNativeInputs = [ python libplist.swig pkgconfig ];
|
||||
buildInputs = [ readline ];
|
||||
propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
|
||||
|
||||
configureFlags = "--enable-dev-tools";
|
||||
patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
|
||||
passthru.swig = libplist.swig;
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/downloads/${name}.tar.bz2";
|
||||
sha256 = "1wbx0hr0q1dhw1p7326qm3dvzacykhc4w005q5wp2gkxa68dnw5s";
|
||||
sha256 = "0r5gjprrnwgad5zsidn41w01gihramagcpl8cwi540qiwq43svqi";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
{ stdenv, fetchurl, cmake, libxml2, glib, swig, python }:
|
||||
{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libplist-1.3";
|
||||
|
||||
buildInputs = [ cmake swig ];
|
||||
buildNativeInputs = [ cmake swig2 ];
|
||||
|
||||
patches = [ ./swig.patch ];
|
||||
|
||||
propagatedBuildInputs = [ libxml2 glib python ];
|
||||
|
||||
passthru.swig = swig2;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
|
||||
sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
|
||||
|
|
34
pkgs/development/libraries/openssl/cert-file-path-max.patch
Normal file
34
pkgs/development/libraries/openssl/cert-file-path-max.patch
Normal file
|
@ -0,0 +1,34 @@
|
|||
This patch, to be applied after `cert-file.patch', fixes compilation
|
||||
on GNU/Hurd where `PATH_MAX' is not defined.
|
||||
|
||||
diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c
|
||||
--- openssl-1.0.0e/crypto/x509/x509_def.c.orig 2012-01-06 00:08:48.000000000 +0100
|
||||
+++ openssl-1.0.0e/crypto/x509/x509_def.c 2012-01-06 00:11:29.000000000 +0100
|
||||
@@ -58,6 +58,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <limits.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo
|
||||
|
||||
const char *X509_get_default_cert_file(void)
|
||||
{
|
||||
- static char buf[PATH_MAX] = X509_CERT_FILE;
|
||||
+ static char *buf;
|
||||
static int init = 0;
|
||||
if (!init) {
|
||||
init = 1;
|
||||
char * s = getenv("OPENSSL_X509_CERT_FILE");
|
||||
if (s && getuid() == geteuid()) {
|
||||
- strncpy(buf, s, sizeof(buf));
|
||||
- buf[sizeof(buf) - 1] = 0;
|
||||
+ buf = strdup(s);
|
||||
+ }
|
||||
+ if (!s) {
|
||||
+ buf = strdup(X509_CERT_FILE);
|
||||
}
|
||||
}
|
||||
return buf;
|
|
@ -26,8 +26,14 @@ stdenv.mkDerivation {
|
|||
# environment variable is ignored for setuid binaries.
|
||||
./cert-file.patch
|
||||
]
|
||||
++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch
|
||||
++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;
|
||||
|
||||
++ (stdenv.lib.optionals (stdenv ? cross && opensslCrossSystem == "hurd-x86")
|
||||
[ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
|
||||
./gnu.patch # submitted upstream
|
||||
])
|
||||
|
||||
++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch)
|
||||
++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd") ./freebsd-x86_64-asm.patch;;
|
||||
|
||||
buildNativeInputs = [ perl ];
|
||||
|
||||
|
@ -71,5 +77,6 @@ stdenv.mkDerivation {
|
|||
description = "A cryptographic library that implements the SSL and TLS protocols";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
priority = 10; # resolves collision with ‘man-pages’
|
||||
};
|
||||
}
|
||||
|
|
25
pkgs/development/libraries/openssl/gnu.patch
Normal file
25
pkgs/development/libraries/openssl/gnu.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.
|
||||
|
||||
--- openssl-1.0.0e/Configure 2012-01-06 00:39:49.000000000 +0100
|
||||
+++ openssl-1.0.0e/Configure 2012-01-06 00:39:51.000000000 +0100
|
||||
@@ -563,7 +563,7 @@ my %table=(
|
||||
"newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
|
||||
|
||||
##### GNU Hurd
|
||||
-"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
|
||||
+"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so",
|
||||
|
||||
##### OS/2 EMX
|
||||
"OS2-EMX", "gcc::::::::",
|
||||
|
||||
--- openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:05:47.000000000 +0100
|
||||
+++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:21:05.000000000 +0100
|
||||
@@ -60,7 +60,7 @@
|
||||
that handle _GNU_SOURCE and other similar macros. Defining it later
|
||||
is simply too late, because those headers are protected from re-
|
||||
inclusion. */
|
||||
-#ifdef __linux
|
||||
+#if defined __linux || defined __GNU__ || defined __GLIBC__
|
||||
# ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE /* make sure dladdr is declared */
|
||||
# endif
|
|
@ -31,4 +31,11 @@ stdenv.mkDerivation {
|
|||
ensureDir $out/lib/qt4/plugins/script
|
||||
cp -av plugins/script/* $out/lib/qt4/plugins/script
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "QtScript bindings generator";
|
||||
homepage = http://code.google.com/p/qtscriptgenerator/;
|
||||
inherit (qt4.meta) platforms;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
{stdenv, fetchurl, cmake, taglib}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
name = "taglib-extras-1.0.1";
|
||||
src = fetchurl {
|
||||
url = http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz;
|
||||
url = "http://www.kollide.net/~jefferai/${name}.tar.gz";
|
||||
sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
|
||||
};
|
||||
buildInputs = [ cmake taglib ];
|
||||
buildInputs = [ taglib ];
|
||||
buildNativeInputs = [ cmake ];
|
||||
}
|
||||
|
|
|
@ -1,19 +1,22 @@
|
|||
{stdenv, fetchurl, zlib, cmake}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "taglib-1.7.0";
|
||||
name = "taglib-1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz";
|
||||
url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
|
||||
sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
|
||||
};
|
||||
|
||||
cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
|
||||
|
||||
buildInputs = [zlib cmake];
|
||||
buildInputs = [zlib];
|
||||
buildNativeInputs = [cmake];
|
||||
|
||||
meta = {
|
||||
homepage = http://developer.kde.org/~wheeler/taglib.html;
|
||||
description = "A library for reading and editing the meta-data of several popular audio formats";
|
||||
inherit (cmake.meta) platforms;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,21 @@
|
|||
{stdenv, fetchurl, m4}:
|
||||
{stdenv, fetchurl, zlib, bzip2, xz, m4}:
|
||||
|
||||
# TODO: Look at the hardcoded paths to kernel, modules etc.
|
||||
stdenv.mkDerivation rec {
|
||||
name = "elfutils-0.148";
|
||||
name = "elfutils-${version}";
|
||||
version = "0.152";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://fedorahosted.org/releases/e/l/elfutils/0.143/${name}.tar.bz2"
|
||||
"https://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
|
||||
"mirror://gentoo/distfiles/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa";
|
||||
sha256 = "19mlgxyzcwiv64ynj2cibgkiw4qkm3n37kizvy6555dsmlaqfybq";
|
||||
};
|
||||
|
||||
buildInputs = [m4];
|
||||
buildInputs = [ zlib bzip2 xz ];
|
||||
|
||||
buildNativeInputs = [m4];
|
||||
|
||||
dontAddDisableDepTrack = true;
|
||||
|
||||
|
|
33
pkgs/development/tools/misc/swig/2.x.nix
Normal file
33
pkgs/development/tools/misc/swig/2.x.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
{ stdenv, fetchurl, pcre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swig-2.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/swig/${name}.tar.gz";
|
||||
sha256 = "12pcw4whi36vd41c43v8c62bn7vnq331hmvzsrg8wvyj61vi2fkn";
|
||||
};
|
||||
|
||||
buildInputs = [ pcre ];
|
||||
|
||||
meta = {
|
||||
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
|
||||
|
||||
longDescription = ''
|
||||
SWIG is an interface compiler that connects programs written in C and
|
||||
C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It
|
||||
works by taking the declarations found in C/C++ header files and using
|
||||
them to generate the wrapper code that scripting languages need to
|
||||
access the underlying C/C++ code. In addition, SWIG provides a variety
|
||||
of customization features that let you tailor the wrapping process to
|
||||
suit your application.
|
||||
'';
|
||||
|
||||
homepage = http://swig.org/;
|
||||
|
||||
# Licensing is a mess: http://www.swig.org/Release/LICENSE .
|
||||
license = "BSD-style";
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo urkud ];
|
||||
};
|
||||
}
|
25
pkgs/games/privateer/0001-fix-VSFile-constructor.patch
Normal file
25
pkgs/games/privateer/0001-fix-VSFile-constructor.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001
|
||||
From: Florian Friesdorf <flo@chaoflow.net>
|
||||
Date: Wed, 4 Jan 2012 23:32:19 +0100
|
||||
Subject: [PATCH] fix VSFile constructor
|
||||
|
||||
---
|
||||
src/vsfilesystem.h | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h
|
||||
index 4bb7a66..71bf9b9 100644
|
||||
--- a/src/vsfilesystem.h
|
||||
+++ b/src/vsfilesystem.h
|
||||
@@ -291,7 +291,7 @@ namespace VSFileSystem
|
||||
VSFile();
|
||||
VSFile( const char * buffer, long size, VSFileType type=ZoneBuffer, VSFileMode=ReadOnly);
|
||||
VSFile( const char * filename, VSFileType type=UnknownFile, VSFileMode=ReadOnly);
|
||||
- VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
|
||||
+ VSFile( const string &filename, VSFileType type=UnknownFile) { VSFile( filename.c_str(), type); }
|
||||
~VSFile();
|
||||
|
||||
FILE * GetFP() { return this->fp; } // This is still needed for special cases (when loading PNG files)
|
||||
--
|
||||
1.7.8
|
||||
|
37
pkgs/games/privateer/default.nix
Normal file
37
pkgs/games/privateer/default.nix
Normal file
|
@ -0,0 +1,37 @@
|
|||
{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib,
|
||||
gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
|
||||
libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "privateer-1.03";
|
||||
|
||||
src = fetchsvn {
|
||||
#url = "mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin";
|
||||
url = "https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine";
|
||||
rev = 294;
|
||||
sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ boost cmake ffmpeg freeglut glib gtk libjpeg libpng
|
||||
libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal
|
||||
pixman pkgconfig python27Full SDL ];
|
||||
|
||||
patches = [ ./0001-fix-VSFile-constructor.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp vegastrike $out/bin
|
||||
cp vegaserver $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://privateer.sourceforge.net/;
|
||||
longDescription = "";
|
||||
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
|
||||
};
|
||||
}
|
|
@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
|
|||
tar xvf $src3
|
||||
cd ..
|
||||
'';
|
||||
patches = [ ./parse.patch ];
|
||||
patchFlags = "-p 0";
|
||||
NIX_LD_FLAGS = ''
|
||||
-rpath ${stdenv.gcc}/lib
|
||||
-rpath ${stdenv.gcc}/lib64
|
||||
'';
|
||||
buildPhase = ''
|
||||
cd Release_1.011
|
||||
make
|
||||
|
@ -45,11 +51,12 @@ stdenv.mkDerivation rec {
|
|||
cat << EOF > $out/bin/$b
|
||||
#!/bin/sh
|
||||
cd $out/opt/tremulous
|
||||
./$b.$arch "$@"
|
||||
exec ./$b.$arch "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/$b
|
||||
done
|
||||
'';
|
||||
dontPatchELF = true;
|
||||
meta = {
|
||||
description = "A game that blends a team based FPS with elements of an RTS";
|
||||
longDescription = ''
|
||||
|
|
21
pkgs/games/tremulous/parse.patch
Normal file
21
pkgs/games/tremulous/parse.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
diff -ruN Release_1.011-old/src/qcommon/parse.c Release_1.011/src/qcommon/parse.c
|
||||
--- Release_1.011-old/src/qcommon/parse.c 2011-12-02 19:11:49.307368651 -0500
|
||||
+++ Release_1.011/src/qcommon/parse.c 2011-12-02 19:13:27.556836387 -0500
|
||||
@@ -981,7 +981,7 @@
|
||||
{
|
||||
if (*string == '\"')
|
||||
{
|
||||
- strcpy(string, string+1);
|
||||
+ memmove(string, string+1, strlen(string));
|
||||
}
|
||||
if (string[strlen(string)-1] == '\"')
|
||||
{
|
||||
@@ -1784,7 +1784,7 @@
|
||||
if ((*ptr == '\\' || *ptr == '/') &&
|
||||
(*(ptr+1) == '\\' || *(ptr+1) == '/'))
|
||||
{
|
||||
- strcpy(ptr, ptr+1);
|
||||
+ memmove(ptr, ptr+1, strlen(ptr));
|
||||
}
|
||||
else
|
||||
{
|
|
@ -198,11 +198,11 @@ in
|
|||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "2.6.32.45";
|
||||
version = "2.6.32.52";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.32/linux-${version}.tar.bz2";
|
||||
sha256 = "1lyp0zl8hk2nz93n803iwfkg5g2dcd18hg0ifszg2rik8svvbbrs";
|
||||
sha256 = "0a3ws6m8942p972jjlixr5v0sh6ll0hlzxwdikb666nppjcgqiz7";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
|
|
@ -215,7 +215,7 @@ in
|
|||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.1.5";
|
||||
version = "3.1.7";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
|
||||
|
@ -223,7 +223,7 @@ import ./generic.nix (
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
|
||||
sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6";
|
||||
sha256 = "1l4imli1mykcda2vvdvfr6c3h9ys9km4s0wsy778d58vcs68pc89";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
|
|
@ -214,18 +214,18 @@ in
|
|||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.2-rc7";
|
||||
version = "3.2";
|
||||
testing = false;
|
||||
|
||||
modDirVersion = "3.2.0-rc7";
|
||||
modDirVersion = "3.2.0";
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
|
||||
'';
|
||||
|
||||
src = fetchurl {
|
||||
#url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
|
||||
url = "mirror://kernel/linux/kernel/v3.0/testing/linux-${version}.tar.bz2";
|
||||
sha256 = "0phakj1c97n2fdz9lh5gmpg6c5g45z2xpgrz3q2z2y9w9dgk3mqd";
|
||||
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2";
|
||||
sha256 = "0qylk7b6w7x3a47mvzbn3yj47q3x79i49aiq8p5af3fgacmzr0f8";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
|
21
pkgs/os-specific/linux/kernel/perf.nix
Normal file
21
pkgs/os-specific/linux/kernel/perf.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
{ stdenv, kernel, elfutils }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "perf-linux-${kernel.version}";
|
||||
|
||||
inherit (kernel) src;
|
||||
|
||||
preConfigure = ''
|
||||
cd tools/perf
|
||||
export makeFlags="DESTDIR=$out"
|
||||
'';
|
||||
|
||||
buildInputs = [ elfutils ];
|
||||
|
||||
meta = {
|
||||
homepage = https://perf.wiki.kernel.org/;
|
||||
description = "Linux tools to profile with performance counters";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
|
@ -26,5 +26,6 @@ stdenv.mkDerivation {
|
|||
'';
|
||||
homepage = http://www.jedsoft.org/most/index.html;
|
||||
license = "GPLv2";
|
||||
platforms = stdenv.lib.platforms.gnu; # random choice
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,22 @@
|
|||
{ stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "usbmuxd-1.0.5";
|
||||
name = "usbmuxd-1.0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
|
||||
sha256 = "130h5hk2qhki5xflcindx0prrgm5h7aqhbygrpasvr6030k6bkiv";
|
||||
sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pkgconfig ];
|
||||
buildNativeInputs = [ cmake pkgconfig ];
|
||||
propagatedBuildInputs = [ libusb1 libplist ];
|
||||
|
||||
patchPhase = "sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt";
|
||||
patchPhase =
|
||||
''
|
||||
sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt
|
||||
sed -e 's,/bin/echo,echo,g' -i Modules/describe.sh
|
||||
'';
|
||||
|
||||
|
||||
cmakeFlags = ''-DLIB_SUFFIX='';
|
||||
meta = {
|
||||
|
@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
usbmuxd: USB Multiplex Daemon. This bit of software is in charge of
|
||||
talking to your iPhone or iPod Touch over USB and coordinating access to
|
||||
its services by other applications.'';
|
||||
inherit (libusb1.meta) platforms;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.urkud ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, substituteAll, libpcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ppp-2.4.5";
|
||||
version = "2.4.5";
|
||||
name = "ppp-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}ftp/ppp/${name}.tar.gz";
|
||||
|
|
|
@ -1260,6 +1260,8 @@ let
|
|||
|
||||
radvd = callPackage ../tools/networking/radvd { };
|
||||
|
||||
privateer = callPackage ../games/privateer { };
|
||||
|
||||
rtmpdump = callPackage ../tools/video/rtmpdump { };
|
||||
|
||||
recutils = callPackage ../tools/misc/recutils { };
|
||||
|
@ -3063,6 +3065,8 @@ let
|
|||
|
||||
swig = callPackage ../development/tools/misc/swig { };
|
||||
|
||||
swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
|
||||
|
||||
swigWithJava = swig;
|
||||
|
||||
swftools = callPackage ../tools/video/swftools { };
|
||||
|
@ -5825,6 +5829,8 @@ let
|
|||
stdenv = overrideGCC stdenv gcc34;
|
||||
};
|
||||
|
||||
perf = callPackage ../os-specific/linux/kernel/perf.nix { };
|
||||
|
||||
# State Nix
|
||||
snix = callPackage ../tools/package-management/snix {
|
||||
|
||||
|
@ -6270,6 +6276,8 @@ let
|
|||
|
||||
miscfiles = callPackage ../data/misc/miscfiles { };
|
||||
|
||||
mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
|
||||
|
||||
mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
|
||||
|
||||
oldstandard = callPackage ../data/fonts/oldstandard { };
|
||||
|
@ -8069,6 +8077,8 @@ let
|
|||
|
||||
bangarang = callPackage ../applications/video/bangarang { };
|
||||
|
||||
basket = callPackage ../applications/office/basket { };
|
||||
|
||||
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
|
||||
|
||||
digikam = callPackage ../applications/graphics/digikam {
|
||||
|
@ -8626,6 +8636,12 @@ let
|
|||
|
||||
vice = callPackage ../misc/emulators/vice { };
|
||||
|
||||
vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
|
||||
inherit stdenv fetchurl makeWrapper perl pkgconfig webkit gtk;
|
||||
inherit (xlibs) libX11;
|
||||
inherit (gnome) libsoup glib_networking;
|
||||
};
|
||||
|
||||
VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
|
||||
|
||||
# Wine cannot be built in 64-bit; use a 32-bit build instead.
|
||||
|
|
|
@ -1055,9 +1055,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
|
||||
|
||||
primitive_0_3_1 = callPackage ../development/libraries/haskell/primitive/0.3.1.nix {};
|
||||
primitive_0_4_0_1 = callPackage ../development/libraries/haskell/primitive/0.4.0.1.nix {};
|
||||
primitive = self.primitive_0_4_0_1;
|
||||
primitive = callPackage ../development/libraries/haskell/primitive {};
|
||||
|
||||
processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
|
||||
|
||||
|
@ -1341,13 +1339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
|||
|
||||
Vec = callPackage ../development/libraries/haskell/Vec {};
|
||||
|
||||
vector_0_7_1 = callPackage ../development/libraries/haskell/vector/0.7.1.nix {
|
||||
primitive = self.primitive_0_3_1;
|
||||
};
|
||||
vector_0_9 = callPackage ../development/libraries/haskell/vector/0.9.nix {
|
||||
primitive = self.primitive_0_4_0_1;
|
||||
};
|
||||
vector = self.vector_0_9;
|
||||
vector = callPackage ../development/libraries/haskell/vector {};
|
||||
|
||||
vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
|
||||
|
||||
|
|
Loading…
Reference in a new issue