Merge remote-tracking branch 'upstream/master' into hardened-stdenv

3 files changed, 0 insertions, 45 deletions

diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix
deleted file mode 100644
index ee4dabf78e78..000000000000
--- a/pkgs/tools/admin/webdruid/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    zlib libpng freetype gd which libxml2
-    geoip
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
-
-  doLinks = a.fullDepEntry (''
-    ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
-  '') ["minInit"];
-
-  meta = {
-    description = "A web log analyzer";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = a.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix
deleted file mode 100644
index 73102be6afe5..000000000000
--- a/pkgs/tools/admin/webdruid/src-for-default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-rec {
-  advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz";
-  version = "0.6.0-alpha5";
-  url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz";
-  hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0";
-  name = "webdruid-0.6.0-alpha5";
-  
-}
diff --git a/pkgs/tools/admin/webdruid/src-info-for-default.nix b/pkgs/tools/admin/webdruid/src-info-for-default.nix
deleted file mode 100644
index 9a4eff296828..000000000000
--- a/pkgs/tools/admin/webdruid/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  downloadPage = "http://sourceforge.net/projects/webdruid/files/";
-  choiceCommand = ''head -1 | sed -re "$skipRedirectSF"'';
-  versionExtractorSedScript = ''$extractReleaseSF'';
-  versionReferenceCreator = ''s@$version@\''${version}@g'';
-  baseName = "webdruid";
-}