From fe87136b52bcecdc009f2dc189e3ed2111b06a6e Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 19 Apr 2025 22:00:44 -0700 Subject: [PATCH 1/5] moon: modernize --- .../tools/build-managers/moon/default.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 746c35a1d53f..ab997d4bbfb0 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -2,24 +2,23 @@ lib, rustPlatform, fetchFromGitHub, - darwin, - stdenv, openssl, pkg-config, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; version = "1.34.3"; src = fetchFromGitHub { owner = "moonrepo"; - repo = pname; - rev = "v${version}"; + repo = "moon"; + tag = "v${finalAttrs.version}"; hash = "sha256-LLKHRybTSUhz5YfaV7scVASa6TJqkHDbpVfzL2bANtQ="; }; - useFetchCargoVendor = true; cargoHash = "sha256-Rx6g+J7Sh1G8ZrUP55oxrUwCyBp0WV67yG6+ql9J5QI="; env = { @@ -27,22 +26,23 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; }; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; + buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; # Some tests fail, because test using internet connection and install NodeJS by example doCheck = false; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Task runner and repo management tool for the web ecosystem, written in Rust"; mainProgram = "moon"; homepage = "https://github.com/moonrepo/moon"; - license = licenses.mit; - maintainers = with maintainers; [ flemzord ]; + changelog = "https://github.com/moonrepo/moon/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ flemzord ]; }; -} +}) From 5e17b5123db7e826b7dd72abceac6ed94eb0824b Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 19 Apr 2025 22:02:54 -0700 Subject: [PATCH 2/5] moon: 1.34.3 -> 1.35.0 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index ab997d4bbfb0..8e5f78af5ee1 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.34.3"; + version = "1.35.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-LLKHRybTSUhz5YfaV7scVASa6TJqkHDbpVfzL2bANtQ="; + hash = "sha256-pUHmkO+OB29njWY3KGUVikRQ7gb3Jf3ht7RohHHFu14="; }; - cargoHash = "sha256-Rx6g+J7Sh1G8ZrUP55oxrUwCyBp0WV67yG6+ql9J5QI="; + cargoHash = "sha256-5bj3K7OoeJfb17OD7jLi5/7Y6j8Q8DA0oH4J+ahLz2U="; env = { RUSTFLAGS = "-C strip=symbols"; From 6ef24f9e900d0b9d55119fc15f091fd95ff0d72c Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 19 Apr 2025 22:03:50 -0700 Subject: [PATCH 3/5] moon: move to by-name --- .../moon/default.nix => by-name/mo/moon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/build-managers/moon/default.nix => by-name/mo/moon/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/by-name/mo/moon/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/moon/default.nix rename to pkgs/by-name/mo/moon/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 548a6291147d..0eb0e1a781bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8516,8 +8516,6 @@ with pkgs; ''; }; - moon = callPackage ../development/tools/build-managers/moon/default.nix { }; - mopsa = ocamlPackages.mopsa.bin; haskell-ci = From 88dd31be02ba35f11cec6ec2a4c5309792c75415 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 22 Apr 2025 18:32:51 -0700 Subject: [PATCH 4/5] moon: 1.35.0 -> 1.35.1 --- pkgs/by-name/mo/moon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index 8e5f78af5ee1..fb03e24b85e5 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.35.0"; + version = "1.35.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-pUHmkO+OB29njWY3KGUVikRQ7gb3Jf3ht7RohHHFu14="; + hash = "sha256-/MKv+k6GZHpqnwheLYAbIAtIT8cZoiNg1EFUNQLbiQk="; }; - cargoHash = "sha256-5bj3K7OoeJfb17OD7jLi5/7Y6j8Q8DA0oH4J+ahLz2U="; + cargoHash = "sha256-CyvcC46FUeEPcDvHiIBunnM4H4Esp2Q6GRhJZgXhlJk="; env = { RUSTFLAGS = "-C strip=symbols"; From 0790ac9ce71f2ecab724d1c086da69b028ba81c5 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 22 Apr 2025 19:17:11 -0700 Subject: [PATCH 5/5] moon: add shell completions --- pkgs/by-name/mo/moon/package.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index fb03e24b85e5..7dcaa8428fa2 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -1,11 +1,14 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, versionCheckHook, nix-update-script, + installShellFiles, + buildPackages, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -27,7 +30,22 @@ rustPlatform.buildRustPackage (finalAttrs: { }; buildInputs = [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd moon \ + --bash <(${emulator} $out/bin/moon completions --shell bash) \ + --fish <(${emulator} $out/bin/moon completions --shell fish) \ + --zsh <(${emulator} $out/bin/moon completions --shell zsh) + '' + ); # Some tests fail, because test using internet connection and install NodeJS by example doCheck = false;