diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
| commit | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (patch) | |
| tree | 3abc8e1606a2c80b6f5d14fef175e50800202163 /nixpkgs/pkgs/development/libraries/libdeltachat/default.nix | |
| parent | a2c1eff83c3118a9aee8076c7f84f58137416b6e (diff) | |
| parent | 9008bc4eb62c878d0812105ea1b34255d651df88 (diff) | |
| download | nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.gz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.bz2 nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.lz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.xz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.zst nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdeltachat/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdeltachat/default.nix | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 7a395a9866d4..d62e8bf245ca 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cargo , cmake +, deltachat-repl , openssl , perl , pkg-config @@ -17,30 +18,32 @@ , libiconv }: -stdenv.mkDerivation rec { +let + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "email-0.0.21" = "sha256-u4CsK/JqFgq5z3iJGxxGtb7QbSkOAqmOvrmagsqfXIU="; + "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; + "iroh-0.4.1" = "sha256-oLvka1nV2yQPzlcaq5CXqXRRu7GkbMocV6GoIlxQKlo="; + "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; + }; + }; +in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.121.0"; + version = "1.131.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; + hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; }; patches = [ ./no-static-lib.patch ]; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; - "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; - "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; - }; - }; + cargoDeps = rustPlatform.importCargoLock cargoLock; nativeBuildInputs = [ cmake @@ -67,8 +70,12 @@ stdenv.mkDerivation rec { cargoCheckHook ]; - passthru.tests = { - python = python3.pkgs.deltachat; + passthru = { + inherit cargoLock; + tests = { + inherit deltachat-repl; + python = python3.pkgs.deltachat; + }; }; meta = with lib; { |