125 files changed, 1736 insertions, 2860 deletions

diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md
index 1a09491649d7..8bef293769e5 100644
--- a/doc/hooks/zig.section.md
+++ b/doc/hooks/zig.section.md
@@ -9,14 +9,14 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases.
 ```nix
 { lib
 , stdenv
-, zig_0_11
+, zig
 }:
 
 stdenv.mkDerivation {
   # . . .
 
   nativeBuildInputs = [
-    zig_0_11.hook
+    zig.hook
   ];
 
   zigBuildFlags = [ "-Dman-pages=true" ];
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 49c7a4a353ec..7d2a22bc25a4 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -632,6 +632,11 @@ in mkLicense lset) ({
     url = "https://old.calculate-linux.org/packages/licenses/iASL";
   };
 
+  icu = {
+    sp