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.

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

csmith: init at 2.3.0, pull in Sys::CPU as dependency. #27095

Merged
merged 2 commits into from
Jul 4, 2017

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jul 3, 2017

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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" (new package, there aren't any)
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@pSub pSub added the 8.has: package (new) This PR adds a new package label Jul 3, 2017
postInstall = ''
substituteInPlace $out/bin/compiler_test.pl \
--replace '$CSMITH_HOME/runtime' $out/include/${name} \
--replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \
Copy link
Member

Choose a reason for hiding this comment

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

Maybe I am wrong but those single quotes seem wrong. I guess you mean something like --replace '${CSMITH_HOME}/runtime' " $out/include/${name}" \

Copy link
Member Author

Choose a reason for hiding this comment

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

Basically, but if written that way (`--replace '${CSMITH_HOME}/runtime') Nix will try to substitute for a 'CSMITH_HOME' variable, here I'm basically escaping it so the script actually contains the dollar-sign and brace characters.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see. That makes sense.

description = "A random generator of C programs";
homepage = "https://embed.cs.utah.edu/csmith";
# Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING
license = licenses.bsd;
Copy link
Member

Choose a reason for hiding this comment

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

licenses.bsd is not a valid option. This looks like a 2-clause BSD license with is called licenses.bsd2. See https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix#L78

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't think so, but I thought it'd break if it didn't exist :3. Thanks, I'll fix that!

Copy link
Member

Choose a reason for hiding this comment

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

It broke. Look at the last travis build :-)

Copy link
Member Author

Choose a reason for hiding this comment

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

Interesting, well regardless I should've checked :). But I'll see what it's doing to test things that I'm not! 👍

@Mic92 Mic92 merged commit 277c1f8 into NixOS:master Jul 4, 2017
@Mic92
Copy link
Member

Mic92 commented Jul 4, 2017

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants