Commit e57d6626 authored by Vincent Bernat's avatar Vincent Bernat
Browse files

caddy: avoid use of builtins and prefer lib 

There is no `lib.hashString`, so keep using `builtins` for this one.
parent 4642e27d

pkgs/by-name/ca/caddy/plugins.nix

+4 −4
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ 
  hash ? lib.fakeHash,

}:

let

  pluginsSorted = builtins.sort builtins.lessThan plugins;

  pluginsSorted = lib.sort lib.lessThan plugins;

  pluginsList = lib.concatMapStrings (plugin: "${plugin}-") pluginsSorted;

  pluginsHash = builtins.hashString "md5" pluginsList;

  pluginsWithoutVersion = builtins.filter (p: !lib.hasInfix "@" p) pluginsSorted;

  pluginsWithoutVersion = lib.filter (p: !lib.hasInfix "@" p) pluginsSorted;

in

assert lib.assertMsg (

  builtins.length pluginsWithoutVersion == 0

) "All plugins should have a version (eg ${builtins.elemAt pluginsWithoutVersion 0}@x.y.z)!";

  lib.length pluginsWithoutVersion == 0

) "All plugins should have a version (eg ${lib.elemAt pluginsWithoutVersion 0}@x.y.z)!";

caddy.overrideAttrs (

  finalAttrs: prevAttrs: {

    vendorHash = null;