Skip to content

flatcam: 8.5 -> unstable-2022-02-02#248004

Closed
matthiasbeyer wants to merge 2 commits intoNixOS:masterfrom
matthiasbeyer:update-flatcam
Closed

flatcam: 8.5 -> unstable-2022-02-02#248004
matthiasbeyer wants to merge 2 commits intoNixOS:masterfrom
matthiasbeyer:update-flatcam

Conversation

@matthiasbeyer
Copy link
Copy Markdown
Contributor

@matthiasbeyer matthiasbeyer commented Aug 8, 2023

qt4 -> qt5

(cherry picked from commit 9ab75e0f1ca9cae1d52cf994f7e46c8748e234ba)

Extracted from #174634
because this can be PRed independently and can land earlier than the PR above.

Description of changes

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.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

ajs124
ajs124 reviewed Aug 18, 2023
View reviewed changes
ajs124 and others added 2 commits August 18, 2023 17:56
@ajs124 @matthiasbeyer
flatcam: 8.5 -> unstable-2022-02-02
5c871ee 
qt4 -> qt5

(cherry picked from commit 9ab75e0f1ca9cae1d52cf994f7e46c8748e234ba)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@matthiasbeyer
flatcam: Rename input Rtree -> rtree
4e6726f 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@ofborg ofborg bot requested a review from trepetti August 18, 2023 16:41
@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 Aug 18, 2023
@natsukium natsukium mentioned this pull request Aug 21, 2023
Merged
12 tasks
@natsukium
Copy link
Copy Markdown
Member

natsukium commented Aug 21, 2023 

error: builder for '/nix/store/h1myk825hzv7v99xk6mpjpsarzvly2kp-flatcam-unstable-2022-02-02.drv' failed with exit code 2;
       last 10 log lines:
       > updateAutotoolsGnuConfigScriptsPhase
       > configuring
       > no configure script, doing nothing
       > installing
       > patching script interpreter paths in .
       > ./tests/canvas/prof.sh: interpreter directive changed from "#!/bin/sh" to "/nix/store/ir0j7zqlw9dc49grmwplppc7gh0s40yf-bash-5.2-p15/bin/sh"
       > ./assets/linux/flatcam-beta: interpreter directive changed from "#!/bin/bash" to "/nix/store/ir0j7zqlw9dc49grmwplppc7gh0s40yf-bash-5.2-p15/bin/bash"
       > install flags: SHELL=/nix/store/ir0j7zqlw9dc49grmwplppc7gh0s40yf-bash-5.2-p15/bin/bash USER_ID=0 LOCAL_PATH=/build/source/. INSTALL_PATH=/nix/store/8zjb0z5df61r01s99w0y9rkp2mqlsyhq-flatcam-unstable-2022-02-02/share/flatcam APPS_PATH=/nix/store/8zjb0z5df61r01s99w0y9rkp2mqlsyhq-flatcam-unstable-2022-02-02/share/applications install
       > Current python version is 3.10
       > Makefile:22: *** You must have at least 3.5 installed.  Stop.

🤔

@matthiasbeyer
Copy link
Copy Markdown
Contributor Author

matthiasbeyer commented Aug 21, 2023

Lol, does the makefile handle "3.10" as "3.1"? 😆

@ajs124
Copy link
Copy Markdown
Member

ajs124 commented Aug 21, 2023

yup, they do

@tjni
Copy link
Copy Markdown
Contributor

tjni commented Aug 24, 2023 •
edited
Loading

I am pretty sure that I broke flatcam on staging-next with the Python bootstrapping changes. Do you think this is close to the finish line, or should I buy more time by merging #249849 first?

@matthiasbeyer
Copy link
Copy Markdown
Contributor Author

matthiasbeyer commented Aug 24, 2023

Go ahead with your PR, I am not sure what to do about the makefile issue here.

@natsukium
Copy link
Copy Markdown
Member

natsukium commented Aug 24, 2023

It seems that these lines can be commented out to avoid the version check.
https://bitbucket.org/jpcgt/flatcam/src/ebf5cb9e3094362c4b0774a54cf119559c02211d/Makefile#lines-20:23

@matthiasbeyer matthiasbeyer deleted the update-flatcam branch January 7, 2024 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ajs124 ajs124 ajs124 left review comments

@trepetti trepetti Awaiting requested review from trepetti

Assignees

No one assigned

Labels

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@matthiasbeyer @natsukium @ajs124 @tjni