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: e129404b910f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6662fbc822fe
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 4, 2019

  1. nauty: small refactoring

    @timokau
    timokau committed Apr 4, 2019
    Copy the full SHA
    5880c44 View commit details

  2. nauty: add timokau as a maintainer 

    I'm interested in this package as a sage dependency.
    @timokau
    timokau committed Apr 4, 2019
    Copy the full SHA
    15045e6 View commit details

  3. nauty: disable cpu feature detection

    @timokau
    timokau committed Apr 4, 2019
    Copy the full SHA
    7f22a42 View commit details

Commits on Apr 5, 2019

  1. Merge pull request #58961 from timokau/nauty-features 

    nauty: disable cpu feature detection
    @timokau
    timokau authored Apr 5, 2019
    Copy the full SHA
    6662fbc View commit details
Showing with 17 additions and 6 deletions.
  1. +17 −6 pkgs/applications/science/math/nauty/default.nix
23 changes: 17 additions & 6 deletions pkgs/applications/science/math/nauty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{stdenv, fetchurl}:
{ stdenv
, lib
, fetchurl
, optimize ? false # impure
}:
stdenv.mkDerivation rec {
name = "nauty-${version}";
version = "26r11";
@@ -7,25 +11,32 @@ stdenv.mkDerivation rec {
sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
};
outputs = [ "out" "dev" ];
configureFlags = lib.optionals (!optimize) [
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
"--disable-popcnt"
"--disable-clz"
];
buildInputs = [];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
find . -type f -perm -111 \! -name '*.*' \! -name configure -exec cp '{}' "$out/bin" \;
cp [Rr][Ee][Aa][Dd]* COPYRIGHT This* [Cc]hange* "$out/share/doc/nauty"
cp *.h $dev/include/nauty
cp *.h "$dev/include/nauty"
for i in *.a; do
cp "$i" "$dev/lib/lib$i";
done
'';
checkTarget = "checks";
meta = {
meta = with lib; {
inherit version;
description = ''Programs for computing automorphism groups of graphs and digraphs'';
license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ raskin timokau ];
platforms = platforms.linux;
homepage = http://pallini.di.uniroma1.it/;
};
}