dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

svn merge ^/nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=31311
This commit is contained in:
Yury G. Kudryashov 2012-01-05 12:11:18 +00:00
commit 6ed3147550
41 changed files with 368 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/networking/browsers/vimprobable2/default.nix Normal file
View File

@ -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>"];
};
}

8
pkgs/applications/science/logic/eProver/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, which, texLive }:
stdenv.mkDerivation {
name = "EProver-1.2";
name = "EProver-1.4";
src = fetchurl {
name = "E-1.2.tar.gz";
url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.2/E.tgz";
sha256 = "14sbpmh8vg376lrrq7i364aa8g5aacq344ihivxn6w4ydh9138nq";
name = "E-1.4.tar.gz";
url = "http://www4.informatik.tu-muenchen.de/~schulz/WORK/E_DOWNLOAD/V_1.4/E.tgz";
sha256 = "1hxkr21xqkkh4bzqip6qf70w9xvvb8p20zzkvyin631ffgvyvr93";
};
buildInputs = [which texLive];

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

@ -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;
};

4
pkgs/desktops/gnome-2/desktop/gnome-panel/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2Python, libxslt, bzip2, python
, glib, gtk, pango, atk, libXau
, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1, libtool}:
stdenv.mkDerivation {
name = "gnome-panel-2.28.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
};
buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2Python libxslt bzip2 python libXau
intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop
libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
libwnck librsvg libgweather gnome_doc_utils libtasn1 libtool ];
configureFlags = "--disable-scrollkeeper";
CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+
"-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:
stdenv.mkDerivation {
name = "mono-2.10.8.1";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
};
buildInputs = [bison pkgconfig glib gettext perl];
buildInputs = [bison pkgconfig glib gettext perl libgdiplus];
propagatedBuildInputs = [glib];
NIX_LDFLAGS = "-lgcc_s" ;
@ -15,6 +15,10 @@ 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":
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
dontStrip = true;
@ -25,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 ?
};
}

9
pkgs/development/libraries/chipmunk/default.nix
View File

@ -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;

43
pkgs/development/libraries/freeglut/0001-remove-typedefs-now-living-in-mesa.patch Normal file
View File

@ -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

12
pkgs/development/libraries/freeglut/default.nix
View File

@ -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 ];
}

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

@ -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
];

4
pkgs/development/libraries/haskell/continued-fractions/default.nix
View File

@ -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";

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

@ -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";

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

@ -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";

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

@ -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 = [

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "http-enumerator";
version = "0.7.2.1";
sha256 = "1qbarxi9268yzb3phnfgvnszbkzs6r63gqzy63h69kpi0k0wl84i";
version = "0.7.2.2";
sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf";
isLibrary = true;
isExecutable = true;
buildDepends = [

11
pkgs/development/libraries/haskell/numeric-prelude/default.nix
View File

@ -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";

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

@ -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
];
};
})

0
pkgs/development/libraries/haskell/primitive/0.4.0.1.nix → pkgs/development/libraries/haskell/primitive/default.nix
View File

4
pkgs/development/libraries/haskell/random-fu/default.nix
View File

@ -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

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

@ -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";

18
pkgs/development/libraries/haskell/vector/0.9.nix
View File

@ -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
];
};
})

4
pkgs/development/libraries/haskell/vector/0.7.1.nix → pkgs/development/libraries/haskell/vector/default.nix
View File

@ -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";

6
pkgs/development/libraries/haskell/xml-enumerator/default.nix
View File

@ -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 = [

15
pkgs/development/libraries/libgdiplus/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig
, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer,
libXrender, libexif }:
stdenv.mkDerivation {
name = "libgdiplus-2.10";
src = fetchurl {
url = http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2;
sha256 = "190j6yvfbpg6bda4n7pdcf2dbqdvrb4dmz5abs2yv0smxybh77id";
};
buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libungif
libjpeg libpng libXrender libexif ];
}

1
pkgs/development/libraries/openssl/default.nix
View File

@ -70,5 +70,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’
};
}

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

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

25
pkgs/games/privateer/0001-fix-VSFile-constructor.patch Normal file
View 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

28
pkgs/games/privateer/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ 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 ];
meta = {
homepage = http://privateer.sourceforge.net/;
longDescription = "";
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.gnu;
};
}

9
pkgs/games/tremulous/default.nix
View File

@ -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
View 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
{

2
pkgs/lib/customisation.nix
View File

@ -34,7 +34,7 @@ rec {
overrideDerivation = drv: f:
let
# Filter out special attributes.
drop = ["meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "type" "override" "deepOverride" "origArgs"]
drop = [ "meta" "passthru" "outPath" "drvPath" "hostDrv" "buildDrv" "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;

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

@ -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;

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

@ -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;

10
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -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;

19
pkgs/tools/graphics/icoutils/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "icoutils-0.29.1";
src = fetchurl {
url = "mirror://savannah/icoutils/${name}.tar.bz2";
sha256 = "180yqv41yc3fi6ggx7azhmaciqzadj0ir87wajigmcpgxkjk6v34";
};
buildInputs = [ libpng ];
meta = {
homepage = http://www.nongnu.org/icoutils/;
description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
license = "GPLv3+";
platforms = with stdenv.lib.platforms; linux;
};
}

23
pkgs/tools/graphics/pngtoico/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngtoico-1.0";
src = fetchurl {
url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz;
sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph";
};
configurePhase = ''
sed -i s,/usr/local,$out, Makefile
'';
buildInputs = [ libpng ];
meta = {
homepage = http://www.kernel.org/pub/software/graphics/pngtoico/;
description = "Small utility to convert a set of PNG images to Microsoft ICO format";
license = "GPLv2+";
platforms = with stdenv.lib.platforms; linux;
};
}

50
pkgs/tools/networking/ppp/default.nix
View File

@ -1,41 +1,33 @@
a :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, substituteAll, libpcap }:
stdenv.mkDerivation rec {
version = "2.4.5";
name = "ppp-${version}";
version = a.lib.attrByPath ["version"] "2.4.4" a;
buildInputs = with a; [
];
in
rec {
src = fetchurl {
url = "http://ppp.samba.org/ftp/ppp/ppp-${version}.tar.gz";
sha256 = "1sli1s478k85vmjdbrqm39nn5r20x9qgg3a0lbp2dwz50zy4bbsq";
url = "${meta.homepage}ftp/ppp/${name}.tar.gz";
sha256 = "019m00q85nrgdpjlhb9021a3iw3pr4a0913gp4h9k7r9r7z7lca3";
};
inherit buildInputs;
configureFlags = [];
patches =
[ ( substituteAll {
src = ./nix-purity.patch;
inherit libpcap;
glibc = stdenv.gcc.libc;
})
./nonpriv.patch
];
phaseNames = ["exportVars" "patchPrivileged" "doConfigure" "doMakeInstall"];
postPatch = "rm -v include/linux/if_pppol2tp.h";
exportVars = a.noDepEntry(''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lcrypt "
'');
buildInputs = [ libpcap ];
/* We want to run it as far as we can with our current permissions
For example, dependent builds would prefer to run --version
without ever using setuid pppd. We are not setuid anyway, so.. */
patchPrivileged = a.fullDepEntry(''
sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c
sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
'') ["minInit" "doUnpack"];
postInstall = "chmod -v -R +rw $out";
passthru = {
inherit version;
};
name = "ppp-" + version;
meta = {
homepage = http://ppp.samba.org/;
description = "Point-to-point implementation for Linux and Solaris";
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}

22
pkgs/tools/networking/ppp/nix-purity.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 060db6a..c151c62 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -117,7 +117,7 @@ CFLAGS += -DHAS_SHADOW
#LIBS += -lshadow $(LIBS)
endif
-ifneq ($(wildcard /usr/include/crypt.h),)
+ifneq ($(wildcard @glibc@/include/crypt.h),)
CFLAGS += -DHAVE_CRYPT_H=1
LIBS += -lcrypt
endif
@@ -169,7 +169,7 @@ LIBS += -ldl
endif
ifdef FILTER
-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
+ifneq ($(wildcard @libpcap@/include/pcap-bpf.h),)
LIBS += -lpcap
CFLAGS += -DPPP_FILTER
endif

13
pkgs/tools/networking/ppp/nonpriv.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/pppd/main.c b/pppd/main.c
index 014d614..6661d33 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -334,7 +334,7 @@ main(argc, argv)
umask(umask(0777) | 022);
uid = getuid();
- privileged = uid == 0;
+ privileged = (uid == 0) || (geteuid() != 0);
slprintf(numbuf, sizeof(numbuf), "%d", uid);
script_setenv("ORIG_UID", numbuf, 0);

19
pkgs/top-level/all-packages.nix
View File

@ -852,6 +852,8 @@ let
iasl = callPackage ../development/compilers/iasl { };
icoutils = callPackage ../tools/graphics/icoutils { };
idutils = callPackage ../tools/misc/idutils { };
iftop = callPackage ../tools/networking/iftop { };
@ -1203,6 +1205,8 @@ let
pngnq = callPackage ../tools/graphics/pngnq { };
pngtoico = callPackage ../tools/graphics/pngtoico { };
polipo = callPackage ../servers/polipo { };
polkit_gnome = callPackage ../tools/security/polkit-gnome { };
@ -1213,9 +1217,7 @@ let
ppl0_11 = callPackage ../development/libraries/ppl/0.11.nix { };
/* WARNING: this version is unsuitable for using with a setuid wrapper */
ppp = builderDefsPackage (import ../tools/networking/ppp) {
};
ppp = callPackage ../tools/networking/ppp { };
pptp = callPackage ../tools/networking/pptp {};
@ -1260,6 +1262,8 @@ let
radvd = callPackage ../tools/networking/radvd { };
privateer = callPackage ../games/privateer { };
rtmpdump = callPackage ../tools/video/rtmpdump { };
recutils = callPackage ../tools/misc/recutils { };
@ -3932,6 +3936,9 @@ let
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgdiplus = callPackage ../development/libraries/libgdiplus {
};
libgpgerror = callPackage ../development/libraries/libgpg-error { };
libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
@ -8622,6 +8629,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.

12
pkgs/top-level/haskell-packages.nix
View File

@ -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 {};

10
pkgs/top-level/perl-packages.nix
View File

@ -1101,15 +1101,7 @@ rec {
DBDSQLite = import ../development/perl-modules/DBD-SQLite {
inherit fetchurl buildPerlPackage DBI;
# sqlite-3.7.9 breaks DBDSQLite, overriding locally for now
sqlite = pkgs.lib.overrideDerivation pkgs.sqlite (args: {
name = "sqlite-3.7.7.1";
src = fetchurl {
url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz;
sha256 = "1pvf72gb6yidc4zjml3k6kwhlvvhbgmbm8hfin9y5jvvbyr3dk3x";
};
});
inherit (pkgs) sqlite;
};
DBDmysql = import ../development/perl-modules/DBD-mysql {