mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 09:43:14 +00:00
11e9fc6418
This release comprises really only a couple of commits: Fix build bugs found immediately following release: - cross fix: https://gerrit.lix.systems/c/lix/+/1781 - musl fix: https://gerrit.lix.systems/c/lix/+/1823 Check TLS certificates in builtins:fetchurl: https://gerrit.lix.systems/c/lix/+/1966 Yes, the latter is a bit delayed, sorry.
75 lines
1.8 KiB
Nix
75 lines
1.8 KiB
Nix
{
|
|
lib,
|
|
aws-sdk-cpp,
|
|
boehmgc,
|
|
callPackage,
|
|
fetchFromGitHub,
|
|
fetchpatch,
|
|
Security,
|
|
|
|
storeDir ? "/nix/store",
|
|
stateDir ? "/nix/var",
|
|
confDir ? "/etc",
|
|
}:
|
|
let
|
|
boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; };
|
|
|
|
boehmgc-nix = boehmgc-nix_2_3.overrideAttrs (drv: {
|
|
patches = (drv.patches or [ ]) ++ [
|
|
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
|
|
../nix/patches/boehmgc-coroutine-sp-fallback.patch
|
|
];
|
|
});
|
|
|
|
aws-sdk-cpp-nix =
|
|
(aws-sdk-cpp.override {
|
|
apis = [
|
|
"s3"
|
|
"transfer"
|
|
];
|
|
customMemoryManagement = false;
|
|
}).overrideAttrs
|
|
{
|
|
# only a stripped down version is build which takes a lot less resources to build
|
|
requiredSystemFeatures = [ ];
|
|
};
|
|
|
|
# Since Lix 2.91 does not use boost coroutines, it does not need boehmgc patches either.
|
|
needsBoehmgcPatches = version: lib.versionOlder version "2.91";
|
|
|
|
common =
|
|
args:
|
|
callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) {
|
|
inherit
|
|
Security
|
|
storeDir
|
|
stateDir
|
|
confDir
|
|
;
|
|
boehmgc = if needsBoehmgcPatches args.version then boehmgc-nix else boehmgc-nix_2_3;
|
|
aws-sdk-cpp = aws-sdk-cpp-nix;
|
|
};
|
|
in
|
|
lib.makeExtensible (self: {
|
|
buildLix = common;
|
|
|
|
lix_2_90 = (
|
|
common {
|
|
version = "2.90.0";
|
|
hash = "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=";
|
|
docCargoHash = "sha256-vSf9MyD2XzofZlbzsmh6NP69G+LiX72GX4Um9UJp3dc=";
|
|
}
|
|
);
|
|
|
|
lix_2_91 = (
|
|
common {
|
|
version = "2.91.1";
|
|
hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
|
|
docCargoHash = "sha256-F6Ld0HfRvW9r5zn8eMTP6djnV/jvwjYQet4Ghp2T90k=";
|
|
}
|
|
);
|
|
|
|
latest = self.lix_2_91;
|
|
stable = self.lix_2_91;
|
|
})
|