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

packaging: only override toml11 when necessary

Browse source 
v4.4.0 hit Nixpkgs in https://github.com/NixOS/nixpkgs/pull/442682.
Ideally we'd just use that, but this keeps the fallback behavior until
it's more widespread

(cherry picked from commit 0f016f9bf5)
This commit is contained in:
Seth Flynn 2025-10-09 03:11:56 -04:00 • committed by github-actions[bot]
parent 6b16af8c0e
commit da328e6004
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";