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
deepin: add update script and update some packages #49499
Conversation
@GrahamcOfBorg build deepin.dde-api deepin.dde-daemon deepin.dde-qt-dbus-factory deepin.dde-session-ui deepin.deepin-desktop-base deepin.deepin-desktop-schemas deepin.deepin-image-viewer deepin.deepin-movie-reborn deepin.deepin-terminal deepin.dtkcore deepin.dtkwidget deepin.go-gir-generator deepin.go-lib deepin.qt5dxcb-plugin deepin.qt5integration |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
@GrahamcOfBorg build deepin.dde-api deepin.dde-daemon deepin.dde-qt-dbus-factory deepin.dde-session-ui deepin.deepin-desktop-base deepin.deepin-desktop-schemas deepin.deepin-image-viewer deepin.deepin-movie-reborn deepin.deepin-terminal deepin.dtkcore deepin.dtkwidget deepin.go-gir-generator deepin.go-lib deepin.qt5dxcb-plugin deepin.qt5integration |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
@GrahamcOfBorg build deepin.dde-api deepin.dde-daemon deepin.dde-qt-dbus-factory deepin.dde-session-ui deepin.deepin-desktop-base deepin.deepin-desktop-schemas deepin.deepin-image-viewer deepin.deepin-movie-reborn deepin.deepin-terminal deepin.dtkcore deepin.dtkwidget deepin.go-gir-generator deepin.go-lib deepin.qt5dxcb-plugin deepin.qt5integration |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration Partial log (click to expand)
|
]; | ||
|
||
postPatch = '' | ||
substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is zssh no longer used? We can remove it from nixpkgs since it was only added for deepin-terminal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
zssh
is still used, but its path is not hard-coded in deepin-terminal
anymore. It is supposed to be in $PATH
. It provides Remote Management support.
In archlinux zssh
is an optional dependency, In Fedora it is a recommended dependency. In debian it is normal dependency.
So I think zssh
should not be removed from nixpkgs.
This failure was there already. See #46463 (comment) |
pkgs/desktops/deepin/update.nix
Outdated
set -x | ||
|
||
# search for the latest version of the package on github | ||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will not be enough if user has GPG signing enabled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jtojnar As I am not used to GPG signing, could you please be more specific on this? Do you mean that PATH
is incomplete, and that something like gnupg
should be added?
Currently the update script works for me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See https://help.github.com/articles/signing-commits/. At least gnupg
is needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does not look like deepin are using gnupg. Is it used somewhere else at runtime?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Mic92 git requires it for signing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jtojnar I have added gnupg
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest to also append the old PATH:
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]}:$PATH
There might be other just as password asking agents if we start with gnupg.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, since the script does not run git commit
directly, gnupg
is not needed in its PATH
. Sorry for the confusion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Mic92 I would prefer not to append $PATH
, as that includes the user current PATH setting. None of the update scripts I have found on the repository does that. It is better to list every needed binary path explicitly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jtojnar I have removed gnupg
then.
The requested review from FRidh and matthewbauer as code owners originated from a mistake from me. Someone with the appropriate rights remove it, please. |
- Update to version 1.3.1 - Currently does not build on aarch64-linux. It seems that in the libpng package (which is bundled with freeimage) neon is not available on the platform, but is detected as being available.
- Update to version 3.0.10 - Add some missing dependencies - Remove patch 'remove-vendor.patch' that went upstream - zssh binary path is not hardcoded anymore
@GrahamcOfBorg build deepin.dde-api deepin.dde-daemon deepin.dde-qt-dbus-factory deepin.dde-session-ui deepin.deepin-desktop-base deepin.deepin-desktop-schemas deepin.deepin-image-viewer deepin.deepin-movie-reborn deepin.deepin-terminal deepin.dtkcore deepin.dtkwidget deepin.go-gir-generator deepin.go-lib deepin.qt5dxcb-plugin deepin.qt5integration deepin.deepin-gtk-theme deepin.deepin-icon-theme deepin.deepin-wm deepin.deepin-mutter |
Unexpected error: command failed with exit code 1 on x86_64-darwin (full log) Attempted: deepin.deepin-icon-theme The following builds were skipped because they don't evaluate on x86_64-darwin: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration, deepin.deepin-gtk-theme, deepin.deepin-wm, deepin.deepin-mutter Partial log (click to expand)
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
local nix-review successfull.
Success on aarch64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration, deepin.deepin-gtk-theme, deepin.deepin-icon-theme, deepin.deepin-wm, deepin.deepin-mutter The following builds were skipped because they don't evaluate on aarch64-linux: deepin.deepin-image-viewer Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: deepin.dde-api, deepin.dde-daemon, deepin.dde-qt-dbus-factory, deepin.dde-session-ui, deepin.deepin-desktop-base, deepin.deepin-desktop-schemas, deepin.deepin-image-viewer, deepin.deepin-movie-reborn, deepin.deepin-terminal, deepin.dtkcore, deepin.dtkwidget, deepin.go-gir-generator, deepin.go-lib, deepin.qt5dxcb-plugin, deepin.qt5integration, deepin.deepin-gtk-theme, deepin.deepin-icon-theme, deepin.deepin-wm, deepin.deepin-mutter Partial log (click to expand)
|
@Mic92 Thanks!! |
Motivation for this change
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)