BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

svn merge ^/nixpkgs/trunk

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31280
This commit is contained in:
Yury G. Kudryashov 2012-01-04 15:22:16 +00:00
commit 394fd28e4e
11 changed files with 89 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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 "+

6
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,8 @@ stdenv.mkDerivation {
# To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
dontDisableStatic = true;
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;

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

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

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;

49
pkgs/tools/networking/ppp/default.nix
View file

@ -1,41 +1,32 @@
a :
let
fetchurl = a.fetchurl;
{ stdenv, fetchurl, substituteAll, libpcap }:
stdenv.mkDerivation rec {
name = "ppp-2.4.5";
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);

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

@ -1215,8 +1215,7 @@ let
ppl = callPackage ../development/libraries/ppl { };
/* 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 {};
@ -3942,6 +3941,9 @@ let
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgdiplus = callPackage ../development/libraries/libgdiplus {
};
libgpgerror = callPackage ../development/libraries/libgpg-error { };
libgphoto2 = callPackage ../development/libraries/libgphoto2 { };

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 {