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

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

Browse Source 
treewide: use lib.warnIf instead of improvised alternatives
This commit is contained in:
Peder Bergebakken Sundt
2023-11-27 16:22:22 +01:00
committed by GitHub
parent c0acebea25 4bae1b3222
commit 1ded005f95
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/atlassian/confluence.nix
+1 -7
View File
@@ -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
View File
@@ -1,13 +1,7 @@
{ 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";