diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index feeeea04c919..b0d5644f6107 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -7,7 +7,7 @@ cmake, mimalloc, ninja, - tbb, + tbb_2022_0, zlib, zstd, @@ -20,17 +20,19 @@ runCommandCC, testers, useMoldLinker, + + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mold"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; - rev = "v${version}"; - hash = "sha256-qtSnzCgWcx1YEcN0LlQ0SNBvciu2Rj1bmekBhcB/la4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DT8xU1JN3zeJe7o7YQFrnpyN0LtcsclUsIX5jFeVYvA="; }; nativeBuildInputs = [ @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ - tbb + tbb_2022_0 zlib zstd ] @@ -53,6 +55,10 @@ stdenv.mkDerivation rec { "-DMOLD_USE_SYSTEM_TBB:BOOL=ON" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + passthru = { updateScript = nix-update-script { }; tests = @@ -110,7 +116,7 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { description = "Faster drop-in replacement for existing Unix linkers (unwrapped)"; longDescription = '' mold is a faster drop-in replacement for existing Unix linkers. It is @@ -119,13 +125,14 @@ stdenv.mkDerivation rec { rapid debug-edit-rebuild cycles. ''; homepage = "https://github.com/rui314/mold"; - changelog = "https://github.com/rui314/mold/releases/tag/v${version}"; - license = licenses.mit; - platforms = platforms.unix; + changelog = "https://github.com/rui314/mold/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "mold"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ azahi paveloom ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d35d3f0b7e8..3d5d9cbe2a3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7851,10 +7851,6 @@ with pkgs; mkdocs = with python3Packages; toPythonApplication mkdocs; - mold = callPackage ../by-name/mo/mold/package.nix { - tbb = tbb_2021_11; - }; - mold-wrapped = wrapBintoolsWith { bintools = mold; extraBuildCommands = ''