From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix --- .../accessibility/contrast/default.nix | 4 +- .../accessibility/mousetweaks/default.nix | 4 +- pkgs/applications/audio/a2jmidid/default.nix | 4 +- pkgs/applications/audio/aacgain/default.nix | 4 +- pkgs/applications/audio/abcde/default.nix | 4 +- pkgs/applications/audio/adlplug/default.nix | 4 +- pkgs/applications/audio/airwave/default.nix | 4 +- pkgs/applications/audio/aj-snapshot/default.nix | 4 +- pkgs/applications/audio/ams-lv2/default.nix | 4 +- pkgs/applications/audio/ams/default.nix | 4 +- pkgs/applications/audio/ardour/5.nix | 4 +- pkgs/applications/audio/ardour/default.nix | 4 +- pkgs/applications/audio/artyFX/default.nix | 4 +- pkgs/applications/audio/ashuffle/default.nix | 4 +- pkgs/applications/audio/aucatctl/default.nix | 4 +- pkgs/applications/audio/audacity/default.nix | 4 +- pkgs/applications/audio/audio-recorder/default.nix | 4 +- pkgs/applications/audio/autotalent/default.nix | 4 +- pkgs/applications/audio/axoloti/default.nix | 4 +- pkgs/applications/audio/axoloti/dfu-util.nix | 4 +- pkgs/applications/audio/axoloti/libusb1.nix | 2 +- pkgs/applications/audio/bambootracker/default.nix | 4 +- pkgs/applications/audio/baudline/default.nix | 4 +- pkgs/applications/audio/bchoppr/default.nix | 4 +- pkgs/applications/audio/bitmeter/default.nix | 4 +- .../audio/bitwig-studio/bitwig-studio1.nix | 2 +- .../audio/bitwig-studio/bitwig-studio3.nix | 2 +- pkgs/applications/audio/bjumblr/default.nix | 4 +- pkgs/applications/audio/bristol/default.nix | 4 +- pkgs/applications/audio/bschaffl/default.nix | 4 +- pkgs/applications/audio/bsequencer/default.nix | 4 +- pkgs/applications/audio/bshapr/default.nix | 4 +- pkgs/applications/audio/bslizr/default.nix | 4 +- pkgs/applications/audio/calf/default.nix | 4 +- pkgs/applications/audio/carla/default.nix | 4 +- pkgs/applications/audio/caudec/default.nix | 4 +- pkgs/applications/audio/cava/default.nix | 4 +- pkgs/applications/audio/cd-discid/default.nix | 4 +- pkgs/applications/audio/cdparanoia/default.nix | 4 +- pkgs/applications/audio/clementine/default.nix | 6 +-- pkgs/applications/audio/clerk/default.nix | 4 +- pkgs/applications/audio/cmt/default.nix | 4 +- pkgs/applications/audio/cmus/default.nix | 4 +- pkgs/applications/audio/cmusfm/default.nix | 4 +- .../applications/audio/cozy-audiobooks/default.nix | 4 +- pkgs/applications/audio/csa/default.nix | 4 +- .../audio/csound/csound-qt/default.nix | 4 +- pkgs/applications/audio/csound/default.nix | 4 +- pkgs/applications/audio/curseradio/default.nix | 4 +- pkgs/applications/audio/deadbeef/default.nix | 4 +- .../audio/deadbeef/plugins/headerbar-gtk3.nix | 4 +- .../audio/deadbeef/plugins/infobar.nix | 4 +- .../audio/deadbeef/plugins/lyricbar.nix | 4 +- .../applications/audio/deadbeef/plugins/mpris2.nix | 4 +- pkgs/applications/audio/denemo/default.nix | 4 +- pkgs/applications/audio/dfasma/default.nix | 8 ++-- pkgs/applications/audio/dirt/default.nix | 4 +- pkgs/applications/audio/distrho/default.nix | 4 +- pkgs/applications/audio/dr14_tmeter/default.nix | 4 +- .../audio/dragonfly-reverb/default.nix | 4 +- pkgs/applications/audio/drumgizmo/default.nix | 4 +- pkgs/applications/audio/dsf2flac/default.nix | 4 +- pkgs/applications/audio/easytag/default.nix | 4 +- pkgs/applications/audio/ekho/default.nix | 4 +- .../applications/audio/ensemble-chorus/default.nix | 4 +- pkgs/applications/audio/espeak-ng/default.nix | 2 +- pkgs/applications/audio/espeak/default.nix | 4 +- pkgs/applications/audio/espeak/edit.nix | 4 +- pkgs/applications/audio/eteroj.lv2/default.nix | 4 +- pkgs/applications/audio/faust/faust1.nix | 4 +- pkgs/applications/audio/faust/faust2.nix | 4 +- pkgs/applications/audio/faust/faustlive.nix | 4 +- pkgs/applications/audio/fdkaac/default.nix | 4 +- pkgs/applications/audio/flac/default.nix | 4 +- pkgs/applications/audio/flac123/default.nix | 4 +- pkgs/applications/audio/flacon/default.nix | 2 +- pkgs/applications/audio/fomp/default.nix | 4 +- pkgs/applications/audio/foo-yc20/default.nix | 4 +- pkgs/applications/audio/freqtweak/default.nix | 4 +- pkgs/applications/audio/ft2-clone/default.nix | 4 +- pkgs/applications/audio/fverb/default.nix | 4 +- pkgs/applications/audio/game-music-emu/default.nix | 4 +- pkgs/applications/audio/gbsplay/default.nix | 4 +- pkgs/applications/audio/geonkick/default.nix | 4 +- pkgs/applications/audio/giada/default.nix | 4 +- pkgs/applications/audio/gigedit/default.nix | 4 +- pkgs/applications/audio/gjay/default.nix | 4 +- pkgs/applications/audio/gmpc/default.nix | 4 +- pkgs/applications/audio/gnome-podcasts/default.nix | 4 +- .../audio/google-musicmanager/default.nix | 4 +- pkgs/applications/audio/gpodder/default.nix | 4 +- pkgs/applications/audio/gradio/default.nix | 4 +- pkgs/applications/audio/greg/default.nix | 4 +- pkgs/applications/audio/gtkpod/default.nix | 4 +- pkgs/applications/audio/guitarix/default.nix | 4 +- pkgs/applications/audio/gwc/default.nix | 4 +- pkgs/applications/audio/gxmatcheq-lv2/default.nix | 4 +- pkgs/applications/audio/gxplugins-lv2/default.nix | 4 +- .../audio/helio-workstation/default.nix | 4 +- pkgs/applications/audio/helm/default.nix | 4 +- pkgs/applications/audio/hybridreverb2/default.nix | 4 +- pkgs/applications/audio/hydrogen/0.nix | 4 +- pkgs/applications/audio/hydrogen/default.nix | 4 +- pkgs/applications/audio/id3v2/default.nix | 4 +- .../applications/audio/infamousPlugins/default.nix | 4 +- pkgs/applications/audio/ingen/default.nix | 4 +- pkgs/applications/audio/ir.lv2/default.nix | 4 +- pkgs/applications/audio/jaaa/default.nix | 4 +- pkgs/applications/audio/jack-capture/default.nix | 4 +- .../audio/jack-oscrolloscope/default.nix | 4 +- pkgs/applications/audio/jalv/default.nix | 4 +- pkgs/applications/audio/jamin/default.nix | 4 +- .../audio/kapitonov-plugins-pack/default.nix | 4 +- pkgs/applications/audio/keyfinder-cli/default.nix | 4 +- pkgs/applications/audio/keyfinder/default.nix | 4 +- pkgs/applications/audio/kid3/default.nix | 4 +- pkgs/applications/audio/klystrack/default.nix | 4 +- pkgs/applications/audio/kmetronome/default.nix | 4 +- pkgs/applications/audio/ladspa-plugins/default.nix | 4 +- pkgs/applications/audio/lash/default.nix | 4 +- pkgs/applications/audio/librespot/default.nix | 4 +- pkgs/applications/audio/linuxsampler/default.nix | 4 +- .../applications/audio/littlegptracker/default.nix | 4 +- pkgs/applications/audio/lmms/default.nix | 4 +- pkgs/applications/audio/ltc-tools/default.nix | 4 +- pkgs/applications/audio/luppp/default.nix | 4 +- pkgs/applications/audio/lv2-cpp-tools/default.nix | 4 +- pkgs/applications/audio/lv2bm/default.nix | 4 +- pkgs/applications/audio/mamba/default.nix | 4 +- pkgs/applications/audio/mda-lv2/default.nix | 4 +- pkgs/applications/audio/melmatcheq.lv2/default.nix | 4 +- pkgs/applications/audio/meterbridge/default.nix | 4 +- pkgs/applications/audio/mhwaveedit/default.nix | 4 +- pkgs/applications/audio/mid2key/default.nix | 4 +- pkgs/applications/audio/midas/generic.nix | 2 +- .../applications/audio/midi-visualizer/default.nix | 4 +- pkgs/applications/audio/midisheetmusic/default.nix | 4 +- pkgs/applications/audio/milkytracker/default.nix | 4 +- pkgs/applications/audio/mixxx/default.nix | 4 +- pkgs/applications/audio/moc/default.nix | 4 +- pkgs/applications/audio/mod-distortion/default.nix | 4 +- pkgs/applications/audio/molot-lite/default.nix | 4 +- pkgs/applications/audio/monkeys-audio/default.nix | 4 +- pkgs/applications/audio/mopidy/gmusic.nix | 4 +- pkgs/applications/audio/mopidy/iris.nix | 4 +- pkgs/applications/audio/mopidy/moped.nix | 4 +- pkgs/applications/audio/mopidy/mopidy.nix | 4 +- pkgs/applications/audio/mopidy/mopify.nix | 4 +- pkgs/applications/audio/mopidy/mpd.nix | 4 +- pkgs/applications/audio/mopidy/mpris.nix | 4 +- .../audio/mopidy/musicbox-webclient.nix | 4 +- pkgs/applications/audio/mopidy/scrobbler.nix | 4 +- pkgs/applications/audio/mopidy/somafm.nix | 4 +- pkgs/applications/audio/mopidy/soundcloud.nix | 4 +- pkgs/applications/audio/mopidy/spotify-tunigo.nix | 4 +- pkgs/applications/audio/mopidy/spotify.nix | 4 +- pkgs/applications/audio/mopidy/tunein.nix | 4 +- pkgs/applications/audio/mopidy/youtube.nix | 4 +- pkgs/applications/audio/mp3blaster/default.nix | 4 +- pkgs/applications/audio/mp3gain/default.nix | 4 +- pkgs/applications/audio/mp3splt/default.nix | 4 +- pkgs/applications/audio/mpc/default.nix | 4 +- pkgs/applications/audio/mpg321/default.nix | 4 +- pkgs/applications/audio/munt/default.nix | 4 +- pkgs/applications/audio/mup/default.nix | 4 +- pkgs/applications/audio/muse/default.nix | 4 +- pkgs/applications/audio/musescore/darwin.nix | 2 +- pkgs/applications/audio/musescore/default.nix | 2 +- pkgs/applications/audio/musikcube/default.nix | 4 +- pkgs/applications/audio/musly/default.nix | 4 +- pkgs/applications/audio/ncmpc/default.nix | 4 +- pkgs/applications/audio/ncpamixer/default.nix | 4 +- .../audio/new-session-manager/default.nix | 4 +- pkgs/applications/audio/ninjas2/default.nix | 4 +- .../applications/audio/noise-repellent/default.nix | 4 +- pkgs/applications/audio/noisetorch/default.nix | 4 +- pkgs/applications/audio/nootka/default.nix | 4 +- pkgs/applications/audio/nootka/unstable.nix | 4 +- pkgs/applications/audio/normalize/default.nix | 4 +- pkgs/applications/audio/nova-filters/default.nix | 4 +- pkgs/applications/audio/ocenaudio/default.nix | 2 +- pkgs/applications/audio/openmpt123/default.nix | 4 +- pkgs/applications/audio/opusfile/default.nix | 4 +- pkgs/applications/audio/orca-c/default.nix | 4 +- pkgs/applications/audio/osmid/default.nix | 4 +- pkgs/applications/audio/padthv1/default.nix | 4 +- pkgs/applications/audio/pamix/default.nix | 4 +- pkgs/applications/audio/pamixer/default.nix | 4 +- pkgs/applications/audio/paprefs/default.nix | 4 +- pkgs/applications/audio/parlatype/default.nix | 4 +- pkgs/applications/audio/paulstretch/default.nix | 4 +- pkgs/applications/audio/pavucontrol/default.nix | 4 +- pkgs/applications/audio/petrifoo/default.nix | 4 +- pkgs/applications/audio/pianobar/default.nix | 4 +- pkgs/applications/audio/pianobooster/default.nix | 4 +- pkgs/applications/audio/picard/default.nix | 4 +- pkgs/applications/audio/picoloop/default.nix | 4 +- pkgs/applications/audio/pithos/default.nix | 4 +- pkgs/applications/audio/playbar2/default.nix | 4 +- pkgs/applications/audio/plugin-torture/default.nix | 4 +- pkgs/applications/audio/plujain-ramp/default.nix | 4 +- pkgs/applications/audio/pmidi/default.nix | 4 +- pkgs/applications/audio/polyphone/default.nix | 4 +- pkgs/applications/audio/ponymix/default.nix | 4 +- pkgs/applications/audio/pt2-clone/default.nix | 4 +- pkgs/applications/audio/ptcollab/default.nix | 4 +- pkgs/applications/audio/puddletag/default.nix | 4 +- pkgs/applications/audio/pulseaudio-ctl/default.nix | 4 +- .../applications/audio/pulseaudio-dlna/default.nix | 4 +- .../audio/pulseaudio-dlna/zeroconf.nix | 4 +- .../audio/pulseaudio-modules-bt/default.nix | 2 +- pkgs/applications/audio/pulseeffects/default.nix | 4 +- pkgs/applications/audio/puredata/default.nix | 4 +- pkgs/applications/audio/qjackctl/default.nix | 4 +- pkgs/applications/audio/qmidiarp/default.nix | 4 +- pkgs/applications/audio/qmidiroute/default.nix | 4 +- pkgs/applications/audio/qmmp/default.nix | 4 +- pkgs/applications/audio/qsampler/default.nix | 4 +- pkgs/applications/audio/qsynth/default.nix | 4 +- pkgs/applications/audio/qtractor/default.nix | 4 +- pkgs/applications/audio/quodlibet/default.nix | 4 +- pkgs/applications/audio/radiotray-ng/default.nix | 4 +- pkgs/applications/audio/rakarrack/default.nix | 4 +- .../audio/real_time_config_quick_scan/default.nix | 4 +- pkgs/applications/audio/reaper/default.nix | 4 +- pkgs/applications/audio/rhythmbox/default.nix | 4 +- pkgs/applications/audio/rkrlv2/default.nix | 4 +- pkgs/applications/audio/rosegarden/default.nix | 4 +- pkgs/applications/audio/rubyripper/default.nix | 4 +- pkgs/applications/audio/sc68/default.nix | 4 +- pkgs/applications/audio/schismtracker/default.nix | 4 +- pkgs/applications/audio/seq24/default.nix | 4 +- pkgs/applications/audio/seq66/default.nix | 4 +- pkgs/applications/audio/setbfree/default.nix | 4 +- pkgs/applications/audio/sfizz/default.nix | 4 +- pkgs/applications/audio/sfxr/default.nix | 4 +- pkgs/applications/audio/shortwave/default.nix | 4 +- pkgs/applications/audio/sisco.lv2/default.nix | 4 +- pkgs/applications/audio/sndpeek/default.nix | 4 +- pkgs/applications/audio/sonic-lineup/default.nix | 4 +- .../audio/sonic-visualiser/default.nix | 4 +- pkgs/applications/audio/sooperlooper/default.nix | 4 +- pkgs/applications/audio/sorcer/default.nix | 4 +- pkgs/applications/audio/sound-juicer/default.nix | 4 +- pkgs/applications/audio/soundtracker/default.nix | 4 +- pkgs/applications/audio/spectmorph/default.nix | 4 +- .../applications/audio/speech-denoiser/default.nix | 4 +- pkgs/applications/audio/spek/default.nix | 4 +- pkgs/applications/audio/split2flac/default.nix | 4 +- .../audio/spotify-cli-linux/default.nix | 4 +- pkgs/applications/audio/spotify-tui/default.nix | 4 +- pkgs/applications/audio/spotify/default.nix | 4 +- pkgs/applications/audio/spotifyd/default.nix | 4 +- pkgs/applications/audio/spotifywm/default.nix | 4 +- pkgs/applications/audio/squeezelite/default.nix | 4 +- pkgs/applications/audio/squishyball/default.nix | 4 +- pkgs/applications/audio/ssrc/default.nix | 4 +- pkgs/applications/audio/stochas/default.nix | 4 +- pkgs/applications/audio/stone-phaser/default.nix | 4 +- pkgs/applications/audio/streamripper/default.nix | 4 +- pkgs/applications/audio/string-machine/default.nix | 4 +- pkgs/applications/audio/sunvox/default.nix | 4 +- pkgs/applications/audio/surge/default.nix | 4 +- pkgs/applications/audio/svox/default.nix | 4 +- pkgs/applications/audio/swh-lv2/default.nix | 4 +- pkgs/applications/audio/synthv1/default.nix | 4 +- pkgs/applications/audio/talentedhack/default.nix | 4 +- pkgs/applications/audio/tambura/default.nix | 4 +- pkgs/applications/audio/tamgamp.lv2/default.nix | 4 +- pkgs/applications/audio/tetraproc/default.nix | 4 +- pkgs/applications/audio/tony/default.nix | 4 +- pkgs/applications/audio/transcode/default.nix | 4 +- pkgs/applications/audio/traverso/default.nix | 4 +- pkgs/applications/audio/tree-from-tags/default.nix | 4 +- pkgs/applications/audio/tunefish/default.nix | 4 +- pkgs/applications/audio/uade123/default.nix | 4 +- pkgs/applications/audio/uhhyou.lv2/default.nix | 4 +- pkgs/applications/audio/vcv-rack/default.nix | 4 +- pkgs/applications/audio/vimpc/default.nix | 4 +- pkgs/applications/audio/virtual-ans/default.nix | 4 +- pkgs/applications/audio/vkeybd/default.nix | 4 +- pkgs/applications/audio/vocal/default.nix | 4 +- pkgs/applications/audio/vocproc/default.nix | 4 +- pkgs/applications/audio/vorbis-tools/default.nix | 4 +- pkgs/applications/audio/waon/default.nix | 4 +- pkgs/applications/audio/whipper/default.nix | 4 +- pkgs/applications/audio/wolf-shaper/default.nix | 4 +- pkgs/applications/audio/x42-avldrums/default.nix | 4 +- pkgs/applications/audio/x42-gmsynth/default.nix | 4 +- pkgs/applications/audio/xmp/default.nix | 4 +- pkgs/applications/audio/xsynth-dssi/default.nix | 4 +- pkgs/applications/audio/xtuner/default.nix | 4 +- pkgs/applications/audio/yoshimi/default.nix | 4 +- pkgs/applications/audio/zam-plugins/default.nix | 4 +- pkgs/applications/audio/zita-ajbridge/default.nix | 4 +- pkgs/applications/audio/zita-at1/default.nix | 4 +- pkgs/applications/audio/zita-njbridge/default.nix | 4 +- .../audio/zynaddsubfx/mruby-zest/default.nix | 4 +- pkgs/applications/backup/areca/default.nix | 4 +- pkgs/applications/backup/deja-dup/default.nix | 4 +- pkgs/applications/backup/vdmfec/default.nix | 4 +- pkgs/applications/blockchains/aeon/default.nix | 4 +- pkgs/applications/blockchains/bitcoin-knots.nix | 4 +- pkgs/applications/blockchains/cgminer/default.nix | 4 +- pkgs/applications/blockchains/ergo/default.nix | 4 +- pkgs/applications/blockchains/ethabi.nix | 4 +- pkgs/applications/blockchains/exodus/default.nix | 2 +- pkgs/applications/blockchains/go-ethereum.nix | 4 +- .../blockchains/ledger-live-desktop/default.nix | 4 +- pkgs/applications/blockchains/monero/default.nix | 4 +- .../applications/blockchains/parity-ui/default.nix | 4 +- pkgs/applications/blockchains/pivx.nix | 4 +- pkgs/applications/blockchains/quorum.nix | 4 +- pkgs/applications/blockchains/stellar-core.nix | 4 +- pkgs/applications/blockchains/tessera.nix | 4 +- pkgs/applications/blockchains/turbo-geth.nix | 4 +- .../blockchains/wasabibackend/default.nix | 4 +- .../blockchains/wasabiwallet/default.nix | 4 +- .../blockchains/whirlpool-gui/default.nix | 4 +- .../lightdm-enso-os-greeter/default.nix | 4 +- .../lightdm-mini-greeter/default.nix | 4 +- .../lightdm-tiny-greeter/default.nix | 4 +- .../display-managers/lightdm/gtk-greeter.nix | 4 +- pkgs/applications/editors/amp/default.nix | 4 +- .../applications/editors/android-studio/common.nix | 3 +- pkgs/applications/editors/apostrophe/default.nix | 4 +- pkgs/applications/editors/atom/default.nix | 4 +- pkgs/applications/editors/bless/default.nix | 4 +- pkgs/applications/editors/bluefish/default.nix | 4 +- pkgs/applications/editors/bluej/default.nix | 4 +- pkgs/applications/editors/bonzomatic/default.nix | 4 +- pkgs/applications/editors/bvi/default.nix | 4 +- pkgs/applications/editors/bviplus/default.nix | 4 +- pkgs/applications/editors/code-browser/default.nix | 4 +- pkgs/applications/editors/deadpixi-sam/default.nix | 4 +- pkgs/applications/editors/dit/default.nix | 2 +- pkgs/applications/editors/eclipse/plugins.nix | 52 +++++++++++----------- pkgs/applications/editors/edbrowse/default.nix | 4 +- pkgs/applications/editors/edit/default.nix | 4 +- .../emacs-modes/color-theme-solarized/default.nix | 4 +- .../editors/emacs-modes/sv-kalender/default.nix | 4 +- pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/applications/editors/emacs/macport.nix | 4 +- pkgs/applications/editors/featherpad/default.nix | 4 +- pkgs/applications/editors/flpsed/default.nix | 4 +- pkgs/applications/editors/focuswriter/default.nix | 4 +- pkgs/applications/editors/fte/default.nix | 4 +- pkgs/applications/editors/geany/default.nix | 4 +- pkgs/applications/editors/ghostwriter/default.nix | 4 +- .../applications/editors/gnome-builder/default.nix | 4 +- pkgs/applications/editors/gnome-latex/default.nix | 4 +- pkgs/applications/editors/gobby/default.nix | 4 +- pkgs/applications/editors/greenfoot/default.nix | 4 +- pkgs/applications/editors/hecate/default.nix | 4 +- pkgs/applications/editors/hexdino/default.nix | 4 +- pkgs/applications/editors/jedit/default.nix | 4 +- pkgs/applications/editors/jetbrains/default.nix | 20 ++++----- pkgs/applications/editors/joe/default.nix | 4 +- pkgs/applications/editors/jupp/default.nix | 4 +- .../editors/kakoune/plugins/case.kak.nix | 4 +- .../editors/kakoune/plugins/kak-ansi.nix | 4 +- .../editors/kakoune/plugins/kak-plumb.nix | 4 +- .../editors/kakoune/plugins/openscad.kak.nix | 4 +- .../editors/kdevelop5/kdevelop-pg-qt.nix | 4 +- pkgs/applications/editors/kibi/default.nix | 4 +- pkgs/applications/editors/kodestudio/default.nix | 2 +- pkgs/applications/editors/leafpad/default.nix | 4 +- pkgs/applications/editors/lighttable/default.nix | 2 +- pkgs/applications/editors/lite/default.nix | 4 +- pkgs/applications/editors/marker/default.nix | 4 +- pkgs/applications/editors/mg/default.nix | 4 +- pkgs/applications/editors/mindforger/default.nix | 4 +- pkgs/applications/editors/mle/default.nix | 4 +- pkgs/applications/editors/moe/default.nix | 4 +- pkgs/applications/editors/monodevelop/default.nix | 4 +- .../editors/music/tuxguitar/default.nix | 4 +- pkgs/applications/editors/ne/default.nix | 4 +- pkgs/applications/editors/nedit/default.nix | 4 +- pkgs/applications/editors/neovim/gnvim/default.nix | 4 +- pkgs/applications/editors/neovim/qt.nix | 4 +- pkgs/applications/editors/okteta/default.nix | 4 +- pkgs/applications/editors/quilter/default.nix | 4 +- pkgs/applications/editors/qxmledit/default.nix | 4 +- pkgs/applications/editors/qxw/default.nix | 4 +- pkgs/applications/editors/rehex/default.nix | 4 +- pkgs/applications/editors/retext/default.nix | 4 +- pkgs/applications/editors/scite/default.nix | 4 +- pkgs/applications/editors/sigil/default.nix | 4 +- pkgs/applications/editors/spacevim/default.nix | 4 +- .../applications/editors/standardnotes/default.nix | 4 +- pkgs/applications/editors/sublime/3/common.nix | 4 +- .../editors/supertux-editor/default.nix | 4 +- pkgs/applications/editors/tecoc/default.nix | 4 +- pkgs/applications/editors/textadept/10/default.nix | 2 +- pkgs/applications/editors/textadept/11/default.nix | 2 +- pkgs/applications/editors/thonny/default.nix | 4 +- pkgs/applications/editors/tiled/default.nix | 4 +- pkgs/applications/editors/tweak/default.nix | 4 +- pkgs/applications/editors/vim/macvim.nix | 4 +- pkgs/applications/editors/vim/vimacs.nix | 4 +- pkgs/applications/editors/vis/default.nix | 4 +- pkgs/applications/editors/viw/default.nix | 4 +- pkgs/applications/editors/vscode/vscode.nix | 2 +- pkgs/applications/editors/vscode/vscodium.nix | 4 +- pkgs/applications/editors/wily/default.nix | 4 +- .../applications/editors/xmlcopyeditor/default.nix | 4 +- pkgs/applications/editors/yi/wrapper.nix | 4 +- pkgs/applications/editors/zile/default.nix | 4 +- pkgs/applications/gis/gmt/dcw.nix | 4 +- pkgs/applications/gis/gmt/default.nix | 4 +- pkgs/applications/gis/gmt/gshhg.nix | 4 +- .../gis/openorienteering-mapper/default.nix | 4 +- pkgs/applications/gis/whitebox-tools/default.nix | 4 +- pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/applications/graphics/ahoviewer/default.nix | 4 +- pkgs/applications/graphics/alchemy/default.nix | 4 +- pkgs/applications/graphics/antimony/default.nix | 4 +- pkgs/applications/graphics/apitrace/default.nix | 4 +- pkgs/applications/graphics/apngasm/2.nix | 4 +- pkgs/applications/graphics/apngasm/default.nix | 4 +- pkgs/applications/graphics/autotrace/default.nix | 4 +- pkgs/applications/graphics/avocode/default.nix | 4 +- pkgs/applications/graphics/azpainter/default.nix | 4 +- pkgs/applications/graphics/batik/default.nix | 4 +- pkgs/applications/graphics/c3d/default.nix | 4 +- pkgs/applications/graphics/darktable/default.nix | 4 +- pkgs/applications/graphics/deskew/default.nix | 4 +- pkgs/applications/graphics/dia/default.nix | 4 +- pkgs/applications/graphics/djview/default.nix | 4 +- pkgs/applications/graphics/drawio/default.nix | 2 +- pkgs/applications/graphics/epeg/default.nix | 4 +- pkgs/applications/graphics/exrtools/default.nix | 4 +- pkgs/applications/graphics/f3d/default.nix | 4 +- pkgs/applications/graphics/fbida/default.nix | 4 +- pkgs/applications/graphics/fig2dev/default.nix | 4 +- pkgs/applications/graphics/fluxus/default.nix | 4 +- pkgs/applications/graphics/fondo/default.nix | 4 +- pkgs/applications/graphics/freecad/default.nix | 4 +- pkgs/applications/graphics/fstl/default.nix | 4 +- pkgs/applications/graphics/gcolor3/default.nix | 4 +- pkgs/applications/graphics/geeqie/default.nix | 4 +- .../applications/graphics/gimp/plugins/default.nix | 4 +- pkgs/applications/graphics/glabels/default.nix | 4 +- .../applications/graphics/gnome-photos/default.nix | 4 +- pkgs/applications/graphics/gnuclad/default.nix | 2 +- pkgs/applications/graphics/goxel/default.nix | 4 +- pkgs/applications/graphics/gpicview/default.nix | 4 +- pkgs/applications/graphics/gqview/default.nix | 4 +- pkgs/applications/graphics/gthumb/default.nix | 4 +- pkgs/applications/graphics/hugin/default.nix | 4 +- pkgs/applications/graphics/hydrus/default.nix | 4 +- pkgs/applications/graphics/ideogram/default.nix | 4 +- pkgs/applications/graphics/imagej/default.nix | 4 +- .../graphics/imgbrd-grabber/default.nix | 4 +- pkgs/applications/graphics/imgcat/default.nix | 4 +- .../applications/graphics/imlibsetroot/default.nix | 4 +- pkgs/applications/graphics/imv/default.nix | 2 +- pkgs/applications/graphics/inkscape/default.nix | 4 +- pkgs/applications/graphics/inkscape/extensions.nix | 4 +- .../applications/graphics/jpeg-archive/default.nix | 4 +- pkgs/applications/graphics/jpeginfo/default.nix | 4 +- pkgs/applications/graphics/jpegoptim/default.nix | 4 +- pkgs/applications/graphics/jpegrescan/default.nix | 4 +- pkgs/applications/graphics/k3d/default.nix | 4 +- .../applications/graphics/kgraphviewer/default.nix | 4 +- pkgs/applications/graphics/kodelife/default.nix | 4 +- pkgs/applications/graphics/ktikz/default.nix | 4 +- pkgs/applications/graphics/lazpaint/default.nix | 4 +- pkgs/applications/graphics/leocad/default.nix | 4 +- .../graphics/luminance-hdr/default.nix | 4 +- pkgs/applications/graphics/mcomix3/default.nix | 2 +- pkgs/applications/graphics/meme/default.nix | 4 +- pkgs/applications/graphics/monado/default.nix | 4 +- pkgs/applications/graphics/mypaint/default.nix | 4 +- pkgs/applications/graphics/nomacs/default.nix | 4 +- pkgs/applications/graphics/nufraw/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 4 +- pkgs/applications/graphics/ocrfeeder/default.nix | 4 +- .../graphics/odafileconverter/default.nix | 2 +- pkgs/applications/graphics/openimageio/2.x.nix | 4 +- pkgs/applications/graphics/openimageio/default.nix | 4 +- pkgs/applications/graphics/paraview/default.nix | 4 +- pkgs/applications/graphics/pbrt/default.nix | 4 +- pkgs/applications/graphics/pdfcpu/default.nix | 4 +- pkgs/applications/graphics/pencil/default.nix | 2 +- pkgs/applications/graphics/photivo/default.nix | 4 +- pkgs/applications/graphics/photoflare/default.nix | 4 +- pkgs/applications/graphics/photoflow/default.nix | 4 +- pkgs/applications/graphics/phototonic/default.nix | 4 +- .../graphics/pick-colour-picker/default.nix | 4 +- pkgs/applications/graphics/potrace/default.nix | 4 +- pkgs/applications/graphics/pqiv/default.nix | 4 +- pkgs/applications/graphics/processing/default.nix | 4 +- pkgs/applications/graphics/qcomicbook/default.nix | 4 +- pkgs/applications/graphics/qiv/default.nix | 4 +- pkgs/applications/graphics/qscreenshot/default.nix | 4 +- pkgs/applications/graphics/rapcad/default.nix | 4 +- .../graphics/rapid-photo-downloader/default.nix | 4 +- pkgs/applications/graphics/renderdoc/default.nix | 4 +- .../graphics/sane/backends/generic.nix | 4 +- pkgs/applications/graphics/sane/frontends.nix | 4 +- pkgs/applications/graphics/scantailor/advanced.nix | 4 +- pkgs/applications/graphics/shotwell/default.nix | 4 +- pkgs/applications/graphics/shutter/default.nix | 4 +- pkgs/applications/graphics/solvespace/default.nix | 4 +- pkgs/applications/graphics/swingsane/default.nix | 4 +- .../applications/graphics/synfigstudio/default.nix | 4 +- pkgs/applications/graphics/tev/default.nix | 4 +- .../graphics/timelapse-deflicker/default.nix | 4 +- pkgs/applications/graphics/ufraw/default.nix | 4 +- pkgs/applications/graphics/viewnior/default.nix | 4 +- .../applications/graphics/write_stylus/default.nix | 2 +- pkgs/applications/graphics/xfig/default.nix | 4 +- pkgs/applications/graphics/xlife/default.nix | 4 +- pkgs/applications/graphics/xournal/default.nix | 4 +- pkgs/applications/graphics/xournalpp/default.nix | 4 +- pkgs/applications/graphics/xrgears/default.nix | 4 +- pkgs/applications/graphics/xzgv/default.nix | 4 +- pkgs/applications/graphics/yed/default.nix | 4 +- pkgs/applications/graphics/zgv/default.nix | 4 +- pkgs/applications/logging/humioctl/default.nix | 4 +- pkgs/applications/misc/1password/default.nix | 4 +- pkgs/applications/misc/ArchiSteamFarm/default.nix | 4 +- pkgs/applications/misc/OSCAR/default.nix | 4 +- pkgs/applications/misc/airtame/default.nix | 2 +- pkgs/applications/misc/almanah/default.nix | 4 +- pkgs/applications/misc/antfs-cli/default.nix | 4 +- pkgs/applications/misc/ape/clex.nix | 4 +- pkgs/applications/misc/ape/default.nix | 6 +-- pkgs/applications/misc/appeditor/default.nix | 4 +- pkgs/applications/misc/apvlv/default.nix | 4 +- pkgs/applications/misc/archivy/default.nix | 2 +- pkgs/applications/misc/artha/default.nix | 4 +- pkgs/applications/misc/asciiquarium/default.nix | 4 +- pkgs/applications/misc/audio/wavrsocvt/default.nix | 4 +- pkgs/applications/misc/ausweisapp2/default.nix | 4 +- pkgs/applications/misc/autospotting/default.nix | 4 +- pkgs/applications/misc/avrdudess/default.nix | 4 +- pkgs/applications/misc/batsignal/default.nix | 4 +- pkgs/applications/misc/bicon/default.nix | 4 +- pkgs/applications/misc/bleachbit/default.nix | 4 +- pkgs/applications/misc/blender/default.nix | 2 +- pkgs/applications/misc/blogc/default.nix | 4 +- pkgs/applications/misc/blugon/default.nix | 4 +- pkgs/applications/misc/break-time/default.nix | 4 +- pkgs/applications/misc/buku/default.nix | 4 +- pkgs/applications/misc/calcurse/default.nix | 4 +- pkgs/applications/misc/candle/default.nix | 4 +- pkgs/applications/misc/cardpeek/default.nix | 4 +- pkgs/applications/misc/cataract/build.nix | 4 +- pkgs/applications/misc/catclock/default.nix | 4 +- pkgs/applications/misc/cbatticon/default.nix | 4 +- pkgs/applications/misc/cheat/default.nix | 4 +- pkgs/applications/misc/chewing-editor/default.nix | 4 +- pkgs/applications/misc/cipher/default.nix | 4 +- pkgs/applications/misc/clipit/default.nix | 4 +- pkgs/applications/misc/clipmenu/default.nix | 2 +- pkgs/applications/misc/cmatrix/default.nix | 4 +- pkgs/applications/misc/colort/default.nix | 4 +- pkgs/applications/misc/corectrl/default.nix | 4 +- pkgs/applications/misc/coursera-dl/default.nix | 4 +- pkgs/applications/misc/cpu-x/default.nix | 4 +- pkgs/applications/misc/ctodo/default.nix | 4 +- pkgs/applications/misc/cum/default.nix | 4 +- pkgs/applications/misc/cura/lulzbot/libarcus.nix | 4 +- pkgs/applications/misc/cura/lulzbot/libsavitar.nix | 4 +- pkgs/applications/misc/cura/lulzbot/uranium.nix | 4 +- pkgs/applications/misc/cura/plugins.nix | 4 +- pkgs/applications/misc/cura/stable.nix | 4 +- pkgs/applications/misc/curaengine/default.nix | 4 +- pkgs/applications/misc/curaengine/stable.nix | 4 +- pkgs/applications/misc/dasel/default.nix | 4 +- pkgs/applications/misc/dbeaver/default.nix | 4 +- pkgs/applications/misc/ddgr/default.nix | 4 +- .../misc/deadd-notification-center/default.nix | 4 +- pkgs/applications/misc/deco/default.nix | 4 +- pkgs/applications/misc/devdocs-desktop/default.nix | 4 +- pkgs/applications/misc/devilspie2/default.nix | 4 +- pkgs/applications/misc/diff-pdf/default.nix | 4 +- pkgs/applications/misc/ding/default.nix | 4 +- pkgs/applications/misc/djvulibre/default.nix | 4 +- pkgs/applications/misc/dmensamenu/default.nix | 4 +- pkgs/applications/misc/dmenu/default.nix | 4 +- pkgs/applications/misc/dmenu/wayland.nix | 4 +- pkgs/applications/misc/dockbarx/default.nix | 8 ++-- pkgs/applications/misc/doomseeker/default.nix | 4 +- pkgs/applications/misc/dotfiles/default.nix | 4 +- pkgs/applications/misc/dstask/default.nix | 4 +- pkgs/applications/misc/dupeguru/default.nix | 4 +- pkgs/applications/misc/eaglemode/default.nix | 4 +- pkgs/applications/misc/effitask/default.nix | 4 +- pkgs/applications/misc/electrum/dash.nix | 4 +- pkgs/applications/misc/electrum/default.nix | 4 +- pkgs/applications/misc/electrum/ltc.nix | 4 +- pkgs/applications/misc/elfx86exts/default.nix | 4 +- pkgs/applications/misc/emem/default.nix | 4 +- pkgs/applications/misc/epdfview/default.nix | 4 +- pkgs/applications/misc/et/default.nix | 4 +- pkgs/applications/misc/eureka-editor/default.nix | 4 +- pkgs/applications/misc/evtest/default.nix | 4 +- pkgs/applications/misc/exercism/default.nix | 4 +- pkgs/applications/misc/far2l/default.nix | 4 +- pkgs/applications/misc/fbmenugen/default.nix | 4 +- pkgs/applications/misc/fbreader/default.nix | 4 +- pkgs/applications/misc/fehlstart/default.nix | 4 +- pkgs/applications/misc/fff/default.nix | 4 +- pkgs/applications/misc/filet/default.nix | 4 +- pkgs/applications/misc/firestarter/default.nix | 4 +- pkgs/applications/misc/flamerobin/default.nix | 4 +- pkgs/applications/misc/fme/default.nix | 4 +- pkgs/applications/misc/font-manager/default.nix | 4 +- pkgs/applications/misc/fontpreview/default.nix | 2 +- pkgs/applications/misc/formatter/default.nix | 4 +- pkgs/applications/misc/foxtrotgps/default.nix | 4 +- pkgs/applications/misc/freemind/default.nix | 4 +- pkgs/applications/misc/fsv/default.nix | 4 +- .../misc/fusee-interfacee-tk/default.nix | 4 +- pkgs/applications/misc/gImageReader/default.nix | 4 +- pkgs/applications/misc/galculator/default.nix | 4 +- .../applications/misc/ganttproject-bin/default.nix | 4 +- pkgs/applications/misc/gcstar/default.nix | 4 +- pkgs/applications/misc/geoipupdate/default.nix | 4 +- pkgs/applications/misc/getxbook/default.nix | 4 +- pkgs/applications/misc/girara/default.nix | 4 +- pkgs/applications/misc/glava/default.nix | 4 +- pkgs/applications/misc/glom/default.nix | 4 +- pkgs/applications/misc/gmrun/default.nix | 4 +- .../misc/gnome-firmware-updater/default.nix | 4 +- .../misc/gnome-multi-writer/default.nix | 4 +- .../misc/gnome-passwordsafe/default.nix | 4 +- pkgs/applications/misc/gnome-recipes/default.nix | 4 +- pkgs/applications/misc/gnome-usage/default.nix | 4 +- pkgs/applications/misc/go-jira/default.nix | 4 +- pkgs/applications/misc/golden-cheetah/default.nix | 4 +- pkgs/applications/misc/goldendict/default.nix | 4 +- pkgs/applications/misc/gollum/default.nix | 4 +- pkgs/applications/misc/googleearth/default.nix | 4 +- pkgs/applications/misc/googler/default.nix | 4 +- pkgs/applications/misc/gosmore/default.nix | 4 +- pkgs/applications/misc/gpa/default.nix | 4 +- pkgs/applications/misc/gphoto2/default.nix | 4 +- pkgs/applications/misc/gphoto2/gphotofs.nix | 4 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- pkgs/applications/misc/gpsbabel/gui.nix | 4 +- pkgs/applications/misc/gpscorrelate/default.nix | 4 +- pkgs/applications/misc/gpsprune/default.nix | 4 +- pkgs/applications/misc/gpx-viewer/default.nix | 4 +- pkgs/applications/misc/gpxsee/default.nix | 4 +- pkgs/applications/misc/gramps/default.nix | 4 +- pkgs/applications/misc/green-pdfviewer/default.nix | 4 +- pkgs/applications/misc/gremlin-console/default.nix | 4 +- pkgs/applications/misc/grsync/default.nix | 4 +- pkgs/applications/misc/gsctl/default.nix | 4 +- pkgs/applications/misc/gtk2fontsel/default.nix | 4 +- pkgs/applications/misc/gxneur/default.nix | 4 +- pkgs/applications/misc/hamster/default.nix | 4 +- pkgs/applications/misc/haxor-news/default.nix | 4 +- pkgs/applications/misc/hello/default.nix | 4 +- pkgs/applications/misc/hivemind/default.nix | 4 +- pkgs/applications/misc/hr/default.nix | 4 +- pkgs/applications/misc/hubstaff/default.nix | 4 +- pkgs/applications/misc/hugo/default.nix | 4 +- pkgs/applications/misc/imag/default.nix | 4 +- pkgs/applications/misc/ipmicfg/default.nix | 4 +- pkgs/applications/misc/ipmiview/default.nix | 4 +- .../applications/misc/j4-dmenu-desktop/default.nix | 4 +- pkgs/applications/misc/jgmenu/default.nix | 4 +- pkgs/applications/misc/joplin-desktop/default.nix | 4 +- pkgs/applications/misc/josm/default.nix | 4 +- pkgs/applications/misc/jotta-cli/default.nix | 4 +- pkgs/applications/misc/jp2a/default.nix | 4 +- pkgs/applications/misc/jrnl/default.nix | 4 +- pkgs/applications/misc/k2pdfopt/default.nix | 4 +- pkgs/applications/misc/k4dirstat/default.nix | 4 +- pkgs/applications/misc/kanboard/default.nix | 4 +- pkgs/applications/misc/kapow/default.nix | 4 +- .../misc/keepass-plugins/keepassrpc/default.nix | 4 +- pkgs/applications/misc/keeweb/default.nix | 4 +- pkgs/applications/misc/khal/default.nix | 4 +- pkgs/applications/misc/kjv/default.nix | 4 +- pkgs/applications/misc/kondo/default.nix | 4 +- pkgs/applications/misc/koreader/default.nix | 4 +- pkgs/applications/misc/kupfer/default.nix | 4 +- pkgs/applications/misc/lenmus/default.nix | 4 +- pkgs/applications/misc/libosmocore/default.nix | 4 +- pkgs/applications/misc/librecad/default.nix | 5 ++- pkgs/applications/misc/lifelines/default.nix | 4 +- pkgs/applications/misc/lighthouse/default.nix | 4 +- pkgs/applications/misc/llpp/default.nix | 2 +- pkgs/applications/misc/loxodo/default.nix | 4 +- pkgs/applications/misc/ltwheelconf/default.nix | 4 +- pkgs/applications/misc/madonctl/default.nix | 4 +- pkgs/applications/misc/makeself/default.nix | 4 +- pkgs/applications/misc/mako/default.nix | 4 +- pkgs/applications/misc/masterpdfeditor/default.nix | 2 +- pkgs/applications/misc/mdp/default.nix | 4 +- pkgs/applications/misc/mediaelch/default.nix | 4 +- pkgs/applications/misc/mediainfo-gui/default.nix | 4 +- pkgs/applications/misc/mediainfo/default.nix | 4 +- pkgs/applications/misc/megacmd/default.nix | 4 +- pkgs/applications/misc/megasync/default.nix | 4 +- pkgs/applications/misc/mencal/default.nix | 4 +- pkgs/applications/misc/menumaker/default.nix | 4 +- pkgs/applications/misc/metamorphose2/default.nix | 4 +- pkgs/applications/misc/metar/default.nix | 4 +- pkgs/applications/misc/minder/default.nix | 4 +- pkgs/applications/misc/minergate-cli/default.nix | 4 +- pkgs/applications/misc/minergate/default.nix | 4 +- pkgs/applications/misc/mkgmap/default.nix | 4 +- pkgs/applications/misc/mkgmap/splitter/default.nix | 4 +- .../misc/moonlight-embedded/default.nix | 4 +- pkgs/applications/misc/mop/default.nix | 4 +- pkgs/applications/misc/mpvc/default.nix | 4 +- pkgs/applications/misc/mqtt-bench/default.nix | 4 +- pkgs/applications/misc/mucommander/default.nix | 4 +- pkgs/applications/misc/multibootusb/default.nix | 4 +- pkgs/applications/misc/mupdf/1.17.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/misc/mwic/default.nix | 4 +- pkgs/applications/misc/mysql-workbench/default.nix | 4 +- pkgs/applications/misc/mystem/default.nix | 4 +- pkgs/applications/misc/neap/default.nix | 4 +- pkgs/applications/misc/nix-tour/default.nix | 4 +- pkgs/applications/misc/nixnote2/default.nix | 4 +- pkgs/applications/misc/notejot/default.nix | 4 +- .../misc/notify-osd-customizable/default.nix | 4 +- pkgs/applications/misc/notify-osd/default.nix | 4 +- pkgs/applications/misc/nrsc5/default.nix | 4 +- pkgs/applications/misc/nut/default.nix | 4 +- pkgs/applications/misc/nwg-launchers/default.nix | 4 +- pkgs/applications/misc/obinskit/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 4 +- pkgs/applications/misc/octoprint/default.nix | 2 +- pkgs/applications/misc/octoprint/plugins.nix | 32 ++++++------- pkgs/applications/misc/ola/default.nix | 4 +- pkgs/applications/misc/olifant/default.nix | 4 +- pkgs/applications/misc/omegat.nix | 4 +- pkgs/applications/misc/onboard/default.nix | 4 +- pkgs/applications/misc/oneko/default.nix | 4 +- pkgs/applications/misc/openbrf/default.nix | 4 +- pkgs/applications/misc/opentx/default.nix | 4 +- pkgs/applications/misc/orca/default.nix | 4 +- pkgs/applications/misc/osm2xmap/default.nix | 4 +- pkgs/applications/misc/osmctools/default.nix | 4 +- pkgs/applications/misc/osmium-tool/default.nix | 4 +- pkgs/applications/misc/pastel/default.nix | 4 +- pkgs/applications/misc/pbpst/default.nix | 4 +- pkgs/applications/misc/pcmanfm/default.nix | 4 +- pkgs/applications/misc/pcmanx-gtk2/default.nix | 4 +- pkgs/applications/misc/pdf-quench/default.nix | 4 +- pkgs/applications/misc/pdfdiff/default.nix | 4 +- pkgs/applications/misc/pdfmod/default.nix | 2 +- pkgs/applications/misc/pdfpc/default.nix | 4 +- pkgs/applications/misc/pdfsam-basic/default.nix | 4 +- pkgs/applications/misc/peaclock/default.nix | 4 +- pkgs/applications/misc/pell/default.nix | 4 +- pkgs/applications/misc/pgadmin/default.nix | 4 +- pkgs/applications/misc/pgmanage/default.nix | 4 +- pkgs/applications/misc/pgmodeler/default.nix | 2 +- pkgs/applications/misc/pinfo/default.nix | 4 +- pkgs/applications/misc/pipr/default.nix | 2 +- pkgs/applications/misc/plank/default.nix | 4 +- .../misc/plasma-applet-volumewin7mixer/default.nix | 4 +- pkgs/applications/misc/playonlinux/default.nix | 4 +- pkgs/applications/misc/plover/default.nix | 6 +-- pkgs/applications/misc/polybar/default.nix | 4 +- pkgs/applications/misc/posterazor/default.nix | 4 +- pkgs/applications/misc/prevo/data.nix | 4 +- pkgs/applications/misc/prevo/default.nix | 4 +- pkgs/applications/misc/prevo/tools.nix | 4 +- pkgs/applications/misc/printrun/default.nix | 4 +- pkgs/applications/misc/procmail/default.nix | 4 +- pkgs/applications/misc/projectlibre/default.nix | 4 +- pkgs/applications/misc/prusa-slicer/default.nix | 2 +- .../misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/applications/misc/pstree/default.nix | 4 +- pkgs/applications/misc/ptask/default.nix | 4 +- pkgs/applications/misc/pwsafe/default.nix | 4 +- pkgs/applications/misc/pydf/default.nix | 4 +- pkgs/applications/misc/pyditz/cerberus.nix | 4 +- pkgs/applications/misc/pyditz/default.nix | 4 +- pkgs/applications/misc/pytrainer/default.nix | 4 +- pkgs/applications/misc/qMasterPassword/default.nix | 4 +- pkgs/applications/misc/qcad/default.nix | 4 +- pkgs/applications/misc/qdirstat/default.nix | 4 +- pkgs/applications/misc/qlandkartegt/garmindev.nix | 4 +- pkgs/applications/misc/qlcplus/default.nix | 4 +- pkgs/applications/misc/qmetro/default.nix | 4 +- pkgs/applications/misc/qsudo/default.nix | 4 +- pkgs/applications/misc/qt-box-editor/default.nix | 4 +- pkgs/applications/misc/qtbitcointrader/default.nix | 4 +- .../misc/redshift-plasma-applet/default.nix | 4 +- pkgs/applications/misc/redshift/default.nix | 4 +- pkgs/applications/misc/regextester/default.nix | 4 +- .../misc/remarkable/remarkable-mouse/default.nix | 4 +- .../applications/misc/remarkable/rmapi/default.nix | 4 +- .../misc/rofi-file-browser/default.nix | 4 +- pkgs/applications/misc/rofi-menugen/default.nix | 4 +- pkgs/applications/misc/rootbar/default.nix | 4 +- pkgs/applications/misc/rsclock/default.nix | 4 +- pkgs/applications/misc/rss-bridge-cli/default.nix | 4 +- pkgs/applications/misc/rtv/default.nix | 4 +- pkgs/applications/misc/sc-im/default.nix | 4 +- pkgs/applications/misc/sdcv/default.nix | 4 +- pkgs/applications/misc/sent/default.nix | 4 +- pkgs/applications/misc/sequeler/default.nix | 4 +- pkgs/applications/misc/sidequest/default.nix | 2 +- pkgs/applications/misc/simplenote/default.nix | 2 +- pkgs/applications/misc/slade/default.nix | 4 +- pkgs/applications/misc/slade/git.nix | 4 +- pkgs/applications/misc/sleepyhead/default.nix | 2 +- pkgs/applications/misc/slic3r/default.nix | 2 +- pkgs/applications/misc/smos/default.nix | 4 +- pkgs/applications/misc/snowsql/default.nix | 4 +- pkgs/applications/misc/speedread/default.nix | 4 +- pkgs/applications/misc/sqliteman/default.nix | 4 +- pkgs/applications/misc/ssocr/default.nix | 4 +- pkgs/applications/misc/ssw/default.nix | 4 +- pkgs/applications/misc/stog/default.nix | 4 +- pkgs/applications/misc/stretchly/default.nix | 2 +- pkgs/applications/misc/styx/default.nix | 4 +- pkgs/applications/misc/subsurface/default.nix | 8 ++-- pkgs/applications/misc/swappy/default.nix | 4 +- pkgs/applications/misc/synapse/default.nix | 4 +- pkgs/applications/misc/syncthing-tray/default.nix | 4 +- .../applications/misc/systembus-notify/default.nix | 4 +- pkgs/applications/misc/tabula/default.nix | 4 +- pkgs/applications/misc/tasknc/default.nix | 4 +- pkgs/applications/misc/taskopen/default.nix | 4 +- pkgs/applications/misc/tasksh/default.nix | 4 +- pkgs/applications/misc/taskwarrior-tui/default.nix | 4 +- pkgs/applications/misc/taskwarrior/default.nix | 4 +- pkgs/applications/misc/tdrop/default.nix | 2 +- pkgs/applications/misc/termdown/default.nix | 4 +- pkgs/applications/misc/terminal-parrot/default.nix | 4 +- .../misc/terminal-typeracer/default.nix | 4 +- pkgs/applications/misc/termpdf.py/default.nix | 4 +- pkgs/applications/misc/thinking-rock/default.nix | 4 +- pkgs/applications/misc/tickrs/default.nix | 4 +- pkgs/applications/misc/timewarrior/default.nix | 4 +- pkgs/applications/misc/tint2/default.nix | 4 +- pkgs/applications/misc/tipp10/default.nix | 4 +- pkgs/applications/misc/tippecanoe/default.nix | 4 +- pkgs/applications/misc/tiramisu/default.nix | 4 +- pkgs/applications/misc/tiv/default.nix | 4 +- pkgs/applications/misc/tnef/default.nix | 4 +- pkgs/applications/misc/todiff/default.nix | 4 +- pkgs/applications/misc/todolist/default.nix | 4 +- pkgs/applications/misc/tomboy/default.nix | 2 +- pkgs/applications/misc/toot/default.nix | 4 +- pkgs/applications/misc/tootle/default.nix | 4 +- pkgs/applications/misc/topydo/default.nix | 4 +- pkgs/applications/misc/translate-shell/default.nix | 4 +- pkgs/applications/misc/tthsum/default.nix | 4 +- pkgs/applications/misc/tty-share/default.nix | 4 +- pkgs/applications/misc/tty-solitaire/default.nix | 4 +- pkgs/applications/misc/tut/default.nix | 4 +- pkgs/applications/misc/tvbrowser/bin.nix | 4 +- pkgs/applications/misc/tzupdate/default.nix | 4 +- pkgs/applications/misc/udiskie/default.nix | 4 +- pkgs/applications/misc/ulauncher/default.nix | 4 +- pkgs/applications/misc/upwork/default.nix | 4 +- pkgs/applications/misc/urlscan/default.nix | 4 +- pkgs/applications/misc/urlview/default.nix | 4 +- pkgs/applications/misc/usync/default.nix | 4 +- pkgs/applications/misc/verbiste/default.nix | 4 +- pkgs/applications/misc/vifm/default.nix | 2 +- pkgs/applications/misc/viking/default.nix | 4 +- pkgs/applications/misc/volnoti/default.nix | 4 +- pkgs/applications/misc/vp/default.nix | 4 +- pkgs/applications/misc/vym/default.nix | 4 +- pkgs/applications/misc/waybar/default.nix | 4 +- pkgs/applications/misc/wcalc/default.nix | 4 +- pkgs/applications/misc/weather/default.nix | 4 +- .../misc/web-media-controller/default.nix | 4 +- pkgs/applications/misc/worker/default.nix | 4 +- pkgs/applications/misc/workrave/default.nix | 4 +- pkgs/applications/misc/xastir/default.nix | 4 +- pkgs/applications/misc/xautoclick/default.nix | 4 +- pkgs/applications/misc/xbattbar/default.nix | 4 +- pkgs/applications/misc/xchm/default.nix | 4 +- pkgs/applications/misc/xcruiser/default.nix | 4 +- pkgs/applications/misc/xdgmenumaker/default.nix | 4 +- pkgs/applications/misc/xdragon/default.nix | 4 +- pkgs/applications/misc/xiphos/default.nix | 4 +- pkgs/applications/misc/xkbd/default.nix | 4 +- pkgs/applications/misc/xkblayout-state/default.nix | 4 +- pkgs/applications/misc/xkbmon/default.nix | 4 +- pkgs/applications/misc/xmenu/default.nix | 4 +- pkgs/applications/misc/xmind/default.nix | 2 +- pkgs/applications/misc/xneur/default.nix | 4 +- pkgs/applications/misc/xpad/default.nix | 4 +- pkgs/applications/misc/xpdf/default.nix | 4 +- pkgs/applications/misc/xpdf/libxpdf.nix | 4 +- .../misc/xrandr-invert-colors/default.nix | 4 +- pkgs/applications/misc/xscope/default.nix | 4 +- pkgs/applications/misc/xsw/default.nix | 2 +- pkgs/applications/misc/xteddy/default.nix | 4 +- pkgs/applications/misc/xygrib/default.nix | 4 +- pkgs/applications/misc/yarssr/default.nix | 2 +- pkgs/applications/misc/yokadi/default.nix | 4 +- .../applications/misc/yubioath-desktop/default.nix | 4 +- pkgs/applications/misc/zathura/djvu/default.nix | 4 +- pkgs/applications/misc/zola/default.nix | 4 +- pkgs/applications/misc/zscroll/default.nix | 4 +- pkgs/applications/networking/3proxy/default.nix | 4 +- .../networking/apache-directory-studio/default.nix | 4 +- .../networking/appgate-sdp/default.nix | 2 +- pkgs/applications/networking/brig/default.nix | 4 +- .../networking/browsers/asuka/default.nix | 4 +- .../networking/browsers/brave/default.nix | 2 +- .../networking/browsers/browsh/default.nix | 4 +- .../networking/browsers/castor/default.nix | 4 +- .../networking/browsers/dillo/default.nix | 4 +- .../networking/browsers/elinks/default.nix | 4 +- .../networking/browsers/eolie/default.nix | 4 +- .../networking/browsers/ephemeral/default.nix | 4 +- .../networking/browsers/falkon/default.nix | 2 +- .../networking/browsers/firefox-bin/default.nix | 2 +- .../networking/browsers/links2/default.nix | 4 +- .../networking/browsers/luakit/default.nix | 4 +- .../networking/browsers/lynx/default.nix | 4 +- .../networking/browsers/midori/default.nix | 4 +- .../networking/browsers/netsurf/browser.nix | 4 +- .../networking/browsers/netsurf/buildsystem.nix | 4 +- .../networking/browsers/netsurf/libcss.nix | 4 +- .../networking/browsers/netsurf/libdom.nix | 4 +- .../networking/browsers/netsurf/libhubbub.nix | 4 +- .../networking/browsers/netsurf/libnsbmp.nix | 4 +- .../networking/browsers/netsurf/libnsfb.nix | 4 +- .../networking/browsers/netsurf/libnsgif.nix | 4 +- .../networking/browsers/netsurf/libnslog.nix | 4 +- .../networking/browsers/netsurf/libnspsl.nix | 4 +- .../networking/browsers/netsurf/libnsutils.nix | 4 +- .../networking/browsers/netsurf/libparserutils.nix | 4 +- .../networking/browsers/netsurf/libsvgtiny.nix | 4 +- .../networking/browsers/netsurf/libutf8proc.nix | 4 +- .../networking/browsers/netsurf/libwapcaplet.nix | 4 +- .../networking/browsers/netsurf/nsgenbind.nix | 4 +- .../networking/browsers/nyxt/default.nix | 2 +- .../networking/browsers/qutebrowser/default.nix | 2 +- .../networking/browsers/surf/default.nix | 2 +- .../browsers/tor-browser-bundle-bin/default.nix | 4 +- .../networking/browsers/vivaldi/default.nix | 4 +- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 4 +- .../networking/browsers/vivaldi/widevine.nix | 4 +- pkgs/applications/networking/c14/default.nix | 4 +- pkgs/applications/networking/calls/default.nix | 4 +- pkgs/applications/networking/cawbird/default.nix | 4 +- pkgs/applications/networking/charles/default.nix | 4 +- .../networking/cloudflared/default.nix | 4 +- .../networking/cluster/atlantis/default.nix | 4 +- .../networking/cluster/click/default.nix | 4 +- .../networking/cluster/docker-machine/default.nix | 4 +- .../networking/cluster/docker-machine/kvm.nix | 4 +- .../networking/cluster/docker-machine/xhyve.nix | 4 +- .../networking/cluster/flink/default.nix | 4 +- .../networking/cluster/fluxcd/default.nix | 4 +- .../networking/cluster/fluxctl/default.nix | 4 +- .../networking/cluster/habitat/default.nix | 4 +- .../networking/cluster/hadoop/default.nix | 4 +- .../networking/cluster/helm/default.nix | 4 +- .../networking/cluster/k9s/default.nix | 4 +- .../networking/cluster/kops/default.nix | 2 +- .../networking/cluster/kubeless/default.nix | 4 +- .../networking/cluster/kubelogin/default.nix | 4 +- .../networking/cluster/kubernix/default.nix | 4 +- .../networking/cluster/linkerd/default.nix | 4 +- .../networking/cluster/minikube/default.nix | 4 +- .../cluster/node-problem-detector/default.nix | 4 +- .../networking/cluster/octant/default.nix | 4 +- .../networking/cluster/openshift/default.nix | 2 +- .../networking/cluster/pig/default.nix | 4 +- .../networking/cluster/popeye/default.nix | 4 +- .../networking/cluster/ssm-agent/default.nix | 4 +- .../cluster/terraform-inventory/default.nix | 4 +- .../terraform-providers/ansible/default.nix | 4 +- .../terraform-providers/cloudfoundry/default.nix | 4 +- .../terraform-providers/elasticsearch/default.nix | 4 +- .../cluster/terraform-providers/gandi/default.nix | 4 +- .../cluster/terraform-providers/hcloud/default.nix | 4 +- .../terraform-providers/keycloak/default.nix | 4 +- .../terraform-providers/libvirt/default.nix | 4 +- .../terraform-providers/linuxbox/default.nix | 4 +- .../cluster/terraform-providers/lxd/default.nix | 4 +- .../cluster/terraform-providers/shell/default.nix | 4 +- .../cluster/terraform-providers/vercel/default.nix | 4 +- .../terraform-providers/vpsadmin/default.nix | 4 +- .../networking/cluster/terraform/default.nix | 2 +- .../networking/cluster/terranix/default.nix | 4 +- .../networking/cluster/tilt/default.nix | 4 +- .../networking/cluster/velero/default.nix | 4 +- pkgs/applications/networking/compactor/default.nix | 4 +- pkgs/applications/networking/datovka/default.nix | 4 +- pkgs/applications/networking/davmail/default.nix | 4 +- pkgs/applications/networking/dsvpn/default.nix | 4 +- .../networking/dyndns/cfdyndns/default.nix | 4 +- pkgs/applications/networking/esniper/default.nix | 4 +- .../feedreaders/canto-daemon/default.nix | 4 +- .../networking/feedreaders/castget/default.nix | 2 +- .../networking/feedreaders/feedreader/default.nix | 4 +- .../networking/feedreaders/newsboat/default.nix | 4 +- .../networking/feedreaders/rawdog/default.nix | 4 +- .../networking/feedreaders/rssguard/default.nix | 4 +- .../networking/feedreaders/rsstail/default.nix | 4 +- pkgs/applications/networking/firehol/default.nix | 2 +- pkgs/applications/networking/firehol/iprange.nix | 4 +- pkgs/applications/networking/flent/default.nix | 4 +- pkgs/applications/networking/flent/http-getter.nix | 4 +- .../networking/ftp/filezilla/default.nix | 4 +- pkgs/applications/networking/ftp/taxi/default.nix | 4 +- pkgs/applications/networking/gdrive/default.nix | 4 +- pkgs/applications/networking/gmailctl/default.nix | 4 +- .../networking/gnome-network-displays/default.nix | 4 +- pkgs/applications/networking/gns3/server.nix | 2 +- .../networking/gopher/gopher/default.nix | 4 +- .../networking/gopher/sacc/default.nix | 4 +- .../networking/ids/suricata/default.nix | 2 +- pkgs/applications/networking/ids/zeek/default.nix | 4 +- pkgs/applications/networking/ike/default.nix | 4 +- .../instant-messengers/SkypeExport/default.nix | 4 +- .../instant-messengers/blink/default.nix | 4 +- .../instant-messengers/bluejeans/default.nix | 2 +- .../instant-messengers/cordless/default.nix | 4 +- .../instant-messengers/coyim/default.nix | 4 +- .../networking/instant-messengers/dino/default.nix | 2 +- .../networking/instant-messengers/discord/base.nix | 4 +- .../instant-messengers/element/element-desktop.nix | 4 +- .../instant-messengers/ferdi/default.nix | 4 +- .../instant-messengers/fractal/default.nix | 4 +- .../instant-messengers/franz/default.nix | 4 +- .../instant-messengers/freetalk/default.nix | 4 +- .../instant-messengers/gitter/default.nix | 4 +- .../instant-messengers/gomuks/default.nix | 4 +- .../instant-messengers/hipchat/default.nix | 4 +- .../jitsi-meet-electron/default.nix | 4 +- .../instant-messengers/jitsi/default.nix | 2 +- .../mattermost-desktop/default.nix | 4 +- .../instant-messengers/mcabber/default.nix | 4 +- .../instant-messengers/mikutter/default.nix | 4 +- .../instant-messengers/mirage/default.nix | 4 +- .../networking/instant-messengers/mm/default.nix | 4 +- .../instant-messengers/neochat/default.nix | 4 +- .../instant-messengers/nheko/default.nix | 2 +- .../pidgin-plugins/carbons/default.nix | 4 +- .../pidgin-plugins/otr/default.nix | 4 +- .../pidgin-plugins/pidgin-latex/default.nix | 4 +- .../pidgin-opensteamworks/default.nix | 4 +- .../pidgin-plugins/pidgin-osd/default.nix | 4 +- .../pidgin-plugins/pidgin-skypeweb/default.nix | 4 +- .../pidgin-xmpp-receipts/default.nix | 4 +- .../pidgin-plugins/purple-discord/default.nix | 4 +- .../pidgin-plugins/purple-facebook/default.nix | 4 +- .../pidgin-plugins/purple-hangouts/default.nix | 4 +- .../pidgin-plugins/purple-lurch/default.nix | 4 +- .../pidgin-plugins/purple-matrix/default.nix | 4 +- .../pidgin-plugins/purple-plugin-pack/default.nix | 4 +- .../pidgin-plugins/purple-slack/default.nix | 4 +- .../purple-xmpp-http-upload/default.nix | 4 +- .../pidgin-plugins/sipe/default.nix | 4 +- .../pidgin-plugins/telegram-purple/default.nix | 4 +- .../pidgin-plugins/tox-prpl/default.nix | 4 +- .../pidgin-plugins/window-merge/default.nix | 4 +- .../instant-messengers/pidgin/default.nix | 2 +- .../instant-messengers/pybitmessage/default.nix | 4 +- .../networking/instant-messengers/qtox/default.nix | 4 +- .../instant-messengers/rambox/default.nix | 2 +- .../networking/instant-messengers/rambox/pro.nix | 4 +- .../instant-messengers/ricochet/default.nix | 4 +- .../instant-messengers/ring-daemon/default.nix | 6 +-- .../instant-me