From 2bb70e84be8206a9b43ffb33f8c16ed8cc7e3b08 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 24 May 2024 17:03:34 +0000 Subject: [PATCH] update-flake.sh: support 2.18.2 2.18.2 is greater than 2.18 but does not support --flake. --- helper/update-flake.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helper/update-flake.sh b/helper/update-flake.sh index 9bbfd4abf..002fd0b89 100755 --- a/helper/update-flake.sh +++ b/helper/update-flake.sh @@ -39,13 +39,13 @@ if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then exit 1 fi -# Support Nix >2.18 +# Support Nix >=2.19 { - versionGreaterThan() { - [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) ]] + versionGreaterThanOrEqual() { + [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) || $1 == "$2" ]] } nixVersion=$(nix --version | cut -d\ -f 3) - if versionGreaterThan "$nixVersion" 2.18; then + if versionGreaterThanOrEqual "$nixVersion" 2.19; then # https://nixos.org/manual/nix/stable/release-notes/rl-2.19#:~:text=nix%20flake%20update nixUpdateArg=--flake else