Skip to content

FIX: agdaPackages.cubical#131149

Closed
guilhermehas wants to merge 2 commits intoNixOS:masterfrom
guilhermehas:master
Closed

FIX: agdaPackages.cubical#131149
guilhermehas wants to merge 2 commits intoNixOS:masterfrom
guilhermehas:master

Conversation

@guilhermehas
Copy link
Copy Markdown
Contributor

Motivation for this change

Cubical Agda library was not working in Agda version 2.6.2. So I fixed it changing it to a newer version.

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"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Relase notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: agda A dependently typed programming language / interactive theorem prover label Jul 23, 2021
@ofborg ofborg bot requested a review from alexarice July 23, 2021 01:01
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 23, 2021
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Jul 23, 2021

you need to change the version = "..." to unstable and the date of the commit

follow the title format and commit format read https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md

i made this issue so maybe we will get a release agda/cubical#583

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should have the same effect:

preConfigure = ''makeFlagsArray=("AGDA_EXEC=agda -W error")'';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This would need to be the other way round I think

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I have already fixed it.

@alexarice
Copy link
Copy Markdown
Contributor

We usually wait for a release before updating agda libraries but Its probably preferable to at least have something that works

@guilhermehas
Copy link
Copy Markdown
Contributor Author

I changed the version to unstable.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 23, 2021
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Jul 23, 2021

Discard the deleted tested package And returned all-packages.nix

Use git rebase to fixup the commits into the first commit and reword the first commit
https://git-rebase.io/#fixup

@guilhermehas
Copy link
Copy Markdown
Contributor Author

Discard the deleted tested package And returned all-packages.nix

Use git rebase to fixup the commits into the first commit and reword the first commit
https://git-rebase.io/#fixup

I have already done the fixup. Look if everything is right.

@Artturin
Copy link
Copy Markdown
Member

Artturin commented Jul 23, 2021

reword 30a0c213eb4 added newer version of cubical Agda
fixup 6bc702b4fa9 added patch to cubical agda
fixup a2f61df7776 agdaPackages.cubical: 0.2 -> unstable
fixup 82034c77c7f agdaPackages.cubical: 0.2 -> unstable
drop cb1e38b389e deleted tested package
drop 548aedd729f returned all-packages.nix

in the next dialog

agdaPackages.cubical: 0.2 -> unstable

it would have been like this but this pr seems to be not needed now #131226

Thank you for the pr though!
if you'd like to commit the other changes then feel free to open a another pr

you should do your work in a separate branch instead of master
if you'd like to update your fork run

# if not done before 
# git remote add upstream https://github.com/NixOS/nixpkgs.git

git fetch upstream
git checkout master
git rebase upstream/master
git push

@guilhermehas guilhermehas force-pushed the master branch 2 times, most recently from b0a5ada to 46174ff Compare July 23, 2021 19:45
@guilhermehas
Copy link
Copy Markdown
Contributor Author

new pull request:
#131280

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

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: agda A dependently typed programming language / interactive theorem prover 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants