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
irods-icommands: fixed version mismatch #29074
Conversation
Was accidentally broken during merge. (cherry picked from commit e825cd8cf681722c9d1e610ada6e775b5230dac0)
(cherry picked from commit 4a6295e)
(cherry picked from commit e4bc14f)
(cherry picked from commit cc45a96)
(cherry picked from commit 232c6a0)
(cherry picked from commit 917a0e3)
(cherry picked from commit 10e8214)
(cherry picked from commit 235b63d)
(cherry picked from commit 8a12b42361506048dd9abbec6dddcc8ac6e61a20)
(cherry picked from commit b7d257a)
GMime home has moved to Github as the list of commits clearly shows, i.e.: jstedfast/gmime@b5cbc68 The description is updated as well to be closer to the one used there and over at gnome.org. (cherry picked from commit ddaa696)
(cherry picked from commit 40cbf90)
(cherry picked from commit cb61e27)
(cherry picked from commit 26ebbac)
(cherry picked from commit 59b525e)
previous mkDefault did not work as expected, as it did not overwrite the original submodule's defaults when the user did not specify any custom options at all. (cherry picked from commit 786e971)
(cherry picked from commit a2794ee)
(cherry picked from commit 9280937)
(cherry picked from commit 52eb0e0)
(cherry picked from commit 9464906)
(cherry picked from commit 6c13647)
(cherry picked from commit b2fd2a8)
This has been introduced in 6a6fb6d. Relying on non-free software by default is probably a bad idea. Apart from the fact that (sane) people usually don't want to have it sitting on their system even people who don't care will have to set "allowUnfree" to true in order to install conky. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @canndrew, @Mic92 (cherry picked from commit 7f99876)
- Update to version 2.0.10 - Use wrapGAppsHook to wrap binaries - Use gstreamer-1.0 - Add dependence on libappindicator (cherry picked from commit 1f48ad8)
(cherry picked from commit 2606882)
(cherry picked from commit b6a1e43)
(cherry picked from commit 28b1170)
Regression introduced by 9435119. Running the tests results in the following traceback: ... File ".../unittest/loader.py", line 91, in loadTestsFromName module = __import__('.'.join(parts_copy)) File ".../test/regrtest.py", line 184, in <module> for module in sys.modules.itervalues(): RuntimeError: dictionary changed size during iteration The reason for this is that the test directory itself is called "test" and the package including regrtest.py is also called "test", so the loader tries to load tests from its own implementation. We could fix this by changing PYTHONPATH and/or making the test directory a proper package, but we'd still have failing tests because beets itself is required to run the tests. However for now I'm just removing the unit_tests kwarg in setup.py so that we have the same behaviour as before the initially mentioned commit. Signed-off-by: aszlig <aszlig@redmoonstudios.org> (cherry picked from commit bd2aeb4)
(cherry picked from commit 5113be5)
(cherry picked from commit 0044631)
(cherry picked from commit b9eebaf)
(cherry picked from commit 43acfe0)
(cherry picked from commit 489bfcf)
Python: several fixes (cherry picked from commit 67651d8)
(cherry picked from commit 41d9884)
(cherry picked from commit cf6f900) Contains quite a few bug fixes
When keys get refreshed a folder with the permissions of the root user get created in the home directory of the user dnscrypt-wrapper. This prevents the service from restarting. In addition to that the parameters of dnscrypt-wrapper have changed in upstream and in the newly packaged software. (cherry picked from commit ca54a86)
(cherry picked from commit 94a4183)
(cherry picked from commit 572361f)
(cherry picked from commit dcbf59d)
cctool's as needs to be told use to use gnu as, or else we'd need a dependency cycle between cctools and clang for this case. In general, this is not a problem because clang uses its own integrated assembler where possible, and gnu as otherwise. (cherry picked from commit eb326c9)
(cherry picked from commit 8bd1a22)
Also remove -fPIC, it's included in the hardening flags by default. (cherry picked from commit 51eafbe)
(cherry picked from commit 024b501)
(cherry picked from commit fefdc00)
Python: several fixes (2) (cherry picked from commit aabadda)
Should contribute to fix issue #28643 |
All patches should go to master first, then be cherry-picked as needed. |
Hm, that didn't quite work the way I'd hoped ... |
Do you want me to create a new PR against the master branch? |
You can force push this branch or re-open, whichever is easier. |
Well, actually, it seems that this PR is obsolete: 5fb9352 |
Seems like it. Thank you, anyway. |
@bzizou I've picked the commit in question to the release branch so should be fixed there as well. |
Motivation for this change
Should fix build (https://hydra.nixos.org/build/59950343/nixlog/9)
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)