ci: fix builds

Author: soywod

Cargo.lock

@@ -15,11 +15,11 @@ repository = "https://github.com/pimalaya/cardamum"
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
-default = ["carddav", "command", "rustls-ring"]
+default = ["carddav", "vdir", "command", "rustls-ring"]
 
 # CardDAV support without TLS (blocking)
 #
-carddav = ["dep:io-stream", "dep:http", "dep:secrecy", "io-addressbook/carddav", "vdir"]
+carddav = ["dep:io-stream", "dep:http", "dep:secrecy", "io-addressbook/carddav"]
 
 # TLS
 #

Cargo.toml

@@ -2,15 +2,16 @@
   description = "CLI to manage contacts";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/staging-next";
+    nixpkgs = {
+      url = "github:nixos/nixpkgs/staging-next";
+    };
     fenix = {
       url = "github:nix-community/fenix/monthly";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pimalaya = {
-      flake = false;
       url = "github:pimalaya/nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      flake = false;
     };
   };
 

flake.lock

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+set -eu
+
+die() {
+    printf '%s\n' "$1" >&2
+    exit "${2-1}"
+}
+
+DESTDIR="${DESTDIR:-}"
+PREFIX="${PREFIX:-"$DESTDIR/usr/local"}"
+RELEASES_URL="https://github.com/pimalaya/cardamum/releases"
+
+binary=cardamum
+system=$(uname -s | tr [:upper:] [:lower:])
+machine=$(uname -m | tr [:upper:] [:lower:])
+
+case $system in
+    msys*|mingw*|cygwin*|win*)
+	target=x86_64-windows
+	binary=cardamum.exe;;
+
+    linux|freebsd)
+	case $machine in
+	    x86_64) target=x86_64-linux;;
+	    x86|i386|i686) target=i686-linux;;
+	    arm64|aarch64) target=aarch64-linux;;
+	    armv6l) target=armv6l-linux;;
+	    armv7l) target=armv7l-linux;;
+	    *) die "Unsupported machine $machine for system $system";;
+	esac;;
+
+    darwin)
+	case $machine in
+	    x86_64) target=x86_64-darwin;;
+	    arm64|aarch64) target=aarch64-darwin;;
+	    *) die "Unsupported machine $machine for system $system";;
+	esac;;
+
+    *)
+	die "Unsupported system $system";;
+esac
+
+tmpdir=$(mktemp -d) || die "Cannot create temporary directory"
+trap "rm -rf $tmpdir" EXIT
+
+echo "Downloading latest $system release…"
+curl -sLo "$tmpdir/cardamum.tgz" \
+     "$RELEASES_URL/latest/download/cardamum.$target.tgz"
+
+echo "Installing binary…"
+tar -xzf "$tmpdir/cardamum.tgz" -C "$tmpdir"
+
+mkdir -p "$PREFIX/bin"
+cp -f -- "$tmpdir/$binary" "$PREFIX/bin/$binary"
+
+die "$("$PREFIX/bin/$binary" --version) installed!" 0

flake.nix

@@ -1,8 +1,8 @@
 {
   pimalaya ? import (fetchTarball "https://github.com/pimalaya/nix/archive/master.tar.gz"),
-  extraBuildInputs ? "",
+  ...
 }:
 
 pimalaya.mkShell {
-  inherit extraBuildInputs;
+  extraBuildInputs = "dbus,openssl";
 }