summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2018-08-06 01:36:09 +0200
committerProfpatsch <mail@profpatsch.de>2018-09-06 18:14:27 +0200
commit3e45b61a9920466a8ea06b8ad9350d56ade435bc (patch)
tree1913cb4951336a37ed9921a538db5a50c7b62008 /pkgs/applications
parent320cdecd1697020cb367adc1f8408dbf689ca254 (diff)
downloadnixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar.gz
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar.bz2
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar.lz
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar.xz
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.tar.zst
nixlib-3e45b61a9920466a8ea06b8ad9350d56ade435bc.zip
lib/trivial: add a few examples of usage of assertMsg/assertOneOf
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/lilyterm/default.nix5
-rw-r--r--pkgs/applications/science/math/ripser/default.nix3
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 72cb1e85802a..948ae7b14a11 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , pkgconfig
 , autoconf, automake, intltool, gettext
 , gtk, vte
 
-# "stable" or "git"
 , flavour ? "stable"
 }:
 
-assert flavour == "stable" || flavour == "git";
+assert lib.assertOneOf "flavour" flavour [ "stable"  "git" ];
 
 let
   stuff =
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 21948a279d07..5e0b7fc300ba 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -8,7 +8,8 @@
 
 with stdenv.lib;
 
-assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
+assert assertOneOf "fileFormat" fileFormat
+  ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
 assert useGoogleHashmap -> sparsehash != null;
 
 let