There is no need to disable Python packages for Python versions that are
no longer in Nixpkgs.
This change was generated using the following script:
pattern='^\s*disabled\s*=\s*pythonOlder\s*"3\.\([0-9]\|10\)"\s*;\s*$'
for f in $(find -name '*.nix'); do
grep -q "$pattern" "$f" || continue
sed -i "/$pattern/d" "$f"
if [ $(grep -c pythonOlder "$f") == 1 ]; then
sed -i '/^\s*pythonOlder,\s*$/d' "$f"
fi
nixfmt "$f"
done
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.
Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
This treewide change targets Python packages
that specifies pytest flags with pytestFlagsArray,
and whose flags cannot be consructed by other pytestCheckHook-honoured arguments.
Use the __structuredAttrs-agnostic argument pytestFlags
instead of the deprecated pytestFlagsArray.
For flags with option arguments,
join each flag and their option argument into a single command-line argument
following POSIX Utility Argument Syntax[1]
for easier overriding (remove/replace).
Examples:
* [ "-W" "ignore:message:WarningClass" ] ->
[ "-Wignore:message:WarningClass" ]
* [ "--reruns" "3" ] ->
[ "--reruns=3" ]
[1]: https://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap12.html
They are not doing anything right now. This is in preparation for their
complete removal from the tree.
Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.
Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes. It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
It should be possible to reproduce this diff. To generate it, I first
ran:
xargs sed -i 's/fetchCargoTarball/fetchCargoVendor/g'
The following manually identified list of files were given as standard
input:
pkgs/applications/graphics/drawpile/default.nix
pkgs/applications/graphics/gnome-decoder/default.nix
pkgs/applications/graphics/gnome-obfuscate/default.nix
pkgs/applications/misc/openbangla-keyboard/default.nix
pkgs/applications/version-management/git-cinnabar/default.nix
pkgs/applications/version-management/mercurial/default.nix
pkgs/applications/version-management/silver-platter/default.nix
pkgs/applications/virtualization/krunvm/default.nix
pkgs/development/libraries/librsvg/default.nix
pkgs/development/python-modules/aardwolf/default.nix
pkgs/development/python-modules/adblock/default.nix
pkgs/development/python-modules/ahocorasick-rs/default.nix
pkgs/development/python-modules/bcrypt/default.nix
pkgs/development/python-modules/biliass/default.nix
pkgs/development/python-modules/chromadb/default.nix
pkgs/development/python-modules/clarabel/default.nix
pkgs/development/python-modules/cmsis-pack-manager/default.nix
pkgs/development/python-modules/copykitten/default.nix
pkgs/development/python-modules/cramjam/default.nix
pkgs/development/python-modules/cryptg/default.nix
pkgs/development/python-modules/cryptography/default.nix
pkgs/development/python-modules/css-inline/default.nix
pkgs/development/python-modules/deebot-client/default.nix
pkgs/development/python-modules/deltalake/default.nix
pkgs/development/python-modules/etebase/default.nix
pkgs/development/python-modules/evtx/default.nix
pkgs/development/python-modules/fastcrc/default.nix
pkgs/development/python-modules/flaxlib/default.nix
pkgs/development/python-modules/gb-io/default.nix
pkgs/development/python-modules/glean-sdk/default.nix
pkgs/development/python-modules/hf-transfer/default.nix
pkgs/development/python-modules/jh2/default.nix
pkgs/development/python-modules/johnnycanencrypt/default.nix
pkgs/development/python-modules/kurbopy/default.nix
pkgs/development/python-modules/libcst/default.nix
pkgs/development/python-modules/lzallright/default.nix
pkgs/development/python-modules/netifaces2/default.nix
pkgs/development/python-modules/nlpo3/default.nix
pkgs/development/python-modules/nutils-poly/default.nix
pkgs/development/python-modules/nutpie/default.nix
pkgs/development/python-modules/orjson/default.nix
pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix
pkgs/development/python-modules/pendulum/default.nix
pkgs/development/python-modules/primp/default.nix
pkgs/development/python-modules/py-sr25519-bindings/default.nix
pkgs/development/python-modules/pycddl/default.nix
pkgs/development/python-modules/pydantic-core/default.nix
pkgs/development/python-modules/pyperscan/default.nix
pkgs/development/python-modules/pysequoia/default.nix
pkgs/development/python-modules/python-bidi/default.nix
pkgs/development/python-modules/python-kadmin-rs/default.nix
pkgs/development/python-modules/qiskit-terra/default.nix
pkgs/development/python-modules/regress/default.nix
pkgs/development/python-modules/rpds-py/default.nix
pkgs/development/python-modules/rtoml/default.nix
pkgs/development/python-modules/rustworkx/default.nix
pkgs/development/python-modules/safetensors/default.nix
pkgs/development/python-modules/skytemple-rust/default.nix
pkgs/development/python-modules/sourmash/default.nix
pkgs/development/python-modules/spacy-alignments/default.nix
pkgs/development/python-modules/sudachipy/default.nix
pkgs/development/python-modules/test-results-parser/default.nix
pkgs/development/python-modules/tiktoken/default.nix
pkgs/development/python-modules/tokenizers/default.nix
pkgs/development/python-modules/tree-sitter-make/default.nix
pkgs/development/python-modules/whenever/default.nix
pkgs/development/python-modules/y-py/default.nix
pkgs/development/python-modules/zxcvbn-rs-py/default.nix
pkgs/development/r-modules/default.nix
pkgs/games/ddnet/default.nix
pkgs/servers/matrix-synapse/plugins/rendezvous.nix
pkgs/tools/filesystems/ceph/default.nix
pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
Then I ran:
xargs -n 1 nix-update --version=skip
With this list of attributes corresponding to the changed files given
as standard input:
drawpile
gnome-decoder
gnome-obfuscate
ibus-engines.openbangla-keyboard
git-cinnabar
mercurial
silver-platter
krunvm
librsvg
python3Packages.aardwolf
python3Packages.adblock
python3Packages.ahocorasick-rs
python3Packages.bcrypt
python3Packages.biliass
python3Packages.chromadb
python3Packages.clarabel
python3Packages.cmsis-pack-manager
python3Packages.copykitten
python3Packages.cramjam
python3Packages.cryptg
python3Packages.cryptography
python3Packages.css-inline
python3Packages.deebot-client
python3Packages.deltalake
python3Packages.etebase
python3Packages.evtx
python3Packages.fastcrc
python3Packages.flaxlib
python3Packages.gb-io
python3Packages.glean-sdk
python3Packages.hf-transfer
python3Packages.jh2
python3Packages.johnnycanencrypt
python3Packages.kurbopy
python3Packages.libcst
python3Packages.lzallright
python3Packages.netifaces2
python3Packages.nlpo3
python3Packages.nutils-poly
python3Packages.nutpie
python3Packages.orjson
python3Packages.pdoc-pyo3-sample-library
python3Packages.pendulum
python3Packages.primp
python3Packages.py-sr25519-bindings
python3Packages.pycddl
python3Packages.pydantic-core
python3Packages.pyperscan
python3Packages.pysequoia
python3Packages.python-bidi
python3Packages.python-kadmin-rs
python3Packages.qiskit-terra
python3Packages.regress
python3Packages.rpds-py
python3Packages.rtoml
python3Packages.rustworkx
python3Packages.safetensors
python3Packages.skytemple-rust
python3Packages.sourmash
python3Packages.spacy-alignments
python3Packages.sudachipy
python3Packages.test-results-parser
python3Packages.tiktoken
python3Packages.tokenizers
python3Packages.tree-sitter-make
python3Packages.whenever
python3Packages.y-py
python3Packages.zxcvbn-rs-py
rPackages.gifski
rPackages.timeless
ddnet
matrix-synapse-plugins.matrix-http-rendezvous-synapse
ceph.python.pkgs.bcrypt
ceph.python.pkgs.cryptography
The list of files for the first command and the list of attributes for
the second command are in the same order, so it should be easy enough
to check their correspondence by putting them side by side.
It might be possible to parallelize the nix-update operations using
xargs' -P option. I haven't tested it.
I also manually removed the now-outdated comment in
pkgs/development/libraries/librsvg/default.nix.
In preparation for the deprecation of `stdenv.isX`.
These shorthands are not conducive to cross-compilation because they
hide the platforms.
Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way
One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059
There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.
```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
Fixes#241482.
Also fix test putting cluster in unhealthy `POOL_APP_NOT_ENABLED` state;
this seems to be the default state with Ceph 18.2.1 at least,
and it does not hurt to fix it now already in the way the Ceph docs say.
Also revert "nixosTests.ceph-single-node: remove dashboard check"
This reverts commit 41b27d7f4b.
