Skip to content

Comments

fmt: fmt_7 -> fmt_9#208834

Merged
SuperSandro2000 merged 9 commits intoNixOS:masterfrom
panicgh:fmt-repin-7-9
Jan 23, 2023
Merged

fmt: fmt_7 -> fmt_9#208834
SuperSandro2000 merged 9 commits intoNixOS:masterfrom
panicgh:fmt-repin-7-9

Conversation

@panicgh
Copy link
Contributor

@panicgh panicgh commented Jan 3, 2023 •
edited
Loading

Description of changes

This is a follow-up on an old PR, #187482 (comment)

What about adding fmt_9 and then at some point do fmt = fmt_9?

This PR targets staging because it affects several dozen packages, including some that take a long time to compile (e.g. ceph).

Steps in this PR:

  • 5759cd4f74f fmt: fmt_7 -> fmt_9
9561d3a8618 treewide: pin to fmt_7

    Change the default fmt to fmt_9. Pin every use of the default fmt to fmt_7. This should result in no net changes, confirmed by:

    Result of nixpkgs-review run on x86_64-linux 1

    2 packages built:
    • fmt
    • fmt_7

  • 8e7101ea94a treewide: unpin fmt_7, use latest fmt where possible

    Where possible, un-pin fmt_7 and use the default fmt (fmt_9) for all those pkgs.

  • 2987542fb39 dolphin-emu-primehack: pin fmt_7 -> fmt_8
12cf059c07e osm2pgsql: pin fmt_7 -> fmt_8
0f0519f2dc0 kompute: pin fmt_7 -> fmt_8
aebbde39a2a openimageio2: pin fmt_7 -> fmt_8
056e6d08b4d ceph: pin fmt_7 -> fmt_8

    Bump individual pkgs to use their latest supported fmt (fmt_8).

  • 596ab0c6702 fmt_7: remove unused pkg

    Cleanup fmt_7, which is nowhere used anymore.

    Result of nixpkgs-review run on x86_64-linux 1

    16 packages marked as broken and skipped:
    • jami-client-qt
    • python310Packages.qiskit
    • python310Packages.qiskit-aer
    • python310Packages.qiskit-finance
    • python310Packages.qiskit-ibmq-provider
    • python310Packages.qiskit-ignis
    • python310Packages.qiskit-nature
    • python310Packages.qiskit-optimization
    • python39Packages.qiskit
    • python39Packages.qiskit-aer
    • python39Packages.qiskit-finance
    • python39Packages.qiskit-ibmq-provider
    • python39Packages.qiskit-ignis
    • python39Packages.qiskit-nature
    • python39Packages.qiskit-optimization
    • ring-daemon
    58 packages built:
    • adlplug
    • bencode
    • blender
    • blender-hip
    • ceph
    • ceph-client
    • ceph-csi
    • d-seams
    • devilutionx
    • dolphin-emu-primehack
    • easyrpg-player
    • ericw-tools
    • fcitx5
    • fcitx5-chewing
    • fcitx5-chinese-addons
    • fcitx5-configtool
    • fcitx5-gtk
    • fcitx5-hangul
    • fcitx5-lua
    • fcitx5-m17n
    • fcitx5-mozc
    • fcitx5-rime
    • fcitx5-table-extra
    • fcitx5-table-other
    • fcitx5-unikey
    • fcitx5-with-addons
    • fmt
    • jami-client
    • jami-daemon
    • kmsxx
    • kompute
    • libceph
    • libime
    • libsForQt5.fcitx5-qt
    • litecoin
    • litecoind
    • mkvtoolnix
    • mkvtoolnix-cli
    • mpd
    • mpd-small
    • mpvScripts.convert
    • openimageio2
    • opnplug
    • osl
    • osm2pgsql
    • pcsx2
    • python310Packages.bpycv
    • python39Packages.kmsxx (python310Packages.kmsxx)
    • python310Packages.vowpalwabbit
    • python39Packages.bpycv
    • python39Packages.vowpalwabbit
    • qemu_full
    • samba4Full
    • torrenttools
    • trenchbroom
    • wdt
    • zeroad
    • zeroadPackages.zeroad-unwrapped
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Jan 3, 2023
@ofborg ofborg bot requested a review from AtilaSaraiva January 3, 2023 03:27
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 3, 2023
@nixos-discourse
Copy link

nixos-discourse commented Jan 14, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/798

@SuperSandro2000 SuperSandro2000 changed the title [staging] fmt: fmt_7 -> fmt_9 fmt: fmt_7 -> fmt_9 Jan 14, 2023
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 14, 2023 •
edited
Loading

Why do we want to target staging here? The rebuild count is still low enough for master.

Also please rebase.

@panicgh panicgh marked this pull request as draft January 14, 2023 22:01
@github-actions github-actions bot added 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 14, 2023
@panicgh panicgh changed the base branch from staging to master January 14, 2023 22:15
@github-actions github-actions bot removed 8.has: documentation This PR adds or changes documentation 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: ocaml OCaml is a general-purpose, high-level, multi-paradigm programming language. 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 14, 2023
@panicgh panicgh marked this pull request as ready for review January 14, 2023 22:18
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jan 15, 2023
@ofborg ofborg bot removed the 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. label Jan 15, 2023
@panicgh panicgh marked this pull request as draft January 15, 2023 22:43
@panicgh panicgh force-pushed the fmt-repin-7-9 branch 2 times, most recently from ff86724 to ca3e3a3 Compare January 16, 2023 00:21
@panicgh
Copy link
Contributor Author

panicgh commented Jan 16, 2023 •
edited
Loading

Added the new pkg rocsolver to the commits where fmt_7 is pinned and the removed again, since it builds with fmt_9. Rebased to the latest master commit.

Failing pkgs are unrelated from this PR, see Hydra builds.

Result of nixpkgs-review run on x86_64-linux 1

13 packages marked as broken and skipped:
  • python310Packages.qiskit
  • python310Packages.qiskit-aer
  • python310Packages.qiskit-finance
  • python310Packages.qiskit-ibmq-provider
  • python310Packages.qiskit-ignis
  • python310Packages.qiskit-nature
  • python310Packages.qiskit-optimization
  • python311Packages.qiskit-aer
  • python311Packages.qiskit-finance
  • python311Packages.qiskit-ibmq-provider
  • python311Packages.qiskit-ignis
  • python311Packages.qiskit-nature
  • python311Packages.qiskit-optimization
5 packages failed to build:
  • jami-client
  • jami-daemon
  • python310Packages.bpycv
  • python310Packages.vowpalwabbit
  • python311Packages.vowpalwabbit
55 packages built:
  • adlplug
  • bencode
  • blender
  • blender-hip
  • ceph
  • ceph-client
  • ceph-csi
  • d-seams
  • devilutionx
  • dolphin-emu-primehack
  • easyrpg-player
  • embree
  • embree2
  • ericw-tools
  • fcitx5
  • fcitx5-chewing
  • fcitx5-chinese-addons
  • fcitx5-configtool
  • fcitx5-gtk
  • fcitx5-hangul
  • fcitx5-lua
  • fcitx5-m17n
  • fcitx5-mozc
  • fcitx5-rime
  • fcitx5-table-extra
  • fcitx5-table-other
  • fcitx5-unikey
  • fcitx5-with-addons
  • fmt
  • kmsxx
  • kompute
  • libceph
  • libime
  • libsForQt5.fcitx5-qt
  • litecoin
  • litecoind
  • mkvtoolnix
  • mkvtoolnix-cli
  • mpd
  • mpd-small
  • mpvScripts.convert
  • openimageio
  • opnplug
  • osl
  • osm2pgsql
  • pcsx2
  • python310Packages.kmsxx (python311Packages.kmsxx)
  • qemu_full
  • rocsolver
  • samba4Full
  • torrenttools
  • trenchbroom
  • wdt
  • zeroad
  • zeroadPackages.zeroad-unwrapped

@panicgh panicgh marked this pull request as ready for review January 16, 2023 00:41
@panicgh panicgh requested a review from bachp January 16, 2023 00:41
@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jan 16, 2023
@panicgh
fmt: fmt_7 -> fmt_9
2dbb06e 
Change the default fmt alias from fmt_7 to fmt_9 (i.e. the latest).

Follow-up on PR NixOS#187482 (5660337).
@panicgh
treewide: pin to fmt_7
8c11eff 
Pin all packages using the default fmt to the older fmt_7.
@panicgh
treewide: unpin fmt_7, use latest fmt where possible
6a1bfe6
@panicgh
dolphin-emu-primehack: pin fmt_7 -> fmt_8
bca5087 
Bump to latest supported fmt.
@panicgh
osm2pgsql: pin fmt_7 -> fmt_8
9e570e9 
Bump to latest supported fmt.
@panicgh
kompute: pin fmt_7 -> fmt_8
d2eac42 
Bump to latest supported fmt.
@panicgh
openimageio: pin fmt_7 -> fmt_8
44c6d3c 
Bump to latest supported fmt.
@panicgh
ceph: pin fmt_7 -> fmt_8
b9bf4d5 
Bump to latest supported fmt.
@panicgh
fmt_7: remove unused pkg
fb9496a
@panicgh
Copy link
Contributor Author

panicgh commented Jan 22, 2023

Rebased to resolve merge conflict.

@SuperSandro2000 SuperSandro2000 merged commit 9d351dc into NixOS:master Jan 23, 2023
@panicgh panicgh deleted the fmt-repin-7-9 branch January 23, 2023 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AtilaSaraiva AtilaSaraiva Awaiting requested review from AtilaSaraiva

@IvarWithoutBones IvarWithoutBones Awaiting requested review from IvarWithoutBones

@bachp bachp Awaiting requested review from bachp

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@panicgh @nixos-discourse @SuperSandro2000 @bachp