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

ciel: init at 3.1.3 #220006

Merged
merged 1 commit into from
Mar 23, 2023
Merged

ciel: init at 3.1.3 #220006

merged 1 commit into from
Mar 23, 2023

Conversation

YisuiDenghua
Copy link
Member

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.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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Mar 7, 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-ready-for-review/1016/41

ocfox
ocfox reviewed Mar 9, 2023
View reviewed changes
Copy link
Member

@ocfox ocfox left a comment

Choose a reason for hiding this comment

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

I think cargo.lock should be added to the upstream repository instead of nixpkgs. Maybe you can communicate with the upstream.

@YisuiDenghua
Copy link
Member Author

I think cargo.lock should be added to the upstream repository instead of nixpkgs. Maybe you can communicate with the upstream.

Just removed Cargo.lock in this repo.

NickCao
NickCao reviewed Mar 10, 2023
View reviewed changes
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Mar 12, 2023
NickCao
NickCao reviewed Mar 13, 2023
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

Overall LGTM. Please squash the commits.

pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
SuperSandro2000
SuperSandro2000 reviewed Mar 19, 2023
View reviewed changes
pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
pkgs/tools/package-management/ciel/default.nix Outdated
mv -v "$out/bin/ciel-rs" "$out/bin/ciel"
env PREFIX="$out/" ./install-assets.sh
# FIXME: remove line below after https://github.com/AOSC-Dev/ciel-rs/pull/15 merged
mv -v $out/share/fish/completions $out/share/fish/vendor_completions.d
Copy link
Member

Choose a reason for hiding this comment

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

Please use installShellCompletion

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm switching to installShellCompletion. However, now I can't use ./install-assets.sh anymore and is manually copying plugins.

pkgs/tools/package-management/ciel/default.nix Outdated Show resolved Hide resolved
@ocfox
Copy link
Member

ocfox commented Mar 22, 2023

Please squash these commits as one.

@KiruyaMomochi
Copy link
Contributor

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

1 package built:
  • ciel

NickCao
NickCao reviewed Mar 22, 2023
View reviewed changes
pkgs/tools/package-management/ciel/default.nix Outdated
Comment on lines 36 to 37
# FIXME: remove patch below after https://github.com/AOSC-Dev/ciel-rs/pull/16 is merged
./0001-use-canonicalize-path-to-find-libexec.patch
Copy link
Member

@NickCao NickCao Mar 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

just use fetchpatch (keep the link to upstream PR as well as the PR title in the comment)

pkgs/tools/package-management/ciel/default.nix Outdated
Comment on lines 40 to 42
postPatch = ''
patchShebangs --build ./install-assets.sh
'';
Copy link
Member

Choose a reason for hiding this comment

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

No longer required.

pkgs/tools/package-management/ciel/default.nix Outdated
Comment on lines 48 to 49
install -d "$out/libexec/ciel-plugin"
install -Dvm755 plugins/* "$out/libexec/ciel-plugin"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
install -d "$out/libexec/ciel-plugin"
install -Dvm755 plugins/* "$out/libexec/ciel-plugin"
install -Dm555 -t "$out/libexec/ciel-plugin" plugins/*

@KiruyaMomochi
Copy link
Contributor

KiruyaMomochi commented Mar 22, 2023 •
edited
Loading

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

1 package built:
  • ciel

Successfully created package of sl.

NickCao
NickCao approved these changes Mar 23, 2023
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

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

checked build output.

@NickCao NickCao merged commit 5256062 into NixOS:master Mar 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KiruyaMomochi KiruyaMomochi KiruyaMomochi left review comments

@ocfox ocfox ocfox left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@NickCao NickCao NickCao approved these changes

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 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.
6 participants
@YisuiDenghua @nixos-discourse @ocfox @KiruyaMomochi @SuperSandro2000 @NickCao