Merge master into staging-next

NixOS · Dec 10, 2024 · e358b03 · e358b03
2 parents 07105d9 + 7243daf
commit e358b03
Show file tree

Hide file tree

Showing 62 changed files with 1,169 additions and 3,492 deletions.
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
@@ -113,6 +113,8 @@ rec {
           "0"
         else if rebuildCount <= 10 then
           "1-10"
+        else if rebuildCount <= 100 then
+          "11-100"
         else if rebuildCount <= 500 then
           "101-500"
         else if rebuildCount <= 1000 then

diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lite-xl";
-  version = "2.1.6";
+  version = "2.1.7";
 
   src = fetchFromGitHub {
     owner = "lite-xl";
     repo = "lite-xl";
     rev = "v${version}";
-    hash = "sha256-J0WxyDxqhIfExamOCnI1+Y6ViVbHR0wOvsY17CixbiI=";
+    hash = "sha256-Ig0XDxnll/zruAwWHwuXiqumBXgAPxuK0E1ELupvcXo=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config ];