umu-launcher: 1.1.4 -> 1.2.3 & init pyzstd #381975
Open
+131
−36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MattSturgeon
changed the title
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
116479c to
81ebee8
Compare
|
I don't think a cherry-picked commit from another PR should be merged as a part of this. We should try to get that one merged first, and keep this as a draft until then. Edit: oh, the other PR adds it as a dep as well. Well, it might be fine then, but separating it to a different PR might be more ideal still. |
I disagree. It's a minor dependency for that PR, this one, and also a third one. Including minor dependencies in a larger PR is fine IMO.
#365111 has been inactive for a few weeks and still needs some cleanup work before being merged. It also has merge conflicts. #356882 is another PR that packages |
|
At least indicate it in the title then? |
MattSturgeon
changed the title
|
diniamo
suggested changes
Feb 14, 2025
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
81ebee8 to
4298aae
Compare
MattSturgeon
requested review from
khaneliman,
SuperSandro2000,
diniamo and
poperigby
and removed request for
diniamo
MattSturgeon
added
8.has: package (new)
R1kaB3rN
suggested changes
Feb 14, 2025
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
4298aae to
9d70269
Compare
MattSturgeon
changed the title
R1kaB3rN
approved these changes
Feb 14, 2025
MattSturgeon
added
12.approvals: 2
|
khaneliman
reviewed
Feb 14, 2025
|
Feel free to fixup pyzstd. I won't be able to get to it for awhile. |
R1kaB3rN
suggested changes
Feb 15, 2025
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
9d70269 to
d64242b
Compare
MattSturgeon
added
12.approvals: 1
khaneliman
approved these changes
Feb 15, 2025
natsukium
requested changes
Feb 15, 2025
|
Looks like umu also has some tests, mostly in the form of shell scripts. I don't want to block this PR on it, but it'd be nice for those to also be part of the package. Looking at the CI workflows, most are run in the e2e workflow, while My first thought is that some tests should be included in the package build, and if some of the other tests are more intensive they can be |
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
842da74 to
f82983a
Compare
Co-authored-by: OTABI Tomoya <[email protected]>
https://github.com/Open-Wine-Components/umu-launcher/releases/tag/1.2.0 https://github.com/Open-Wine-Components/umu-launcher/releases/tag/1.2.1 https://github.com/Open-Wine-Components/umu-launcher/releases/tag/1.2.2 https://github.com/Open-Wine-Components/umu-launcher/releases/tag/1.2.3 Incorporates work done in: Open-Wine-Components/umu-launcher#345
MattSturgeon
force-pushed
the
umu/1.2.1
branch
from
f82983a to
f3c8ed5
Compare
Added a check phase using I had to disable 5/97 tests and configure a writable Not sure how much of the 5 skipped tests are upstream issues vs environment issues. Build log with all tests enabled: |
MattSturgeon
commented
Feb 15, 2025
Comment on lines
+21
to
+26
| postPatch = '' | ||
| # pyzst specifies setuptools<74 because 74+ drops `distutils.msvc9compiler`, | ||
| # required for Python 3.9 under Windows | ||
| substituteInPlace pyproject.toml \ | ||
| --replace-fail '"setuptools>=64,<74"' '"setuptools"' | ||
| ''; |
There was a problem hiding this comment.
I tried using pythonRelaxDepsHook instead:
diff --git a/pkgs/development/python-modules/pyzstd/default.nix b/pkgs/development/python-modules/pyzstd/default.nix
index 62e77d821d08..f403a5338b00 100644
--- a/pkgs/development/python-modules/pyzstd/default.nix
+++ b/pkgs/development/python-modules/pyzstd/default.nix
@@ -3,6 +3,7 @@
fetchFromGitHub,
lib,
pytestCheckHook,
+ pythonRelaxDepsHook,
setuptools,
zstd-c,
}:
@@ -18,13 +19,6 @@ buildPythonPackage rec {
hash = "sha256-Az+0m1XUFxExBZK8bcjK54Zt2d5ZlAKRMZRdr7rPcss=";
};
- postPatch = ''
- # pyzst specifies setuptools<74 because 74+ drops `distutils.msvc9compiler`,
- # required for Python 3.9 under Windows
- substituteInPlace pyproject.toml \
- --replace-fail '"setuptools>=64,<74"' '"setuptools"'
- '';
-
nativeBuildInputs = [
setuptools
];
@@ -33,6 +27,10 @@ buildPythonPackage rec {
setuptools
];
+ pythonRelaxDeps = [
+ "setuptools"
+ ];
+
buildInputs = [
zstd-c
];
@@ -43,6 +41,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
+ pythonRelaxDepsHook
];
pythonImportsCheck = [But I don't think this supports relaxing dependencies specified in pyproject.toml? The docs mention:
pythonRelaxDepsHookworks by modifying the resulting wheel file
MattSturgeon
commented
Feb 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changelogs:
Incorporates work done in the upstream flake: Open-Wine-Components/umu-launcher#345
All patches removed.
Now also uses cargo for some dependencies. See Compiling non-Rust packages that include Rust code in the nixpkgs manual.
Used the new configure flags to specify "vendored" dependencies don't need to be built, since we install them nixpkgs packages.
Adds
withTruststoreandwithDeltaUpdatespackage args, that allow configuring the new optional dependencies, as-per the upstream flake.Adds check phase using
pytestCheckHook.Includes the dependency
pyzstd, cherry-picked from #365111.Package builds ok. I've not tested using it at runtime yet.
Fixes #381960
Fixes #371859
cc maintainers @LovingMelody @diniamo
cc upstream @R1kaB3rN
Things done
nix-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.