Remove fetchMD5warn
Deprecation warnings should not be used in Nixpkgs because they spam
innocent "nix-env -qa" users with (in this case) dozens of messages
that they can't do anything about.
This also reverts commit 2ca8833383
.
This commit is contained in:
parent
f26ff0b1bd
commit
e3a873479e
@ -138,7 +138,4 @@ rec {
|
||||
*/
|
||||
warn = msg: builtins.trace "WARNING: ${msg}";
|
||||
info = msg: builtins.trace "INFO: ${msg}";
|
||||
|
||||
fetchMD5warn = name: context : data : info
|
||||
"Deprecated use of MD5 hash in ${name} to fetch ${context}" data;
|
||||
}
|
||||
|
@ -7,8 +7,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then
|
||||
(stdenv.lib.fetchMD5warn "fetchdarcs" url md5) else sha256;
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
inherit url rev context;
|
||||
}
|
||||
|
@ -11,8 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then
|
||||
(stdenv.lib.fetchMD5warn "fetchegg" name md5) else sha256;
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
inherit version;
|
||||
|
||||
|
@ -50,8 +50,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then
|
||||
(stdenv.lib.fetchMD5warn "fetchgit" url md5) else sha256;
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
|
||||
|
||||
|
@ -15,8 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if md5 != null then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if md5 != null then
|
||||
(stdenv.lib.fetchMD5warn "fetchhg" url md5) else sha256;
|
||||
outputHash = if md5 != null then md5 else sha256;
|
||||
|
||||
inherit url rev;
|
||||
preferLocalBuild = true;
|
||||
|
@ -29,8 +29,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then
|
||||
(stdenv.lib.fetchMD5warn "fetchsvn" url md5) else sha256;
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
inherit url rev sshSupport openssh ignoreExternals;
|
||||
|
||||
|
@ -8,8 +8,7 @@ stdenv.mkDerivation {
|
||||
|
||||
outputHashAlgo = if sha256 == "" then "md5" else "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = if sha256 == "" then
|
||||
(stdenv.lib.fetchMD5warn "fetchsvnssh" url md5) else sha256;
|
||||
outputHash = if sha256 == "" then md5 else sha256;
|
||||
|
||||
sshSubversion = ./sshsubversion.exp;
|
||||
|
||||
|
@ -112,8 +112,7 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
|
||||
outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
|
||||
if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
|
||||
outputHash = if outputHash != "" then outputHash else
|
||||
if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else
|
||||
(stdenv.lib.fetchMD5warn "fetchurl" (builtins.head urls_) md5);
|
||||
if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
|
||||
|
||||
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
|
||||
|
||||
|
@ -63,15 +63,12 @@ releaseTools.sourceTarball rec {
|
||||
fi
|
||||
|
||||
# Check that all-packages.nix evaluates on a number of platforms without any warnings.
|
||||
# Filter out MD5 warnings for now
|
||||
for platform in i686-linux x86_64-linux x86_64-darwin; do
|
||||
header "checking Nixpkgs on $platform"
|
||||
|
||||
NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \
|
||||
--show-trace --argstr system "$platform" \
|
||||
-qa --drv-path --system-filter \* --system 2>&1 >/dev/null |
|
||||
(grep -v '^trace: INFO: Deprecated use of MD5 hash in fetch' || true) |
|
||||
tee eval-warnings.log
|
||||
-qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log
|
||||
|
||||
if [ -s eval-warnings.log ]; then
|
||||
echo "Nixpkgs on $platform evaluated with warnings, aborting"
|
||||
|
Loading…
Reference in New Issue
Block a user