From 776bedbb5fca600a20a89b1d6e02e54f11b30c63 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 17 Mar 2012 17:20:30 +0000 Subject: [PATCH] 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 --- .../misc/kiwixbuilder/default.nix | 28 ------ pkgs/applications/misc/simgrid/default.nix | 59 ------------ .../instant-messengers/carrier/2.4.2.nix | 54 ----------- .../mailreaders/thunderbird/7.x.nix | 96 ------------------- .../thunderbird/thunderbird-build-deps.patch | 21 ---- .../libraries/bluez-libs/default.nix | 9 -- .../development/libraries/libjingle/0.4.0.nix | 10 -- .../perl-modules/Font-TTF/default.nix | 10 -- pkgs/tools/X11/xauth/default.nix | 10 -- pkgs/tools/security/p0f/default.nix | 13 --- pkgs/tools/security/p0f/p0f.patch | 46 --------- 11 files changed, 356 deletions(-) delete mode 100644 pkgs/applications/misc/kiwixbuilder/default.nix delete mode 100644 pkgs/applications/misc/simgrid/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/7.x.nix delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch delete mode 100644 pkgs/development/libraries/bluez-libs/default.nix delete mode 100644 pkgs/development/libraries/libjingle/0.4.0.nix delete mode 100644 pkgs/development/perl-modules/Font-TTF/default.nix delete mode 100644 pkgs/tools/X11/xauth/default.nix delete mode 100644 pkgs/tools/security/p0f/default.nix delete mode 100644 pkgs/tools/security/p0f/p0f.patch diff --git a/pkgs/applications/misc/kiwixbuilder/default.nix b/pkgs/applications/misc/kiwixbuilder/default.nix deleted file mode 100644 index cec8513e4c7..00000000000 --- a/pkgs/applications/misc/kiwixbuilder/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/applications/misc/simgrid/default.nix b/pkgs/applications/misc/simgrid/default.nix deleted file mode 100644 index 45b93dab830..00000000000 --- a/pkgs/applications/misc/simgrid/default.nix +++ /dev/null @@ -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 - }; -} diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix deleted file mode 100644 index 877e71d0d00..00000000000 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ /dev/null @@ -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 {}) - - diff --git a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix deleted file mode 100644 index fb84271787c..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/7.x.nix +++ /dev/null @@ -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 <