From 5283690260c8ebd3b41829bdca6b7052818de18d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 11 Feb 2026 15:24:00 -0600 Subject: [PATCH 1/2] dazel: migrate to by-name --- .../dazel/default.nix => by-name/da/dazel/package.nix} | 9 +++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{development/tools/dazel/default.nix => by-name/da/dazel/package.nix} (79%) diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/by-name/da/dazel/package.nix similarity index 79% rename from pkgs/development/tools/dazel/default.nix rename to pkgs/by-name/da/dazel/package.nix index cfc669c4feb8..8e44957875ff 100644 --- a/pkgs/development/tools/dazel/default.nix +++ b/pkgs/by-name/da/dazel/package.nix @@ -1,15 +1,16 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dazel"; version = "0.0.43"; pyproject = true; - build-system = [ setuptools ]; + build-system = [ + python3Packages.setuptools + ]; src = fetchPypi { inherit pname version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7b195c2e66..8f9af2036a1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1468,8 +1468,6 @@ with pkgs; inherit (cue) writeCueValidator; - dazel = python3Packages.callPackage ../development/tools/dazel { }; - detect-secrets = with python3Packages; toPythonApplication detect-secrets; deterministic-host-uname = deterministic-uname.override { From 2c39b0b82206c3c4f1614d37e63ac3045e377d6b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 11 Feb 2026 15:25:29 -0600 Subject: [PATCH 2/2] dazel: switch to finalAttrs --- pkgs/by-name/da/dazel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dazel/package.nix b/pkgs/by-name/da/dazel/package.nix index 8e44957875ff..0ee095906d00 100644 --- a/pkgs/by-name/da/dazel/package.nix +++ b/pkgs/by-name/da/dazel/package.nix @@ -3,7 +3,7 @@ python3Packages, fetchPypi, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "dazel"; version = "0.0.43"; pyproject = true; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { ]; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-2enQRKg4CAPGHte02io+EfiW9AmuP3Qi41vNQeChg+8="; }; @@ -25,4 +25,4 @@ python3Packages.buildPythonApplication rec { malt3 ]; }; -} +})