From e4e84b2b36b33b185b4693161200add7e4b9c483 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 19:48:01 +0900 Subject: [PATCH 1/7] dprint: format with nixfmt-rfc-style --- pkgs/development/tools/dprint/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index d6b1266ab393..f57edba6aa79 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchCrate, rustPlatform, CoreFoundation, Security }: +{ + lib, + stdenv, + fetchCrate, + rustPlatform, + CoreFoundation, + Security, +}: rustPlatform.buildRustPackage rec { pname = "dprint"; @@ -11,7 +18,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + CoreFoundation + Security + ]; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions From d76335d6343069e3455beb747055ac392c5bca0f Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 19:56:33 +0900 Subject: [PATCH 2/7] dprint: add passthru.tests.version --- pkgs/development/tools/dprint/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index f57edba6aa79..6e66d51dbe79 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -5,6 +5,8 @@ rustPlatform, CoreFoundation, Security, + testers, + dprint, }: rustPlatform.buildRustPackage rec { @@ -27,6 +29,17 @@ rustPlatform.buildRustPackage rec { # every commit upstream on GitHub Actions doCheck = false; + passthru = { + tests.version = testers.testVersion { + inherit version; + + package = dprint; + command = '' + DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version + ''; + }; + }; + meta = with lib; { description = "Code formatting platform written in Rust"; longDescription = '' From ef9f08ed35e96b5354435f9535f463d8d5d1409e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:40:38 +0900 Subject: [PATCH 3/7] dprint: add updateScript --- pkgs/development/tools/dprint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 6e66d51dbe79..e39f4251843b 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -6,6 +6,7 @@ CoreFoundation, Security, testers, + nix-update-script, dprint, }: @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { DPRINT_CACHE_DIR="$(mktemp --directory)" dprint --version ''; }; + + updateScript = nix-update-script { }; }; meta = with lib; { From 4155ccc122bb63eddb310b279ad577b87046f081 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:49:43 +0900 Subject: [PATCH 4/7] dprint: 0.47.2 -> 0.47.5 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index e39f4251843b..910d19d89c4a 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.47.2"; + version = "0.47.5"; src = fetchCrate { inherit pname version; - hash = "sha256-zafRwiXfRACT6G408pXLCk7t6akabOs1VFLRF9SeNWI="; + hash = "sha256-1TfROcng9hF8j2PR+LEXNWnIKLapTPU1QunoCi5NxhI="; }; - cargoHash = "sha256-86ecnwDDVvgXgBBodP2rSZOn+R52Jap8RCKILttGOn8="; + cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation From fe3ce419eb0b647233f0ba3f86e59bddac18711a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sun, 10 Nov 2024 20:51:06 +0900 Subject: [PATCH 5/7] dprint: switch to the new darwin sdk pattern --- pkgs/development/tools/dprint/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 910d19d89c4a..38cb068c4d59 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -3,8 +3,6 @@ stdenv, fetchCrate, rustPlatform, - CoreFoundation, - Security, testers, nix-update-script, dprint, @@ -21,11 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreFoundation - Security - ]; - # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ebffaa70335..f6323a2b13be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8231,9 +8231,7 @@ with pkgs; dbt = with python3Packages; toPythonApplication dbt-core; - dprint = callPackage ../development/tools/dprint { - inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; - }; + dprint = callPackage ../development/tools/dprint { }; devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; From cf5c3ee399803dc4ec2e08ae52fd9578ee46c6c1 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 12:24:04 +0900 Subject: [PATCH 6/7] dprint: 0.47.5 -> 0.47.6 Release: https://github.com/dprint/dprint/releases/tag/0.47.6 This diff is generated by ```bash nix-shell ./maintainers/scripts/update.nix --argstr package dprint ``` And checked with ```bash nix-build --attr pkgs.dprint.passthru.tests ``` --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index 38cb068c4d59..5cf6abe3633c 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.47.5"; + version = "0.47.6"; src = fetchCrate { inherit pname version; - hash = "sha256-1TfROcng9hF8j2PR+LEXNWnIKLapTPU1QunoCi5NxhI="; + hash = "sha256-7tGzSFp7Dnu27L65mqFd7hzeFFDfe1xJ6cMul3hGyJs="; }; - cargoHash = "sha256-EliiKKRt+7IMPR8+0OWn+YKizPT9SZjVALAdbwi301w="; + cargoHash = "sha256-y3tV3X7YMOUGBn2hCmxsUUc9QQleKEioTIw7SGoBvSQ="; # Tests fail because they expect a test WASM plugin. Tests already run for # every commit upstream on GitHub Actions From 435da03a6e6e374a60dcb6f633a617c2666603b6 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 5 Dec 2024 12:41:32 +0900 Subject: [PATCH 7/7] dprint: move to pkgs/by-name https://github.com/NixOS/nixpkgs/blob/fbafd4f6751c961b36f8d4ff6b13cd2d163622bf/pkgs/by-name/README.md?plain=1#L79-L114 --- .../tools/dprint/default.nix => by-name/dp/dprint/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/dprint/default.nix => by-name/dp/dprint/package.nix} (100%) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/by-name/dp/dprint/package.nix similarity index 100% rename from pkgs/development/tools/dprint/default.nix rename to pkgs/by-name/dp/dprint/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6323a2b13be..99a230410aaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8231,8 +8231,6 @@ with pkgs; dbt = with python3Packages; toPythonApplication dbt-core; - dprint = callPackage ../development/tools/dprint { }; - devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; libcxx = llvmPackages.libcxx;