From 25137473565f7dd76d6b43fb275d7567fbd277fe Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 27 Oct 2018 13:27:25 +0200 Subject: [PATCH 1/2] sage: fix attrname This is a minimal change mainly to make sure repology recognizes this package as sage. I plan a bit more refactoring later, but this is intentionally kept minimally invasive so that it won't break anything and can be backported to 18.09. --- pkgs/applications/science/math/sage/sage-wrapper.nix | 2 +- pkgs/applications/science/math/sage/sage.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix index 06b667f426f..4b2f9c461c1 100644 --- a/pkgs/applications/science/math/sage/sage-wrapper.nix +++ b/pkgs/applications/science/math/sage/sage-wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = sage.version; - name = "sage-wrapper-${version}"; + name = "sage-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b1e5d7278b0..ad9a32e0ca5 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = sage-with-env.version; - name = "sage-${version}"; + name = "sage-tests-${version}"; buildInputs = [ makeWrapper From 80833d13feb586a5799bad5aacfb106fd3fbf0f1 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 27 Oct 2018 14:08:35 +0200 Subject: [PATCH 2/2] sage: add sagemath alias Sage is commonly referred to as sagemath (probably to improve searchability). Many other distors call their package sagemath. --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a8c4f1334d..444028d2db0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -250,6 +250,7 @@ mapAliases ({ s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 s6PortableUtils = s6-portable-utils; # added 2018-07-23 + sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02