public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into x-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2012-10-01 11:43:43 -04:00
parent 745cb58e4e 41ca123e73
commit b78256fbd7
40 changed files with 720 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/plowshare/default.nix
+5 -7
View File
@@ -1,16 +1,14 @@
{ stdenv, fetchurl, makeWrapper, curl }:
let
stdenv.mkDerivation rec {
v = "20120807";
name = "plowshare-${version}";
in stdenv.mkDerivation {
name = "plowshare-git${v}";
version = "git20120916";
src = fetchurl {
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz";
sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si";
url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
};
buildInputs = [ makeWrapper ];
pkgs/tools/networking/aircrack-ng/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchsvn {
url = "http://trac.aircrack-ng.org/svn/trunk";
inherit rev;
sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw";
sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db";
};
buildInputs = [libpcap openssl zlib];