Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

siege: fix build after multiple-outputs #15038

Merged
merged 1 commit into from
Apr 28, 2016
Merged

Conversation

joachifm
Copy link
Contributor

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @ocharles, @bjornfor and @7c6f434c to be potential reviewers

@danbst
Copy link
Contributor

danbst commented Apr 28, 2016

Thanks. Version can be bumped too

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index 48e2fc5..46dbc73 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, zlib }:

 stdenv.mkDerivation rec {
-  name = "siege-3.0.8";
+  name = "siege-4.0.1";

   src = fetchurl {
     url = "http://download.joedog.org/siege/${name}.tar.gz";
-    sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq";
+    sha256 = "0dr8k64s7zlhy3w8n1br0h6xd06p09p9809l9rp13isf10jp5pgx";
   };

   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

-  configureFlags = [ "--with-ssl=${openssl}" ];
+  configureFlags = [ "--with-ssl=${openssl.dev}" "--with-zlib=${zlib.dev}" ];
+  buildInputs = [ openssl zlib ];

   meta = with stdenv.lib; {

@joachifm joachifm merged commit 44acb68 into NixOS:master Apr 28, 2016
@joachifm
Copy link
Contributor Author

@danbst please submit a PR, I don't use siege myself

@danbst danbst mentioned this pull request Apr 28, 2016
7 tasks
@joachifm joachifm deleted the fix-siege branch April 30, 2016 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants