Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3b2c06909ea2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 374016fb1cbf
Choose a head ref
  • 8 commits
  • 1 file changed
  • 1 contributor

Commits on May 28, 2020

  1. gap: use the check target for install checks 

    As suggested by Max Horn.

This exists since gap 4.10 and will only run the install checks once
while also exiting with an appropriate exit code. This new check has
uncovered some test failures, which are harmless and actually disabled
in a future gap release. The error-detection code for the previous test
target was probably broken.
    @timokau
    timokau committed May 28, 2020
    Copy the full SHA
    a4c76b9 View commit details

  2. gap: move to new source URL 

    GAP downloads moved to a new subdomain. The old one still redirects, but
the new one is the "source of truth" so we should switch to that.
    @timokau
    timokau committed May 28, 2020
    Copy the full SHA
    c269b51 View commit details

  3. gap: remove m4 dependency 

    No longer necessary, since the build system was significantly overhauled
/ replaced by Max Horn.
    @timokau
    timokau committed May 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e2e45e1 View commit details

  4. gap: fix comment typo

    @timokau
    timokau committed May 28, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9e245a0 View commit details

  5. gap: use https for the homepage

    @timokau
    timokau committed May 28, 2020
    Copy the full SHA
    f15c816 View commit details

  6. gap: add readline support 

    Technically optional but strongly recommended from upstream. Replaces
their own implementation for input parsing.
    @timokau
    timokau committed May 28, 2020
    Copy the full SHA
    d689f3f View commit details

  7. gap: remove explicit configreFlags 

    System gmp is now the default.
    @timokau
    timokau committed May 28, 2020
    Copy the full SHA
    6579f81 View commit details

Commits on Jun 2, 2020

  1. Merge pull request #89111 from timokau/gap-cleanup 

    gap: cleanup
    @timokau
    timokau authored Jun 2, 2020
    Copy the full SHA
    374016f View commit details
Showing with 25 additions and 20 deletions.
  1. +25 −20 pkgs/applications/science/math/gap/default.nix
45 changes: 25 additions & 20 deletions pkgs/applications/science/math/gap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
, fetchurl
, fetchpatch
, makeWrapper
, m4
, readline
, gmp
# one of
# - "minimal" (~400M):
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
version = "4.10.2";

src = fetchurl {
url = "https://www.gap-system.org/pub/gap/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2";
sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94";
};

@@ -73,10 +73,8 @@ stdenv.mkDerivation rec {
patchShebangs .
'';

configureFlags = [ "--with-gmp=system" ];

buildInputs = [
m4
readline
gmp
];

@@ -91,14 +89,31 @@ stdenv.mkDerivation rec {
url = "https://github.com/gap-system/gap/commit/3361c172e6c5ff3bb3f01ba9d6f1dd4ad42cea80.patch";
sha256 = "1kwp9qnfvmlbpf1c3rs6j5m2jz22rj7a4hb5x1gj9vkpiyn5pdyj";
})

# Fix for locale specific tests causing issues. Already upstream.
# Backport of https://github.com/gap-system/gap/pull/4022
# WHEN REMOVING: also remove the`rm tst/testinstall/strings.tst` line in
# `postPatch` below. That line is necessary since the patch is not intended
# for gap 4.10.
(fetchpatch {
name = "remove-locale-specific-tests.patch";
url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch";
excludes = ["tst/testinstall/stringobj.tst"];
sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc";
})
];

postPatch = ''
# File not covered by the remove-locale-specific-tests.patch patch above.
rm tst/testinstall/strings.tst
'';

# "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min.
# tests are run twice, once with all packages loaded and once without
# checkTarget = "teststandard";

doInstallCheck = true;
installCheckTarget = "testinstall";
installCheckTarget = "check";

preInstallCheck = ''
# gap tests check that the home directory exists
@@ -119,16 +134,6 @@ stdenv.mkDerivation rec {
)
'';

postCheck = ''
# The testsuite doesn't exit with a non-zero exit code on failure.
# It leaves its logs in dev/log however.
# grep for error messages
if grep ^##### dev/log/*; then
exit 1
fi
'';

postBuild = ''
pushd pkg
bash ../bin/BuildPackages.sh
@@ -170,11 +175,11 @@ stdenv.mkDerivation rec {
];
platforms = platforms.all;
broken = stdenv.isDarwin;
# keeping all packages increases the package size considerably, wchich
# is why a local build is preferable in that situation. The timeframe
# is reasonable and that way the binary cache doesn't get overloaded.
# keeping all packages increases the package size considerably, which is
# why a local build is preferable in that situation. The timeframe is
# reasonable and that way the binary cache doesn't get overloaded.
hydraPlatforms = lib.optionals (!keepAllPackages) meta.platforms;
license = licenses.gpl2;
homepage = "http://gap-system.org/";
homepage = "https://www.gap-system.org";
};
}