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
Merge master into staging-next #108956
Closed
Closed
Merge master into staging-next #108956
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
By default, Perl versions since 5.8.1 use randomization to make hashes resistant to complexity attacks. That randomization makes building VM images such as ubuntu1804x86_64 non-deterministic because the (imported) derivations built by deb/deb-closure.pl are not stable. This can easily be observed by repeating the following sequence of commands and noting the path of the image's .drv: nix-instantiate -E '(import <nixpkgs> {}).vmTools.diskImageFuns.ubuntu1804x86_64 {}' nix-store --delete /nix/store/*ubuntu-18.04-bionic-amd64.nix One source of non-determinism is the handling of Provides/Replaces, which depends on the order of iteration over %packages. Here is a diff showing the corresponding change in output: >>> awk -virtual awk: using original-awk - original-awk: libc6 (>= 2.14) +virtual awk: using mawk + mawk: libc6 (>= 2.14) - mawk: libc6 (>= 2.14) ->>> libc6 This patch sorts packages by name for Provides/Replaces processing, which seems to result in stable output. (If the above turns out not to be sufficient, one could also set the PERL_HASH_SEED and PERL_PERTURB_KEYS environment variables, documented in 'perlrun', to disable Perl's built-in randomization. Complexity attacks are not an issue as we control and trust all inputs.)
…k unit file It is meant to fix the race condition between iwd and udev trying to rename the interface.
The change to GCC 10 did break this package as it does some conversation from 32bit integer to the type "int" which might be "narrower" depending on the platform. By default GCC 10 errors in these cases. Since this code is fine (and has been for a long time) it is okay to disable the error in this case.
cflow no longer errors out on darwin
The fish-foreign-env and the fishPlugins.foreign-env packages aren't compatible due to changes in directory layout. It's better to remove the alias so that the evaluation explicitly fails instead of allowing silent runtime breakage. GitHub: see NixOS#107834 (comment) GitHub: see LnL7/nix-darwin#269 GitHub: see nix-community/home-manager#1701 GitHub: see nix-community/home-manager#1702
HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS paths. None of these exist on NixOS, but the code assumes that at least one of the directories will be found, and crashes when it doesn't (cups_ppd_path is None and the code passes that to os.path.join). A usable PPD search path for the running system on NixOS is /var/lib/cups/path/share, so this patches the source to check this path as well. This should fix the NixOS case and keep non-NixOS cases working too.
python3Packages.ds_store: init at 1.3.0
The library does not depend on stdenv, that `stdenv` exposes `lib` is an artifact of the ancient origins of nixpkgs.
…tial-diff vscode-extensions.ryu1kn.partial-diff: init at 1.4.1
pcsc-cyberjack: fix compilation with gcc10
bupstash: init at 0.6.4
oberon-risc-emu: init at 2020-08-18
vmTools.debClosureGenerator: Fix non-determinism in dependency graph
ioquake3: 2019-05-29 -> 2020-08-29
appgate-sdp: add appgate-sdp to modules list
php80.extensions.oci8: 2.2.0 -> 3.0.1
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.
Motivation for this change
#105153 (comment)
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)