Upgrading dependencies, including zstd-seekable

pmeunier

Sep 15, 2021, 11:12 AM

AKARNWLHKVH4477BX2KZ6VY4YPTMXQFVPUSFCWHG4LZ4OCW2F5CQC

Dependencies

[2] B6SRJRLW Update Cargo.nix
[3] OC3QJUVK Update to rust 1.54. Needed by clap.
[4] 3QGE6HRD Version bump (upgrade to zstd-seekable 0.2, take 2)
[5] 6F6AAHK4 Simplifying pijul::commands::log, and fixing Broken Pipe errors
[6] ZTVNGFNT Version bump
[7] AOK35FEX New Cargo.nix versions
[8] 2CNY6KTC Updating Cargo.nix
[9] J6UIWIYY Version bump
[10] B5Z4IMEU Generating Cargo.nix for pijul 1.0.0-alpha.6
[11] Y7KH4QOP Updating Cargo.nix
[12] TNN56XYK libpijul alpha.43
[13] HKEOO4QJ Version bump
[14] I24UEJQL Various post-fire fixes
[15] FYUDBQ3C Formatting changes + version bump
[16] H62VFFJE Cargo.nix, and solving conflicts
[17] KUMJITTF Version bump in the lockfiles
[18] HDGRZISM Version updates
[19] UN64Q3P2 Version bump
[20] G734WNM6 flake.nix: use crate2nix
[21] 6DOXSHWG Cleanup, and version bump
[22] 6XDVUSBM Version bump
[23] VYHHOEYH Versions and formatting
[24] QJXNUQFJ Solving conflicts
[25] JRENVH5D Reqwest 0.11
[26] HR3WK6A7 When lock times out, check that there are no more clients before quitting
[27] FXT5FS5W Updating Cargo.nix
[28] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
[29] 3VJB4ULD Updating Cargo.nix
[30] 7ZFRYVVQ Cargo.nix and formatting
[31] B3QWIGDE Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)
[32] Q7CAYX5N Fixing Windows compilation
[33] GBSL4AZI Version bump
[34] I52XSRUH Massive cleanup, and simplification
[35] SAGSYAPX Various version bumps
[*] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[*] BNPSVXIC Friendlier progress bars

Change contents

replacement in "libpijul/Cargo.toml" at line 119

[6.109303]→[4.345:400](∅→∅)

zstd-seekable = { version = "0.2.0", optional = true }

[6.109303]

[6.199]

zstd-seekable = { version = "0.2.1", optional = true }
replacement in "Cargo.nix" at line 2

[6.14]→[3.109:173](∅→∅)

# This file was @generated by crate2nix 0.9.0 with the command:

[6.14]

[6.78]

# This file was @generated by crate2nix 0.10.0 with the command:
replacement in "Cargo.nix" at line 11

[6.525]→[3.174:282](∅→∅)

then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)

[6.525]

[6.633]

then lib.warn "crate2nix: Passing `buildRustCrate` as argument to Cargo.nix is deprecated. If you don't customize `buildRustCrate`, replace `callPackage ./Cargo.nix {}` by `import ./Cargo.nix { inherit pkgs; }`, and if you need to customize `buildRustCrate`, use `buildRustCrateForPkgs` instead." (_: buildRustCrate)
replacement in "Cargo.nix" at line 3017

[6.84748]→[2.0:36](∅→∅)

version = "1.0.0-alpha.47";

[6.84748]

[6.84783]

version = "1.0.0-alpha.48";
edit in "Cargo.nix" at line 4397

[38.12181]

[38.12181]

}
{
name = "thiserror";
packageId = "thiserror";
edit in "Cargo.nix" at line 6027

[6.12562]→[6.161017:161040](∅→∅),[6.161017]→[6.161017:161040](∅→∅),[6.161040]→[6.6448:6449](∅→∅),[6.6449]→[6.161049:161515](∅→∅),[6.161049]→[6.161049:161515](∅→∅)

}
];

};
"threadpool" = rec {
crateName = "threadpool";
version = "1.8.1";
edition = "2015";
sha256 = "1amgfyzvynbm8pacniivzq9r0fh3chhs7kijic81j76l6c5ycl6h";
authors = [
"The Rust Project Developers"
"Corey Farwell <coreyf@rwell.org>"
"Stefan Schindler <dns2utf8@estada.ch>"
];
dependencies = [
{
name = "num_cpus";
packageId = "num_cpus";
edit in "Cargo.nix" at line 7800

[6.225748]

[6.225748]

"xxhash-rust" = rec {
crateName = "xxhash-rust";
version = "0.8.2";
edition = "2018";
sha256 = "1v9dk6shls1rsmidf2dxdi3460bn7ingqgvn5mf7prgnxmdy2xg5";
authors = [
"Douman <douman@gmx.se>"
];
features = {
};
resolvedDefaultFeatures = [ "xxh64" ];
};
replacement in "Cargo.nix" at line 7889

[6.226917]→[6.6993:7020](∅→∅)

version = "0.1.7";

[6.226917]

[6.226944]

version = "0.2.1";
replacement in "Cargo.nix" at line 7891

[6.226970]→[6.7021:7094](∅→∅)

sha256 = "0bxzd71myj094hp03jpqbv1r80x0hk1ahsjwfv50j0wgx379jfry";

[6.226970]

[6.227043]

sha256 = "16ag26g74k296ppi0flz47qvrfi938km95jvr0brphpcwc2wqqdc";
edit in "Cargo.nix" at line 7894

[6.227114]

[6.227114]

"Darley Barreto <darleybarreto@gmail.com>"
replacement in "Cargo.nix" at line 7906

[6.227425]→[6.227425:227496](∅→∅)

name = "threadpool";
packageId = "threadpool";

[6.227425]

[6.227496]

name = "xxhash-rust";
packageId = "xxhash-rust";
features = [ "xxh64" ];
edit in "Cargo.nix" at line 7913

[6.227650]→[6.227650:227717](∅→∅),[6.227717]→[6.12267:12279](∅→∅)

name = "cc";
packageId = "cc";
}
{
replacement in "Cargo.nix" at line 7926

[6.227946]→[3.10707:10772](∅→∅)

This corresponds roughly to what buildRustCrate is setting.

[6.227946]

[6.228011]

This corresponds roughly to what buildRustCrate is setting.
replacement in "Cargo.nix" at line 7998

[6.230173]→[3.10773:10817](∅→∅)

of crate given as the second argument.

[6.230173]

[6.230217]

of crate given as the second argument.
replacement in "Cargo.nix" at line 8000

[6.230218]→[3.10818:10965](∅→∅)

testCrateFlags: list of flags to pass to the test exectuable
testInputs: list of packages that should be available during test execution

[6.230218]

[6.230365]

testCrateFlags: list of flags to pass to the test exectuable
testInputs: list of packages that should be available during test execution
replacement in "Cargo.nix" at line 8003

[6.230370]→[3.10966:11034](∅→∅)

crateWithTest = { crate, testCrate, testCrateFlags, testInputs }:

[6.230370]

[6.230438]

crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
edit in "Cargo.nix" at line 8006

[6.230540]

[6.230540]

assert builtins.typeOf testPreRun == "string";
assert builtins.typeOf testPostRun == "string";
edit in "Cargo.nix" at line 8021

[6.8393]

[6.8393]

# If the user hasn't set any pre/post commands, we don't want to
# insert empty lines. This means that any existing users of crate2nix
# don't get a spurious rebuild unless they set these explicitly.
testCommand = pkgs.lib.concatStringsSep "\n"
(pkgs.lib.filter (s: s != "") [
testPreRun
"$f $testCrateFlags 2>&1 | tee -a $out"
testPostRun
]);
replacement in "Cargo.nix" at line 8063

[6.9364]→[3.11035:11085](∅→∅)

$f $testCrateFlags 2>&1 | tee -a $out

[6.9364]

[6.231266]

${testCommand}
edit in "Cargo.nix" at line 8087

[6.9836]

[6.232003]

# Any command to run immediatelly before a test is executed.
, testPreRun ? ""
# Any command run immediatelly after a test is executed.
, testPostRun ? ""
edit in "Cargo.nix" at line 8099

[6.9978]

[6.9978]

, testPreRun
, testPostRun
replacement in "Cargo.nix" at line 8133

[6.232751]→[3.11086:11139](∅→∅)

inherit testCrateFlags testInputs;

[6.232751]

[6.232804]

inherit testCrateFlags testInputs testPreRun testPostRun;
replacement in "Cargo.nix" at line 8139

[6.11172]→[3.11140:11219](∅→∅)

{ inherit features crateOverrides runTests testCrateFlags testInputs; };

[6.11172]

[6.232936]

{ inherit features crateOverrides runTests testCrateFlags testInputs testPreRun testPostRun; };
replacement in "Cargo.nix" at line 8142

[6.11342]→[3.11220:11254](∅→∅)

for the corresponding crate.

[6.11342]

[6.233056]

for the corresponding crate.
replacement in "Cargo.nix" at line 8280

[6.236813]→[3.11255:11283](∅→∅)

be serialized as JSON.

[6.236813]

[6.236842]

be serialized as JSON.
replacement in "Cargo.nix" at line 8325

[6.238245]→[3.11284:11299](∅→∅)

features.

[6.238245]

[6.15218]

features.
replacement in "Cargo.nix" at line 8327

[6.15219]→[3.11300:11371](∅→∅)

This is useful for verifying the feature resolution in crate2nix.

[6.15219]

[6.238335]

This is useful for verifying the feature resolution in crate2nix.
replacement in "Cargo.nix" at line 8364

[6.239598]→[3.11372:11517](∅→∅)

If multiple paths to a dependency enable different features, the
corresponding feature sets are merged. Features in rust are additive.

[6.239598]

[6.239743]

If multiple paths to a dependency enable different features, the
corresponding feature sets are merged. Features in rust are additive.
edit in "Cargo.nix" at line 8390

[6.15609]

[6.240646]

enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
replacement in "Cargo.nix" at line 8394

[6.240752]→[3.11518:11589](∅→∅)

features = dependencyFeatures expandedFeatures dependency;

[6.240752]

[6.240823]

features = dependencyFeatures enabledFeatures dependency;
replacement in "Cargo.nix" at line 8403

[6.241150]→[3.11590:11633](∅→∅)

features = expandedFeatures;

[6.241150]

[6.241193]

features = enabledFeatures;
replacement in "Cargo.nix" at line 8427

[6.16373]→[3.11634:11715](∅→∅)

combinedFeatures = sortedUnique (cacheFeatures ++ expandedFeatures);

[6.16373]

[6.242228]

combinedFeatures = sortedUnique (cacheFeatures ++ enabledFeatures);
replacement in "Cargo.nix" at line 8479

[6.243894]→[3.11716:11742](∅→∅)

rules in featureMap.

[6.243894]

[6.243920]

rules in featureMap.
replacement in "Cargo.nix" at line 8481

[6.243921]→[3.11743:11887](∅→∅)

featureMap is an attribute set which maps feature names to lists of further
feature names to enable in case this feature is selected.

[6.243921]

[6.244065]

featureMap is an attribute set which maps feature names to lists of further
feature names to enable in case this feature is selected.
edit in "Cargo.nix" at line 8495

[6.244477]

[6.244477]

/* This function adds optional dependencies as features if they are enabled
indirectly by dependency features. This function mimics Cargo's behavior
described in a note at:
https://doc.rust-lang.org/nightly/cargo/reference/features.html#dependency-features
*/
enableFeatures = dependencies: features:
assert (builtins.isList features);
assert (builtins.isList dependencies);
let
additionalFeatures = lib.concatMap
(
dependency:
assert (builtins.isAttrs dependency);
let
enabled = builtins.any (doesFeatureEnableDependency dependency) features;
in
if (dependency.optional or false) && enabled then [ dependency.name ] else [ ]
)
dependencies;
in
sortedUnique (features ++ additionalFeatures);
replacement in "Cargo.nix" at line 8518

[6.244482]→[3.11888:11947](∅→∅)

Returns the actual features for the given dependency.

[6.244482]

[6.17356]

Returns the actual features for the given dependency.
replacement in "Cargo.nix" at line 8520

[6.17357]→[3.11948:12018](∅→∅)

features: The features of the crate that refers this dependency.

[6.17357]

[6.244616]

features: The features of the crate that refers this dependency.
edit in "Cargo.nix" at line 8559

[6.4095]→[6.4095:4096](∅→∅)
replacement in "Cargo.nix" at line 8560

[3.12024]→[3.12024:12025](∅→∅)

}

[3.12024]

}
replacement in "Cargo.lock" at line 2637

[6.62007]→[5.4547:4565](∅→∅)

version = "0.2.0"

[6.62007]

[6.62025]

version = "0.2.1"
replacement in "Cargo.lock" at line 2639

[6.62090]→[5.4566:4644](∅→∅)

checksum = "62d9eace42d7bf64591d547cb727d89277e3de1c1b934e3d9d0af8c6687587ef"

[6.62090]

[6.62168]

checksum = "ac61cc05e3ecc29b17c85b9654271a29babcf1219f3a10ef35494c729e114f99"