Skip to content
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

treewide: replace substituteAll with replaceVars (part 2) #373658

Merged
merged 1 commit into from
Jan 19, 2025

Conversation

wolfgangwalther
Copy link
Contributor

On the road again, driving #237216 forward. Continuation of #365440. Same approach: Auto-generated changes, removed all of those that would require adjustments.

The number of changed packages should still allow to build this via nixpkgs-review.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: qt/kde 6.topic: emacs Text editor 6.topic: vim 6.topic: pantheon The Pantheon desktop environment 6.topic: deepin Desktop environment and its components labels Jan 14, 2025
@wolfgangwalther
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review


x86_64-linux

⏩ 8 packages marked as broken and skipped:
  • gimpPlugins.exposureBlend
  • gimpPlugins.resynthesizer
  • jextract
  • linuxKernel.packages.linux_5_4_hardened.virtualbox
  • piper-train
  • piper-train.dist
  • spring
  • springLobby
❌ 9 packages failed to build:
  • airwave
  • pidginPackages.purple-signald
  • python313Packages.gruut
  • python313Packages.gruut.dist
  • python313Packages.phonemizer
  • python313Packages.phonemizer.dist
  • toppler
  • tts
  • tts.dist
✅ 403 packages built:
  • adapta-gtk-theme
  • anyk
  • apkeditor
  • apkleaks
  • apkleaks.dist
  • apksigcopier
  • apksigcopier.dist
  • apksigner
  • arc-theme
  • arcan
  • arcan-all-wrapped
  • arcan-wrapped
  • arcan.dev
  • arcan.lib
  • arcan.man
  • armitage
  • arx-libertatis
  • asciidoc-full
  • asciidoc-full-with-plugins
  • asciidoc-full-with-plugins.dist
  • asciidoc-full.dist
  • atlauncher
  • autopsy
  • ayu-theme-gtk
  • bisq2
  • bluej
  • breeze-hacked-cursor-theme
  • capitaine-cursors
  • cat9-wrapped
  • catppuccin-cursors
  • catppuccin-cursors.frappeBlue
  • catppuccin-cursors.frappeDark
  • catppuccin-cursors.frappeFlamingo
  • catppuccin-cursors.frappeGreen
  • catppuccin-cursors.frappeLavender
  • catppuccin-cursors.frappeLight
  • catppuccin-cursors.frappeMaroon
  • catppuccin-cursors.frappeMauve
  • catppuccin-cursors.frappePeach
  • catppuccin-cursors.frappePink
  • catppuccin-cursors.frappeRed
  • catppuccin-cursors.frappeRosewater
  • catppuccin-cursors.frappeSapphire
  • catppuccin-cursors.frappeSky
  • catppuccin-cursors.frappeTeal
  • catppuccin-cursors.frappeYellow
  • catppuccin-cursors.latteBlue
  • catppuccin-cursors.latteDark
  • catppuccin-cursors.latteFlamingo
  • catppuccin-cursors.latteGreen
  • catppuccin-cursors.latteLavender
  • catppuccin-cursors.latteLight
  • catppuccin-cursors.latteMaroon
  • catppuccin-cursors.latteMauve
  • catppuccin-cursors.lattePeach
  • catppuccin-cursors.lattePink
  • catppuccin-cursors.latteRed
  • catppuccin-cursors.latteRosewater
  • catppuccin-cursors.latteSapphire
  • catppuccin-cursors.latteSky
  • catppuccin-cursors.latteTeal
  • catppuccin-cursors.latteYellow
  • catppuccin-cursors.macchiatoBlue
  • catppuccin-cursors.macchiatoDark
  • catppuccin-cursors.macchiatoFlamingo
  • catppuccin-cursors.macchiatoGreen
  • catppuccin-cursors.macchiatoLavender
  • catppuccin-cursors.macchiatoLight
  • catppuccin-cursors.macchiatoMaroon
  • catppuccin-cursors.macchiatoMauve
  • catppuccin-cursors.macchiatoPeach
  • catppuccin-cursors.macchiatoPink
  • catppuccin-cursors.macchiatoRed
  • catppuccin-cursors.macchiatoRosewater
  • catppuccin-cursors.macchiatoSapphire
  • catppuccin-cursors.macchiatoSky
  • catppuccin-cursors.macchiatoTeal
  • catppuccin-cursors.macchiatoYellow
  • catppuccin-cursors.mochaBlue
  • catppuccin-cursors.mochaDark
  • catppuccin-cursors.mochaFlamingo
  • catppuccin-cursors.mochaGreen
  • catppuccin-cursors.mochaLavender
  • catppuccin-cursors.mochaLight
  • catppuccin-cursors.mochaMaroon
  • catppuccin-cursors.mochaMauve
  • catppuccin-cursors.mochaPeach
  • catppuccin-cursors.mochaPink
  • catppuccin-cursors.mochaRed
  • catppuccin-cursors.mochaRosewater
  • catppuccin-cursors.mochaSapphire
  • catppuccin-cursors.mochaSky
  • catppuccin-cursors.mochaTeal
  • catppuccin-cursors.mochaYellow
  • chickenPackages_5.chickenEggs.espeak
  • cie-middleware-linux
  • cinnamon-screensaver
  • clevis
  • clevis.man
  • coreboot-configurator
  • corretto11
  • corretto11.debug
  • corretto17
  • corretto17.debug
  • corretto21
  • corretto21.debug
  • cryptomator
  • dblatexFull
  • deepin.dde-daemon
  • deepin.dde-gsettings-schemas
  • deepin.dde-network-core
  • deepin.dde-session-shell
  • deepin.dde-session-shell.dev
  • diagrams-as-code
  • diagrams-as-code.dist
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • disorderfs
  • durden-wrapped
  • ekho
  • emacsPackages.codeium
  • emacsPackages.emacspeak
  • emojione
  • espeak
  • espeakup
  • experienced-pixel-dungeon
  • fastddsgen
  • fdroidserver
  • fdroidserver.dist
  • fim
  • find-billy
  • freenet
  • freeplane
  • ganttproject-bin
  • garble
  • ghidra
  • ghidra-extensions.findcrypt
  • ghidra-extensions.ghidra-delinker-extension
  • ghidra-extensions.ghidra-golanganalyzerextension
  • ghidra-extensions.gnudisassembler
  • ghidra-extensions.lightkeeper
  • ghidra-extensions.machinelearning
  • ghidra-extensions.ret-sync
  • ghidra-extensions.sleighdevtools
  • ghidra-extensions.wasm
  • gimp
  • gimp-with-plugins
  • gimp.dev
  • gimpPlugins.bimp
  • gimpPlugins.farbfeld
  • gimpPlugins.fourier
  • gimpPlugins.gimplensfun
  • gimpPlugins.gmic
  • gimpPlugins.lightning
  • gimpPlugins.lqrPlugin
  • gimpPlugins.texturize
  • gimpPlugins.waveletSharpen
  • gnomeExtensions.arcmenu
  • gnomeExtensions.drop-down-terminal
  • gnomeExtensions.easyScreenCast
  • gnomeExtensions.easyeffects-preset-selector
  • gnomeExtensions.freon
  • gnomeExtensions.gtk4-desktop-icons-ng-ding
  • gnomeExtensions.no-title-bar
  • gnomeExtensions.sound-output-device-chooser
  • gnomeExtensions.system-monitor
  • gnomeExtensions.system-monitor-next
  • gnomeExtensions.vitals
  • gotenberg
  • gradle (gradle_8)
  • gradle_7
  • greenfoot
  • gruut (python312Packages.gruut)
  • gruut-ipa (python312Packages.gruut-ipa)
  • gruut-ipa.dist (python312Packages.gruut-ipa.dist)
  • gruut.dist (python312Packages.gruut.dist)
  • gscan2pdf
  • gscan2pdf.man
  • hackneyed
  • hikounomizu
  • inkscape
  • inkscape-extensions.textext
  • inkscape-extensions.textext.dist
  • inkscape-with-extensions
  • iso-flags
  • iso-flags-png-320x240
  • jabref
  • jadx
  • java-hamcrest
  • javaPackages.openjfx17
  • javaPackages.openjfx21
  • javaPackages.openjfx23
  • jextract-21
  • jogger
  • json2cdn
  • k40-whisperer
  • kakounePlugins.rep
  • kdePackages.audiocd-kio
  • kdePackages.audiocd-kio.debug
  • kdePackages.audiocd-kio.dev
  • kdePackages.audiocd-kio.devtools
  • kdePackages.drkonqi
  • kdePackages.drkonqi.debug
  • kdePackages.drkonqi.dev
  • kdePackages.drkonqi.devtools
  • kdePackages.kde-gtk-config
  • kdePackages.kde-gtk-config.debug
  • kdePackages.kde-gtk-config.dev
  • kdePackages.kde-gtk-config.devtools
  • kdePackages.kdeconnect-kde
  • kdePackages.kdeconnect-kde.debug
  • kdePackages.kdeconnect-kde.dev
  • kdePackages.kdeconnect-kde.devtools
  • kdePackages.kdenetwork-filesharing
  • kdePackages.kdenetwork-filesharing.debug
  • kdePackages.kdenetwork-filesharing.dev
  • kdePackages.kdenetwork-filesharing.devtools
  • kdePackages.kdenlive
  • kdePackages.kdenlive.debug
  • kdePackages.kdenlive.dev
  • kdePackages.kdenlive.devtools
  • kdePackages.kdeplasma-addons
  • kdePackages.kdeplasma-addons.debug
  • kdePackages.kdeplasma-addons.dev
  • kdePackages.kdeplasma-addons.devtools
  • kdePackages.krdp
  • kdePackages.krdp.debug
  • kdePackages.krdp.dev
  • kdePackages.krdp.devtools
  • kdePackages.plasma-desktop
  • kdePackages.plasma-desktop.debug
  • kdePackages.plasma-desktop.dev
  • kdePackages.plasma-desktop.devtools
  • kdePackages.plasma-disks
  • kdePackages.plasma-disks.debug
  • kdePackages.plasma-disks.dev
  • kdePackages.plasma-disks.devtools
  • kdePackages.plasma-mobile
  • kdePackages.plasma-mobile.debug
  • kdePackages.plasma-mobile.dev
  • kdePackages.plasma-mobile.devtools
  • kdePackages.plasma-nm
  • kdePackages.plasma-nm.debug
  • kdePackages.plasma-nm.dev
  • kdePackages.plasma-nm.devtools
  • key
  • keyboard-layout-editor
  • keyguard
  • keyspersecond
  • klavaro
  • kotlin-language-server
  • libeufin
  • libsForQt5.plasma-nm
  • lightdm
  • lightdm-enso-os-greeter
  • lightdm-gtk-greeter
  • lightdm-mini-greeter
  • lightdm-mobile-greeter
  • lightdm-slick-greeter
  • lightdm-tiny-greeter
  • lightdm.dev
  • lightdm_qt
  • lightdm_qt.dev
  • linuxKernel.packages.linux_5_10.virtualbox
  • linuxKernel.packages.linux_5_10_hardened.virtualbox
  • linuxKernel.packages.linux_5_15.virtualbox
  • linuxKernel.packages.linux_5_15_hardened.virtualbox
  • linuxKernel.packages.linux_5_4.virtualbox
  • linuxKernel.packages.linux_6_1.virtualbox
  • linuxKernel.packages.linux_6_11.virtualbox
  • linuxKernel.packages.linux_6_11_hardened.virtualbox
  • linuxKernel.packages.linux_6_12.virtualbox
  • linuxKernel.packages.linux_6_12_hardened.virtualbox
  • linuxKernel.packages.linux_6_1_hardened.virtualbox
  • linuxKernel.packages.linux_6_6.virtualbox
  • linuxKernel.packages.linux_hardened.virtualbox (linuxKernel.packages.linux_6_6_hardened.virtualbox)
  • linuxKernel.packages.linux_latest_libre.virtualbox
  • linuxKernel.packages.linux_libre.virtualbox
  • linuxKernel.packages.linux_lqx.virtualbox
  • linuxKernel.packages.linux_xanmod.virtualbox
  • linuxKernel.packages.linux_xanmod_latest.virtualbox (linuxKernel.packages.linux_xanmod_stable.virtualbox)
  • linuxKernel.packages.linux_zen.virtualbox
  • lomiri.lomiri
  • lomiri.lomiri-session
  • luksmeta
  • lyra-cursors
  • maptool
  • marytts
  • mate.mate-panel-with-applets
  • mate.mate-utils
  • material-cursors
  • mcaselector
  • microsoft-identity-broker
  • mindustry
  • mindustry-server
  • mindustry-wayland
  • minion
  • mitm-cache
  • mob
  • mojave-gtk-theme
  • moneydance
  • mucommander
  • nextflow
  • nf-test
  • ns-usbloader
  • numix-cursor-theme
  • numix-solarized-gtk-theme
  • olvid
  • opentrack
  • pantheon.elementary-greeter
  • pantheon.file-roller-contract
  • pantheon.switchboard-plug-datetime
  • pantheon.switchboard-plug-keyboard
  • pantheon.switchboard-plug-mouse-touchpad
  • pantheon.switchboard-plug-network
  • pantheon.switchboard-plug-pantheon-shell
  • pantheon.switchboard-plug-power
  • pantheon.switchboard-with-plugs
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-indicator-datetime
  • pantheon.wingpanel-indicator-keyboard
  • pantheon.wingpanel-indicator-power
  • pantheon.wingpanel-with-indicators
  • pattypan
  • pdfchain
  • pdfsam-basic
  • pdftk
  • phonemizer (python312Packages.phonemizer)
  • phonemizer.dist (python312Packages.phonemizer.dist)
  • pipeworld-wrapped
  • plasma-panel-colorizer
  • plasma-panel-spacer-extended
  • plata-theme
  • pop-gtk-theme
  • prio-wrapped
  • python312Packages.diagrams
  • python312Packages.diagrams.dist
  • python312Packages.espeak-phonemizer
  • python312Packages.espeak-phonemizer.dist
  • python312Packages.osc-diagram
  • python312Packages.osc-diagram.dist
  • python313Packages.diagrams
  • python313Packages.diagrams.dist
  • python313Packages.espeak-phonemizer
  • python313Packages.espeak-phonemizer.dist
  • python313Packages.gruut-ipa
  • python313Packages.gruut-ipa.dist
  • python313Packages.osc-diagram
  • python313Packages.osc-diagram.dist
  • quake-injector
  • quark-goldleaf
  • rat-king-adventure
  • rkpd2
  • scenebuilder
  • scenic-view
  • shattered-pixel-dungeon
  • shorter-pixel-dungeon
  • signald
  • signaturepdf
  • slimevr
  • slimevr-server
  • sparrow
  • sparrow-unwrapped
  • speechd
  • sportstracker
  • stirling-pdf
  • summoning-pixel-dungeon
  • synthesia
  • tang
  • tang.man
  • tower-pixel-dungeon
  • vimPlugins.Preview-nvim
  • vimPlugins.aw-watcher-vim
  • vimPlugins.fruzzy
  • vimPlugins.gx-nvim
  • vimPlugins.lens-vim
  • vimPlugins.markdown-preview-nvim
  • vimPlugins.openscad-nvim
  • vimPlugins.vim-grammarous
  • vimPluginsUpdater
  • vimix-cursors
  • virtualboxHardened
  • virtualboxHardened.modsrc
  • volantes-cursors
  • vtfedit
  • wavebox
  • winbox
  • wineWowPackages.base (wineWowPackages.stable)
  • wineWowPackages.full (wineWowPackages.stableFull)
  • wineWowPackages.minimal
  • wineWowPackages.staging
  • wineWowPackages.stagingFull
  • wineWowPackages.unstable
  • wineWowPackages.unstableFull
  • wineWowPackages.wayland
  • wineWowPackages.waylandFull
  • wineasio
  • wordbook
  • wpa_supplicant_gui
  • xarcan
  • yabridge
  • yabridgectl

Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All changes look good and very straightforward. Due to replaceVars checks, I know that if there are missing replacements or failed replacements, building the package would expose them. That's great.

I also love that this is a net negative LOC change.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 15, 2025
@wolfgangwalther
Copy link
Contributor Author

I double checked that all touched packages were part of the nixpkgs-review, thus no conditionals prevented building some of them. ✔️

@wolfgangwalther wolfgangwalther merged commit 0ec8369 into NixOS:master Jan 19, 2025
24 of 28 checks passed
@wolfgangwalther wolfgangwalther deleted the refactor-tractor-2 branch January 19, 2025 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: deepin Desktop environment and its components 6.topic: emacs Text editor 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: pantheon The Pantheon desktop environment 6.topic: qt/kde 6.topic: vim 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants