From 3358263b3da9c118047d19ff23d39410319300f7 Mon Sep 17 00:00:00 2001 From: Gavin Kondrath <78187175+gavink97@users.noreply.github.com> Date: Fri, 29 Aug 2025 08:29:00 +0700 Subject: [PATCH 01/19] cooper: init at 1.01-unstable-2025-05-25 --- pkgs/by-name/co/cooper/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/co/cooper/package.nix diff --git a/pkgs/by-name/co/cooper/package.nix b/pkgs/by-name/co/cooper/package.nix new file mode 100644 index 000000000000..f608413168f7 --- /dev/null +++ b/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 ]; + }; +} From 978649eac28cea845668c7fc06ee9d30a16fd012 Mon Sep 17 00:00:00 2001 From: Gavin Kondrath <78187175+gavink97@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:43:45 +0700 Subject: [PATCH 02/19] drafting-mono: init at 1.1-unstable-2024-06-04 --- pkgs/by-name/dr/drafting-mono/package.nix | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/dr/drafting-mono/package.nix diff --git a/pkgs/by-name/dr/drafting-mono/package.nix b/pkgs/by-name/dr/drafting-mono/package.nix new file mode 100644 index 000000000000..a08f50c5eb13 --- /dev/null +++ b/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 ]; + }; +} From 428098cb78ca643f477008105b2758d0a5c1c4b7 Mon Sep 17 00:00:00 2001 From: Gavin Kondrath <78187175+gavink97@users.noreply.github.com> Date: Fri, 29 Aug 2025 09:17:00 +0700 Subject: [PATCH 03/19] besley: init at 4.0-unstable-2023-01-09 --- pkgs/by-name/be/besley/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/be/besley/package.nix diff --git a/pkgs/by-name/be/besley/package.nix b/pkgs/by-name/be/besley/package.nix new file mode 100644 index 000000000000..c39300459713 --- /dev/null +++ b/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 ]; + }; +} From 76b3a4643608994507e97d8af9984590a9ace19a Mon Sep 17 00:00:00 2001 From: Gavin Kondrath <78187175+gavink97@users.noreply.github.com> Date: Fri, 29 Aug 2025 07:44:21 +0700 Subject: [PATCH 04/19] bodoni-moda: init at 2.4-unstable-2024-02-18 --- pkgs/by-name/bo/bodoni-moda/package.nix | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/bo/bodoni-moda/package.nix diff --git a/pkgs/by-name/bo/bodoni-moda/package.nix b/pkgs/by-name/bo/bodoni-moda/package.nix new file mode 100644 index 000000000000..cd70f1f870b8 --- /dev/null +++ b/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 ]; + }; +} From c2ec9234e8f7017ee4831ad010e9fd70118fa905 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 30 Aug 2025 15:05:40 +0200 Subject: [PATCH 05/19] fetchRadiclePatch: init --- doc/build-helpers/fetchers.chapter.md | 15 +++++++ doc/redirects.json | 3 ++ .../fetchradiclepatch/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 62 insertions(+) create mode 100644 pkgs/build-support/fetchradiclepatch/default.nix diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 08b978e720dc..866bde570f8a 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/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. diff --git a/doc/redirects.json b/doc/redirects.json index 7b0841c639b7..a5da63d7d2c2 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -1669,6 +1669,9 @@ "fetchfromradicle": [ "index.html#fetchfromradicle" ], + "fetchradiclepatch": [ + "index.html#fetchradiclepatch" + ], "requirefile": [ "index.html#requirefile" ], diff --git a/pkgs/build-support/fetchradiclepatch/default.nix b/pkgs/build-support/fetchradiclepatch/default.nix new file mode 100644 index 000000000000..22f9ea6c4817 --- /dev/null +++ b/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; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b61cf0936cf0..e1c6c4433aae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -702,6 +702,7 @@ with pkgs; fetchFromRepoOrCz = callPackage ../build-support/fetchrepoorcz { }; fetchFromRadicle = callPackage ../build-support/fetchradicle { }; + fetchRadiclePatch = callPackage ../build-support/fetchradiclepatch { }; fetchgx = callPackage ../build-support/fetchgx { }; From 09669ef9d243437185db488851779592573b6717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Sep 2025 20:49:53 +0000 Subject: [PATCH 06/19] awsbck: 0.3.15 -> 1.0.0 --- pkgs/by-name/aw/awsbck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix index e7be8c3657b8..1c253b989b34 100644 --- a/pkgs/by-name/aw/awsbck/package.nix +++ b/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; From 222caccafe5f07827af33fbefc527b2ca1818456 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:31 +0000 Subject: [PATCH 07/19] linux_testing: 6.17-rc4 -> 6.17-rc5 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 18e7919d89cf..3fd90c288679 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.17-rc4", - "hash": "sha256:1vjwy9n3rpxjymyzyz7fbj20z0wf27229aml3qazcmy5kk115v66", + "version": "6.17-rc5", + "hash": "sha256:14dvh8vbc3digvx96mhqnd4ijbxkhn1ph1nqkxlri3sff5z51k9x", "lts": false }, "6.1": { From 6a0b5259d2c8749e402394604318cf030f0d7583 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:33 +0000 Subject: [PATCH 08/19] linux_6_16: 6.16.5 -> 6.16.6 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3fd90c288679..7e60f9e10c6b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -35,8 +35,8 @@ "lts": true }, "6.16": { - "version": "6.16.5", - "hash": "sha256:1wqk48jzmw5cbijsx5gya8mb0hwzf3pjns85xphisambgspgpgvn", + "version": "6.16.6", + "hash": "sha256:00ihif1hqz1xi3bdzw25j9fjjvirnqpms0qf39hgnri15qg7pda8", "lts": false } } From 7f7d17a771743253c4a7dcdadabc484bee8c8ef1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:35 +0000 Subject: [PATCH 09/19] linux_6_12: 6.12.45 -> 6.12.46 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7e60f9e10c6b..18b8bdd3157e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.12": { - "version": "6.12.45", - "hash": "sha256:0gnvz69anxxpf3ns424mcb6xy10zjxdgb8c126fbipzvkiaai5cg", + "version": "6.12.46", + "hash": "sha256:0gjp2jqw9ip8j5i97bg2xvdy6r5sqzvia16qqlisrji4sf176pif", "lts": true }, "6.16": { From fee9232449a108d731ec9bc4e0f9e7c72ce8cf49 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:37 +0000 Subject: [PATCH 10/19] linux_6_6: 6.6.104 -> 6.6.105 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 18b8bdd3157e..f8651a444692 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.6": { - "version": "6.6.104", - "hash": "sha256:0sp32nlvglmf1fgapkks6x1xkcmc75i13lfzvjnvmyhscsfjyxra", + "version": "6.6.105", + "hash": "sha256:078skrcidk6ql0p33q1m6h1lc0miv2hwn5368c5rhwhq9xk6x49z", "lts": true }, "6.12": { From f20203081d2dc219d29a0fe2e4fe94bad0be9737 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:40 +0000 Subject: [PATCH 11/19] linux_6_1: 6.1.150 -> 6.1.151 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f8651a444692..7d2706d2bfcc 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.150", - "hash": "sha256:1vr4g32y74jl43hlp2jh708mp2qg4zwqh1bwa3xl9dg2136gy6q0", + "version": "6.1.151", + "hash": "sha256:0yzbib44hxx4s9py0psa6f7xvav9m52k066knfbglnm94dvv45hq", "lts": true }, "5.15": { From df8874236095a9a8784a025b06d33960bf7e4608 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:43 +0000 Subject: [PATCH 12/19] linux_5_15: 5.15.191 -> 5.15.192 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 7d2706d2bfcc..f88ec8b2fc4c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -10,8 +10,8 @@ "lts": true }, "5.15": { - "version": "5.15.191", - "hash": "sha256:0kljdv2fmg7qa5lqgdzx30rbnabw963w4k10jzsbdvd36jnb6bbs", + "version": "5.15.192", + "hash": "sha256:1gjnpvzlhdip40b00vz4qrg9fhvlxfanb2xlbybjg7l8r8z8g1pb", "lts": true }, "5.10": { From 7170de339b349d61dd20d5a47cc1bb520475008e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:45 +0000 Subject: [PATCH 13/19] linux_5_10: 5.10.242 -> 5.10.243 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f88ec8b2fc4c..10369fd05a84 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -15,8 +15,8 @@ "lts": true }, "5.10": { - "version": "5.10.242", - "hash": "sha256:1kd9dgggk4p0kwd3il0xdsxa1qffcs6znk2k76d6rqkl640fffmw", + "version": "5.10.243", + "hash": "sha256:0f3yv3liyhy01si76asvxrp1kjhv9ldiw7wqp9k2hfbw8ks1xl0m", "lts": true }, "5.4": { From 718d792beeaad81fbeb93c9a6bca04f313c2ae43 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Sep 2025 22:03:48 +0000 Subject: [PATCH 14/19] linux_5_4: 5.4.298 -> 5.4.299 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 10369fd05a84..7a56afa1c9a1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "5.4": { - "version": "5.4.298", - "hash": "sha256:1rp40i2y5w8mw3126q24yfziqa30qfaddw40cig1xp5s3bnkn5h1", + "version": "5.4.299", + "hash": "sha256:0bdzy3bpywm24nx73ah9smwmmlmyhvlf5xcp2kk1z54dxfp9bpl8", "lts": true }, "6.6": { From e64a95d943652629730e0d8d398e4b2cc68cdb2a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 25 Jul 2025 10:29:06 +0200 Subject: [PATCH 15/19] qemu: 10.0.3 -> 10.1.0 --- pkgs/applications/virtualization/qemu/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4e313ed8784c..7c78704ef8c6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/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" ''; From 69cde4d543f12ac55c47987b67412ddd10ac5bb3 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 25 Aug 2025 21:36:43 +0200 Subject: [PATCH 16/19] gcc: fix powerpc-linux cross compilers --- .../gcc/common/libgcc-buildstuff.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix b/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix index 5c72e0dbdf05..1c969946ca1e 100644 --- a/pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix +++ b/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 +'' From b6d48619ed872c60d3008665c2a5b94e0a6b2b7a Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Mon, 25 Aug 2025 14:08:32 +0200 Subject: [PATCH 17/19] lib.systems: add ppc32 target --- lib/systems/doubles.nix | 1 + lib/systems/examples.nix | 5 +++++ lib/tests/systems.nix | 2 ++ 3 files changed, 8 insertions(+) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 90f67b3916fb..4c80300b01c4 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -45,6 +45,7 @@ let "mips64-linux" "mips64el-linux" "mipsel-linux" + "powerpc-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9686ee8e59ab..9a53dac073ae 100644 --- a/lib/systems/examples.nix +++ b/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"; } diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 236ee20727e6..3bddf78dea19 100644 --- a/lib/tests/systems.nix +++ b/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" From 5f746cb259a8608c0acb2f146cca4584f3dfade1 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Tue, 26 Aug 2025 16:06:24 +0200 Subject: [PATCH 18/19] rust: add powerpc-linux as a target platform --- pkgs/development/compilers/rust/binary.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index eb2af2b5a23e..41cf9c08c653 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/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" From 5449eb3a6997f48bd109d1add071e90e1dbc3774 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 10 Sep 2025 09:21:13 +0300 Subject: [PATCH 19/19] lasuite-meet{,-frontend}: 0.1.34 -> 0.1.35 --- pkgs/by-name/la/lasuite-meet-frontend/package.nix | 6 +++--- pkgs/by-name/la/lasuite-meet/package.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix index 2dded51dac91..c571faf34681 100644 --- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix +++ b/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 = '' diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index 2f97003da37e..dec773ea68d1 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/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";