diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-26 12:01:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-26 12:01:18 +0000 |
commit | 7ac1647abc383ad3d6c59cfb57519294d5809143 (patch) | |
tree | 0bbc9b93db904ec6f0321dab341f3c93c1501732 /pkgs/by-name/li | |
parent | 3a6265b8b5185addde4539f8a4db0cb412ba0e92 (diff) | |
parent | b00f19626a7ef8bfb065c087370a32aba634d9b2 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name/li')
-rw-r--r-- | pkgs/by-name/li/libdict/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/li/libmamba/package.nix | 60 | ||||
-rw-r--r-- | pkgs/by-name/li/libstrophe/package.nix | 1 |
3 files changed, 61 insertions, 2 deletions
diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index 1c6e770299ca0..ad2ecbf4f2470 100644 --- a/pkgs/by-name/li/libdict/package.nix +++ b/pkgs/by-name/li/libdict/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/rtbrick/libdict/"; - changelog = "https://github.com/rtbrick/libdict/releases/tag/${version}"; + changelog = "https://github.com/rtbrick/libdict/releases/tag/${finalAttrs.version}"; description = "C library of key-value data structures"; license = licenses.bsd2; maintainers = teams.wdz.members; diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix new file mode 100644 index 0000000000000..2c31119e2bfa6 --- /dev/null +++ b/pkgs/by-name/li/libmamba/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromGitHub, + lib, + stdenv, + cmake, + fmt, + spdlog, + tl-expected, + nlohmann_json, + yaml-cpp, + simdjson, + reproc, + libsolv, + curl, + libarchive, + zstd, + bzip2, + python3Packages, +}: +stdenv.mkDerivation rec { + pname = "libmamba"; + version = "1.5.7"; + src = fetchFromGitHub { + owner = "mamba-org"; + repo = "mamba"; + rev = "${pname}-${version}"; + hash = "sha256-HfmvLi9IBWlaGAn2Ej4Bnm4b3l19jEXwNl5IUkdVxi0="; + }; + nativeBuildInputs = [ + cmake + python3Packages.python + ]; + buildInputs = [ + fmt + spdlog + tl-expected + nlohmann_json + yaml-cpp + simdjson + reproc + libsolv + curl + libarchive + zstd + bzip2 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_LIBMAMBA" true) + (lib.cmakeBool "BUILD_SHARED" true) + ]; + + meta = { + description = "The library for the fast Cross-Platform Package Manager"; + homepage = "https://github.com/mamba-org/mamba"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.ericthemagician ]; + }; +} diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix index 81c31d5f80265..f66c15edfd21b 100644 --- a/pkgs/by-name/li/libstrophe/package.nix +++ b/pkgs/by-name/li/libstrophe/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://strophe.im/libstrophe/"; license = with licenses; [ gpl3Only mit ]; platforms = platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ devhell flosse ]; }; } |