-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
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
staging-next 2025-02-09 #380680
Open
vcunat
wants to merge
530
commits into
master
Choose a base branch
from
staging-next
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
staging-next 2025-02-09 #380680
+8,485
−5,046
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
* util-linuxMinimal: build without pam and shadow These depend on python via audit preventing the use of libuuid from util-linux in python builds. * cpython: provide libuuid for the _uuid module Relying on libuuid offers synchronization primitives, so that "no two processes can obtain the same UUID"¹. [1] https://docs.python.org/3/library/uuid.html#module-uuid
…: Conditionalize gobject-introspection and vala gobject-introspection doesn't support static Although the dependencies for these don't build on static this can still be useful in the future or for preventing additional issues being created for xfce packages. Tested on native by changing the conditionals to false.
Without the change the build of upcoming `sqlite-3.49.0` will fail as: > Error: Unknown option --oldincludedir > Try: 'configure --help' for options Looking at https://www.gnu.org/prep/standards/html_node/Directory-Variables.html it feels like it's something that predates gcc and it should be an alias to `--includedir=`. Let's just drop the setting of `--oldincludedir=` (and `cmake` equivalent).
…he staging ones) (#377057)
…encies (#377721) * Allow "package" key in Cargo.toml dependencies * Update replace-workspace-values.py Some dependencies in Cargo.toml have a "package" key, which serves as an alias: ``` foo = { package = "original-name" ... } ``` which with nixpkgs triggered ``` > Copying to /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0 > Patching /nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml > Traceback (most recent call last): > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 127, in <module> > main() > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 104, in main > changed |= replace_dependencies(workspace_manifest, crate_manifest) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 77, in replace_dependencies > changed |= replace_key(workspace_manifest, root[key], "dependencies", k) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/harh7nnnib9896dwqr0xjqrr0l8wdcw7-replace-workspace-values/bin/replace-workspace-values", line 58, in replace_key > raise Exception(f"Unhandled keys in inherited dependency {key}: {local_dep}") > Exception: Unhandled keys in inherited dependency codec: {'package': 'parity-scale-codec'} > Traceback (most recent call last): > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 314, in <module> > main() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 310, in main > subcommand_func() > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 302, in <lambda> > "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3])) > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 259, in create_vendor > copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir) > File "/nix/store/qrf1j1w95va92fzv55lxpvw2dpm03bnr-fetch-cargo-vendor-util/bin/fetch-cargo-vendor-util", line 215, in copy_and_patch_git_crate_subtree > subprocess.check_output(cmd) > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 466, in check_output > return run(*popenargs, stdout=PIPE, timeout=timeout, check=True, > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > File "/nix/store/qrc496n6fsqp4p5m5h8wmw5d5jwyw5mr-python3-3.12.8/lib/python3.12/subprocess.py", line 571, in run > raise CalledProcessError(retcode, process.args, > subprocess.CalledProcessError: Command '['replace-workspace-values', '/nix/store/jay72vz43afnlymsah7v543zmnv6l7ck-gcli-0.3.0-vendor/subxt-0.37.0/Cargo.toml', '/nix/store/c4jdggg9ihgi032pyc7g6ysdpb30xv1r-gcli-0.3.0-vendor-staging/git/00f181c1a5d8986e7146ddc72a745c793a9a1d8e/Cargo.toml']' returned non-zero exit status 1. ``` This fixes that
Fast forward to a version required by onnxruntime.
This is the hash for the GitHub snapshot of the 3.4.1 tag, not the official tarball we're using. When the PR doing this update was updated after the tarballs came out, updating the hash was forgotten. I've checked the hashes of the other OpenSSL versions and they're fine. Fixes: c05c515 ("openssl_3_4: init at 3.4.1; openssl_3_3: remove")
This hack hasn't been necessary since libcdr 0.0.9 or 0.1.0, and now breaks the build with ICU 76.
The line the patch touches is actually inside conditional code and isn't executed with Sphinx 7, so we don't need to touch it.
haskellPackages.text-icu fails due to haskell/text-icu#108 which probably causes quite a few regressions. The test seems probably safe to disable, I'll look into that. |
Unblocks the test suite of nodejs and probably other packages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
1.severity: security
Issues which raise a security issue, or PRs that fix one
6.topic: crystal
Programming language - https://crystal-lang.org/
6.topic: cuda
Parallel computing platform and API
6.topic: dotnet
Language: .NET
6.topic: emacs
Text editor
6.topic: games
6.topic: GNOME
GNOME desktop environment and its underlying platform
6.topic: golang
6.topic: haskell
6.topic: java
Including JDK, tooling, other languages, other VMs
6.topic: llvm/clang
Issues related to llvmPackages, clangStdenv and related
6.topic: lua
6.topic: mate
The MATE Desktop Environment
6.topic: nixos
Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS
6.topic: nodejs
6.topic: ocaml
6.topic: php
6.topic: python
6.topic: qt/kde
6.topic: rocm
6.topic: rust
6.topic: stdenv
Standard environment
6.topic: tcl
6.topic: xfce
The Xfce Desktop Environment
8.has: changelog
8.has: documentation
This PR adds or changes documentation
8.has: module (update)
This PR changes an existing module in `nixos/`
10.rebuild-darwin: 501+
10.rebuild-darwin: 5001+
10.rebuild-linux: 501+
10.rebuild-linux: 5001+
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.
Helpful links
https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents
https://hydra.nixos.org/job/nixos/staging-next-small/tested
https://hydra.nixos.org/jobset/nixpkgs/staging-next
https://hydra.nixos.org/jobset/nixos/staging-next-small
Important breakages
nothing so far