pijul nest
guest › [sign in] [explore]

xxHash is back

rohan
Oct 15, 2021, 10:58 PM
4WCGTAYSNWGCLGEOQVOXRCWNQUO5OHNOMTQRWWBQIR6IF56TZ67QC

Dependencies

  • [2] M2C6QW2A Avoid serialising twice in order to save the changes' signatures
  • [3] RNNJ4ORV shell uses the flake
  • [4] NX6DDK7R Removing xxHash from the Nix dependencies
  • [5] 3VJB4ULD Updating Cargo.nix
  • [6] HDGRZISM Version updates
  • [7] KUMJITTF Version bump in the lockfiles
  • [8] SAGSYAPX Various version bumps
  • [9] OC3QJUVK Update to rust 1.54. Needed by clap.
  • [10] 6F6AAHK4 Simplifying pijul::commands::log, and fixing Broken Pipe errors
  • [11] G734WNM6 flake.nix: use crate2nix
  • [12] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
  • [13] FXT5FS5W Updating Cargo.nix
  • [14] XF3FRWJ6 Version bump (including clap 3.0.0-beta.4)
  • [15] AKARNWLH Upgrading dependencies, including zstd-seekable
  • [16] YN63NUZO Sanakirja 1.0
  • [17] 6XDVUSBM Version bump
  • [18] Y7KH4QOP Updating Cargo.nix
  • [19] QJXNUQFJ Solving conflicts
  • [20] I52XSRUH Massive cleanup, and simplification
  • [*] XAY4DYRR Version bump
  • [*] 7ZFRYVVQ Cargo.nix and formatting

Change contents

  • edit in "shell.nix" at line 1
    [5.96]→[5.96:107](∅→∅),[5.96]→[5.96:107](∅→∅),[5.96]→[5.96:107](∅→∅),[5.96]→[5.96:107](∅→∅)
    xxHash
  • edit in "flake.nix" at line 87
    [22.159]
    [4.0]
    xxHash
  • replacement in "Cargo.nix" at line 2
    [5.14]→[5.56:121](∅→∅)
    # This file was @generated by crate2nix 0.10.0 with the command:
    [5.14]
    [5.78]
    # This file was @generated by crate2nix 0.9.0 with the command:
  • replacement in "Cargo.nix" at line 11
    [5.525]→[5.122:443](∅→∅)
    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)
    [5.525]
    [5.633]
    then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)
  • edit in "Cargo.nix" at line 6027
    [23.12562]
    [5.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 7817
    [5.225739]→[5.225739:225748](∅→∅),[5.225748]→[5.575:909](∅→∅)
    };
    "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 7895
    [5.226917]→[5.919:946](∅→∅)
    version = "0.2.1";
    [5.226917]
    [5.226944]
    version = "0.1.7";
  • replacement in "Cargo.nix" at line 7897
    [5.226970]→[5.947:1020](∅→∅)
    sha256 = "16ag26g74k296ppi0flz47qvrfi938km95jvr0brphpcwc2wqqdc";
    [5.226970]
    [5.227043]
    sha256 = "0bxzd71myj094hp03jpqbv1r80x0hk1ahsjwfv50j0wgx379jfry";
  • edit in "Cargo.nix" at line 7900
    [5.227114]→[5.1021:1074](∅→∅)
    "Darley Barreto <darleybarreto@gmail.com>"
  • replacement in "Cargo.nix" at line 7911
    [5.227425]→[5.1075:1184](∅→∅)
    name = "xxhash-rust";
    packageId = "xxhash-rust";
    features = [ "xxh64" ];
    [5.227425]
    [5.227496]
    name = "threadpool";
    packageId = "threadpool";
  • edit in "Cargo.nix" at line 7916
    [5.227549]
    [5.227549]
    {
    name = "cc";
    packageId = "cc";
    }
  • replacement in "Cargo.nix" at line 7934
    [5.227946]→[5.1185:1249](∅→∅)
    This corresponds roughly to what buildRustCrate is setting.
    [5.227946]
    [5.228011]
    This corresponds roughly to what buildRustCrate is setting.
  • replacement in "Cargo.nix" at line 8006
    [5.230173]→[5.1250:1293](∅→∅)
    of crate given as the second argument.
    [5.230173]
    [5.230217]
    of crate given as the second argument.
  • replacement in "Cargo.nix" at line 8008
    [5.230218]→[5.1294:1439](∅→∅)
    testCrateFlags: list of flags to pass to the test exectuable
    testInputs: list of packages that should be available during test execution
    [5.230218]
    [5.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 8011
    [5.230370]→[5.1440:1533](∅→∅)
    crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
    [5.230370]
    [5.230438]
    crateWithTest = { crate, testCrate, testCrateFlags, testInputs }:
  • edit in "Cargo.nix" at line 8014
    [5.230540]→[5.1534:1637](∅→∅)
    assert builtins.typeOf testPreRun == "string";
    assert builtins.typeOf testPostRun == "string";
  • edit in "Cargo.nix" at line 8027
    [5.8393]→[5.1638:2088](∅→∅)
    # 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 8060
    [5.9364]→[5.2089:2116](∅→∅)
    ${testCommand}
    [5.9364]
    [5.231266]
    $f $testCrateFlags 2>&1 | tee -a $out
  • edit in "Cargo.nix" at line 8084
    [5.9836]→[5.2117:2292](∅→∅)
    # 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 8092
    [5.9978]→[5.2293:2336](∅→∅)
    , testPreRun
    , testPostRun
  • replacement in "Cargo.nix" at line 8124
    [5.232751]→[5.2337:2413](∅→∅)
    inherit testCrateFlags testInputs testPreRun testPostRun;
    [5.232751]
    [5.232804]
    inherit testCrateFlags testInputs;
  • replacement in "Cargo.nix" at line 8130
    [5.11172]→[5.2414:2516](∅→∅)
    { inherit features crateOverrides runTests testCrateFlags testInputs testPreRun testPostRun; };
    [5.11172]
    [5.232936]
    { inherit features crateOverrides runTests testCrateFlags testInputs; };
  • replacement in "Cargo.nix" at line 8133
    [5.11342]→[5.2517:2550](∅→∅)
    for the corresponding crate.
    [5.11342]
    [5.233056]
    for the corresponding crate.
  • replacement in "Cargo.nix" at line 8271
    [5.236813]→[5.2551:2578](∅→∅)
    be serialized as JSON.
    [5.236813]
    [5.236842]
    be serialized as JSON.
  • replacement in "Cargo.nix" at line 8316
    [5.238245]→[5.2579:2593](∅→∅)
    features.
    [5.238245]
    [5.15218]
    features.
  • replacement in "Cargo.nix" at line 8318
    [5.15219]→[5.2594:2664](∅→∅)
    This is useful for verifying the feature resolution in crate2nix.
    [5.15219]
    [5.238335]
    This is useful for verifying the feature resolution in crate2nix.
  • replacement in "Cargo.nix" at line 8355
    [5.239598]→[5.2665:2808](∅→∅)
    If multiple paths to a dependency enable different features, the
    corresponding feature sets are merged. Features in rust are additive.
    [5.239598]
    [5.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 8381
    [5.15609]→[5.2809:2902](∅→∅)
    enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
  • replacement in "Cargo.nix" at line 8384
    [5.240752]→[5.2903:2973](∅→∅)
    features = dependencyFeatures enabledFeatures dependency;
    [5.240752]
    [5.240823]
    features = dependencyFeatures expandedFeatures dependency;
  • replacement in "Cargo.nix" at line 8393
    [5.241150]→[5.2974:3016](∅→∅)
    features = enabledFeatures;
    [5.241150]
    [5.241193]
    features = expandedFeatures;
  • replacement in "Cargo.nix" at line 8417
    [5.16373]→[5.3017:3097](∅→∅)
    combinedFeatures = sortedUnique (cacheFeatures ++ enabledFeatures);
    [5.16373]
    [5.242228]
    combinedFeatures = sortedUnique (cacheFeatures ++ expandedFeatures);
  • replacement in "Cargo.nix" at line 8469
    [5.243894]→[5.3098:3123](∅→∅)
    rules in featureMap.
    [5.243894]
    [5.243920]
    rules in featureMap.
  • replacement in "Cargo.nix" at line 8471
    [5.243921]→[5.3124:3266](∅→∅)
    featureMap is an attribute set which maps feature names to lists of further
    feature names to enable in case this feature is selected.
    [5.243921]
    [5.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 8484
    [5.3963]→[5.244476:244477](∅→∅),[5.17355]→[5.244476:244477](∅→∅),[5.244476]→[5.244476:244477](∅→∅),[5.244477]→[5.3267:4099](∅→∅)
    /* 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 8486
    [5.244482]→[5.4101:4159](∅→∅)
    Returns the actual features for the given dependency.
    [5.244482]
    [5.17356]
    Returns the actual features for the given dependency.
  • replacement in "Cargo.nix" at line 8488
    [5.17357]→[5.4160:4229](∅→∅)
    features: The features of the crate that refers this dependency.
    [5.17357]
    [5.244616]
    features: The features of the crate that refers this dependency.
  • edit in "Cargo.nix" at line 8527
    [5.4096]→[5.12019:12024](∅→∅),[5.12024]→[5.4230:4232](∅→∅)
    };
    }
  • edit in "Cargo.nix" at line 8528
    [5.4233]
    };
    }
  • edit in "Cargo.lock" at line 2109
    [5.49058]
    [5.49284]
    name = "threadpool"
    version = "1.8.1"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
    dependencies = [
    "num_cpus",
    ]
    [[package]]
  • edit in "Cargo.lock" at line 2606
    [5.61239]→[5.61239:61252](∅→∅),[5.61252]→[5.4351:4533](∅→∅)
    [[package]]
    name = "xxhash-rust"
    version = "0.8.2"
    source = "registry+https://github.com/rust-lang/crates.io-index"
    checksum = "e575e15bedf6e57b5c2d763ffc6c3c760143466cbd09d762d539680ab5992ded"
  • replacement in "Cargo.lock" at line 2640
    [5.62007]→[2.2790:2808](∅→∅)
    version = "0.2.2"
    [5.62007]
    [5.62025]
    version = "0.1.7"
  • replacement in "Cargo.lock" at line 2642
    [5.62090]→[2.2809:2887](∅→∅)
    checksum = "1b8063b34aea161faa6068c9246f98fc033047af5764305ae972e0bc0bf768d4"
    [5.62090]
    [5.62168]
    checksum = "3e3b99cee88f0309ca765c6aa8c284a00394c35ef8ca012e2409485fc369bf2f"
  • edit in "Cargo.lock" at line 2644
    [5.62185]
    [5.62192]
    "cc",
  • replacement in "Cargo.lock" at line 2648
    [5.62230]→[5.4645:4661](∅→∅)
    "xxhash-rust",
    [5.62230]
    [5.62245]
    "threadpool",