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

decker: init at 1.31 #206472

Merged
merged 1 commit into from
Oct 23, 2023
Merged

decker: init at 1.31 #206472

merged 1 commit into from
Oct 23, 2023

Conversation

foo-dogsquared
Copy link
Member

Description of changes

Add Decker, a multimedia sketchpad.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

There are some things I don't know how to do properly such as installing those Vim plugins (or could be added as a separate package if that is preferred).

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.7 decker: init at 1.9 Jan 2, 2023
@foo-dogsquared foo-dogsquared changed the title decker: init at 1.9 decker: init at 1.10 Jan 9, 2023
duxovni
duxovni approved these changes Mar 5, 2023
View reviewed changes
Copy link
Contributor

@duxovni duxovni left a comment

Choose a reason for hiding this comment

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

Could be updated to v1.12 now; LGTM in any case, successfully built and ran it on x86_64-linux.

pkgs/applications/misc/decker/default.nix Outdated Show resolved Hide resolved
duxovni
duxovni suggested changes Mar 5, 2023
View reviewed changes
Copy link
Contributor

@duxovni duxovni left a comment

Choose a reason for hiding this comment

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

Actually, the docs and vim plugins aren't being installed to the right places:

pkgs/applications/misc/decker/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/decker/default.nix Outdated Show resolved Hide resolved
@duxovni
Copy link
Contributor

duxovni commented Mar 6, 2023

The failing checks on darwin should be fixed by JohnEarnest/Decker#53.

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.10 decker: init at 1.12 Mar 7, 2023
duxovni
duxovni approved these changes Mar 8, 2023
View reviewed changes
Copy link
Contributor

@duxovni duxovni left a comment

Choose a reason for hiding this comment

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

Yay! If you want to backport in the now-merged Makefile patch for now, to fix the broken darwin build:

pkgs/applications/misc/decker/default.nix Outdated Show resolved Hide resolved
@foo-dogsquared foo-dogsquared changed the title decker: init at 1.12 decker: init at 1.14 Mar 22, 2023
@foo-dogsquared
Copy link
Member Author

Updated the package to 1.14. Also rebased it on top of 216f9f4.

@foo-dogsquared
Copy link
Member Author

Update the package to 1.18 and rebased on top of 52f1451.

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.14 decker: init at 1.18 Apr 29, 2023
@foo-dogsquared
Copy link
Member Author

Updated the package to 1.21 and rebased it on top of 78576e1.

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.18 decker: init at 1.21 Jun 3, 2023
@foo-dogsquared
Copy link
Member Author

(Oof, I missed the previous releases. That's my bad.)

Updated the package to 1.24 and rebased it on top of f1468a9.

@foo-dogsquared
Copy link
Member Author

Updated the package to 1.29 and rebased it on top of 9e69bdb.

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.21 decker: init at 1.29 Sep 27, 2023
@foo-dogsquared foo-dogsquared changed the title decker: init at 1.29 decker: init at 1.30 Sep 30, 2023
@foo-dogsquared
Copy link
Member Author

Updated Decker to 1.30 and now uses by-name structure.

@foo-dogsquared
Copy link
Member Author

Updated to 1.31.

@foo-dogsquared foo-dogsquared changed the title decker: init at 1.30 decker: init at 1.31 Oct 20, 2023
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/1176

pbsds
pbsds requested changes Oct 20, 2023
View reviewed changes
Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

Looking good!

Result of nixpkgs-review pr 206472 run on x86_64-linux 1

1 package built:
  • decker

It runs fine, but these files are marked executable, which i believe they should not:

${decker}/share/doc/decker/examples/decks/dialog.deck
${decker}/share/doc/decker/examples/decks/patedit.deck
${decker}/share/doc/decker/examples/lilt/life.lil
${decker}/share/doc/decker/examples/lilt/mandel.lil
${decker}/share/doc/decker/examples/lilt/maze.lil
${decker}/share/doc/decker/examples/lilt/podcasts.lil
${decker}/share/doc/decker/format.md
${decker}/share/doc/decker/images/audio.gif
${decker}/share/doc/decker/images/brushes.png
${decker}/share/doc/decker/images/cards.gif
${decker}/share/doc/decker/images/conprops.gif
${decker}/share/doc/decker/images/listener.gif
${decker}/share/doc/decker/images/logo.png
${decker}/share/doc/decker/images/mover.gif
${decker}/share/doc/decker/images/palette.png
${decker}/share/doc/decker/images/position.gif
${decker}/share/doc/decker/images/protoattrs.gif
${decker}/share/doc/decker/images/protoinstances.gif
${decker}/share/doc/decker/images/protomargins.gif
${decker}/share/doc/decker/images/protoprops.gif
${decker}/share/doc/decker/images/protosize.gif
${decker}/share/doc/decker/images/protowids.gif
${decker}/share/doc/decker/images/sounds.gif
${decker}/share/doc/decker/images/wings.gif
${decker}/share/doc/decker/lil.md
${decker}/share/doc/decker/lilt.md

Could you also try to run the test target in the Makefile during checkPhase?

running tests
no Makefile or custom checkPhase, doing nothing

pkgs/by-name/de/decker/package.nix Outdated Show resolved Hide resolved
@foo-dogsquared
Copy link
Member Author

It runs fine, but these files are marked executable, which i believe they should not:

${decker}/share/doc/decker/examples/decks/dialog.deck
${decker}/share/doc/decker/examples/decks/patedit.deck
${decker}/share/doc/decker/examples/lilt/life.lil
${decker}/share/doc/decker/examples/lilt/mandel.lil
${decker}/share/doc/decker/examples/lilt/maze.lil
${decker}/share/doc/decker/examples/lilt/podcasts.lil
${decker}/share/doc/decker/format.md
${decker}/share/doc/decker/images/audio.gif
${decker}/share/doc/decker/images/brushes.png
${decker}/share/doc/decker/images/cards.gif
${decker}/share/doc/decker/images/conprops.gif
${decker}/share/doc/decker/images/listener.gif
${decker}/share/doc/decker/images/logo.png
${decker}/share/doc/decker/images/mover.gif
${decker}/share/doc/decker/images/palette.png
${decker}/share/doc/decker/images/position.gif
${decker}/share/doc/decker/images/protoattrs.gif
${decker}/share/doc/decker/images/protoinstances.gif
${decker}/share/doc/decker/images/protomargins.gif
${decker}/share/doc/decker/images/protoprops.gif
${decker}/share/doc/decker/images/protosize.gif
${decker}/share/doc/decker/images/protowids.gif
${decker}/share/doc/decker/images/sounds.gif
${decker}/share/doc/decker/images/wings.gif
${decker}/share/doc/decker/lil.md
${decker}/share/doc/decker/lilt.md

I fixed the permissions of the docfiles now. Though, I left examples/lilt/podcasts.lil as an executable since it has a shebang on it which I think it's intended to be an executable anyways. Also, I updated the package to only install the HTML files in the documentation instead of bundling both the Markdown and the generated HTML.

Could you also try to run the test target in the Makefile during checkPhase?

running tests
no Makefile or custom checkPhase, doing nothing

My bad, I didn't noticed that it didn't actually checked. With make test, there's some additional output now.

running tests
running tests against ./c/build/lilt ...
all interpreter tests passed.
all dom tests passed.
all roundtrip tests passed.

@pbsds pbsds merged commit 6f16c6c into NixOS:master Oct 23, 2023
22 checks passed
@foo-dogsquared foo-dogsquared deleted the add-decker branch October 24, 2023 03:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@duxovni duxovni duxovni approved these changes

@pbsds pbsds pbsds approved these changes

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@foo-dogsquared @duxovni @nixos-discourse @pbsds