Merge staging-next into staging

doc/build-helpers/fetchers.chapter.md

@@ -914,6 +914,21 @@ fetchFromRadicle {
 }
 ```
 
+## `fetchRadiclePatch` {#fetchradiclepatch}
+
+`fetchRadiclePatch` works very similarly to `fetchFromRadicle` with almost the same arguments
+expected. However, instead of a `rev` or `tag` argument, a `revision` argument is expected, which
+contains the full revision id of the Radicle patch to fetch.
+
+```nix
+fetchRadiclePatch {
+  seed = "rosa.radicle.xyz";
+  repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"; # radicle-explorer
+  revision = "d97d872386c70607beda2fb3fc2e60449e0f4ce4"; # patch: d77e064
+  hash = "sha256-ttnNqj0lhlSP6BGzEhhUOejKkkPruM9yMwA5p9Di4bk=";
+}
+```
+
 ## `requireFile` {#requirefile}
 
 `requireFile` allows requesting files that cannot be fetched automatically, but whose content is known.

doc/redirects.json

@@ -1675,6 +1675,9 @@
   "fetchfromradicle": [
     "index.html#fetchfromradicle"
   ],
+  "fetchradiclepatch": [
+    "index.html#fetchradiclepatch"
+  ],
   "requirefile": [
     "index.html#requirefile"
   ],

lib/systems/doubles.nix

@@ -45,6 +45,7 @@ let
     "mips64-linux"
     "mips64el-linux"
     "mipsel-linux"
+    "powerpc-linux"
     "powerpc64-linux"
     "powerpc64le-linux"
     "riscv32-linux"

lib/systems/examples.nix

@@ -36,6 +36,11 @@ rec {
     };
   };
 
+  ppc32 = {
+    config = "powerpc-unknown-linux-gnu";
+    rust.rustcTarget = "powerpc-unknown-linux-gnu";
+  };
+
   sheevaplug = {
     config = "armv5tel-unknown-linux-gnueabi";
   }

lib/tests/systems.nix

@@ -94,6 +94,7 @@ lib.runTests (
     ];
     testmmix = mseteq mmix [ "mmix-mmixware" ];
     testpower = mseteq power [
+      "powerpc-linux"
       "powerpc-netbsd"
       "powerpc-none"
       "powerpc64-linux"
@@ -174,6 +175,7 @@ lib.runTests (
       "mips64-linux"
       "mips64el-linux"
       "mipsel-linux"
+      "powerpc-linux"
       "powerpc64-linux"
       "powerpc64le-linux"
       "riscv32-linux"

pkgs/applications/virtualization/qemu/default.nix

@@ -146,11 +146,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString nixosTestRunner "-for-vm-tests"
     + lib.optionalString toolsOnly "-utils"
     + lib.optionalString userOnly "-user";
-  version = "10.0.3";
+  version = "10.1.0";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-XIkSZ7FTSndEZduLGg38sMXm1+y29xNFYlrfTgiJlFs=";
+    hash = "sha256-4FFzSbUMpz6+wvqFsGBQ1cRjymXHOIM72PwfFfGAvlE=";
   };
 
   depsBuildBuild = [
@@ -300,6 +300,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '$source_path/VERSION' '$source_path/QEMU_VERSION'
     substituteInPlace meson.build \
       --replace-fail "'VERSION'" "'QEMU_VERSION'"
+    substituteInPlace docs/conf.py \
+      --replace-fail "'../VERSION'" "'../QEMU_VERSION'"
     substituteInPlace python/qemu/machine/machine.py \
       --replace-fail /var/tmp "$TMPDIR"
   '';

pkgs/build-support/fetchradiclepatch/default.nix

@@ -0,0 +1,43 @@
+{
+  fetchFromRadicle,
+  jq,
+  lib,
+}:
+
+lib.makeOverridable (
+  {
+    revision,
+    postFetch ? "",
+    nativeBuildInputs ? [ ],
+    ...
+  }@args:
+
+  assert lib.assertMsg (
+    !args ? rev && !args ? tag
+  ) "fetchRadiclePatch does not accept `rev` or `tag` arguments.";
+
+  fetchFromRadicle (
+    {
+      nativeBuildInputs = [ jq ] ++ nativeBuildInputs;
+      rev = revision;
+      leaveDotGit = true;
+      postFetch = ''
+        { read -r head; read -r base; } < <(jq -r '.oid, .base' $out/0)
+        git -C $out fetch --depth=1 "$url" "$base" "$head"
+        git -C $out diff "$base" "$head" > patch
+        rm -r $out
+        mv patch $out
+        ${postFetch}
+      '';
+    }
+    // removeAttrs args [
+      "revision"
+      "postFetch"
+      "nativeBuildInputs"
+      "leaveDotGit"
+    ]
+  )
+  // {
+    inherit revision;
+  }
+)

pkgs/by-name/aw/awsbck/package.nix

@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "awsbck";
-  version = "0.3.15";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "awsbck";
     rev = "v${version}";
-    hash = "sha256-Sa+CCRfhZyMmbbPggeJ+tXYdrhmDwfiirgLdTEma05M=";
+    hash = "sha256-IFdhfBri1k5u7NfC1HTSegKCtRDK2fz+WkjwHOtp1qk=";
   };
 
-  cargoHash = "sha256-kCVMsA2tu8hxoe/JGd+a4Jcok3rM/yb/UWE4xhuPLoo=";
+  cargoHash = "sha256-9RKsnGjbP0iQsC2iCq6LTleILHvX0powQu15oopE2XY=";
 
   # tests run in CI on the source repo
   doCheck = false;

pkgs/by-name/be/besley/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "besley";
+  version = "4.0-unstable-2023-01-09";
+
+  src = fetchFromGitHub {
+    owner = "indestructible-type";
+    repo = "Besley";
+    rev = "99d5b97fcb863c4a667571ac8f86f745c345d3ab";
+    hash = "sha256-N6QU3Pd6EnIrdbRtDT3mW5ny683DBWo0odADJBSdA2E=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    cp fonts/*/*.otf $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://indestructibletype.com/Besley.html";
+    description = "Besley an antique slab serif font by indestructible type*";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gavink97 ];
+  };
+}

pkgs/by-name/bo/bodoni-moda/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "bodoni-moda";
+  version = "2.4-unstable-2024-02-18";
+
+  src = fetchFromGitHub {
+    owner = "indestructible-type";
+    repo = "Bodoni";
+    rev = "30ce6cdc354ef179a3b72ba0f0e71826e599348c";
+    hash = "sha256-OQi+KKBM+BrmA2pDit6dib5krrQBba5dVCBd2/G5sIM=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    cp fonts/*/*.ttf $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://indestructibletype.com/Bodoni.html";
+    description = "Bodoni Moda a modern no-compromises Bodoni family by indestructible type*";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gavink97 ];
+  };
+}

pkgs/by-name/co/cooper/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "cooper";
+  version = "1.01-unstable-2025-05-25";
+
+  src = fetchFromGitHub {
+    owner = "indestructible-type";
+    repo = "Cooper";
+    rev = "062a60572254535634569ab23b993a5745bab4ac";
+    hash = "sha256-4WaRFvAn32IfeCCDszOsmDxFuKnnADOXj/vj8SZB2mU=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    cp fonts/*/*.otf $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://indestructibletype.com/Cooper/index.html";
+    description = "Cooper* a revival of the Cooper font family by indestructible type*";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gavink97 ];
+  };
+}

pkgs/by-name/dr/drafting-mono/package.nix

@@ -0,0 +1,33 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "drafting-mono";
+  version = "1.1-unstable-2024-06-04";
+
+  src = fetchFromGitHub {
+    owner = "indestructible-type";
+    repo = "Drafting";
+    rev = "c387df13576c3b541352725b021f9f99302e52d6";
+    hash = "sha256-J64mmDOzTV4MRuZO3MB2SSX5agCRjLDjXAPXuDfdlOM=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    cp fonts/*/*.otf $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://indestructibletype.com/Drafting/";
+    description = "Drafting* Mono a mixed serif typewriter inspired font by indestructible type*";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ gavink97 ];
+  };
+}

pkgs/by-name/la/lasuite-meet-frontend/package.nix

@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.34";
+  version = "0.1.35";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";
+    hash = "sha256-gjvfsxuqVU7KyQxo7l+l0mC1F4fbe7gK+K4T5wAthY8=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-svCLdlX5GnVCoYlf6uzYBr5wIp3buURj6Op60VtGFjg=";
+    hash = "sha256-1qkR76VsgL3giz+9TIW+D3soEsZegaFMVJ/EJu09b8c=";
   };
 
   buildPhase = ''

pkgs/by-name/la/lasuite-meet/package.nix

@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.34";
+  version = "0.1.35";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-5RY/k9yuiV+JwLBoZpw9zNCTWXCEAnB1FU6njWpvdXk=";
+    hash = "sha256-gjvfsxuqVU7KyQxo7l+l0mC1F4fbe7gK+K4T5wAthY8=";
   };
 
   sourceRoot = "source/src/backend";

pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix

@@ -16,7 +16,7 @@ let
   # glibc.  At this early pre-glibc stage these files sometimes
   # have different names.
   crtstuff-ofiles =
-    if stdenv.targetPlatform.isPower then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o";
+    if stdenv.targetPlatform.isPower64 then "ecrti.o ecrtn.o ncrti.o ncrtn.o" else "crti.o crtn.o";
 
   # Normally, `SHLIB_LC` is set to `-lc`, which means that
   # `libgcc_s.so` cannot be built until `libc.so` is available.
@@ -28,7 +28,7 @@ let
   # gcc-built `{e,n}crt{n,i}.o` instead of failing to find the
   # versions which have been repackaged in libc as `crt{n,i}.o`
   #
-  SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower "-mnewlib";
+  SHLIB_LC = lib.optionalString stdenv.targetPlatform.isPower64 "-mnewlib";
 
 in
 ''
@@ -47,11 +47,14 @@ in
 # https://www.openwall.com/lists/musl/2022/11/09/3
 #
 # 'parsed.cpu.family' won't be correct for every platform.
-+
-  lib.optionalString
-    (
-      stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha
-    )
-    ''
-      touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S
-    ''
++ (lib.optionalString
+  (
+    stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha
+  )
+  ''
+    touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S
+  ''
+)
++ lib.optionalString (stdenv.targetPlatform.isPower && !stdenv.targetPlatform.isPower64) ''
+  touch libgcc/config/rs6000/crt{i,n}.S
+''

pkgs/development/compilers/rust/binary.nix

@@ -89,6 +89,7 @@ rec {
         "armv7l-linux"
         "i686-linux"
         "loongarch64-linux"
+        "powerpc-linux"
         "powerpc64-linux"
         "powerpc64le-linux"
         "riscv64-linux"

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,42 +1,42 @@
 {
     "testing": {
-        "version": "6.17-rc4",
-        "hash": "sha256:1vjwy9n3rpxjymyzyz7fbj20z0wf27229aml3qazcmy5kk115v66",
+        "version": "6.17-rc5",
+        "hash": "sha256:14dvh8vbc3digvx96mhqnd4ijbxkhn1ph1nqkxlri3sff5z51k9x",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.150",
-        "hash": "sha256:1vr4g32y74jl43hlp2jh708mp2qg4zwqh1bwa3xl9dg2136gy6q0",
+        "version": "6.1.151",
+        "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.191",
-        "hash": "sha256:0kljdv2fmg7qa5lqgdzx30rbnabw963w4k10jzsbdvd36jnb6bbs",
+        "version": "5.15.192",
+        "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb",
         "lts": true
     },
     "5.10": {
-        "version": "5.10.242",
-        "hash": "sha256:1kd9dgggk4p0kwd3il0xdsxa1qffcs6znk2k76d6rqkl640fffmw",
+        "version": "5.10.243",
+        "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m",
         "lts": true
     },
     "5.4": {
-        "version": "5.4.298",
-        "hash": "sha256:1rp40i2y5w8mw3126q24yfziqa30qfaddw40cig1xp5s3bnkn5h1",
+        "version": "5.4.299",
+        "hash": "sha256:0bdzy3bpywm24nx73ah9smwmmlmyhvlf5xcp2kk1z54dxfp9bpl8",
         "lts": true
     },
     "6.6": {
-        "version": "6.6.104",
-        "hash": "sha256:0sp32nlvglmf1fgapkks6x1xkcmc75i13lfzvjnvmyhscsfjyxra",
+        "version": "6.6.105",
+        "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.45",
-        "hash": "sha256:0gnvz69anxxpf3ns424mcb6xy10zjxdgb8c126fbipzvkiaai5cg",
+        "version": "6.12.46",
+        "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif",
         "lts": true
     },
     "6.16": {
-        "version": "6.16.5",
-        "hash": "sha256:1wqk48jzmw5cbijsx5gya8mb0hwzf3pjns85xphisambgspgpgvn",
+        "version": "6.16.6",
+        "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8",
         "lts": false
     }
 }

pkgs/top-level/all-packages.nix

@@ -692,6 +692,7 @@ with pkgs;
   fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { };
 
   fetchFromRadicle = callPackage ../build-support/fetchradicle { };
+  fetchRadiclePatch = callPackage ../build-support/fetchradiclepatch { };
 
   fetchgx = callPackage ../build-support/fetchgx { };