guymager: init at 0.8.13 #278529
guymager: init at 0.8.13 #278529
Conversation
|
@ofborg eval |
To be checked in NixOS#81418
@emilytrau fixed |
|
Result of 2 packages built:
|
| enableParallelBuilding = true; | ||
|
|
||
| nativeBuildInputs = [ libsForQt5.qmake libsForQt5.wrapQtAppsHook ]; | ||
| dontWrapQtApps = true; |
There was a problem hiding this comment.
@eclairevoyant If I remove that, I get the following error:
Running phase: qtPreHook
Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set.
error: builder for '/nix/store/fncpc8jyf7b1h08yipf25pkmls71pxhn-libguytools-2.1.0.drv' failed with exit code 1;
last 10 log lines:
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/qqzz17mjs51kpfx9faw98f35r7ffwqng-xcb-util-renderutil-0.3.10-dev
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/7rd4b08axmpg5nnys8kkjbmj7cxlkdlc-xcb-util-renderutil-0.3.10
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/x3l69111mbfd38dd8q59hqv94vz6d6jn-xcb-util-wm-0.4.2-dev
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/fiwwkqgfgb4g2f63iycpsx2h5amk2jdv-xcb-util-wm-0.4.2
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/h5j6ggf0g230bavqarsvyi23zw789fv3-libglvnd-1.7.0-dev
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/d6gvgzzifggrb7fh1v0yi8bvrdlwhpqa-libglvnd-1.7.0
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/hjspqdvym6v553582mxp2a3f84p4aqyr-qtbase-5.15.14-bin
> calling 'envTargetTargetHook' function hook 'make_glib_find_gsettings_schemas' /nix/store/9wba9diw8b199hfzcv8w99wzma66dzm1-qtbase-5.15.14
> Running phase: qtPreHook
> Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set.
For full logs, run 'nix log /nix/store/fncpc8jyf7b1h08yipf25pkmls71pxhn-libguytools-2.1.0.drv'.
I can also use only:
nativeBuildInputs = [ libsForQt5.qmake libsForQt5.wrapQtAppsHook ];
and remove dontWrapQtApps. What should I use?
| , parted | ||
| , udev | ||
| , libewf-legacy | ||
| , libbfio |
There was a problem hiding this comment.
this doesn't exist in the nixpkgs rev you're using, please rebase on current master
There was a problem hiding this comment.
Just for confirmation, the right commands to do this are:
git clone https://github.com/D3vil0p3r/nixpkgs -b patch-9
git remote add upstream https://github.com/NixOS/nixpkgs.git
git fetch upstream
git rebase upstream/master
git push -f origin patch-9
?
There was a problem hiding this comment.
After git rebase upstream/master, there are a lot of files that need to fix conflicts...
...
pkgs/top-level/release-lib.nix: needs merge
pkgs/top-level/release-python.nix: needs merge
pkgs/top-level/release-r.nix: needs merge
pkgs/top-level/release-small.nix: needs merge
pkgs/top-level/release.nix: needs merge
pkgs/top-level/ruby-packages.nix: needs merge
pkgs/top-level/splice.nix: needs merge
pkgs/top-level/stage.nix: needs merge
pkgs/top-level/unixtools.nix: needs merge
pkgs/top-level/wine-packages.nix: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
Probably it is better to close this PR and open a new one?
There was a problem hiding this comment.
GitHub interface is sub subpar.
You can use the bulldozer method:
- Save guymager/package.nix to a safe location (say ~/backups/)
- create a local
patch-9branch - get back guymager/package.nix
- commit and force-push
There was a problem hiding this comment.
@D3vil0p3r you should already have a local clone of nixpkgs if you're creating PRs, as rebasing is often necessary.
Ensure you do not use a shallow or treeless clone; use a blobless clone if you need to save time (--filter=blob:none)
For rebasing itself, I would use git rebase -i as you can see in advance what commits will get picked and adjust the list as needed
There was a problem hiding this comment.
So, if I understood well, I should blobless clone the nixpkgs repo of my patch-9:
git clone https://github.com/D3vil0p3r/nixpkgs -b patch-9 --filter=blob:none
cd nixpkgs
git rebase -i
but I get only noop. Should I do additional things? Sorry for wasting your time guys.
To be checked in #81418
Depends on:
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.