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

fetchFromGitHub add LFS support & Spacenav updates #263120

Merged
merged 9 commits into from
Nov 4, 2024
Merged

fetchFromGitHub add LFS support & Spacenav updates #263120

merged 9 commits into from
Nov 4, 2024

Conversation

Sohalt
Copy link
Contributor

@Sohalt Sohalt commented Oct 24, 2023 •
edited
Loading

Description of changes

  • Update libspnav
  • Update spacenavd
  • Support LFS in fetchFromGitHub
  • Update spnavcfg
  • Update spacenavd module

fixes #230295

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: fetch labels Oct 24, 2023
@Sohalt Sohalt mentioned this pull request Oct 24, 2023
Closed
@ofborg ofborg bot requested a review from gebner October 24, 2023 11:56
@the-furry-hubofeverything
Copy link
Contributor

IMO adding code to a fetcher is a fairly large change, since it is used by everyone. I suggest either add that to the title or create a seperate PR

@Sohalt Sohalt changed the title Spacenav updates fetchFromGitHub add LFS support & Spacenav updates Oct 28, 2023
@Sohalt Sohalt marked this pull request as ready for review November 26, 2023 15:06
@Sohalt
Copy link
Contributor Author

Sohalt commented Nov 26, 2023

Tested the module and spnavcfg. Also tested that it works in Blender 3.5.1 (using a spacemouse wireless)

@luzpaz
Copy link
Contributor

luzpaz commented Feb 10, 2024

What is blocking this PR ?

@coldelectrons
Copy link

I am also interested in this PR's progress.

@AT-Geist
Copy link

I would also like to see this merged

@Sohalt Sohalt mentioned this pull request Jun 11, 2024
Closed
13 tasks
@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-ready-for-review/3032/4510

SuperSandro2000
SuperSandro2000 reviewed Sep 3, 2024
View reviewed changes
pkgs/misc/drivers/spacenavd/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/spnavcfg/default.nix Outdated Show resolved Hide resolved
pkgs/applications/misc/spnavcfg/default.nix Outdated Show resolved Hide resolved
nixos/modules/services/hardware/spacenavd.nix Outdated Show resolved Hide resolved
pkgs/misc/drivers/spacenavd/default.nix Outdated Show resolved Hide resolved
pkgs/misc/drivers/spacenavd/default.nix Outdated Show resolved Hide resolved
@Sohalt Sohalt requested a review from philiptaron as a code owner September 4, 2024 16:56
philiptaron
philiptaron previously requested changes Sep 4, 2024
View reviewed changes
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

One change requested: spnavcfg ought to contain the details of which version of qt it depends on, not all-packages.nix.

I'm going to merge once that's resolved.

The change to fetchGitHub, which is what got me added to this PR, looks great. Thanks.

The three packages that fail to build also fail to build on master.

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

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
3 packages failed to build:
  • horizon-eda
  • super-slicer
  • super-slicer.debug
27 packages built:
  • blender
  • blender-hip
  • blendfarm
  • cameractrls
  • cameractrls-gtk3
  • cameractrls-gtk4
  • disko
  • dune3d
  • freecad
  • freecad-wayland
  • kicadAddons.kikit
  • kicadAddons.kikit-library
  • kikit
  • kikit.dist
  • libspnav
  • openscad
  • openscad-unstable
  • snis
  • solvespace
  • spacenav-cube-example
  • spacenavd
  • spnavcfg
  • super-slicer-beta
  • super-slicer-beta.debug
  • super-slicer-latest
  • super-slicer-latest.debug
  • vimPlugins.openscad-nvim

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/misc/drivers/spacenavd/default.nix Show resolved Hide resolved
pkgs/applications/misc/spnavcfg/default.nix Outdated Show resolved Hide resolved
@jue89
Copy link
Contributor

jue89 commented Sep 5, 2024

The three packages that fail to build also fail to build on master.

FYI ... horizon-eda should be fixed by #339213.

@philiptaron
Copy link
Contributor

The three packages that fail to build also fail to build on master.

FYI ... horizon-eda should be fixed by #339213.

Thanks, merged.

@philiptaron
Copy link
Contributor

philiptaron commented Sep 11, 2024 •
edited
Loading

I'd like to merge this. @Sohalt, would you like me to make the adjustment that I requested? I'd be happy to do so.

@jue89
Copy link
Contributor

jue89 commented Sep 19, 2024

I'd like to merge this. @Sohalt, would you like me to make the adjustment that I requested? I'd be happy to do so.

@philiptaron FYI - @Sohalt gave you a thumbs-up on that comment ;o)

@philiptaron
Copy link
Contributor

Missed that. Thanks! I'll do so when I have access to Big Computer not just Tiny Computer.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
@jue89
Copy link
Contributor

jue89 commented Nov 4, 2024

Gentle ping 🏓

I guess it's too late for 24.11?

@philiptaron philiptaron dismissed their stale review November 4, 2024 16:17

Changes implemented.

@philiptaron
Copy link
Contributor

I'll address @SuperSandro2000's requested changes, wait for ofBorg, then merge. Not too late for 24.11, @jue89 -- and thanks for the ping.

@philiptaron philiptaron removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 4, 2024
@philiptaron

This comment was marked as outdated.

Sign in to view
@philiptaron
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 263120

x86_64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools
❌ 2 packages failed to build:
  • super-slicer
  • super-slicer.debug
✅ 27 packages built:
  • blender
  • blender-hip
  • blendfarm
  • cameractrls
  • cameractrls-gtk3
  • cameractrls-gtk4
  • dune3d
  • freecad
  • freecad-wayland
  • horizon-eda
  • kicadAddons.kikit
  • kicadAddons.kikit-library
  • kikit
  • kikit.dist
  • libspnav
  • openscad
  • openscad-unstable
  • snis
  • solvespace
  • spacenav-cube-example
  • spacenavd
  • spnavcfg
  • super-slicer-beta
  • super-slicer-beta.debug
  • super-slicer-latest
  • super-slicer-latest.debug
  • vimPlugins.openscad-nvim

@philiptaron
Copy link
Contributor

Need to fix the Darwin build failure, then I think it's good.

@philiptaron
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 263120

aarch64-darwin

❌ 3 packages failed to build:
  • super-slicer
  • super-slicer-beta
  • super-slicer-latest
✅ 5 packages built:
  • dune3d
  • libspnav
  • spacenav-cube-example
  • spacenavd
  • spnavcfg

@philiptaron philiptaron merged commit 464adc0 into NixOS:master Nov 4, 2024
11 of 12 checks passed
WilliButz referenced this pull request Dec 10, 2024
@philiptaron
nixos/boot: merge to maintain commit signatures
898a502
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@jue89 jue89 jue89 left review comments

@philiptaron philiptaron philiptaron left review comments

@gebner gebner Awaiting requested review from gebner

Assignees
No one assigned
Labels
6.topic: fetch 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Spacenav module does not work in Blender
10 participants
@Sohalt @the-furry-hubofeverything @luzpaz @coldelectrons @AT-Geist @nixos-discourse @jue89 @philiptaron @SuperSandro2000 @wegank