Update pijul

Author: fossdd

Cargo.lock

@@ -1,5 +1,5 @@
 
-# This file was @generated by crate2nix 0.9.0 with the command:
+# This file was @generated by crate2nix 0.10.0 with the command:
 #   "generate"
 # See https://github.com/kolloch/crate2nix for more info.
 
@@ -8,7 +8,7 @@
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
 , buildRustCrateForPkgs ? if buildRustCrate != null
-    then lib.warn "`buildRustCrate` is deprecated, use `buildRustCrateForPkgs` instead" (_: buildRustCrate)
+    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)
     else pkgs: pkgs.buildRustCrate
   # Deprecated
 , buildRustCrate ? null
@@ -3014,7 +3014,7 @@ rec {
       };
       "libpijul" = rec {
         crateName = "libpijul";
-        version = "1.0.0-alpha.47";
+        version = "1.0.0-alpha.48";
         edition = "2018";
         src = lib.cleanSourceWith { filter = sourceFilter;  src = ./libpijul; };
         authors = [
@@ -4395,6 +4395,10 @@ rec {
             name = "terminal_size";
             packageId = "terminal_size";
           }
+          {
+            name = "thiserror";
+            packageId = "thiserror";
+          }
           {
             name = "thrussh";
             packageId = "thrussh";
@@ -6023,24 +6027,6 @@ rec {
           }
         ];
 
-      };
-      "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";
-          }
-        ];
-
       };
       "thrussh" = rec {
         crateName = "thrussh";
@@ -7811,6 +7797,18 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "unsupported" ];
       };
+      "xxhash-rust" = rec {
+        crateName = "xxhash-rust";
+        version = "0.8.2";
+        edition = "2018";
+        sha256 = "1v9dk6shls1rsmidf2dxdi3460bn7ingqgvn5mf7prgnxmdy2xg5";
+        authors = [
+          "Douman <douman@gmx.se>"
+        ];
+        features = {
+        };
+        resolvedDefaultFeatures = [ "xxh64" ];
+      };
       "yasna" = rec {
         crateName = "yasna";
         version = "0.4.0";
@@ -7888,11 +7886,12 @@ rec {
       };
       "zstd-seekable" = rec {
         crateName = "zstd-seekable";
-        version = "0.1.7";
+        version = "0.2.1";
         edition = "2018";
-        sha256 = "0bxzd71myj094hp03jpqbv1r80x0hk1ahsjwfv50j0wgx379jfry";
+        sha256 = "16ag26g74k296ppi0flz47qvrfi938km95jvr0brphpcwc2wqqdc";
         authors = [
           "Pierre-Étienne Meunier <pe@pijul.org>"
+          "Darley Barreto <darleybarreto@gmail.com>"
         ];
         dependencies = [
           {
@@ -7904,15 +7903,12 @@ rec {
             packageId = "thiserror";
           }
           {
-            name = "threadpool";
-            packageId = "threadpool";
+            name = "xxhash-rust";
+            packageId = "xxhash-rust";
+            features = [ "xxh64" ];
           }
         ];
         buildDependencies = [
-          {
-            name = "cc";
-            packageId = "cc";
-          }
           {
             name = "pkg-config";
             packageId = "pkg-config";
@@ -7927,7 +7923,7 @@ rec {
 #
 
   /* Target (platform) data for conditional dependencies.
-     This corresponds roughly to what buildRustCrate is setting.
+    This corresponds roughly to what buildRustCrate is setting.
   */
   defaultTarget = {
     unix = true;
@@ -7999,14 +7995,16 @@ rec {
       );
 
   /* Returns a crate which depends on successful test execution
-     of crate given as the second argument.
+    of crate given as the second argument.
 
-     testCrateFlags: list of flags to pass to the test exectuable
-     testInputs: list of packages that should be available during test execution
+    testCrateFlags: list of flags to pass to the test exectuable
+    testInputs: list of packages that should be available during test execution
   */
-  crateWithTest = { crate, testCrate, testCrateFlags, testInputs }:
+  crateWithTest = { crate, testCrate, testCrateFlags, testInputs, testPreRun, testPostRun }:
     assert builtins.typeOf testCrateFlags == "list";
     assert builtins.typeOf testInputs == "list";
+    assert builtins.typeOf testPreRun == "string";
+    assert builtins.typeOf testPostRun == "string";
     let
       # override the `crate` so that it will build and execute tests instead of
       # building the actual lib and bin targets We just have to pass `--test`
@@ -8020,6 +8018,15 @@ rec {
                 buildTests = true;
               }
             );
+          # 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
+            ]);
         in
         pkgs.runCommand "run-tests-${testCrate.name}"
           {
@@ -8053,7 +8060,7 @@ rec {
           for file in ${drv}/tests/*; do
             f=$testRoot/$(basename $file)-$hash
             cp $file $f
-            $f $testCrateFlags 2>&1 | tee -a $out
+            ${testCommand}
           done
         '';
     in
@@ -8077,6 +8084,10 @@ rec {
     , runTests ? false
     , testCrateFlags ? [ ]
     , testInputs ? [ ]
+      # Any command to run immediatelly before a test is executed.
+    , testPreRun ? ""
+      # Any command run immediatelly after a test is executed.
+    , testPostRun ? ""
     }:
     lib.makeOverridable
       (
@@ -8085,6 +8096,8 @@ rec {
         , runTests
         , testCrateFlags
         , testInputs
+        , testPreRun
+        , testPostRun
         }:
         let
           buildRustCrateForPkgsFuncOverriden =
@@ -8117,16 +8130,16 @@ rec {
                 {
                   crate = drv;
                   testCrate = testDrv;
-                  inherit testCrateFlags testInputs;
+                  inherit testCrateFlags testInputs testPreRun testPostRun;
                 }
             else drv;
         in
         derivation
       )
-      { inherit features crateOverrides runTests testCrateFlags testInputs; };
+      { inherit features crateOverrides runTests testCrateFlags testInputs testPreRun testPostRun; };
 
   /* Returns an attr set with packageId mapped to the result of buildRustCrateForPkgsFunc
-     for the corresponding crate.
+    for the corresponding crate.
   */
   builtRustCratesWithFeatures =
     { packageId
@@ -8264,7 +8277,7 @@ rec {
       map depDerivation enabledDependencies;
 
   /* Returns a sanitized version of val with all values substituted that cannot
-     be serialized as JSON.
+    be serialized as JSON.
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
@@ -8309,9 +8322,9 @@ rec {
     { internal = debug; };
 
   /* Returns differences between cargo default features and crate2nix default
-     features.
+    features.
 
-     This is useful for verifying the feature resolution in crate2nix.
+    This is useful for verifying the feature resolution in crate2nix.
   */
   diffDefaultPackageFeatures =
     { crateConfigs ? crates
@@ -8348,8 +8361,8 @@ rec {
 
   /* Returns an attrset mapping packageId to the list of enabled features.
 
-     If multiple paths to a dependency enable different features, the
-     corresponding feature sets are merged. Features in rust are additive.
+    If multiple paths to a dependency enable different features, the
+    corresponding feature sets are merged. Features in rust are additive.
   */
   mergePackageFeatures =
     { crateConfigs ? crates
@@ -8374,10 +8387,11 @@ rec {
       let
         crateConfig = crateConfigs."${packageId}" or (builtins.throw "Package not found: ${packageId}");
         expandedFeatures = expandFeatures (crateConfig.features or { }) features;
+        enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
         depWithResolvedFeatures = dependency:
           let
             packageId = dependency.packageId;
-            features = dependencyFeatures expandedFeatures dependency;
+            features = dependencyFeatures enabledFeatures dependency;
           in
           { inherit packageId features; };
         resolveDependencies = cache: path: dependencies:
@@ -8386,7 +8400,7 @@ rec {
           let
             enabledDependencies = filterEnabledDependencies {
               inherit dependencies target;
-              features = expandedFeatures;
+              features = enabledFeatures;
             };
             directDependencies = map depWithResolvedFeatures enabledDependencies;
             foldOverCache = op: lib.foldl op cache directDependencies;
@@ -8410,7 +8424,7 @@ rec {
         cacheWithSelf =
           let
             cacheFeatures = featuresByPackageId.${packageId} or [ ];
-            combinedFeatures = sortedUnique (cacheFeatures ++ expandedFeatures);
+            combinedFeatures = sortedUnique (cacheFeatures ++ enabledFeatures);
           in
           featuresByPackageId // {
             "${packageId}" = combinedFeatures;
@@ -8462,10 +8476,10 @@ rec {
     || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
-     rules in featureMap.
+    rules in featureMap.
 
-     featureMap is an attribute set which maps feature names to lists of further
-     feature names to enable in case this feature is selected.
+    featureMap is an attribute set which maps feature names to lists of further
+    feature names to enable in case this feature is selected.
   */
   expandFeatures = featureMap: inputFeatures:
     assert (builtins.isAttrs featureMap);
@@ -8478,10 +8492,32 @@ rec {
     in
     sortedUnique outFeatures;
 
+  /* 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);
+
   /*
-     Returns the actual features for the given dependency.
+    Returns the actual features for the given dependency.
 
-     features: The features of the crate that refers this dependency.
+    features: The features of the crate that refers this dependency.
   */
   dependencyFeatures = features: dependency:
     assert (builtins.isList features);
@@ -8520,6 +8556,6 @@ rec {
   #
   # crate2nix/default.nix (excerpt end)
   #
-
   };
-}
+}
+

Cargo.nix

@@ -82,9 +82,9 @@
 
                     pijul = { ... }: {
                       buildInputs = with pkgs; [
-                        xxHash
                         zstd
                         libsodium
+                        libiconv
                       ] ++ lib.optionals stdenv.isDarwin (
                         [ openssl ]
                         ++ (with darwin.apple_sdk.frameworks; [

flake.nix

@@ -116,7 +116,7 @@ twox-hash = "1.6"
 crossbeam-deque = "0.8"
 crossbeam-utils = "0.8"
 
-zstd-seekable = { version = "0.2.0", optional = true }
+zstd-seekable = { version = "0.1.0", optional = true }
 cfg-if = "1.0"
 memchr = "2.4"