Skip to content

hyprpaper: 0.5.0 -> 0.6.0#278364

Merged
1 commit merged intoNixOS:masterfrom
fufexan:hyprland
Jan 18, 2024
Merged

hyprpaper: 0.5.0 -> 0.6.0#278364
1 commit merged intoNixOS:masterfrom
fufexan:hyprland

Conversation

@fufexan
Copy link
Contributor

@fufexan fufexan commented Jan 2, 2024

Description of changes

  • hyprlang: init at 0.2.1 (new dependency of hyprpaper)
  • hyprpaper: 0.5.0 -> 0.6.0

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 2, 2024
@ofborg ofborg bot requested a review from wozeparrot January 2, 2024 23:12
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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. labels Jan 2, 2024
@geri1701 geri1701 self-requested a review January 15, 2024 15:36
@geri1701
Copy link
Member

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

3 packages built:
  • hyprlang
  • hyprlang.dev
  • hyprpaper

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jan 15, 2024
@ghost ghost marked this pull request as draft January 16, 2024 07:38
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

remove the changes in pkgs/top-level/all-packages.nix and rebase when #278784 merges.

@fufexan fufexan force-pushed the hyprland branch 2 times, most recently from 3ad1eac to 0af87f5 Compare January 16, 2024 20:24
@ghost ghost marked this pull request as ready for review January 18, 2024 20:26
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

i believe this needs to get rebased off master to pull in #278784
not sure why it is not registering a merge-conflict with the changes to pkgs/by-name/hy/hyprlang/package.nix and pkgs/top-level/all-packages.nix

[edit] seems this might be ok if the changes are identical to what is in master.

@fufexan
Copy link
Contributor Author

fufexan commented Jan 18, 2024

The hyprlang commit is the same, I made sure of that. Probably why it doesn't trigger a conflict.

@ghost
Copy link

ghost commented Jan 18, 2024

The hyprlang commit is the same, I made sure of that. Probably why it doesn't trigger a conflict.

ok -- nixpkgs-review did the right thing too -- no merge conflicts.

however, the aarch64-linux build is failing

/nix/store/wjkn3fmykn68rbpnamj9kzgw263xcga2-binutils-2.40/bin/ld: /nix/store/hddv2aciqs8k8pza6nsrhxki3ri60n1p-hyprlang-0.2.1/lib/libhyprlang.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_cold(char*, unsigned long, char const*, unsigned long, unsigned long)@GLIBCXX_3.4.31'

@fufexan
Copy link
Contributor Author

fufexan commented Jan 18, 2024

My bad, syncing through github does a merge instead of rebase. I'm in the middle of a pretty big rebase (9000+ commits) in nixpkgs currently, so I'll do this rebase after that's done.

@ghost
Copy link

ghost commented Jan 18, 2024

however, the aarch64-linux build is failing

/nix/store/wjkn3fmykn68rbpnamj9kzgw263xcga2-binutils-2.40/bin/ld: /nix/store/hddv2aciqs8k8pza6nsrhxki3ri60n1p-hyprlang-0.2.1/lib/libhyprlang.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace_cold(char*, unsigned long, char const*, unsigned long, unsigned long)@GLIBCXX_3.4.31'

i think this link error is due to using gcc13 for libhyprlang but hyprpaper is gcc12 on aarch64-linux, so you'll have to add the gcc13stdev to hyprpaper in all-packages.nix too.

[edit] looks like #272674 is in staging-next, so whenever that merges in to master (1 month?) gcc13 will be the default for aarch64-linux as well.

@ofborg ofborg bot added the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Jan 18, 2024
@ghost
Copy link

ghost commented Jan 18, 2024

@ofborg build hyprpaper

@ghost ghost merged commit 2613c05 into NixOS:master Jan 18, 2024
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants