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

colorstorm: 2.0.0 -> 2.0.0-unstable-2025-01-17 #377279

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

niklaskorz
Copy link
Contributor

@niklaskorz niklaskorz commented Jan 27, 2025

Changelog: benbusby/colorstorm@v2.0.0...e645c42

All changes since 2.0 are are only build- or documentation-related.
colorstorm is the last package in nixpkgs depending on a Zig version older than 0.11 (precisely, 0.9 even). Bumping it to the recent but yet untagged commit making it compatible with the current Zig version 0.13.

A new tagged release has been requested in benbusby/colorstorm#16

Moved out of #376540 as the update itself isn't blocked by the Zig refactoring.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@niklaskorz
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377279


x86_64-linux

✅ 1 package built:
  • colorstorm

aarch64-linux

✅ 1 package built:
  • colorstorm

x86_64-darwin

✅ 1 package built:
  • colorstorm

aarch64-darwin

✅ 1 package built:
  • colorstorm

@niklaskorz
Copy link
Contributor Author

niklaskorz commented Jan 27, 2025

Edit: fixed by pkgs/by-name/co/colorstorm/0001-fix-segfault.patch (this might cause a memory leak, but should be fine as colorstorm isn't a long running application, and it appears the same potential leak was already part of 2.0.0, at least this fixes the segfault until upstream comes up with something better)

Upstream PR: benbusby/colorstorm#17


Tested running on https://github.com/benbusby/colorstorm/blob/main/examples/earthbound-themes.json as colorstorm earthbound-themes.json. Unfortunately, it looks like the changes from benbusby/colorstorm#15 weren't thoroughly tested.

Before this PR:

aarch64-darwin

Zig 0.9 build failure
   > -- Installing: /nix/store/d1xamfvzwgpikfgd9xam14vhfm54543p-zig-0.9.1/lib
   > thread 802309 panic: Darwin is handled separately via std.zig.system.darwin module
   > Unable to dump stack trace: debug info stripped
   > ::
   > :: ERROR: Subprocess aborted
   > :: (execute_process)
   > ::
   > :: argv: /tmp/nix-build-zig-0.9.1.drv-0/source/build/zig build --zig-lib-dir /tmp/nix-build-zig-0.9.1.drv-0/source/lib -Dlib-files-only --prefix /nix/store/d1xamfvzwgpikfgd9xam14vhfm54543p-zig-0.9.1 -Dconfig_h=/tmp/nix-build-zig-0.9.1.drv-0/source/build/config.h install
   > ::
   > :: argv[0]: /tmp/nix-build-zig-0.9.1.drv-0/source/build/zig
   > :: argv[1]: build
   > :: argv[2]: --zig-lib-dir
   > :: argv[3]: /tmp/nix-build-zig-0.9.1.drv-0/source/lib
   > :: argv[4]: -Dlib-files-only
   > :: argv[5]: --prefix
   > :: argv[6]: /nix/store/d1xamfvzwgpikfgd9xam14vhfm54543p-zig-0.9.1
   > :: argv[7]: -Dconfig_h=/tmp/nix-build-zig-0.9.1.drv-0/source/build/config.h
   > :: argv[8]: install
   > ::
   > CMake Error at /tmp/nix-build-zig-0.9.1.drv-0/source/cmake/install.cmake:36 (message):
   > Call Stack (most recent call first):
   >   cmake_install.cmake:67 (include)
   >
   >
   > make: *** [Makefile:100: install] Fehler 1

x86_64-linux

Build and execution successful
-- vim
   ./colorstorm-out/vim/colors/earthbound.vim
   ./colorstorm-out/vim/colors/moonside.vim
   ./colorstorm-out/vim/colors/threed.vim
   ./colorstorm-out/vim/colors/fire-spring.vim
   ./colorstorm-out/vim/colors/dusty-dunes.vim
   ./colorstorm-out/vim/colors/magicant.vim
   ./colorstorm-out/vim/colors/cave-of-the-past.vim
   ./colorstorm-out/vim/colors/devils-machine.vim
-- vscode
   ./colorstorm-out/vscode/themes/earthbound.json
   ./colorstorm-out/vscode/themes/moonside.json
   ./colorstorm-out/vscode/themes/threed.json
   ./colorstorm-out/vscode/themes/fire-spring.json
   ./colorstorm-out/vscode/themes/dusty-dunes.json
   ./colorstorm-out/vscode/themes/magicant.json
   ./colorstorm-out/vscode/themes/cave-of-the-past.json
   ./colorstorm-out/vscode/themes/devils-machine.json
-- sublime
   ./colorstorm-out/sublime/earthbound.tmTheme
   ./colorstorm-out/sublime/moonside.tmTheme
   ./colorstorm-out/sublime/threed.tmTheme
   ./colorstorm-out/sublime/fire-spring.tmTheme
   ./colorstorm-out/sublime/dusty-dunes.tmTheme
   ./colorstorm-out/sublime/magicant.tmTheme
   ./colorstorm-out/sublime/cave-of-the-past.tmTheme
   ./colorstorm-out/sublime/devils-machine.tmTheme
-- atom
   ./colorstorm-out/atom/themes/earthbound-syntax/colors.less
   ./colorstorm-out/atom/themes/moonside-syntax/colors.less
   ./colorstorm-out/atom/themes/threed-syntax/colors.less
   ./colorstorm-out/atom/themes/fire-spring-syntax/colors.less
   ./colorstorm-out/atom/themes/dusty-dunes-syntax/colors.less
   ./colorstorm-out/atom/themes/magicant-syntax/colors.less
   ./colorstorm-out/atom/themes/cave-of-the-past-syntax/colors.less
   ./colorstorm-out/atom/themes/devils-machine-syntax/colors.less
-- iterm2
   ./colorstorm-out/iterm2/earthbound.itermcolors
   ./colorstorm-out/iterm2/moonside.itermcolors
   ./colorstorm-out/iterm2/threed.itermcolors
   ./colorstorm-out/iterm2/fire-spring.itermcolors
   ./colorstorm-out/iterm2/dusty-dunes.itermcolors
   ./colorstorm-out/iterm2/magicant.itermcolors
   ./colorstorm-out/iterm2/cave-of-the-past.itermcolors
   ./colorstorm-out/iterm2/devils-machine.itermcolors

After this PR:

aarch64-darwin

Execution fails with segmentation fault
-- vim
Segmentation fault at address 0x100af8010
Panicked during a panic. Aborting.
Abort trap: 6

x86_64-linux

Execution fails with segmentation fault
-- vim
Segmentation fault at address 0x7f71652ac010
???:?:?: 0x101d94a in ??? (exe)
Unwind information for `exe:0x101d94a` was not available, trace may be incomplete

[1]    1674128 abort (core dumped)

Copy link
Contributor

@ddogfoodd ddogfoodd left a comment

Choose a reason for hiding this comment

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

pretty cool project, thanks @niklaskorz, this works for me on x86_64-linux

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 27, 2025
@kirillrdy
Copy link
Member

didn't wait for darwin to finish because of https://discourse.nixos.org/t/prs-stuck-in-passthru-tests-for-darwin/59257/7

@kirillrdy kirillrdy merged commit b2a8492 into NixOS:master Jan 28, 2025
26 of 28 checks passed
@niklaskorz niklaskorz mentioned this pull request Feb 5, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants