Merge pull request #139 from akirak/fix/nix-24-for-25

nix.el: Fix for Nix 2.5
NixOS · Oct 19, 2021 · 01e37b6 · 01e37b6
2 parents 8e20de5 + ed00d8d
commit 01e37b6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/nix.el b/nix.el
@@ -186,10 +186,11 @@ OPTIONS a list of options to accept."
 
 (defun nix-is-24 ()
   "Whether Nix is a version with Flakes support."
-  ;; earlier versions reported as 3, now it’s just nix-2.4
   (let ((version (nix-version)))
-    (or (string-prefix-p "nix (Nix) 3" version)
-        (string-prefix-p "nix (Nix) 2.4" version))))
+    (save-match-data
+      (when (string-match (rx bol "nix (Nix) " (group (+ digit) (?  "." (+ digit))))
+                          version)
+        (version<= "2.4" (match-string 1 version))))))
 
 (defun nix-has-flakes ()
   "Whether Nix is a version with Flakes support."