Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c05b3655410b
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8126ce7e4503
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 27, 2018

  1. 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.

(cherry picked from commit 2513747)
    @timokau
    timokau committed Oct 27, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    66d8fd1 View commit details

  2. sage: add sagemath alias 

    Sage is commonly referred to as sagemath (probably to improve
searchability). Many other distors call their package sagemath.

(cherry picked from commit 80833d1)
    @timokau
    timokau committed Oct 27, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9e7a83 View commit details

Commits on Oct 29, 2018

  1. Merge pull request #49249 from timokau/sage-fix-attrname-18.09 

    sage: fix attrname, add sagemath alias (18.09)
    @timokau
    timokau authored Oct 29, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8126ce7 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 pkgs/applications/science/math/sage/sage-wrapper.nix
  2. +1 −1 pkgs/applications/science/math/sage/sage.nix
  3. +1 −0 pkgs/top-level/aliases.nix
2 changes: 1 addition & 1 deletion pkgs/applications/science/math/sage/sage-wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

stdenv.mkDerivation rec {
version = sage.version;
name = "sage-wrapper-${version}";
name = "sage-${version}";

buildInputs = [
makeWrapper
2 changes: 1 addition & 1 deletion pkgs/applications/science/math/sage/sage.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

stdenv.mkDerivation rec {
version = sage-with-env.version;
name = "sage-${version}";
name = "sage-tests-${version}";

buildInputs = [
makeWrapper
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -235,6 +235,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