From a76e69894c9ba1ac6307b74f5167cf5761eef875 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Sat, 11 Jan 2014 22:27:49 +0000 Subject: [PATCH] Update siege --- pkgs/tools/networking/siege/default.nix | 61 +++++-------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index ebbfcb5d3608..23aa30554362 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,51 +1,12 @@ -x@{builderDefsPackage - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="siege"; - version="2.70"; - name="${baseName}-${version}"; - url="ftp://ftp.joedog.org/pub/siege/${name}.tar.gz"; - hash="14fxfmfsqwyahc91w4vn3n8hvclf78n4k1xllqsrpvjb5asvrd1w"; +{ stdenv, fetchurl }: +let + version = "3.0.2"; + baseName = "siege"; +in stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + src = fetchurl { + url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; + sha256 = "0b86rvcrjxy6h9w32bhpcm1gwmn223mf9f30dfsnaw51w90kn716"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; - - createDirs = a.fullDepEntry '' - mkdir -p "$out/"{bin,lib,share/man,etc} - '' ["defEnsureDir"]; - - meta = { - description = "HTTP load tester"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.joedog.org/index/siege-home"; - }; - }; -}) x - + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; +}