cargo: switch to use packaged crates by default

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/.cargo/config b/.cargo/config
new file mode 100644 (file)
index 0000000..3b5b6e4
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,5 @@
+[source]
+[source.debian-packages]
+directory = "/usr/share/cargo/registry"
+[source.crates-io]
+replace-with = "debian-packages"

diff --git a/Cargo.toml b/Cargo.toml
index 2953992909cf606bf834eabddfa763c33aa9421b..37cfbc37a4b6709f5fa80ab9c4f58830cfcc42f1 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ pam = "0.7"
 pam-sys = "0.5"
 percent-encoding = "2.1"
 pin-utils = "0.1.0-alpha"
-proxmox = { git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox", version = "0.1", features = [ "sortable-macro", "api-macro" ] }
+proxmox = { version = "0.1.1", features = [ "sortable-macro", "api-macro" ] }
 regex = "1.2"
 rustyline = "5.0.5"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/README.rst b/README.rst
index c475707026d6dc94e4b70a0984ac5819615d9ab4..dda461e44f2453cd03e1ec8afffe6e3a9a1d8a78 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -5,22 +5,23 @@ To use current git master code of the proxmox* helper crates, add::
 
    git = "ssh://gitolite3@proxdev.maurer-it.com/rust/proxmox"
 
+or::
+
+   path = "../proxmox/proxmox"
+
 to the proxmox dependency, and update the version to reflect the current,
 pre-release version number (e.g., "0.1.1-dev.1" instead of "0.1.0").
 
-Local (packaged) crates
-=======================
+Local cargo config
+==================
 
-To use locally installed, packaged crates instead of crates.io put the
-following into ./.cargo/config (or point CARGO_HOME to a directory containing
-such a config file)::
+This repository ships with a ``.cargo/config`` that replaces the crates.io
+registry with packaged crates located in ``/usr/share/cargo/registry``.
 
-   [source]
-   [source.debian-packages]
-   directory = "/usr/share/cargo/registry"
-   [source.crates-io]
-   replace-with = "debian-packages"
-
-This is akin to what happens when building with dh_cargo. Cargo.lock needs to
-be deleted when switching between packaged crates and crates.io, since the
+A similar config is also applied building with dh_cargo. Cargo.lock needs to be
+deleted when switching between packaged crates and crates.io, since the
 checksums are not compatible.
+
+To reference new dependencies (or updated versions) that are not yet packaged,
+the dependency needs to point directly to a path or git source (e.g., see
+example for proxmox crate above).