From fbe4cf6ae3e4436a061319d5b8b407c7660eba05 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:08:01 -0700 Subject: [PATCH 1/3] cryptop: use callPackage --- pkgs/applications/blockchains/cryptop/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index c4689d82f4ca..3537243de857 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -1,13 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - requests, - requests-cache, - setuptools, }: - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cryptop"; version = "0.2.0"; format = "setuptools"; @@ -17,7 +13,7 @@ buildPythonApplication rec { sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools requests requests-cache diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a2b319170a0..6611e9b75612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14237,7 +14237,7 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; + cryptop = callPackage ../applications/blockchains/cryptop { }; elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; From ed81ad23a306bde0e385b3d92e7f0fa821f6faa9 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:09:20 -0700 Subject: [PATCH 2/3] cryptop: do not use list for single license --- pkgs/applications/blockchains/cryptop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index 3537243de857..07430c794792 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; mainProgram = "cryptop"; }; From 047f027ad7e1a658f0cf2bff1e1373a6422d4c22 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Mon, 4 Aug 2025 21:10:39 -0700 Subject: [PATCH 3/3] cryptop: move to by-name --- .../cryptop/default.nix => by-name/cr/cryptop/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/blockchains/cryptop/default.nix => by-name/cr/cryptop/package.nix} (100%) diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/by-name/cr/cryptop/package.nix similarity index 100% rename from pkgs/applications/blockchains/cryptop/default.nix rename to pkgs/by-name/cr/cryptop/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6611e9b75612..244767fc50e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14237,8 +14237,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - cryptop = callPackage ../applications/blockchains/cryptop { }; - elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; inherit (darwin) autoSignDarwinBinariesHook;