Remove some files not reachable from all-packages.nix
List of removed files: * pkgs/applications/misc/kiwixbuilder/default.nix * pkgs/applications/misc/simgrid/default.nix * pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix * pkgs/applications/networking/mailreaders/thunderbird/7.x.nix * pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch * pkgs/development/libraries/bluez-libs/default.nix * pkgs/development/libraries/libjingle/0.4.0.nix * pkgs/development/perl-modules/Font-TTF/default.nix * pkgs/tools/X11/xauth/default.nix * pkgs/tools/security/p0f/default.nix * pkgs/tools/security/p0f/p0f.patch svn path=/nixpkgs/trunk/; revision=33205
This commit is contained in:
Yury G. Kudryashov
parent
f0925eeded
commit
776bedbb5f
@ -1,28 +0,0 @@
|
||||
args : with args; with builderDefs {src="";} null;
|
||||
let localDefs = builderDefs (rec {
|
||||
src = /* put a fetchurl here */
|
||||
fetchurl {
|
||||
url = http://downloads.sourceforge.net/kiwix/kiwixbuilder.tgz;
|
||||
sha256 = "0qb97smw4675i3hh328a7f65payw1w71bn4d32ycdkmqk56zl4ds";
|
||||
};
|
||||
buildInputs = [glib zlib];
|
||||
configureFlags = [" --prefix=$out "];
|
||||
preConfigure = fullDepEntry (''
|
||||
export NIX_CFLAGS_COMPILE=$NIX_CFLAGS_COMPILE' -I${glib}/include/glib-2.0/ -I${glib}/lib/glib-2.0/include/ '
|
||||
export NIX_LDFLAGS=$NIX_LDFLAGS' -lglib-2.0 '
|
||||
sed -e 's@/usr/local/lib/libz\.a@${zlib}/lib/libz.a@' -i configure
|
||||
'') ["minInit" "doUnpack"];
|
||||
}) args null; /* null is a terminator for sumArgs */
|
||||
in with localDefs;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kiwix";
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure localDefs
|
||||
[preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
|
||||
meta = {
|
||||
description = "
|
||||
Offline Wikipedia viewer builder.
|
||||
";
|
||||
inherit src;
|
||||
};
|
||||
}
|
||||
@ -1,59 +0,0 @@
|
||||
{ fetchurl, stdenv, cmake, ruby }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "simgrid-3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
|
||||
sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
|
||||
};
|
||||
|
||||
/* FIXME: Ruby currently disabled because of this:
|
||||
|
||||
Linking C shared library ../src/.libs/libsimgrid.so
|
||||
ld: cannot find -lruby-1.8.7-p72
|
||||
|
||||
*/
|
||||
buildInputs = [ cmake /* ruby */ ];
|
||||
|
||||
preConfigure =
|
||||
# Make it so that libsimgrid.so will be found when running programs from
|
||||
# the build dir.
|
||||
'' export LD_LIBRARY_PATH="$PWD/src/.libs"
|
||||
export cmakeFlags="-Dprefix=$out"
|
||||
'';
|
||||
|
||||
makeFlags = "VERBOSE=1";
|
||||
|
||||
patchPhase =
|
||||
'' for i in "src/smpi/"*
|
||||
do
|
||||
sed -i "$i" -e's|/bin/bash|/bin/sh|g'
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = "make install-simgrid";
|
||||
|
||||
# Fixing the few tests that fail is left as an exercise to the reader.
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
|
||||
|
||||
longDescription =
|
||||
'' SimGrid is a toolkit that provides core functionalities for the
|
||||
simulation of distributed applications in heterogeneous distributed
|
||||
environments. The specific goal of the project is to facilitate
|
||||
research in the area of distributed and parallel application
|
||||
scheduling on distributed computing platforms ranging from simple
|
||||
network of workstations to Computational Grids.
|
||||
'';
|
||||
|
||||
homepage = http://simgrid.gforge.inria.fr/;
|
||||
|
||||
license = "LGPLv2+";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.ludo ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
};
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
args : with args;
|
||||
/*
|
||||
arguments: all buildInputs
|
||||
optional: purple2Source: purple-2 source - place to copy libpurple from
|
||||
(to use a fresher pidgin build)
|
||||
*/
|
||||
let
|
||||
externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null;
|
||||
in
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = http://downloads.sourceforge.net/funpidgin/carrier-2.4.2.tar.bz2;
|
||||
sha256 = "176mi7gxkvvrmxsd58bi8qgkc209gpnlp21hh3j0dmb9zszyh7kp";
|
||||
};
|
||||
|
||||
buildInputs = [gtkspell aspell
|
||||
gstreamer startupnotification
|
||||
libxml2 openssl nss
|
||||
libXScrnSaver ncurses scrnsaverproto
|
||||
libX11 xproto kbproto GConf avahi
|
||||
dbus dbus_glib glib python
|
||||
autoconf libtool automake];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pkgconfig gtk perl perlXMLParser gettext
|
||||
];
|
||||
|
||||
configureFlags="--with-nspr-includes=${nss}/include/nspr"
|
||||
+ " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
|
||||
+ " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
|
||||
+ " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
|
||||
|
||||
preBuild = fullDepEntry (''
|
||||
export echo=echo
|
||||
'') [];
|
||||
|
||||
/* doConfigure should be specified separately */
|
||||
phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
|
||||
++ (lib.optional externalPurple2 "postInstall")
|
||||
;
|
||||
|
||||
name = "carrier-" + version;
|
||||
meta = {
|
||||
description = "Carrier - PidginIM GUI fork with user-friendly development model";
|
||||
homepage = http://funpidgin.sf.net;
|
||||
};
|
||||
} // (if externalPurple2 then {
|
||||
postInstall = fullDepEntry (''
|
||||
mkdir -p $out/lib/purple-2
|
||||
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
|
||||
'') ["minInit" "defEnsureDir"]; }
|
||||
else {})
|
||||
|
||||
|
||||
@ -1,96 +0,0 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
|
||||
, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
|
||||
, libnotify, cairo, pixman, fontconfig
|
||||
|
||||
, # If you want the resulting program to call itself "Thunderbird"
|
||||
# instead of "Shredder", enable this option. However, those
|
||||
# binaries may not be distributed without permission from the
|
||||
# Mozilla Foundation, see
|
||||
# http://www.mozilla.org/foundation/trademarks/.
|
||||
enableOfficialBranding ? false
|
||||
|
||||
}:
|
||||
|
||||
let version = "7.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "thunderbird-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
|
||||
sha1 = "ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
|
||||
libnotify cairo pixman fontconfig yasm mesa /* nss */
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix weird dependencies such as a so file which depends on "-lpthread".
|
||||
./thunderbird-build-deps.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lpixman-1";
|
||||
|
||||
configureFlags =
|
||||
[ "--enable-application=mail"
|
||||
"--enable-optimize"
|
||||
"--disable-debug"
|
||||
"--enable-strip"
|
||||
"--with-system-jpeg"
|
||||
"--with-system-zlib"
|
||||
# "--with-system-bz2"
|
||||
"--with-system-nspr"
|
||||
"--enable-system-cairo"
|
||||
"--disable-crashreporter"
|
||||
"--disable-necko-wifi"
|
||||
"--disable-tests"
|
||||
"--enable-calendar"
|
||||
]
|
||||
++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
|
||||
|
||||
# The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
|
||||
# prefix, and PREFIX in some places where they are not set. In
|
||||
# particular, there are some linker flags like
|
||||
# `-rpath-link=$(LIBXUL_DIST)/bin'. Since this expands to
|
||||
# `-rpath-link=/bin', the build fails due to the purity checks in
|
||||
# the ld wrapper. So disable the purity check for now.
|
||||
preBuild = "NIX_ENFORCE_PURITY=0";
|
||||
|
||||
# This doesn't work:
|
||||
#makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
|
||||
|
||||
postInstall =
|
||||
''
|
||||
# Fix some references to /bin paths in the Xulrunner shell script.
|
||||
substituteInPlace $out/lib/thunderbird-*/thunderbird \
|
||||
--replace /bin/pwd "$(type -tP pwd)" \
|
||||
--replace /bin/ls "$(type -tP ls)"
|
||||
|
||||
# Create a desktop item.
|
||||
mkdir -p $out/share/applications
|
||||
cat > $out/share/applications/thunderbird.desktop <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Exec=$out/bin/thunderbird
|
||||
Icon=$out/lib/thunderbird-${version}/chrome/icons/default/default256.png
|
||||
Name=Thunderbird
|
||||
GenericName=Mail Reader
|
||||
Categories=Application;Network;
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mozilla Thunderbird, a full-featured email client";
|
||||
homepage = http://www.mozilla.org/thunderbird/;
|
||||
license =
|
||||
# Official branding implies thunderbird name and logo cannot be reuse,
|
||||
# see http://www.mozilla.org/foundation/licensing.html
|
||||
if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
|
||||
maintainers = with maintainers; [ pierron ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
diff -x _inst -x _build -x .svn -ur comm-miramar/config/rules.mk comm-miramar.after/config/rules.mk
|
||||
--- comm-miramar/config/rules.mk 2011-06-24 22:13:31.000000000 +0200
|
||||
+++ comm-miramar/config/rules.mk 2011-08-15 12:27:07.305556040 +0200
|
||||
@@ -851,9 +851,13 @@
|
||||
|
||||
ifndef _LIBNAME_RELATIVE_PATHS
|
||||
|
||||
-LIBS_DEPS += $(filter -l%, $(LIBS))
|
||||
-HOST_LIBS_DEPS += $(filter -l%, $(HOST_LIBS))
|
||||
-DSO_LDOPTS_DEPS += $(filter -l%, $(EXTRA_DSO_LDOPTS))
|
||||
+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(LIBS))))
|
||||
+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(HOST_LIBS))))
|
||||
+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%$(DLL_SUFFIX),$(filter-out -lpthread -ldl -lrt -ljemalloc -lmozmalloc,$(filter -l%, $(EXTRA_DSO_LDOPTS))))
|
||||
+
|
||||
+LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(LIBS)))
|
||||
+HOST_LIBS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(HOST_LIBS)))
|
||||
+DSO_LDOPTS_DEPS += $(patsubst -l%,$(LIB_PREFIX)%.$(LIB_SUFFIX),$(filter -ljemalloc -lmozmalloc, $(EXTRA_DSO_LDOPTS)))
|
||||
|
||||
_LIBDIRS = $(patsubst -L%,%,$(filter -L%, $(LIBS) $(HOST_LIBS) $(EXTRA_DSO_LDOPTS)))
|
||||
ifneq (,$(_LIBDIRS))
|
||||
Seulement dans comm-miramar.after/config: rules.mk~
|
||||
@ -1,9 +0,0 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bluez-libs-2.25";
|
||||
src = fetchurl {
|
||||
url = http://bluez.sf.net/download/bluez-libs-2.25.tar.gz;
|
||||
md5 = "ebc8408c9a74c785786a2ef7185fe628";
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
args: with args;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libjingle-" + version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sf/libjingle/${name}.tar.gz";
|
||||
sha256 = "0izg1i4nmhysvkqmsl2xqp0x6lwz2jjyavvhv196hsdsr2w0iwvi";
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{fetchurl, perl}:
|
||||
|
||||
import ../generic perl {
|
||||
name = "perl-Font-TTF-0.43";
|
||||
src = fetchurl {
|
||||
url = mirror://cpan/authors/id/M/MH/MHOSKEN/Font-TTF-0.43.tar.gz;
|
||||
sha256 = "0782mj5n5a2qbghvvr20x51llizly6q5smak98kzhgq9a7q3fg89";
|
||||
};
|
||||
perlPreHook = "makeMakerFlags=\"EXPATLIBPATH=$expat/lib EXPATINCPATH=$expat/include\"";
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
{stdenv, fetchurl, pkgconfig, libX11, libXau, libXext, libXmu}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xauth-7.0";
|
||||
src = fetchurl {
|
||||
url = http://nixos.org/tarballs/xauth-7.0.tar.bz2;
|
||||
md5 = "d597005016baa8af81a5b0e38951d563";
|
||||
};
|
||||
buildInputs = [pkgconfig libX11 libXau libXext libXmu];
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{stdenv, fetchurl, libpcap}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "p0f-2.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz;
|
||||
md5 = "1ccbcd8d4c95ef6dae841120d23c56a5";
|
||||
};
|
||||
|
||||
buildInputs = [libpcap];
|
||||
patches = [./p0f.patch];
|
||||
}
|
||||
@ -1,46 +0,0 @@
|
||||
diff -ruN p0f/Build p0f.new/Build
|
||||
--- p0f/Build 2006-03-16 08:44:34.000000000 +0100
|
||||
+++ p0f.new/Build 2007-01-13 03:26:40.000000000 +0100
|
||||
@@ -36,9 +36,9 @@
|
||||
|
||||
USE_BPF="pcap-bpf.h"
|
||||
|
||||
-if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
|
||||
- USE_BPF="net/bpf.h"
|
||||
-fi
|
||||
+#if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
|
||||
+# USE_BPF="net/bpf.h"
|
||||
+#fi
|
||||
|
||||
export USE_BPF
|
||||
|
||||
diff -ruN p0f/mk/Linux p0f.new/mk/Linux
|
||||
--- p0f/mk/Linux 2006-08-21 14:37:00.000000000 +0200
|
||||
+++ p0f.new/mk/Linux 2007-01-13 03:34:18.000000000 +0100
|
||||
@@ -11,8 +11,7 @@
|
||||
LIBS = -lpcap
|
||||
STRIP = strip
|
||||
CFLAGS = -O3 -Wall -fomit-frame-pointer -funroll-loops \
|
||||
- -DUSE_BPF=\"${USE_BPF}\" \
|
||||
- -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
|
||||
+ -DUSE_BPF=\"${USE_BPF}\"
|
||||
FILE = p0f
|
||||
TOOLS = test/sendack test/sendack2 test/sendsyn
|
||||
|
||||
@@ -47,9 +46,11 @@
|
||||
rm -f /tmp/p0f.tgz
|
||||
|
||||
install: $(FILE)
|
||||
- cp -f $(FILE) /usr/sbin/
|
||||
- cp -f p0frep /usr/sbin/
|
||||
- mkdir /etc/p0f || true
|
||||
- cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp /etc/p0f/
|
||||
- cp -f p0f.1 /usr/man/man1/ || cp -f p0f.1 /usr/local/man/man1/
|
||||
+ mkdir -p ${out}/sbin
|
||||
+ cp -f $(FILE) ${out}/sbin/
|
||||
+ cp -f p0frep ${out}/sbin/
|
||||
+ mkdir -p ${out}/etc/p0f || true
|
||||
+ cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp ${out}/etc/p0f/
|
||||
+ mkdir -p ${out}/man/man1
|
||||
+ cp -f p0f.1 ${out}/man/man1/
|
||||
@echo "You might want to manually install test/ tools now."
|
||||
Loading…
Reference in New Issue
Block a user