diff --git a/pkgs/applications/science/math/mathmod/fix-paths.patch b/pkgs/by-name/ma/mathmod/fix-paths.patch similarity index 100% rename from pkgs/applications/science/math/mathmod/fix-paths.patch rename to pkgs/by-name/ma/mathmod/fix-paths.patch diff --git a/pkgs/applications/science/math/mathmod/default.nix b/pkgs/by-name/ma/mathmod/package.nix similarity index 56% rename from pkgs/applications/science/math/mathmod/default.nix rename to pkgs/by-name/ma/mathmod/package.nix index dd85d0678492..df64cf723125 100644 --- a/pkgs/applications/science/math/mathmod/default.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -1,18 +1,19 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, qmake +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, }: -mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "11.1-unstable-2024-01-26"; + version = "12.0"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; - rev = "24d03a04c17363520ae7cf077e72a7b8684eb6fd"; - hash = "sha256-HiqHssPGqYEVZWchZRj4rFPc+xNVZk1ryl5qvFC2BmQ="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ="; }; patches = [ ./fix-paths.patch ]; @@ -21,9 +22,13 @@ mkDerivation { substituteInPlace MathMod.pro --subst-var out ''; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = with libsForQt5; [ + qmake + wrapQtAppsHook + ]; meta = { + changelog = "https://github.com/parisolab/mathmod/releases/tag/${finalAttrs.version}"; description = "Mathematical modelling software"; homepage = "https://github.com/parisolab/mathmod"; license = lib.licenses.gpl2Plus; @@ -31,4 +36,4 @@ mkDerivation { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c410d060522..ab19972dbaa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36410,8 +36410,6 @@ with pkgs; cudaSupport = true; }; - mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; - metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { };