maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/tools/turbofetch): Regenerate Cargo.nix and filter src

Browse source 
The Cargo.lock also got changed because of crate2nix using --freezed.

Change-Id: I48cabe514e0cf1dd1f00870bcb7958a2a49663d5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11969
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Ilan Joselevich 2024-07-09 17:00:56 +02:00 • committed by clbot
parent 716f5624fe
commit 52b8cf8d1f
3 changed files with 28 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/tools/turbofetch/Cargo.lock generated
View file

@ -230,9 +230,9 @@ dependencies = [
[[package]] [[package]]
name = "data-encoding" name = "data-encoding"
version = "2.4.0" version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
[[package]] [[package]]
name = "digest" name = "digest"

48
tvix/tools/turbofetch/Cargo.nix
View file

@ -1,4 +1,4 @@
# This file was @generated by crate2nix 0.13.0 with the command: # This file was @generated by crate2nix 0.14.1 with the command:
# "generate" "--all-features" # "generate" "--all-features"
# See https://github.com/kolloch/crate2nix for more info. # See https://github.com/kolloch/crate2nix for more info.
@ -13,6 +13,8 @@
, rootFeatures ? [ "default" ] , rootFeatures ? [ "default" ]
# If true, throw errors instead of issueing deprecation warnings. # If true, throw errors instead of issueing deprecation warnings.
, strictDeprecation ? false , strictDeprecation ? false
# Elements to add to the `-C target-feature=` argument passed to `rustc`
# (separated by `,`, prefixed with `+`).
# Used for conditional compilation based on CPU feature detection. # Used for conditional compilation based on CPU feature detection.
, targetFeatures ? [ ] , targetFeatures ? [ ]
# Whether to perform release builds: longer compile times, faster binaries. # Whether to perform release builds: longer compile times, faster binaries.
@ -658,7 +660,7 @@ rec {
{ {
name = "libc"; name = "libc";
packageId = "libc"; packageId = "libc";
target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-linux-android"); target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-linux-android");
} }
{ {
name = "libc"; name = "libc";
@ -725,9 +727,9 @@ rec {
}; };
"data-encoding" = rec { "data-encoding" = rec {
crateName = "data-encoding"; crateName = "data-encoding";
version = "2.4.0"; version = "2.6.0";
edition = "2018"; edition = "2018";
sha256 = "023k3dk8422jgbj7k72g63x51h1mhv91dhw1j4h205vzh6fnrrn2"; sha256 = "1qnn68n4vragxaxlkqcb1r28d3hhj43wch67lm4rpxlw89wnjmp8";
authors = [ authors = [
"Julien Cretin <git@ia0.eu>" "Julien Cretin <git@ia0.eu>"
]; ];
@ -4352,12 +4354,7 @@ rec {
requiredFeatures = [ ]; requiredFeatures = [ ];
} }
]; ];
# We can't filter paths with references in Nix 2.4 src = lib.cleanSourceWith { filter = sourceFilter; src = ./.; };
# See https://github.com/NixOS/nix/issues/5410
src =
if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion))
then lib.cleanSourceWith { filter = sourceFilter; src = ./.; }
else ./.;
dependencies = [ dependencies = [
{ {
name = "aws_lambda_events"; name = "aws_lambda_events";
@ -5198,12 +5195,12 @@ rec {
{ {
name = "winapi-i686-pc-windows-gnu"; name = "winapi-i686-pc-windows-gnu";
packageId = "winapi-i686-pc-windows-gnu"; packageId = "winapi-i686-pc-windows-gnu";
target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnu"); target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnu");
} }
{ {
name = "winapi-x86_64-pc-windows-gnu"; name = "winapi-x86_64-pc-windows-gnu";
packageId = "winapi-x86_64-pc-windows-gnu"; packageId = "winapi-x86_64-pc-windows-gnu";
target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnu"); target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnu");
} }
]; ];
features = { features = {
@ -5553,7 +5550,7 @@ rec {
{ {
name = "windows_aarch64_gnullvm"; name = "windows_aarch64_gnullvm";
packageId = "windows_aarch64_gnullvm"; packageId = "windows_aarch64_gnullvm";
target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm"); target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm");
} }
{ {
name = "windows_aarch64_msvc"; name = "windows_aarch64_msvc";
@ -5578,7 +5575,7 @@ rec {
{ {
name = "windows_x86_64_gnullvm"; name = "windows_x86_64_gnullvm";
packageId = "windows_x86_64_gnullvm"; packageId = "windows_x86_64_gnullvm";
target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm"); target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm");
} }
{ {
name = "windows_x86_64_msvc"; name = "windows_x86_64_msvc";
@ -5794,14 +5791,11 @@ rec {
fuchsia = true; fuchsia = true;
test = false; test = false;
/* We are choosing an arbitrary rust version to grab `lib` from, inherit (platform.rust.platform)
which is unfortunate, but `lib` has been version-agnostic the arch
whole time so this is good enough for now. os
*/ vendor;
os = pkgs.rust.lib.toTargetOs platform; family = platform.rust.platform.target-family;
arch = pkgs.rust.lib.toTargetArch platform;
family = pkgs.rust.lib.toTargetFamily platform;
vendor = pkgs.rust.lib.toTargetVendor platform;
env = "gnu"; env = "gnu";
endian = endian =
if platform.parsed.cpu.significantByte.name == "littleEndian" if platform.parsed.cpu.significantByte.name == "littleEndian"
@ -5878,6 +5872,7 @@ rec {
( (
_: { _: {
buildTests = true; buildTests = true;
release = false;
} }
); );
# If the user hasn't set any pre/post commands, we don't want to # If the user hasn't set any pre/post commands, we don't want to
@ -5907,8 +5902,9 @@ rec {
# because we compiled those test binaries in the former and not the latter. # because we compiled those test binaries in the former and not the latter.
# So all paths will expect source tree to be there and not in the build top directly. # So all paths will expect source tree to be there and not in the build top directly.
# For example: $NIX_BUILD_TOP := /build in general, if you ask yourself. # For example: $NIX_BUILD_TOP := /build in general, if you ask yourself.
# TODO(raitobezarius): I believe there could be more edge cases if `crate.sourceRoot` # NOTE: There could be edge cases if `crate.sourceRoot` does exist but
# do exist but it's very hard to reason about them, so let's wait until the first bug report. # it's very hard to reason about them.
# Open a bug if you run into this!
mkdir -p source/ mkdir -p source/
cd source/ cd source/
@ -6043,7 +6039,7 @@ rec {
let let
self = { self = {
crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs; crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs;
target = makeTarget pkgs.stdenv.hostPlatform; target = makeTarget stdenv.hostPlatform;
build = mkBuiltByPackageIdByPkgs pkgs.buildPackages; build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
}; };
in in
@ -6118,8 +6114,6 @@ rec {
buildRustCrateForPkgsFunc pkgs buildRustCrateForPkgsFunc pkgs
( (
crateConfig // { crateConfig // {
# https://github.com/NixOS/nixpkgs/issues/218712
dontStrip = stdenv.hostPlatform.isDarwin;
src = crateConfig.src or ( src = crateConfig.src or (
pkgs.fetchurl rec { pkgs.fetchurl rec {
name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz";

13
tvix/tools/turbofetch/default.nix
View file

@ -1,12 +1,9 @@
{ lib, pkgs, ... }: { pkgs, depot, ... }:
(pkgs.callPackage ./Cargo.nix { (pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = pkgs.defaultCrateOverrides // { defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
turbofetch = prev: {
ring = prev: { src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
links = ''ring_core_${lib.replaceStrings ["."] ["_"] prev.version}'';
}; };
}; };
}).rootCrate.build.override { }).rootCrate.build
runTests = true;
}