Unverified Commit 1ded005f authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #269453 from ShamrockLee/use-warn-if 

treewide: use lib.warnIf instead of improvised alternatives
parents c0acebea 4bae1b32

pkgs/servers/atlassian/confluence.nix

+1 −7
Original line number Diff line number Diff line
@@ -6,13 +6,7 @@ 


assert withMysql -> (mysql_jdbc != null);



let

  optionalWarning = cond: msg:

    if cond then lib.warn msg

    else lib.id;

in



optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!"

lib.warnIf (crowdProperties != null) "Using `crowdProperties` is deprecated!"

(stdenvNoCC.mkDerivation rec {

  pname = "atlassian-confluence";

  version = "7.19.14";

pkgs/servers/atlassian/crowd.nix

+1 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, home ? "/var/lib/crowd"

, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:



let

  optionalWarning = cond: msg:

    if cond then lib.warn msg

    else lib.id;

in



optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!"

lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!"

(stdenv.mkDerivation rec {

  pname = "atlassian-crowd";

  version = "5.0.1";