Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add bliss package #42897

Merged
merged 1 commit into from Jul 4, 2018
Merged

add bliss package #42897

merged 1 commit into from Jul 4, 2018

Conversation

fragamus
Copy link
Contributor

@fragamus fragamus commented Jul 2, 2018 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • [ x ] NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

matthewbauer
matthewbauer reviewed Jul 2, 2018
View reviewed changes
pkgs/applications/science/math/bliss/default.nix Outdated

nativeBuildInputs = [ unzip doxygen ];

unpackCmd = ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be needed - unzip has a hook to do this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

matthewbauer
matthewbauer requested changes Jul 2, 2018
View reviewed changes
pkgs/applications/science/math/bliss/default.nix Outdated
url = "http://scip.zib.de/download/bugfixes/scip-5.0.1/bliss-0.73.patch";
sha256 = "815868d6586bcd49ff3c28e14ccb536d38b2661151088fe08187c13909c5dab0";
};
src = [ blissSrc blissPatch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

src shuold just be blisssrc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

pkgs/applications/science/math/bliss/default.nix Outdated
esac
'';

patchPhase = ''
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just put blissPatch in patches - this makes things more composable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

infinisil
infinisil requested changes Jul 4, 2018
View reviewed changes
pkgs/applications/science/math/bliss/default.nix Outdated

nativeBuildInputs = [ unzip doxygen ];

patches = [ blissPatch ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to have the patch here directly (patches = [ (fetchurl { ...). Because blissPatch would be passed to the builder which doesn't use it. If you do want to assign variables, use a let in at the beginning

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@infinisil
Copy link
Member

And you need to finally learn how to squash multiple commits into one, look it up online.

@infinisil
Copy link
Member

@GrahamcOfBorg build bliss

fragamus
fragamus commented Jul 4, 2018
View reviewed changes
Copy link
Contributor Author

@fragamus fragamus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

squash into one commit now done

pkgs/applications/science/math/bliss/default.nix Outdated

nativeBuildInputs = [ unzip doxygen ];

patches = [ blissPatch ];
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: bliss

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: bliss

Partial log (click to expand)

g++ -I. -g -Wall --pedantic -O9 -fPIC -o bliss bliss.o defs.o graph.o partition.o orbit.o uintseqhash.o heap.o timer.o utils.o bliss_C.o
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73
shrinking /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73/bin/bliss
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73/lib  /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73/bin
patching script interpreter paths in /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73
checking for references to /build in /nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73...
/nix/store/k136g5syl4k4dqgwdpy33zmyl8r3jbgr-bliss-0.73

@infinisil
Copy link
Member

One more thing: Change the commit message to "bliss: init at 0.73"

@infinisil infinisil merged commit fac943f into NixOS:master Jul 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer requested changes

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fragamus @infinisil @GrahamcOfBorg @matthewbauer