Merge branch 'zsa-integration-generics' into zsa-integration-proptest

Author: dmidem

.cargo/config.toml

@@ -85,6 +85,9 @@ rustflags = [
 
 [build]
 rustdocflags = [
+    # FIXME: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
+    "--cfg", "zcash_unstable=\"nu6\"",
+
     # The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
     # https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68
 

.github/workflows/ci-basic.yml

@@ -16,9 +16,6 @@ jobs:
       ROCKSDB_LIB_DIR: /usr/lib
       # Use system-installed Snappy library for compression in RocksDB
       SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu
-      # Enable the `nu6` feature in `zcash_protocol`
-      RUSTFLAGS: '--cfg zcash_unstable="nu6"'
-      RUSTDOCFLAGS: '--cfg zcash_unstable="nu6"'
 
     steps:
       - uses: actions/checkout@v4