diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-12 19:38:15 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-12 19:42:23 +0200 |
commit | abd361173a9f50b55a15bf65593f78a5cf884703 (patch) | |
tree | c92a30b0d63d1c3320fa917d50eeebe0a924d9a3 /pkgs/tools | |
parent | 87c3c0e8856083e18009cb5f33d880f3e8614d8a (diff) | |
download | nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar.gz nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar.bz2 nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar.lz nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar.xz nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.tar.zst nixlib-abd361173a9f50b55a15bf65593f78a5cf884703.zip |
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.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/security/tboot/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/tpm-quote-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/tpm-tools/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/trousers/default.nix | 15 |
4 files changed, 23 insertions, 13 deletions
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 7975a7fd6229..86c4d96e97d9 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -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; }; } + diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index d753ba6db141..c178d401154f 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake, trousers, openssl}: +{ stdenv, fetchurl, trousers, openssl }: stdenv.mkDerivation { name = "tpm-quote-tools-1.0.2"; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 2c8d645e28cc..95b3b6b51f77 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -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; }; } + diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index d747af42b127..4c2af359b964 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -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; }; } + |