diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index fa1fa8f41622..383f556a1ad6 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -10,20 +10,24 @@ openssl, cacert, sqlite, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sq"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; tag = "v${finalAttrs.version}"; - hash = "sha256-lM+j1KtH3U/lbPXnKALAP75YokDufbdz8s8bjb0VXUY="; + hash = "sha256-+6QVRp0zDJIIv23YlAI/cspHuGc+YcWdPfJZIOxQRW8="; }; - cargoHash = "sha256-3z1Qm/eeVlH0/x3C8PSSPIlQaRKk1U6mRlEiKk0AaVQ="; + cargoHash = "sha256-I6hPpRpILV+iU9erfVBQOXuICx4IvWvGyHWdep7jRm4="; + + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ pkg-config @@ -45,17 +49,23 @@ rustPlatform.buildRustPackage (finalAttrs: { export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt ''; - env.ASSET_OUT_DIR = "/tmp/"; + env.ASSET_OUT_DIR = "target"; + + # key store daemon binds a loopback socket + __darwinAllowLocalNetworking = true; doCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; postInstall = '' - installManPage /tmp/man-pages/*.* + installManPage ${finalAttrs.env.ASSET_OUT_DIR}/man-pages/*.* installShellCompletion \ --cmd sq \ - --bash /tmp/shell-completions/sq.bash \ - --fish /tmp/shell-completions/sq.fish \ - --zsh /tmp/shell-completions/_sq + --bash ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sq.bash \ + --fish ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sq.fish \ + --zsh ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/_sq ''; passthru.updateScript = nix-update-script { }; @@ -69,6 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: { minijackson doronbehar dvn0 + anish ]; mainProgram = "sq"; };