build fails due to missing libpq (#213)

Author: davepacheco

.github/workflows/rust.yml

@@ -73,10 +73,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-18.04, macos-10.15 ]
-        # NOTE: Although we'd like to use stable, we cannot with a newer version
-        # of Propolis as a dependency (which only builds with nightly).
-        #        toolchain: [ nightly-2021-04-24, stable ]
-        toolchain: [ nightly-2021-04-24 ]
+        # See rust-toolchain for why we're using nightly here.
+        toolchain: [ nightly ]
     steps:
     # actions/checkout@v2
     - uses: actions/checkout@28c7f3d2b5162b5ddd3dfd9a45aa55eaf396478b

Cargo.lock

@@ -32,3 +32,12 @@ panic = "abort"
 #dropshot = { path = "../dropshot/dropshot" }
 #[patch."https://github.com/oxidecomputer/steno"]
 #steno = { path = "../steno" }
+
+#
+# We maintain a fork of pq-sys to address
+# https://github.com/sgrif/pq-sys/issues/36.  If the fix for that (PR#37) lands
+# upstream, we can remove our fork.
+#
+[patch.crates-io.pq-sys]
+git = 'https://github.com/oxidecomputer/pq-sys'
+branch = "oxide"

Cargo.toml

@@ -1,17 +1,15 @@
-# We use nightly to enable the "asm" feature for dtrace probes.
+# We use nightly for two reasons:
 #
-# Additionally, we specify this specific verion of nightly to
-# workaround known bugs for illumos on more recent versions.
-# Context: https://github.com/rust-lang/rust/pull/85772
+# 1. To enable the "asm" feature for dtrace probes.
+# 2. To make use of our workaround for issue sgrif/pq-sys#36.  This relies on a
+#    Cargo feature that will not be available on stable until 1.56.
 #
-# Short-term: Once that bug is fixed, we should feel free
-# to update to migrate to a more recent nightly.
+# When both of those are part of stable Rust, we should update this file to
+# point to "stable" instead.
 #
-# Long-term: Once the ASM feature is stabilized, we should
-# consider using stable instead of nightly.
 
 [toolchain]
 # NOTE: This toolchain is also specified within .github/workflows/rust.yml
 # If you update it here, update that file too.
-channel = "nightly-2021-04-24"
+channel = "nightly"
 profile = "default"