mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 03:56:01 +01:00
Merge pull request #14199 from getchoo-contrib/getchoo/toml11-fix
packaging: only override `toml11` when necessary
This commit is contained in:
commit
dfafd8bc38
1 changed files with 14 additions and 9 deletions
|
|
@ -57,15 +57,20 @@ 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
|
||||||
version = "4.4.0";
|
toml11 =
|
||||||
src = pkgs.fetchFromGitHub {
|
if lib.versionAtLeast pkgs.toml11.version "4.4.0" then
|
||||||
owner = "ToruNiina";
|
pkgs.toml11
|
||||||
repo = "toml11";
|
else
|
||||||
tag = "v${version}";
|
pkgs.toml11.overrideAttrs rec {
|
||||||
hash = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ=";
|
version = "4.4.0";
|
||||||
};
|
src = pkgs.fetchFromGitHub {
|
||||||
};
|
owner = "ToruNiina";
|
||||||
|
repo = "toml11";
|
||||||
|
tag = "v${version}";
|
||||||
|
hash = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ=";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
|
# TODO Hack until https://github.com/NixOS/nixpkgs/issues/45462 is fixed.
|
||||||
boost =
|
boost =
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue