From 1200bc87a63f8738f1efbcb150164b230db2acc2 Mon Sep 17 00:00:00 2001 From: Grayson Tinker Date: Sun, 7 Jun 2026 15:45:13 -0700 Subject: [PATCH] mwic: migrate to by-name --- .../mwic/default.nix => by-name/mw/mwic/package.nix} | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/mwic/default.nix => by-name/mw/mwic/package.nix} (70%) diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/by-name/mw/mwic/package.nix similarity index 70% rename from pkgs/applications/misc/mwic/default.nix rename to pkgs/by-name/mw/mwic/package.nix index 9aa8902f416d..46a1cfe0efeb 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/by-name/mw/mwic/package.nix @@ -2,25 +2,25 @@ lib, stdenv, fetchurl, - pythonPackages, + python3Packages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.7.10"; pname = "mwic"; src = fetchurl { - url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/jwilk/mwic/releases/download/${finalAttrs.version}/mwic-${finalAttrs.version}.tar.gz"; sha256 = "sha256-dmIHPehkxpSb78ymVpcPCu4L41coskrHQOg067dprOo="; }; makeFlags = [ "PREFIX=\${out}" ]; nativeBuildInputs = [ - pythonPackages.wrapPython + python3Packages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ pyenchant regex ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4757e55b295c..7a470a17d01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9441,10 +9441,6 @@ with pkgs; mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay; - mwic = callPackage ../applications/misc/mwic { - pythonPackages = python3Packages; - }; - netmaker = callPackage ../applications/networking/netmaker { subPackages = [ "." ]; }; netmaker-full = callPackage ../applications/networking/netmaker { };