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

Gerbil #32329

Merged
merged 2 commits into from
Dec 5, 2017
Merged

Gerbil #32329

merged 2 commits into from
Dec 5, 2017
+8 −8

Conversation

fare
Copy link
Contributor

@fare fare commented Dec 5, 2017 •
edited
Loading

Motivation for this change

Many notable changes to Gerbil, that itself depends on notable changes to Gambit, have happened in the two months or so since I last upstreamed my changes to nixpkgs.

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
    • 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/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 5, 2017
Mic92
Mic92 reviewed Dec 5, 2017
View reviewed changes
pkgs/development/compilers/gambit/default.nix
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "gambit-${version}";
version = "4.8.8-300db59";
version = "4.8.8-415-g29ed48bb";
Copy link
Member

@Mic92 Mic92 Dec 5, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

We need actually numbers instead of git hashes, since hashes cannot be ordered by nix-env.
Can you switch to date of commit instead of a concrete git hash here?

Copy link
Member

Choose a reason for hiding this comment

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

Maybe 415 is already enough?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe 415 is OK.

Mic92
Mic92 reviewed Dec 5, 2017
View reviewed changes
pkgs/development/compilers/gerbil/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "gerbil-${version}";

version = "0.12-DEV-777-gd855915";
version = "0.12-DEV-836-gcde6802";
Copy link
Member

Choose a reason for hiding this comment

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

same here.

@grahamc
Copy link
Member

grahamc commented Dec 5, 2017

@GrahamcOfBorg eval

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 5, 2017
@fare
Copy link
Contributor Author

fare commented Dec 5, 2017

Indeed the 415 and 836 are the number of commits and make it easy to order the version numbers. These versions are taken from git describe --tags (stripping the leading v from the tag, so nix recognizes it's version numbers indeed).

I can switch to date if you prefer, but the above is what Gerbil natively uses, and that Gambit may use in the future.

@7c6f434c 7c6f434c merged commit b04040c into NixOS:master Dec 5, 2017
@7c6f434c
Copy link
Member

7c6f434c commented Dec 5, 2017

I think if upstream explicitly references commit counts, it is an aceptable style of patchlevel.

@Mic92
Copy link
Member

Mic92 commented Dec 7, 2017

@7c6f434c yes, but version still contains a commit hash in pr you have just merged, not just the patchlevel.

@7c6f434c
Copy link
Member

7c6f434c commented Dec 7, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@fare @grahamc @7c6f434c @Mic92 @GrahamcOfBorg