From 7cf33b2eddf8993890e2105105a492da2d2c3323 Mon Sep 17 00:00:00 2001 From: guylamar2006 Date: Mon, 4 Aug 2025 09:40:08 -0500 Subject: [PATCH] dmensamenu: migrate to by-name, modernize (#430631) --- .../dm}/dmensamenu/dmenu-path.patch | 0 .../dm/dmensamenu/package.nix} | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 8 insertions(+), 13 deletions(-) rename pkgs/{applications/misc => by-name/dm}/dmensamenu/dmenu-path.patch (100%) rename pkgs/{applications/misc/dmensamenu/default.nix => by-name/dm/dmensamenu/package.nix} (64%) diff --git a/pkgs/applications/misc/dmensamenu/dmenu-path.patch b/pkgs/by-name/dm/dmensamenu/dmenu-path.patch similarity index 100% rename from pkgs/applications/misc/dmensamenu/dmenu-path.patch rename to pkgs/by-name/dm/dmensamenu/dmenu-path.patch diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/by-name/dm/dmensamenu/package.nix similarity index 64% rename from pkgs/applications/misc/dmensamenu/default.nix rename to pkgs/by-name/dm/dmensamenu/package.nix index a7703ee844f0..435ab331f363 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/by-name/dm/dmensamenu/package.nix @@ -1,13 +1,12 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, replaceVars, - requests, dmenu, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dmensamenu"; version = "1.2.2"; format = "setuptools"; @@ -15,8 +14,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "dotlambda"; repo = "dmensamenu"; - rev = version; - sha256 = "1ck1i1k40bli6m3n49ff6987hglby9fn4vfr28jpkm3h70s2km3n"; + tag = version; + hash = "sha256-dtQpNDhw1HklEtltYl3yiz54UDLOJWJHNZEuQGaIYbI="; }; patches = [ @@ -25,18 +24,18 @@ buildPythonApplication rec { }) ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ requests ]; # No tests implemented doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/dotlambda/dmensamenu"; description = "Print German canteen menus using dmenu and OpenMensa"; mainProgram = "dmensamenu"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab76551da97f..43af51567661 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11862,10 +11862,6 @@ with pkgs; dmenu-rs-enable-plugins = dmenu-rs.override { enablePlugins = true; }; - dmensamenu = callPackage ../applications/misc/dmensamenu { - inherit (python3Packages) buildPythonApplication requests; - }; - inherit (callPackage ../applications/virtualization/docker { }) docker_25 docker_28