From 63ca0c72717e58c0fb787f7ce6091e5d83154b97 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 22 Apr 2024 10:38:10 +0200 Subject: [PATCH 1/5] mathemagix: init at 11126 --- pkgs/by-name/ma/mathemagix/package.nix | 45 ++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/ma/mathemagix/package.nix diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix new file mode 100644 index 000000000000..5735bf8d0d64 --- /dev/null +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchsvn, + readline, + ncurses, + bison, + libtool, + gmp, + mpfr, +}: + +stdenv.mkDerivation { + pname = "mathemagix"; + version = "11126"; + + src = fetchsvn { + url = "https://subversion.renater.fr/anonscm/svn/mmx/"; + rev = 11126; + hash = "sha256-AFnYd5oFg/wgaHPjfZmqXNljEpoFW4h6f3UG+KZauEs="; + }; + + nativeBuildInputs = [ + readline + ncurses + bison + libtool + gmp + mpfr + ]; + + preConfigure = '' + export HOME="$PWD" + ''; + + configureFlags = [ "--prefix=${placeholder "out"}" ]; + + meta = { + description = "Mathemagix is a free computer algebra and analysis system. It consists of a high level language with a compiler and a series of mathematical libraries, some of which are written in C++."; + homepage = "http://www.mathemagix.org/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.linux; + }; +} From 84c05e12607cf21a9b18f8d36c2099530b690059 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 23 Apr 2024 20:34:10 +0200 Subject: [PATCH 2/5] Update pkgs/by-name/ma/mathemagix/package.nix Co-authored-by: Aleksana --- pkgs/by-name/ma/mathemagix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix index 5735bf8d0d64..2ec22aa98da4 100644 --- a/pkgs/by-name/ma/mathemagix/package.nix +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { configureFlags = [ "--prefix=${placeholder "out"}" ]; meta = { - description = "Mathemagix is a free computer algebra and analysis system. It consists of a high level language with a compiler and a series of mathematical libraries, some of which are written in C++."; + description = "A free computer algebra and analysis system consisting of a high level language with a compiler and a series of mathematical libraries"; homepage = "http://www.mathemagix.org/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ drupol ]; From ffac0b2e423629d4044df019ddeb020207bce599 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 23 Apr 2024 18:59:11 +0200 Subject: [PATCH 3/5] !fixup Address PR feedback part 1 --- pkgs/by-name/ma/mathemagix/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix index 2ec22aa98da4..52a9a7a8cd8b 100644 --- a/pkgs/by-name/ma/mathemagix/package.nix +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -10,16 +10,18 @@ mpfr, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mathemagix"; version = "11126"; src = fetchsvn { url = "https://subversion.renater.fr/anonscm/svn/mmx/"; - rev = 11126; + rev = finalAttrs.version; hash = "sha256-AFnYd5oFg/wgaHPjfZmqXNljEpoFW4h6f3UG+KZauEs="; }; + strictDeps = true; + nativeBuildInputs = [ readline ncurses @@ -42,4 +44,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ drupol ]; platforms = lib.platforms.linux; }; -} +}) From b9f8e1baf888398fa185330b94f7d5592a8abdd4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 23 Apr 2024 20:42:03 +0200 Subject: [PATCH 4/5] !fixup Address PR feedback part 2 --- pkgs/by-name/ma/mathemagix/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix index 52a9a7a8cd8b..ba299f639d72 100644 --- a/pkgs/by-name/ma/mathemagix/package.nix +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -22,11 +22,14 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ + buildInputs = [ readline ncurses - bison libtool + ]; + + nativeBuildInputs = [ + bison gmp mpfr ]; @@ -35,8 +38,6 @@ stdenv.mkDerivation (finalAttrs: { export HOME="$PWD" ''; - configureFlags = [ "--prefix=${placeholder "out"}" ]; - meta = { description = "A free computer algebra and analysis system consisting of a high level language with a compiler and a series of mathematical libraries"; homepage = "http://www.mathemagix.org/"; From 647738b3277ada730224a7cbf4a2eeb95cb40de2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 24 Apr 2024 10:37:32 +0200 Subject: [PATCH 5/5] !fixup Address PR feedback part 3 --- pkgs/by-name/ma/mathemagix/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mathemagix/package.nix b/pkgs/by-name/ma/mathemagix/package.nix index ba299f639d72..f9c53759dfb7 100644 --- a/pkgs/by-name/ma/mathemagix/package.nix +++ b/pkgs/by-name/ma/mathemagix/package.nix @@ -23,15 +23,15 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; buildInputs = [ - readline - ncurses + gmp libtool + mpfr + ncurses + readline ]; nativeBuildInputs = [ bison - gmp - mpfr ]; preConfigure = ''