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

fetch*: print a trace warning about md5 deprecation

Browse Source
This commit is contained in:
Michael Raskin 2016-10-08 00:24:10 +02:00 committed by Robin Gloster
parent c6b050fd2f
commit f603dc11a6
9 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/trivial.nix
View File

@ -113,4 +113,7 @@ rec {
*/ */
warn = msg: builtins.trace "WARNING: ${msg}"; warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}"; info = msg: builtins.trace "INFO: ${msg}";
fetchMD5warn = name: context : data : warn
"Deprecated use of MD5 hash in ${name} to fetch ${context}" data;
} }

3
pkgs/build-support/fetchdarcs/default.nix
View File

@ -7,7 +7,8 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then
(stdenv.lib.fetchMD5warn "fetchdarcs" url md5) else sha256;
inherit url rev context; inherit url rev context;
} }

3
pkgs/build-support/fetchegg/default.nix
View File

@ -11,7 +11,8 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then
(stdenv.lib.fetchMD5warn "fetchegg" name md5) else sha256;
inherit version; inherit version;

8
pkgs/build-support/fetchfile/default.nix
View File

@ -1,7 +1,11 @@
{stdenv}: {pathname, md5}: stdenv.mkDerivation { {stdenv}: {pathname, md5 ? "", sha256 ? ""}: stdenv.mkDerivation {
name = baseNameOf (toString pathname); name = baseNameOf (toString pathname);
builder = ./builder.sh; builder = ./builder.sh;
pathname = pathname; pathname = pathname;
md5 = md5; } // if (sha256 == "") then {
md5 = (stdenv.lib.fetchMD5warn "fetchfile" pathname md5);
id = md5; id = md5;
} else {
sha256 = sha256;
id = sha256;
} }

3
pkgs/build-support/fetchgit/default.nix
View File

@ -50,7 +50,8 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then
(stdenv.lib.fetchMD5warn "fetchgit" url md5) else sha256;
inherit url rev leaveDotGit fetchSubmodules deepClone branchName; inherit url rev leaveDotGit fetchSubmodules deepClone branchName;

3
pkgs/build-support/fetchhg/default.nix
View File

@ -15,7 +15,8 @@ stdenv.mkDerivation {
outputHashAlgo = if md5 != null then "md5" else "sha256"; outputHashAlgo = if md5 != null then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if md5 != null then md5 else sha256; outputHash = if md5 != null then
(stdenv.lib.fetchMD5warn "fetchhg" url md5) else sha256;
inherit url rev; inherit url rev;
preferLocalBuild = true; preferLocalBuild = true;

3
pkgs/build-support/fetchsvn/default.nix
View File

@ -29,7 +29,8 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then
(stdenv.lib.fetchMD5warn "fetchsvn" url md5) else sha256;
inherit url rev sshSupport openssh ignoreExternals; inherit url rev sshSupport openssh ignoreExternals;

3
pkgs/build-support/fetchsvnssh/default.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation {
outputHashAlgo = if sha256 == "" then "md5" else "sha256"; outputHashAlgo = if sha256 == "" then "md5" else "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = if sha256 == "" then md5 else sha256; outputHash = if sha256 == "" then
(stdenv.lib.fetchMD5warn "fetchsvnssh" url md5) else sha256;
sshSubversion = ./sshsubversion.exp; sshSubversion = ./sshsubversion.exp;

3
pkgs/build-support/fetchurl/default.nix
View File

@ -112,7 +112,8 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
outputHash = if outputHash != "" then outputHash else outputHash = if outputHash != "" then outputHash else
if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else
(stdenv.lib.fetchMD5warn "fetchurl" (builtins.head urls_) md5);
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";