From 1639e10d340d638bda0f14dd69060d8470c4da02 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Sun, 26 Jun 2022 23:35:42 +0200 Subject: [PATCH 1/4] Update perseus new url --> http://people.maths.ox.ac.uk/nanda/perseus/index.html add NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile --- pkgs/applications/science/math/perseus/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 4545203dacca..a9cf6e1b018d 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" ]; src = fetchurl { - url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip"; - sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj"; + url = "http://people.maths.ox.ac.uk/nanda/source/perseus_4_beta.zip"; + sha256 = "sha256-cnkJEIC4tu+Ni7z0cKdjmLdS8QLe8iKpdA8uha2MeSU="; }; sourceRoot = "."; - + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; @@ -32,9 +32,9 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; + homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ erikryb ]; + maintainers = with lib.maintainers; [ erikryb mrbitt ]; platforms = lib.platforms.linux; }; } From 923e4415d26da2db76229c1ab10c5a4be5752746 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Sun, 26 Jun 2022 23:50:03 +0200 Subject: [PATCH 2/4] Update perseus add space in line 17 --- pkgs/applications/science/math/perseus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index a9cf6e1b018d..353d6691a9c9 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation { }; sourceRoot = "."; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile + buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; From cd52b6d893c50f464d618a079e37253572fda102 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Mon, 27 Jun 2022 00:27:46 +0200 Subject: [PATCH 3/4] Update delete mrbitt maintainers --- pkgs/applications/science/math/perseus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 353d6691a9c9..5c1ed3e0a939 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ erikryb mrbitt ]; + maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; } From 22bccbcd9780c39ab08f4791e1de401b306a3923 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Mon, 27 Jun 2022 10:08:55 +0200 Subject: [PATCH 4/4] Update perseus delete space --- pkgs/applications/science/math/perseus/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 5c1ed3e0a939..d9921e68edb1 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation { }; sourceRoot = "."; - - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile - + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus '';