Merge remote-tracking branch 'origin/master' into staging-next

NixOS · Oct 27, 2024 · 280a9f8 · 280a9f8
2 parents 50ef4f6 + 3e32c07
commit 280a9f8
Show file tree

Hide file tree

Showing 99 changed files with 8,529 additions and 3,597 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
 # fix indentation in meteor default.nix
 a37a6de881ec4c6708e6b88fd16256bbc7f26bbd
 
+# pkgs/stdenv/make-derivation: Reindent
+b4cc2a2479a7ab0f6440b2e1319221920ef72699
+
 # treewide: automatically md-convert option descriptions
 2e751c0772b9d48ff6923569adfa661b030ab6a2
 

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -6265,6 +6265,12 @@
     github = "elliottslaughter";
     githubId = 3129;
   };
+  ElliottSullingeFarrall = {
+    name = "Elliott Sullinge-Farrall";
+    email = "[email protected]";
+    github = "ElliottSullingeFarrall";
+    githubId = 108588212;
+  };
   elliottvillars = {
     email = "[email protected]";
     github = "elliottvillars";
@@ -16361,6 +16367,11 @@
     githubId = 33182938;
     name = "Pankaj";
   };
+  PapayaJackal = {
+    github = "PapayaJackal";
+    githubId = 145766029;
+    name = "PapayaJackal";
+  };
   paperdigits = {
     email = "[email protected]";
     github = "paperdigits";
@@ -19740,6 +19751,12 @@
     github = "shikanime";
     githubId = 22115108;
   };
+  shiphan = {
+    email = "[email protected]";
+    name = "Shiphan";
+    github = "Shiphan";
+    githubId = 140245703;
+  };
   shiryel = {
     email = "[email protected]";
     name = "Shiryel";
@@ -23282,6 +23299,12 @@
     githubId = 28888242;
     name = "WORLDofPEACE";
   };
+  WoutSwinkels = {
+    name = "Wout Swinkels";
+    email = "[email protected]";
+    github = "WoutSwinkels";
+    githubId = 113464111;
+  };
   wozeparrot = {
     email = "[email protected]";
     github = "wozeparrot";

diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix
@@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec {
     license = licenses.mit;
     mainProgram = "tijolo";
     maintainers = with maintainers; [ sund3RRR ];
+    broken = true;
   };
 }