From 84019db8efe1ad5d97c1bf18c29769d1caf631ec Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 15 Oct 2022 16:06:03 -0300 Subject: [PATCH] muon: unstable-2022-09-24 -> 0.1.0 --- .../tools/build-managers/muon/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index 937b53dac293..b94a376ebb34 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -17,16 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "unstable-2022-09-24"; + version = "0.1.0"; src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; repo = "muon"; - rev = "f385c82a6104ea3341ca34756e2812d700bc43d8"; - hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0="; + rev = finalAttrs.version; + hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o="; }; + outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; + nativeBuildInputs = [ pkgconf samurai @@ -50,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { # URLs manually extracted from subprojects directory meson-docs-wrap = fetchurl { name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz"; - hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg="; + url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz"; + hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q="; }; samurai-wrap = fetchurl { @@ -79,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = let - featureFlag = feature: flag: + muonFeatureFlag = feature: flag: "-D${feature}=${if flag then "enabled" else "disabled"}"; - conditionFlag = condition: flag: + muonConditionFlag = condition: flag: "-D${condition}=${lib.boolToString flag}"; cmdlineForMuon = lib.concatStringsSep " " [ - (conditionFlag "static" stdenv.targetPlatform.isStatic) - (featureFlag "docs" buildDocs) - (featureFlag "samurai" embedSamurai) + (muonConditionFlag "static" stdenv.targetPlatform.isStatic) + (muonFeatureFlag "docs" buildDocs) + (muonFeatureFlag "samurai" embedSamurai) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' @@ -132,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: { }; }) # TODO LIST: -# 1. setup hook -# 2. multiple outputs -# 3. automate sources acquisition (especially wraps) -# 4. tests +# 1. automate sources acquisition (especially wraps) +# 2. setup hook +# 3. tests