nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

Merge pull request #14202 from NixOS/backport-14199-to-2.32-maintenance

Browse source 
[Backport 2.32-maintenance] packaging: only override `toml11` when necessary
This commit is contained in:
internal-nix-ci[bot] 2025-10-09 18:04:05 +00:00 • committed by GitHub
commit 70655061e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packaging/dependencies.nix
View file

@ -57,7 +57,12 @@ scope: {
prevAttrs.postInstall; prevAttrs.postInstall;
}); });
toml11 = pkgs.toml11.overrideAttrs rec { # TODO: Remove this when https://github.com/NixOS/nixpkgs/pull/442682 is included in a stable release
toml11 =
if lib.versionAtLeast pkgs.toml11.version "4.4.0" then
pkgs.toml11
else
pkgs.toml11.overrideAttrs rec {
version = "4.4.0"; version = "4.4.0";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ToruNiina"; owner = "ToruNiina";