From 5837aedb4de3fbd171d2148f373554798f5af0c4 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 14 Oct 2024 12:30:46 -0500 Subject: [PATCH 1/6] nufmt: format --- pkgs/development/tools/nufmt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/development/tools/nufmt/default.nix index e5e656877ef9..54f816e281e9 100644 --- a/pkgs/development/tools/nufmt/default.nix +++ b/pkgs/development/tools/nufmt/default.nix @@ -1,4 +1,3 @@ - { lib, stdenv, @@ -18,9 +17,12 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - IOKit - ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + IOKit + ] + ); cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; @@ -28,6 +30,6 @@ rustPlatform.buildRustPackage rec { description = "Nushell formatter"; homepage = "https://github.com/nushell/nufmt"; license = licenses.mit; - maintainers = with maintainers; [iogamaster]; + maintainers = with maintainers; [ iogamaster ]; }; } From 9f9bd495d4fbee9edf471d4831399333c80ec3bb Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 14 Oct 2024 12:31:26 -0500 Subject: [PATCH 2/6] nufmt: move to by-name --- .../nufmt/default.nix => by-name/nu/nufmt/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{development/tools/nufmt/default.nix => by-name/nu/nufmt/package.nix} (86%) diff --git a/pkgs/development/tools/nufmt/default.nix b/pkgs/by-name/nu/nufmt/package.nix similarity index 86% rename from pkgs/development/tools/nufmt/default.nix rename to pkgs/by-name/nu/nufmt/package.nix index 54f816e281e9..75ea05cacc24 100644 --- a/pkgs/development/tools/nufmt/default.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -26,10 +26,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; - meta = with lib; { + meta = { description = "Nushell formatter"; homepage = "https://github.com/nushell/nufmt"; - license = licenses.mit; - maintainers = with maintainers; [ iogamaster ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ iogamaster ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491f6c861dea..90967713f300 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38653,8 +38653,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - nufmt = callPackage ../development/tools/nufmt { }; - bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; cagebreak = callPackage ../applications/window-managers/cagebreak { From b0be0a580d4d5b3803b81753f5dcd7d43b4eb4ac Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 14 Oct 2024 12:30:54 -0500 Subject: [PATCH 3/6] nufmt: add meta.mainProgram --- pkgs/by-name/nu/nufmt/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 75ea05cacc24..fa6f212b94d1 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nushell/nufmt"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ iogamaster ]; + mainProgram = "nufmt"; }; } From cb5cfd9a6f3d7bea462ad40813b1af414036ac58 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 14 Oct 2024 16:18:12 -0500 Subject: [PATCH 4/6] nufmt: add update script --- pkgs/by-name/nu/nufmt/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index fa6f212b94d1..d5d0424558f1 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rustPlatform, darwin, + nix-update-script, ... }: rustPlatform.buildRustPackage rec { @@ -25,6 +26,7 @@ rustPlatform.buildRustPackage rec { ); cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Nushell formatter"; From b9aac85c3afaa83ddd71d013474f9f0c3a04e928 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 15 Oct 2024 09:06:06 -0500 Subject: [PATCH 5/6] nufmt: unstable-2023-09-25 -> 0-unstable-2024-10-15 --- pkgs/by-name/nu/nufmt/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index d5d0424558f1..4d398f3478a1 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -4,18 +4,19 @@ fetchFromGitHub, rustPlatform, darwin, + llvmPackages, nix-update-script, ... }: rustPlatform.buildRustPackage rec { pname = "nufmt"; - version = "unstable-2023-09-25"; + version = "0-unstable-2024-10-15"; src = fetchFromGitHub { owner = "nushell"; repo = "nufmt"; - rev = "796ee834c1e31ead4c5479bf2827a4339c5d61d1"; - hash = "sha256-BwKLl8eMCrqVt9PA5SHAXxu3ypP2ePcSuljKL+wSkvw="; + rev = "37b473be178fd752b5bf421f8b20f48209e9c2ec"; + hash = "sha256-BrVWw6oklG70UomKDv5IBvoFIjtpajHKV37fh4fnK3E="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( @@ -25,7 +26,10 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc="; + env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib"; + + cargoHash = "sha256-eKQJanQ9ax5thc2DuO0yIgovor+i5Soylw58I2Y5cHw="; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { From 36ca2a6cfbb60ec304df5dc9d4f91a68f0cf2fbe Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 15 Oct 2024 09:10:36 -0500 Subject: [PATCH 6/6] nufmt: add maintainer khaneliman --- pkgs/by-name/nu/nufmt/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index 4d398f3478a1..28f16ade6679 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -36,7 +36,10 @@ rustPlatform.buildRustPackage rec { description = "Nushell formatter"; homepage = "https://github.com/nushell/nufmt"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ iogamaster ]; + maintainers = with lib.maintainers; [ + iogamaster + khaneliman + ]; mainProgram = "nufmt"; }; }