PR fixups: use mirror://, drop unused params, etc.

Note: hash of trousers tarball didn't match (anymore),
so I updated it to the one from sourceforge.
It's probably some safe and tiny retrospective update.
This commit is contained in:
Vladimír Čunát 2014-08-12 19:38:15 +02:00
parent 87c3c0e885
commit abd361173a
4 changed files with 23 additions and 13 deletions

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, autoconf, automake, trousers, openssl, zlib}:
{ stdenv, fetchurl, trousers, openssl, zlib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "tboot-1.8.0";
src = fetchurl {
url = https://sourceforge.net/projects/tboot/files/tboot/tboot-1.8.0.tar.gz;
url = "mirror://sourceforge/tboot/${name}.tar.gz";
sha256 = "04z1maryqnr714f3rcynqrpmlx76lxr6bb543xwj5rdl1yvdw2xr";
};
@ -30,3 +30,4 @@ stdenv.mkDerivation {
platforms = platforms.linux;
};
}

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, autoconf, automake, trousers, openssl}:
{ stdenv, fetchurl, trousers, openssl }:
stdenv.mkDerivation {
name = "tpm-quote-tools-1.0.2";

View file

@ -1,10 +1,13 @@
{stdenv, fetchurl, autoconf, automake, trousers, openssl}:
{ stdenv, fetchurl, trousers, openssl }:
stdenv.mkDerivation {
name = "tpm-tools-1.3.8";
let
version = "1.3.8";
in
stdenv.mkDerivation rec {
name = "tpm-tools-${version}";
src = fetchurl {
url = https://sourceforge.net/projects/trousers/files/tpm-tools/1.3.8/tpm-tools-1.3.8.tar.gz;
url = "mirror://sourceforge/trousers/tpm-tools/${version}/${name}.tar.gz";
sha256 = "10za1gi89vi9m2lmm7jfzs281h55x1sbbm2bdgdh692ljpq4zsv6";
};
@ -20,3 +23,4 @@ stdenv.mkDerivation {
platforms = platforms.unix;
};
}

View file

@ -1,11 +1,15 @@
{stdenv, fetchurl, autoconf, automake, openssl}:
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation {
name = "trousers-0.3.11.2";
let
ver_maj = "0.3.11";
ver_min = "2";
in
stdenv.mkDerivation rec {
name = "trousers-${ver_maj}.${ver_min}";
src = fetchurl {
url = https://sourceforge.net/projects/trousers/files/trousers/0.3.11/trousers-0.3.11.2.tar.gz;
sha256 = "03c71szmij1nx3jicacmazh0yan3qm00k0ahmh4mq88fw00k1p4v";
url = "mirror://sourceforge/trousers/trousers/${ver_maj}/${name}.tar.gz";
sha256 = "1m9qi4452jr5yy4y9zyfi5ndwam5krq7ny8z2q3f91v1hcjgk5la";
};
buildInputs = [ openssl ];
@ -26,3 +30,4 @@ stdenv.mkDerivation {
platforms = platforms.unix;
};
}