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

Jump to bottom

[20.09] chez-modules: Fix path to csv-site. #98577

Merged
merged 2 commits into from Oct 8, 2020
Merged

[20.09] chez-modules: Fix path to csv-site. #98577

merged 2 commits into from Oct 8, 2020

Conversation

meithecatte
Copy link
Contributor

Motivation for this change

backport of #97927 and #98128
ZHF: #97479

cc @NixOS/nixos-release-managers

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
    • nixpkgs-review seems to want to merge my branch with master before building the diffs. The changes were tested before backporting, though
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from thoughtpolice September 23, 2020 19:10
cole-h
cole-h approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM.

[1 built, 6 copied (38.3 MiB), 10.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/98577
6 packages built:
chez chez-matchable chez-mit chez-scmutils chez-srfi idris2

r-burns
r-burns approved these changes Sep 24, 2020
View reviewed changes
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Built chez-* and idris2 on darwin

cole-h
cole-h requested changes Sep 24, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Something I missed in my review last night:

Please cherry-pick these commits from the master branch (for reference, see https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes; start from step 4). Once that is done, my approval stands.

@meithecatte
chez-modules: Fix path to csv-site.
7d00144 
It seems that the installation path for chez modules no longer includes
the Chez version. This fixes the build for chez-mit and chez-scmutils.

(cherry picked from commit 72ccc9b)
@meithecatte
chez: add env hook
17b6d3f 
As a follow-up to NixOS#97927, chez can now find its libraries in a
nix-shell, and derivations for such libraries don't need to handle the
search path themselves.

(cherry picked from commit 8f60607)
@meithecatte
Copy link
Contributor Author

@cole-h Sorry, I have missed the -x flag before. PTAL.

cole-h
cole-h approved these changes Sep 24, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Much better, thanks. Should be good to go!

@thoughtpolice thoughtpolice merged commit d0077a6 into NixOS:release-20.09 Oct 8, 2020
@thoughtpolice
Copy link
Member

Sorry for the wait, thanks!

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

@thoughtpolice thoughtpolice thoughtpolice approved these changes

@cole-h cole-h cole-h approved these changes

@r-burns r-burns r-burns approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 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
@meithecatte @thoughtpolice @cole-h @r-burns