diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix index ad6052e1061a..3b7e461d60b4 100644 --- a/pkgs/by-name/li/libmamba/package.nix +++ b/pkgs/by-name/li/libmamba/package.nix @@ -1,23 +1,23 @@ { - fetchFromGitHub, - lib, - stdenv, - cmake, - fmt, - spdlog, - tl-expected, - nlohmann_json, - yaml-cpp, - simdjson, - reproc, - libsolv, - curl, - msgpack-c, - libarchive, - zstd, - nix-update-script, bzip2, + cmake, + curl, + fetchFromGitHub, + fmt, + lib, + libarchive, + libsolv, + msgpack-c, + nix-update-script, + nlohmann_json, python3, + reproc, + simdjson, + spdlog, + stdenv, + tl-expected, + yaml-cpp, + zstd, }: stdenv.mkDerivation (finalAttrs: { @@ -37,19 +37,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + bzip2 + curl fmt + libarchive + libsolv + msgpack-c + nlohmann_json + reproc + simdjson spdlog tl-expected - nlohmann_json yaml-cpp - simdjson - reproc - libsolv - curl - msgpack-c - libarchive zstd - bzip2 ]; cmakeFlags = [ @@ -58,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_SHARED" true) ]; + __structuredAttrs = true; + strictDeps = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ma/mamba-cpp/package.nix b/pkgs/by-name/ma/mamba-cpp/package.nix index 56a781e6bdae..539580657d4d 100644 --- a/pkgs/by-name/ma/mamba-cpp/package.nix +++ b/pkgs/by-name/ma/mamba-cpp/package.nix @@ -1,19 +1,19 @@ { - lib, - stdenv, bzip2, - cmake, cli11, + cmake, + lib, + libmamba, msgpack-c, - yaml-cpp, nlohmann_json, - zstd, + python3, reproc, spdlog, + stdenv, tl-expected, - libmamba, - python3, versionCheckHook, + yaml-cpp, + zstd, }: stdenv.mkDerivation { pname = "mamba-cpp"; @@ -22,17 +22,17 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ + bzip2 + cli11 + libmamba + msgpack-c + nlohmann_json python3 reproc spdlog - nlohmann_json tl-expected - zstd - bzip2 - cli11 - msgpack-c yaml-cpp - libmamba + zstd ]; cmakeFlags = [ @@ -43,6 +43,9 @@ stdenv.mkDerivation { nativeInstallCheckInputs = [ versionCheckHook ]; + __structuredAttrs = true; + strictDeps = true; + meta = { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; diff --git a/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/pkgs/development/python-modules/conda-libmamba-solver/default.nix index 7c58c473dded..8e73b16b3c35 100644 --- a/pkgs/development/python-modules/conda-libmamba-solver/default.nix +++ b/pkgs/development/python-modules/conda-libmamba-solver/default.nix @@ -1,25 +1,24 @@ { - lib, + boltons, buildPythonPackage, fetchFromGitHub, hatchling, hatch-vcs, - boltons, + lib, libmambapy, msgpack, requests, zstandard, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "conda-libmamba-solver"; version = "26.4.2"; pyproject = true; src = fetchFromGitHub { - inherit pname version; owner = "conda"; repo = "conda-libmamba-solver"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8+BIUQp2tg50P0UDjzBvywg8/mDelDYMtp/ejEcMH20="; }; @@ -47,4 +46,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ericthemagician ]; }; -} +}) diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix index 80602a461941..907fb0ae5116 100644 --- a/pkgs/development/python-modules/libmambapy/default.nix +++ b/pkgs/development/python-modules/libmambapy/default.nix @@ -1,23 +1,23 @@ { - lib, - python, - buildPythonPackage, + bzip2, cmake, + curl, + buildPythonPackage, + fmt, + lib, + libmamba, + libsolv, msgpack-c, ninja, - libmamba, + nlohmann_json, pybind11, + python, + reproc, scikit-build-core, - fmt, spdlog, tl-expected, - nlohmann_json, yaml-cpp, - reproc, - libsolv, - curl, zstd, - bzip2, }: buildPythonPackage rec { @@ -39,17 +39,17 @@ buildPythonPackage rec { buildInputs = [ (libmamba.override { python3 = python; }) - curl - zstd bzip2 - spdlog + curl fmt - msgpack-c - tl-expected - nlohmann_json - yaml-cpp - reproc libsolv + msgpack-c + nlohmann_json + reproc + spdlog + tl-expected + yaml-cpp + zstd ]; pythonImportsCheck = [