git.iko.soy/typeable/nixpkgs
on master help sign in
1505 files changed+94047−116213
since splitsnapshots
unifiedsplit
.editorconfig+5 .github/workflows/update-terraform-providers.yml+6−5 doc/builders/fetchers.chapter.md+11−11 doc/builders/images/dockertools.section.md+8−8 doc/builders/images/ocitools.section.md+3−3 doc/builders/images/snaptools.section.md+1−1 doc/builders/packages/citrix.section.md+5−5 doc/builders/packages/eclipse.section.md+5−5 doc/builders/packages/elm.section.md+1−1 doc/builders/packages/emacs.section.md+3−3 doc/builders/packages/etc-files.section.md+4−4 doc/builders/packages/firefox.section.md+7−8 doc/builders/packages/fish.section.md+1−1 doc/builders/packages/fuse.section.md+2−2 doc/builders/packages/ibus.section.md+3−3 doc/builders/packages/linux.section.md+7−7 doc/builders/packages/locales.section.md+2−2 doc/builders/packages/nginx.section.md+2−2 doc/builders/packages/opengl.section.md+1−1 doc/builders/packages/shell-helpers.section.md+1−1 doc/builders/packages/steam.section.md+8−8 doc/builders/packages/urxvt.section.md+4−4 doc/builders/packages/weechat.section.md+5−5 doc/builders/trivial-builders.chapter.md+3−3 doc/contributing/submitting-changes.chapter.md+1−1 doc/stdenv/meta.chapter.md+34 doc/stdenv/stdenv.chapter.md+54 doc/using/overrides.chapter.md+6−2 lib/default.nix+7−2 lib/flakes.nix+22 lib/meta.nix+14 lib/modules.nix+4−1 lib/strings.nix+61−1 lib/systems/doubles.nix+2 lib/systems/inspect.nix+2 lib/systems/platforms.nix+2−2 lib/tests/flakes/subflakeTest/flake.nix+8 lib/tests/flakes/subflakeTest/subflake/flake.nix+5 lib/tests/misc.nix+59 lib/tests/systems.nix+3 maintainers/maintainer-list.nix+108−12 maintainers/scripts/luarocks-packages.csv+2−1 maintainers/scripts/pluginupdate.py+43−37 maintainers/team-list.nix+36 nixos/doc/manual/administration/declarative-containers.section.md+1−1 nixos/doc/manual/administration/imperative-containers.section.md+2−2 nixos/doc/manual/from_md/administration/declarative-containers.section.xml+2−2 nixos/doc/manual/from_md/administration/imperative-containers.section.xml+3−2 nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+102−1 nixos/doc/manual/release-notes/rl-2205.section.md+40−1 nixos/lib/systemd-types.nix+33−1 nixos/lib/utils.nix+1−1 nixos/maintainers/scripts/lxd/lxd-image.nix+1−1 nixos/modules/config/console.nix+5−6 nixos/modules/hardware/all-firmware.nix+7−3 nixos/modules/hardware/raid/hpsa.nix+4−1 nixos/modules/hardware/video/nvidia.nix+5−4 nixos/modules/hardware/video/webcam/facetimehd.nix+14−1 nixos/modules/i18n/input-method/fcitx5.nix+21−6 nixos/modules/installer/cd-dvd/channel.nix+2−1 nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+14−8 nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix+59 nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix+49 nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix+20 nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+1−3 nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+1−3 nixos/modules/installer/sd-card/sd-image-aarch64.nix+9 nixos/modules/module-list.nix+6−1 nixos/modules/profiles/all-hardware.nix+3 nixos/modules/profiles/installation-device.nix+4 nixos/modules/profiles/qemu-guest.nix+2−2 nixos/modules/programs/k3b.nix+52 nixos/modules/programs/thefuck.nix+7−6 nixos/modules/security/pam.nix+3−3 nixos/modules/services/continuous-integration/gitlab-runner.nix+9−2 nixos/modules/services/databases/couchdb.nix+6 nixos/modules/services/hardware/udev.nix+32−7 nixos/modules/services/misc/zookeeper.nix+8−1 nixos/modules/services/monitoring/mimir.nix+63 nixos/modules/services/networking/asterisk.nix+11−43 nixos/modules/services/networking/cloudflare-dyndns.nix+93 nixos/modules/services/networking/prosody.nix+1 nixos/modules/services/networking/ssh/sshd.nix+1 nixos/modules/services/networking/supplicant.nix+1−1 nixos/modules/services/system/nscd.nix+1−1 nixos/modules/services/web-apps/galene.nix+29 nixos/modules/services/web-apps/keycloak.nix+2−1 nixos/modules/services/x11/desktop-managers/enlightenment.nix+5 nixos/modules/services/x11/desktop-managers/lumina.nix+4 nixos/modules/services/x11/desktop-managers/lxqt.nix+9 nixos/modules/services/x11/desktop-managers/mate.nix+1 nixos/modules/services/x11/desktop-managers/pantheon.xml+3−3 nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1 nixos/modules/system/boot/luksroot.nix+1 nixos/modules/system/boot/stage-1-init.sh+1−5 nixos/modules/system/boot/systemd/initrd-secrets.nix+36 nixos/modules/system/boot/systemd/initrd.nix+30−37 nixos/modules/system/boot/systemd/shutdown.nix+31−5 nixos/modules/tasks/filesystems/xfs.nix+2−2 nixos/modules/tasks/filesystems/zfs.nix+5 nixos/modules/testing/test-instrumentation.nix+19−26 nixos/modules/virtualisation/nixos-containers.nix+26−11 nixos/modules/virtualisation/oci-containers.nix+1−5 nixos/modules/virtualisation/qemu-vm.nix+8−3 nixos/modules/virtualisation/vmware-host.nix+166 nixos/release-combined.nix+2 nixos/release.nix+2−2 nixos/tests/all-tests.nix+1−1 nixos/tests/common/lxd/config.yaml+24 nixos/tests/containers-ephemeral.nix+3−3 nixos/tests/containers-imperative.nix+6−6 nixos/tests/containers-tmpfs.nix+5−5 nixos/tests/custom-ca.nix+104−90 nixos/tests/gitlab.nix+298−25 nixos/tests/installer-systemd-stage-1.nix+33 nixos/tests/installer.nix+6−1 nixos/tests/lxd-image-server.nix+15−48 nixos/tests/lxd-image.nix−89 nixos/tests/lxd.nix+40−63 nixos/tests/matrix-appservice-irc.nix+3 nixos/tests/openssh.nix+12−6 nixos/tests/pam/pam-oath-login.nix+1−1 nixos/tests/pgadmin4.nix+37−48 nixos/tests/systemd-initrd-luks-keyfile.nix+1−1 nixos/tests/systemd-initrd-simple.nix+1−1 nixos/tests/systemd-shutdown.nix+8−3 nixos/tests/xmpp/xmpp-sendmessage.nix+1−4 pkgs/applications/audio/LibreArp/default.nix+53 pkgs/applications/audio/LibreArp/lv2.nix+53 pkgs/applications/audio/amberol/default.nix+3−3 pkgs/applications/audio/audio-recorder/default.nix+1−1 pkgs/applications/audio/cardinal/default.nix+2−11 pkgs/applications/audio/carla/default.nix+2−2 pkgs/applications/audio/caudec/default.nix+2−2 pkgs/applications/audio/cider/default.nix+3−3 pkgs/applications/audio/denemo/default.nix+2−2 pkgs/applications/audio/faust/faust2.nix+2−2 pkgs/applications/audio/faust/faustlive.nix+9−12 pkgs/applications/audio/fluidsynth/default.nix+2−2 pkgs/applications/audio/greg/default.nix+3−3 pkgs/applications/audio/gspeech/default.nix+2−2 pkgs/applications/audio/guitarix/default.nix+2 pkgs/applications/audio/jamesdsp/default.nix+5 pkgs/applications/audio/mopidy/mopidy.nix+3−3 pkgs/applications/audio/musikcube/default.nix+5−3 pkgs/applications/audio/ncspot/default.nix+3−3 pkgs/applications/audio/noise-repellent/default.nix+11−9 pkgs/applications/audio/plexamp/default.nix+3−3 pkgs/applications/audio/pyradio/default.nix+3−3 pkgs/applications/audio/spotify/default.nix+3−3 pkgs/applications/audio/viper4linux-gui/default.nix+82 pkgs/applications/audio/viper4linux/default.nix+61 pkgs/applications/blockchains/bisq-desktop/default.nix+1−2 pkgs/applications/blockchains/bitcoin/default.nix+2−2 pkgs/applications/blockchains/btcpayserver/default.nix+2−2 pkgs/applications/blockchains/btcpayserver/deps.nix+29−29 pkgs/applications/blockchains/clightning/default.nix+2−2 pkgs/applications/blockchains/electrs/default.nix+3−3 pkgs/applications/blockchains/lnd/default.nix+2−2 pkgs/applications/blockchains/monero-cli/default.nix+2−2 pkgs/applications/blockchains/monero-gui/default.nix+2−2 pkgs/applications/blockchains/namecoin/default.nix+5−6 pkgs/applications/blockchains/nbxplorer/default.nix+2−2 pkgs/applications/blockchains/nbxplorer/deps.nix+15 pkgs/applications/editors/android-studio/common.nix+2 pkgs/applications/editors/android-studio/default.nix+2−1 pkgs/applications/editors/cudatext/default.nix+2−2 pkgs/applications/editors/cudatext/deps.json+2−2 pkgs/applications/editors/emacs/28.nix+1−1 pkgs/applications/editors/emacs/generic.nix+5−3 pkgs/applications/editors/helix/default.nix+3 pkgs/applications/editors/jetbrains/default.nix+20−17 pkgs/applications/editors/jetbrains/update.py+17−14 pkgs/applications/editors/jetbrains/versions.json+108−108 pkgs/applications/editors/lifeograph/default.nix+5−5 pkgs/applications/editors/okteta/default.nix+2 pkgs/applications/editors/oni2/common.nix−1 pkgs/applications/editors/texmaker/default.nix+2−2 pkgs/applications/editors/texstudio/default.nix+2−2 pkgs/applications/editors/vim/plugins/build-vim-plugin.nix+2 pkgs/applications/editors/vim/plugins/default.nix+7−2 pkgs/applications/editors/vim/plugins/generated.nix+441−440 pkgs/applications/editors/vim/plugins/overrides.nix+2−5 pkgs/applications/editors/vim/plugins/update.py+47−16 pkgs/applications/editors/vim/plugins/vim-command-check-hook.sh+25 pkgs/applications/editors/vim/plugins/vim-utils.nix+18−2 pkgs/applications/editors/vscode/extensions/default.nix+12 pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix−1 pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix+2−2 pkgs/applications/editors/vscode/update-vscodium.sh+16−12 pkgs/applications/editors/vscode/vscodium.nix+5−8 pkgs/applications/editors/xedit/default.nix+2−2 pkgs/applications/emulators/mame/default.nix+2−2 pkgs/applications/emulators/ripes/default.nix+50 pkgs/applications/finance/irpf/default.nix+2−2 pkgs/applications/gis/grass/default.nix+10−36 pkgs/applications/gis/qgis/unwrapped-ltr.nix+2−2 pkgs/applications/gis/qgis/unwrapped.nix+2−2 pkgs/applications/graphics/ImageMagick/7.0.nix+2−2 pkgs/applications/graphics/cloudcompare/default.nix+2 pkgs/applications/graphics/digikam/default.nix+14−3 pkgs/applications/graphics/geeqie/default.nix+2−2 pkgs/applications/graphics/graphicsmagick/default.nix+2−2 pkgs/applications/graphics/ovito/default.nix+2−2 pkgs/applications/graphics/sane/backends/brscan4/default.nix+2−2 pkgs/applications/graphics/sane/backends/brscan5/default.nix+2−2 pkgs/applications/graphics/tesseract/default.nix+6 pkgs/applications/graphics/tesseract/fetch-language-hashes+2−2 pkgs/applications/graphics/tesseract/languages.nix+245−245 pkgs/applications/graphics/tesseract/tesseract3.nix+14−3 pkgs/applications/graphics/tesseract/tesseract4.nix+15−3 pkgs/applications/graphics/tesseract/tesseract5.nix+39 pkgs/applications/graphics/tesseract/wrapper.nix+29−3 pkgs/applications/kde/default.nix+4−1 pkgs/applications/networking/browsers/falkon/default.nix → pkgs/applications/kde/falkon.nix+4−13 pkgs/applications/kde/fetch.sh+1−1 pkgs/applications/kde/kaddressbook.nix+4 pkgs/applications/kde/kalarm.nix+2−2 pkgs/applications/kde/kalarmcal.nix−19 pkgs/applications/office/kalendar/default.nix → pkgs/applications/kde/kalendar.nix+1−10 pkgs/applications/kde/kdegraphics-thumbnailers.nix+2−2 pkgs/applications/kde/kdepim-addons.nix+2−2 pkgs/applications/kde/kdepim-runtime/default.nix+2−2 pkgs/applications/kde/kmousetool.nix+35 pkgs/applications/kde/picmi.nix+1−11 pkgs/applications/kde/pimcommon.nix+2−2 pkgs/applications/graphics/skanpage/default.nix → pkgs/applications/kde/skanpage.nix+2−6 pkgs/applications/kde/srcs.nix+937−921 pkgs/applications/kde/yakuake.nix+2 pkgs/applications/logging/sosreport/default.nix+51 pkgs/applications/misc/1password/default.nix+5−5 pkgs/applications/misc/anytype/default.nix+2−2 pkgs/applications/misc/audio/wavesurfer/default.nix−30 pkgs/applications/misc/authy/default.nix+30−7 pkgs/applications/misc/barrier/default.nix+12−1 pkgs/applications/misc/bottles/default.nix+2−2 pkgs/applications/misc/calibre/default.nix+5−1 pkgs/applications/misc/charm/default.nix+3−3 pkgs/applications/misc/ff2mpv/default.nix+34 pkgs/applications/misc/fspy/default.nix+2−3 pkgs/applications/misc/gallery-dl/default.nix+2−2 pkgs/applications/misc/gnome-secrets/default.nix+4−10 pkgs/applications/misc/hello/default.nix+8−5 pkgs/applications/misc/hello/test.nix+8 pkgs/applications/misc/hugo/default.nix+3−3 pkgs/applications/misc/joplin-desktop/default.nix+3−3 pkgs/applications/misc/kiln/default.nix+3−3 pkgs/applications/misc/libosmocore/default.nix+21−6 pkgs/applications/misc/lighthouse/default.nix−35 pkgs/applications/misc/marktext/default.nix+5−6 pkgs/applications/misc/megacmd/default.nix+2−2 pkgs/applications/misc/moonlight-qt/default.nix+2−2 pkgs/applications/misc/nnn/default.nix+2−2 pkgs/applications/misc/obsidian/default.nix+3−3 pkgs/applications/misc/octoprint/default.nix+7−245 pkgs/applications/misc/opencpn/default.nix+85−16 pkgs/applications/misc/organicmaps/default.nix+7−12 pkgs/applications/misc/osmscout-server/default.nix+3−24 pkgs/applications/misc/phwmon/default.nix+1−1 pkgs/applications/misc/prusa-slicer/default.nix+2−2 pkgs/applications/misc/sigal/default.nix+17−13 pkgs/applications/misc/skytemple/default.nix+5−2 pkgs/applications/misc/solaar/default.nix+3−2 pkgs/applications/misc/sqls/default.nix+5−3 pkgs/applications/misc/tut/default.nix+2−2 pkgs/applications/misc/udiskie/default.nix+30−25 pkgs/applications/misc/udiskie/locale-path.patch+17 pkgs/applications/misc/upwork/default.nix+3−3 pkgs/applications/misc/vit/default.nix+3−5 pkgs/applications/misc/xpdf/default.nix+2−2 pkgs/applications/misc/xplr/default.nix+3−3 pkgs/applications/networking/bee/bee.nix+1−3 pkgs/applications/networking/browsers/brave/default.nix+71−55 pkgs/applications/networking/browsers/chromium/common.nix+11−12 pkgs/applications/networking/browsers/chromium/upstream-info.json+30−30 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+393−393 pkgs/applications/networking/browsers/firefox/common.nix−12 pkgs/applications/networking/browsers/firefox/librewolf/src.json+5−5 pkgs/applications/networking/browsers/firefox/packages.nix+4−4 pkgs/applications/networking/browsers/google-chrome/default.nix+1−1 pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6 pkgs/applications/networking/browsers/qutebrowser/default.nix+1 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+8−1 pkgs/applications/networking/browsers/vivaldi/default.nix+2−2 pkgs/applications/networking/cloudflare-dyndns/default.nix+53 pkgs/applications/networking/cloudflared/default.nix+2−2 pkgs/applications/networking/cluster/flink/default.nix+2−2 pkgs/applications/networking/cluster/fluxcd/default.nix+5−5 pkgs/applications/networking/cluster/fluxcd/update.sh+38−31 pkgs/applications/networking/cluster/istioctl/default.nix+8−3 pkgs/applications/networking/cluster/kn/default.nix+2−2 pkgs/applications/networking/cluster/kompose/default.nix+2−2 pkgs/applications/networking/cluster/kube3d/default.nix+28−12 pkgs/applications/networking/cluster/kubecfg/default.nix+7−7 pkgs/applications/networking/cluster/nerdctl/default.nix+3−3 pkgs/applications/networking/cluster/nomad-pack/default.nix+4−4 pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3 pkgs/applications/networking/cluster/talosctl/default.nix+4−4 pkgs/applications/networking/cluster/terraform-providers/providers.json+86−77 pkgs/applications/networking/firewalld/default.nix+104 pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch+13 pkgs/applications/networking/gmailctl/default.nix+4−6 pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3 pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix+1 pkgs/development/libraries/libdeltachat/darwin-dylib.patch → pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patch pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+2−1 pkgs/applications/networking/instant-messengers/element/pin.json+3−3 pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix+2−2 pkgs/applications/networking/instant-messengers/linphone/default.nix+40−13 pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch+56−31 pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patch+27 pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch+6−6 pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2 pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix+3−3 pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix+2−2 pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix+2−2 pkgs/applications/networking/instant-messengers/teams/default.nix+3−3 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix+1 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch+57 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix+3−6 pkgs/applications/networking/instant-messengers/zoom-us/default.nix+46−7 pkgs/applications/networking/instant-messengers/zulip/default.nix+2−2 pkgs/applications/networking/ipfs-cluster/default.nix+3−12 pkgs/applications/networking/irc/senpai/default.nix+4−4 pkgs/applications/networking/irc/weechat/default.nix+2−2 pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+2−2 pkgs/applications/networking/mailreaders/meli/default.nix+1−2 pkgs/applications/networking/mailreaders/mutt/default.nix+2−2 pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+261−261 pkgs/applications/networking/mailreaders/thunderbird/packages.nix+2−2 pkgs/applications/networking/modem-manager-gui/default.nix+15 pkgs/applications/networking/n8n/node-packages.nix+315−240 pkgs/applications/networking/newsreaders/liferea/default.nix+2−2 pkgs/applications/networking/nextcloud-client/default.nix+7−4 pkgs/applications/networking/p2p/gnunet/default.nix+2−2 pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2 pkgs/applications/networking/seafile-client/default.nix+5−3 pkgs/applications/networking/sync/onedrive/default.nix+2−2 pkgs/applications/networking/sync/rclone/default.nix+3−3 pkgs/applications/networking/termius/default.nix+3−3 pkgs/applications/networking/zerobin/default.nix+1−1 pkgs/applications/office/beamerpresenter/default.nix+45−22 pkgs/applications/office/bookworm/default.nix−2 pkgs/applications/office/calligra/default.nix+16 pkgs/applications/office/libreoffice/soffice-template.desktop+6 pkgs/applications/office/libreoffice/wrapper.nix+25−12 pkgs/applications/office/qownnotes/default.nix+2−2 pkgs/applications/office/tusk/default.nix+3−2 pkgs/applications/office/zotero/default.nix+2−2 pkgs/applications/radio/gnuradio/wrapper.nix+1−1 pkgs/applications/radio/kalibrate-rtl/default.nix+5−5 pkgs/applications/radio/rtl-sdr/default.nix+11−7 pkgs/applications/radio/uhd/default.nix+2 pkgs/applications/science/biology/blast/default.nix+2−2 pkgs/applications/science/biology/bwa/default.nix+2 pkgs/applications/science/biology/megahit/default.nix+3 pkgs/applications/science/biology/quast/default.nix+1−3 pkgs/applications/science/biology/samtools/default.nix+8−1 pkgs/applications/science/biology/tebreak/default.nix+2−2 pkgs/applications/science/computer-architecture/qtrvsim/default.nix+2−2 pkgs/applications/science/logic/easycrypt/default.nix+50 pkgs/applications/science/logic/easycrypt/runtest.nix+24 pkgs/applications/science/math/adolc/default.nix+23 pkgs/applications/science/misc/colmap/default.nix+22−6 pkgs/applications/science/misc/snakemake/default.nix+27−13 pkgs/applications/science/robotics/mavproxy/default.nix+2−2 pkgs/applications/terminal-emulators/alacritty/default.nix−2 pkgs/applications/terminal-emulators/foot/default.nix+3−2 pkgs/applications/terminal-emulators/wezterm/default.nix+17−9 pkgs/applications/version-management/git-and-tools/gh/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-cliff/default.nix+3−3 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix+4−12 pkgs/applications/version-management/git-and-tools/git/default.nix+6−4 pkgs/applications/version-management/git-and-tools/gitbatch/default.nix+12−10 pkgs/applications/version-management/git-and-tools/gitbatch/deps.nix−543 pkgs/applications/version-management/git-repo/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+2−2 pkgs/applications/version-management/gitlab/data.json+7−7 pkgs/applications/version-management/gitlab/gitaly/Gemfile+1−1 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+13−13 pkgs/applications/version-management/gitlab/gitaly/default.nix+4−4 pkgs/applications/version-management/gitlab/gitaly/gemset.nix+16−16 pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+3−3 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+10−9 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+87−83 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+75−64 pkgs/applications/version-management/redmine/Gemfile+2−2 pkgs/applications/version-management/redmine/Gemfile.lock+48−50 pkgs/applications/version-management/redmine/default.nix+3−5 pkgs/applications/version-management/redmine/gemset.nix+39−49 pkgs/applications/version-management/redmine/update.sh+17 pkgs/applications/version-management/subversion/default.nix−5 pkgs/applications/video/clickshare-csc1/default.nix−2 pkgs/applications/video/davinci-resolve/default.nix+2−2 pkgs/applications/video/hyperion-ng/default.nix+50 pkgs/applications/video/kodi/unwrapped.nix+2−2 pkgs/applications/video/lightworks/default.nix+4−4 pkgs/applications/video/mkvtoolnix/default.nix+2−2 pkgs/applications/video/peek/default.nix−2 pkgs/applications/video/vdr/plugins.nix+5−80 pkgs/applications/video/vlc/default.nix+2−2 pkgs/applications/virtualization/containerd/default.nix+2−2 pkgs/applications/virtualization/crun/default.nix+2−2 pkgs/applications/virtualization/distrobox/default.nix+2−2 pkgs/applications/virtualization/lima/default.nix+8−3 pkgs/applications/virtualization/podman-tui/default.nix+2−2 pkgs/applications/virtualization/podman/default.nix+1 pkgs/applications/virtualization/vmware-workstation/default.nix+341 pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap+11 pkgs/applications/virtualization/vmware-workstation/vmware-config+21 pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap+5 pkgs/applications/virtualization/vmware-workstation/vmware-modconfig+8 pkgs/applications/window-managers/wmfs/default.nix+1−5 pkgs/applications/window-managers/wmii-hg/default.nix−46 pkgs/applications/window-managers/wmii/default.nix+72 pkgs/build-support/docker/default.nix+1−2 pkgs/build-support/dotnet/build-dotnet-module/default.nix+10−5 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh+2−1 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh+2−1 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh+5−1 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh+5−4 pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh+2−1 pkgs/build-support/dotnet/make-nuget-source/default.nix+26−18 pkgs/build-support/dotnet/nuget-to-nix/default.nix+25−3 pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh+3−1 pkgs/build-support/fetchfirefoxaddon/default.nix+2−2 pkgs/build-support/fetchnextcloudapp/default.nix+1−6 pkgs/build-support/kernel/make-initrd-ng-tool.nix+8−1 pkgs/build-support/kernel/make-initrd-ng.nix+2−2 pkgs/build-support/kernel/make-initrd-ng/src/main.rs+15−7 pkgs/build-support/rust/build-rust-crate/build-crate.nix+3−2 pkgs/build-support/rust/build-rust-crate/configure-crate.nix+2−1 pkgs/build-support/rust/build-rust-crate/default.nix+4−2 pkgs/build-support/rust/default-crate-overrides.nix+1−1 pkgs/build-support/writers/default.nix+2−2 pkgs/data/fonts/amiri/default.nix+2−2 pkgs/data/fonts/annapurna-sil/default.nix+29 pkgs/data/fonts/ezra-sil/default.nix+26 pkgs/data/fonts/galatia-sil/default.nix+29 pkgs/data/fonts/iosevka/bin.nix+1−1 pkgs/data/fonts/iosevka/variants.nix+92−92 pkgs/data/fonts/kacst/default.nix+22 pkgs/data/fonts/lao/default.nix+22 pkgs/data/fonts/uni-vga/default.nix+4−6 pkgs/data/icons/comixcursors/default.nix+5−25 pkgs/data/icons/luna-icons/default.nix+5−2 pkgs/data/misc/hackage/pin.json+4−4 pkgs/data/themes/flat-remix-gnome/default.nix+4−4 pkgs/data/themes/flat-remix-gtk/default.nix+2−2 pkgs/data/themes/orchis-theme/default.nix+2−2 pkgs/data/themes/vimix/default.nix+12−4 pkgs/desktops/cdesktopenv/default.nix+2−2 pkgs/desktops/enlightenment/econnman/default.nix+4−4 pkgs/desktops/enlightenment/ecrire/default.nix+1−1 pkgs/desktops/enlightenment/efl/default.nix+1−1 pkgs/desktops/enlightenment/enlightenment/default.nix+1−1 pkgs/desktops/enlightenment/ephoto/default.nix+1−1 pkgs/desktops/enlightenment/evisum/default.nix+1−1 pkgs/desktops/enlightenment/rage/default.nix+1−1 pkgs/desktops/enlightenment/terminology/default.nix+1−1 pkgs/desktops/gnome-2/platform/libglade/default.nix+2−5 pkgs/desktops/gnome/apps/ghex/default.nix+2−2 pkgs/desktops/gnome/apps/gnome-calendar/default.nix+2−2 pkgs/desktops/gnome/apps/gnome-todo/default.nix+3−3 pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix+2−2 pkgs/desktops/gnome/core/gnome-software/default.nix+2−2 pkgs/desktops/gnome/core/zenity/default.nix+2−2 pkgs/desktops/gnome/extensions/collisions.json+20 pkgs/desktops/gnome/extensions/extensionRenames.nix+6−3 pkgs/desktops/gnome/extensions/extensions.json+99−86 pkgs/desktops/gnome/extensions/update-extensions.py+1−1 pkgs/desktops/lumina/lumina-calculator/default.nix+1−1 pkgs/desktops/lumina/lumina-pdf/default.nix+1−1 pkgs/desktops/lumina/lumina/default.nix+1−1 pkgs/desktops/lxqt/compton-conf/default.nix+1−1 pkgs/desktops/lxqt/default.nix+2−5 pkgs/desktops/lxqt/libfm-qt/default.nix+3−3 pkgs/desktops/lxqt/liblxqt/default.nix+3−3 pkgs/desktops/lxqt/libqtxdg/default.nix+3−3 pkgs/desktops/lxqt/libsysstat/default.nix+1−1 pkgs/desktops/lxqt/lximage-qt/default.nix+3−3 pkgs/desktops/lxqt/lxqt-about/default.nix+3−3 pkgs/desktops/lxqt/lxqt-admin/default.nix+3−3 pkgs/desktops/lxqt/lxqt-archiver/default.nix+3−3 pkgs/desktops/lxqt/lxqt-build-tools/default.nix+3−3 pkgs/desktops/lxqt/lxqt-config/default.nix+3−3 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix+3−3 pkgs/desktops/lxqt/lxqt-notificationd/default.nix+3−3 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix+3−3 pkgs/desktops/lxqt/lxqt-panel/default.nix+4−3 pkgs/desktops/lxqt/lxqt-policykit/default.nix+3−3 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix+3−3 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix+3−3 pkgs/desktops/lxqt/lxqt-runner/default.nix+3−3 pkgs/desktops/lxqt/lxqt-session/default.nix+3−3 pkgs/desktops/lxqt/lxqt-sudo/default.nix+3−3 pkgs/desktops/lxqt/lxqt-themes/default.nix+3−3 pkgs/desktops/lxqt/obconf-qt/default.nix+1−1 pkgs/desktops/lxqt/pavucontrol-qt/default.nix+3−3 pkgs/desktops/lxqt/pcmanfm-qt/default.nix+3−3 pkgs/desktops/lxqt/qlipper/default.nix+1−1 pkgs/desktops/lxqt/qps/default.nix+3−3 pkgs/desktops/lxqt/qterminal/default.nix+3−3 pkgs/desktops/lxqt/qtermwidget/default.nix+3−3 pkgs/desktops/lxqt/screengrab/default.nix+3−3 pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix+41 pkgs/desktops/pantheon/apps/switchboard/default.nix+2−15 pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix+12−5 pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix+6−6 pkgs/desktops/pantheon/default.nix+2 pkgs/desktops/pantheon/granite/7/default.nix+73 pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix+2−2 pkgs/desktops/xfce/applications/xfce4-terminal/default.nix+2−2 pkgs/development/beam-modules/erlang-ls/default.nix+2−2 pkgs/development/beam-modules/erlang-ls/rebar-deps.nix+8−7 pkgs/development/compilers/abcl/default.nix+6−1 pkgs/development/compilers/bupc/default.nix−1 pkgs/development/compilers/chez/default.nix+3−3 pkgs/development/compilers/chicken/5/eggs.nix+414 pkgs/development/compilers/chicken/5/eggs.scm+5 pkgs/development/compilers/ghc/8.10.2-binary.nix+14 pkgs/development/compilers/ghc/8.10.7-binary.nix+14 pkgs/development/compilers/glslang/default.nix+2−2 pkgs/development/compilers/graalvm/community-edition/default.nix+4−6 pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json+24−24 pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json+24−24 pkgs/development/compilers/graalvm/community-edition/update.nix+1 pkgs/development/compilers/hare/config-template.mk+27 pkgs/development/compilers/hare/hare.nix+93 pkgs/development/compilers/hare/harec.nix+45 pkgs/development/compilers/jasmin-compiler/default.nix+41 pkgs/development/compilers/open-watcom/v2.nix+3−3 pkgs/development/compilers/opendylan/bin.nix+2−2 pkgs/development/compilers/openjdk/11.nix+8−5 pkgs/development/compilers/openjdk/17.nix+3−3 pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch+21−3 pkgs/development/compilers/ponyc/default.nix+2−2 pkgs/development/compilers/purescript/purescript/default.nix+5−7 pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js+1−1 pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix+2−2 pkgs/development/compilers/sbcl/2.2.4.nix+4 pkgs/development/compilers/solc/default.nix+34−11 pkgs/development/compilers/squeak/default.nix+1−3 pkgs/development/compilers/swift/default.nix−6 pkgs/development/coq-modules/coqtail-math/default.nix+6−1 pkgs/development/coq-modules/flocq/default.nix+2−2 pkgs/development/coq-modules/metacoq/default.nix+76 pkgs/development/coq-modules/metalib/default.nix+7−3 pkgs/development/coq-modules/parsec/default.nix+6−2 pkgs/development/coq-modules/simple-io/default.nix+10−3 pkgs/development/coq-modules/tlc/default.nix+2 pkgs/development/embedded/fpga/apio/default.nix+5−4 pkgs/development/embedded/openocd/default.nix+1 pkgs/development/gnuradio-modules/osmosdr/default.nix+2 pkgs/development/haskell-modules/configuration-common.nix+22−12 pkgs/development/haskell-modules/configuration-darwin.nix+6−7 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+7 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+3 pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+2−1 pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+10−5 pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+4 pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml+47−15 pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+7−4 pkgs/development/haskell-modules/hackage-packages.nix+1178−365 pkgs/development/interpreters/alda/default.nix+3−3 pkgs/development/interpreters/guile/1.8.nix−1 pkgs/development/interpreters/guile/2.0.nix−1 pkgs/development/interpreters/guile/2.2.nix−1 pkgs/development/interpreters/guile/3.0.nix−1 pkgs/development/interpreters/pixie/default.nix−94 pkgs/development/interpreters/pixie/dust.nix−46 pkgs/development/interpreters/pixie/load_paths.patch−25 pkgs/development/interpreters/pixie/make-paths-configurable.patch−119 pkgs/development/interpreters/python/hooks/default.nix+6 pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh+3 pkgs/development/interpreters/python/hooks/sphinx-hook.sh+57 pkgs/development/interpreters/python/wrapper.nix+2−2 pkgs/development/interpreters/racket/default.nix+2−2 pkgs/development/interpreters/racket/minimal.nix+1−1 pkgs/development/interpreters/sollya/default.nix+2−2 pkgs/development/java-modules/liquibase_redshift_extension/default.nix+27 pkgs/development/java-modules/redshift_jdbc/default.nix+28 pkgs/development/libraries/at-spi2-core/default.nix+2−2 pkgs/development/libraries/audio/libspecbleach/default.nix+26 pkgs/development/libraries/bc-decaf/default.nix+36 pkgs/development/libraries/bctoolbox/default.nix+16−6 pkgs/development/libraries/belcard/default.nix+4−3 pkgs/development/libraries/belle-sip/default.nix+8−8 pkgs/development/libraries/belr/default.nix+4−3 pkgs/development/libraries/bzrtp/default.nix+5−6 pkgs/development/libraries/dbus/default.nix+7 pkgs/development/libraries/docopt_cpp/default.nix+10−2 pkgs/development/libraries/doctest/default.nix+5−5 pkgs/development/libraries/duckdb/default.nix+36−3 pkgs/development/libraries/entt/default.nix+2−2 pkgs/development/libraries/fcft/default.nix+2−2 pkgs/development/libraries/ffmpegthumbnailer/default.nix+3−3 pkgs/development/libraries/gdal/2.4.nix+11−1 pkgs/development/libraries/gecode/3.nix+2−2 pkgs/development/libraries/glib/default.nix+2−10 pkgs/development/libraries/glibc/default.nix+4−7 pkgs/development/libraries/glibmm/default.nix+2−2 pkgs/development/libraries/goffice/default.nix+1−1 pkgs/development/libraries/goocanvas/2.x.nix+2−2 pkgs/development/libraries/gstreamer/bad/default.nix+5−3 pkgs/development/libraries/gstreamer/base/default.nix+2−2 pkgs/development/libraries/gstreamer/core/default.nix+2−2 pkgs/development/libraries/gstreamer/default.nix+2 pkgs/development/libraries/gstreamer/devtools/default.nix+2−2 pkgs/development/libraries/gstreamer/ges/default.nix+2−2 pkgs/development/libraries/gstreamer/good/default.nix+2−2 pkgs/development/libraries/gstreamer/libav/default.nix+2−2 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2 pkgs/development/libraries/gstreamer/ugly/default.nix+2−2 pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2 pkgs/development/libraries/gstreamer/viperfx/default.nix+41 pkgs/development/libraries/gtk/4.x.nix+2−2 pkgs/development/libraries/gusb/default.nix+2−2 pkgs/development/libraries/htmlcxx/c++17.patch+24 pkgs/development/libraries/htmlcxx/default.nix+7−4 pkgs/development/libraries/hyperscan/default.nix+2−2 pkgs/development/libraries/imath/default.nix+2−2 pkgs/development/libraries/inih/default.nix+3−3 pkgs/development/libraries/java/commons/daemon/default.nix+2−2 pkgs/development/libraries/jellyfin-ffmpeg/default.nix+1−1 pkgs/development/libraries/kpmcore/default.nix+10−18 pkgs/development/libraries/libarchive/default.nix+20−7 pkgs/development/libraries/libcef/default.nix+6−6 pkgs/development/libraries/libdeltachat/default.nix+3−5 pkgs/development/libraries/libinjection/default.nix+12−4 pkgs/development/libraries/libinput/default.nix+2−2 pkgs/development/libraries/libixp-hg/default.nix−27 pkgs/development/libraries/libixp/default.nix+28 pkgs/development/libraries/libjcat/default.nix+4−3 pkgs/development/libraries/liblinphone/default.nix+23−9 pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch+57 pkgs/development/libraries/libosmscout/default.nix+9−8 pkgs/development/libraries/libpqxx/default.nix+2−2 pkgs/development/libraries/libslirp/default.nix+2−2 pkgs/development/libraries/libvdpau/default.nix+2−2 pkgs/development/libraries/libviperfx/default.nix+30 pkgs/development/libraries/libxcrypt/default.nix+4 pkgs/development/libraries/libxmlb/default.nix+4−12 pkgs/development/libraries/libxsmm/default.nix+1−3 pkgs/development/libraries/lime/default.nix+15−5 pkgs/development/libraries/mediastreamer/default.nix+22−17 pkgs/development/libraries/mediastreamer/msopenh264.nix+6−7 pkgs/development/libraries/mesa/default.nix+2−2 pkgs/development/libraries/mimetic/default.nix+8−2 pkgs/development/libraries/nghttp3/default.nix+3−3 pkgs/development/libraries/ngtcp2/default.nix+3−3 pkgs/development/libraries/nss/85_security_load_3.77+.patch+76 pkgs/development/libraries/nss/generic.nix+5−1 pkgs/development/libraries/nss/latest.nix+2−2 pkgs/development/libraries/openal-soft/default.nix+14−8 pkgs/development/libraries/openal-soft/search-out.patch+2−2 pkgs/development/libraries/opendht/default.nix+2−2 pkgs/development/libraries/openfst/default.nix+2−2 pkgs/development/libraries/openjpeg/default.nix+1−1 pkgs/development/libraries/openssl/default.nix+2−2 pkgs/development/libraries/ortp/default.nix+5−4 pkgs/development/libraries/physics/cernlib/default.nix+2−2 pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patch−20 pkgs/development/libraries/poppler/0.61.nix−94 pkgs/development/libraries/proj/default.nix+17−8 pkgs/development/libraries/ptex/default.nix+2−2 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+18−3 pkgs/development/libraries/qwt/default.nix+2 pkgs/development/libraries/rocclr/default.nix+2−2 pkgs/development/libraries/rocm-comgr/default.nix+2−2 pkgs/development/libraries/rocm-device-libs/default.nix+2−2 pkgs/development/libraries/rocm-runtime/default.nix+2−2 pkgs/development/libraries/rocm-thunk/default.nix+2−2 pkgs/development/libraries/science/astronomy/indilib/default.nix+2−2 pkgs/development/libraries/science/biology/htslib/default.nix+18−2 pkgs/development/libraries/science/math/caffe2/default.nix−151 pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patch−46 pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patch−55 pkgs/development/libraries/science/math/liblapack/default.nix+2−11 pkgs/development/libraries/science/math/scalapack/default.nix+8−1 pkgs/development/libraries/skalibs/default.nix+2−2 pkgs/development/libraries/slang/default.nix+7 pkgs/development/libraries/snack/default.nix−36 pkgs/development/libraries/soci/bc-soci.nix+53 pkgs/development/libraries/spirv-headers/default.nix+2−2 pkgs/development/libraries/utmps/default.nix+2−2 pkgs/development/libraries/vapoursynth/default.nix+3−6 pkgs/development/libraries/vulkan-headers/default.nix+2−2 pkgs/development/libraries/vulkan-loader/default.nix+6−3 pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch+14 pkgs/development/libraries/waylandpp/default.nix+4−3 pkgs/development/libraries/webkitgtk/default.nix+2−2 pkgs/development/libraries/wolfssl/default.nix+2−2 pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix+2−2 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+2−2 pkgs/development/libraries/xdg-desktop-portal/default.nix+18−12 pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch−13 pkgs/development/lisp-modules-new/.gitattributes+1 pkgs/development/lisp-modules-new/.gitignore+3 pkgs/development/lisp-modules-new/doc/api.md+197 pkgs/development/lisp-modules-new/doc/nix-cl.md+98 pkgs/development/lisp-modules-new/doc/quicklisp.md+54 pkgs/development/lisp-modules-new/doc/quirks.md+5 pkgs/development/lisp-modules-new/examples/abcl-package-set.nix+24 pkgs/development/lisp-modules-new/examples/abcl-with-packages.nix+23 pkgs/development/lisp-modules-new/examples/bordeaux-threads.nix+43 pkgs/development/lisp-modules-new/examples/sbcl-with-bt.nix+31 pkgs/development/lisp-modules-new/import/api.lisp+18 pkgs/development/lisp-modules-new/import/database/sqlite.lisp+134 pkgs/development/lisp-modules-new/import/init.sql+41 pkgs/development/lisp-modules-new/import/main.lisp+40 pkgs/development/lisp-modules-new/import/nix.lisp+81 pkgs/development/lisp-modules-new/import/org.lispbuilds.nix.asd+24 pkgs/development/lisp-modules-new/import/repository/quicklisp.lisp+199 pkgs/development/lisp-modules-new/import/util.lisp+16 pkgs/development/lisp-modules-new/imported.nix+65675 pkgs/development/lisp-modules-new/lisp-packages.nix+432 pkgs/development/lisp-modules-new/old-make-wrapper.sh+155 pkgs/development/lisp-modules-new/packages.nix+369 pkgs/development/lisp-modules-new/patches/swank-pure-paths.patch+28 pkgs/development/lisp-modules-new/ql-import.lisp+6 pkgs/development/lisp-modules-new/ql.nix+140 pkgs/development/lisp-modules-new/readme.md+34 pkgs/development/lisp-modules-new/shell.nix+7 pkgs/development/lisp-modules-new/test/lispPackagesToTest.txt+395 pkgs/development/lisp-modules-new/test/test.lisp+94 pkgs/development/lua-modules/generated-packages.nix+42−9 pkgs/development/lua-modules/luaexpat.patch−36 pkgs/development/lua-modules/overrides.nix+6−3 pkgs/development/node-packages/composition.nix+1−1 pkgs/development/node-packages/default.nix+8−41 pkgs/development/node-packages/node-env.nix+21−11 pkgs/development/node-packages/node-packages.json+1−2 pkgs/development/node-packages/node-packages.nix+3297−3709 pkgs/development/ocaml-modules/atd/default.nix+6−14 pkgs/development/ocaml-modules/atdgen/codec-runtime.nix+18 pkgs/development/ocaml-modules/atdgen/default.nix+8−17 pkgs/development/ocaml-modules/atdgen/runtime.nix+15 pkgs/development/ocaml-modules/camlp-streams/default.nix+20 pkgs/development/ocaml-modules/dune-action-plugin/default.nix+4 pkgs/development/ocaml-modules/dune-glob/default.nix+4 pkgs/development/ocaml-modules/dune-private-libs/default.nix+4 pkgs/development/ocaml-modules/dune-rpc/default.nix+23 pkgs/development/ocaml-modules/dune-site/default.nix+4 pkgs/development/ocaml-modules/fiber/default.nix+23 pkgs/development/ocaml-modules/ocaml-lsp/default.nix+7−8 pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix+8−4 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix+25−5 pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix+15−3 pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nix+23 pkgs/development/ocaml-modules/ocsigen-start/default.nix+4−2 pkgs/development/ocaml-modules/stdune/default.nix+6−2 pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix−39 pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix−35 pkgs/development/ocaml-modules/tezos/base-test-helpers.nix−32 pkgs/development/ocaml-modules/tezos/base.nix−37 pkgs/development/ocaml-modules/tezos/clic.nix−28 pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nix−38 pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix−44 pkgs/development/ocaml-modules/tezos/client-base.nix−28 pkgs/development/ocaml-modules/tezos/context.nix−34 pkgs/development/ocaml-modules/tezos/crypto.nix−42 pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix−23 pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix−23 pkgs/development/ocaml-modules/tezos/error-monad.nix−35 pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix−25 pkgs/development/ocaml-modules/tezos/event-logging.nix−28 pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nix−26 pkgs/development/ocaml-modules/tezos/hacl-glue.nix−17 pkgs/development/ocaml-modules/tezos/legacy-store.nix−42 pkgs/development/ocaml-modules/tezos/lmdb.nix−51 pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix−31 pkgs/development/ocaml-modules/tezos/micheline.nix−32 pkgs/development/ocaml-modules/tezos/mockup-proxy.nix−27 pkgs/development/ocaml-modules/tezos/mockup-registration.nix−23 pkgs/development/ocaml-modules/tezos/p2p-services.nix−19 pkgs/development/ocaml-modules/tezos/p2p.nix−38 pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix−23 pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix−28 pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix−23 pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix−28 pkgs/development/ocaml-modules/tezos/protocol-alpha.nix−21 pkgs/development/ocaml-modules/tezos/protocol-compiler.nix−34 pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix−21 pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix−18 pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix−42 pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix−25 pkgs/development/ocaml-modules/tezos/protocol-environment.nix−43 pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix−23 pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix−23 pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nix−21 pkgs/development/ocaml-modules/tezos/protocol-updater.nix−26 pkgs/development/ocaml-modules/tezos/proxy.nix−36 pkgs/development/ocaml-modules/tezos/requester.nix−34 pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nix−23 pkgs/development/ocaml-modules/tezos/rpc-http-client.nix−23 pkgs/development/ocaml-modules/tezos/rpc-http.nix−25 pkgs/development/ocaml-modules/tezos/rpc.nix−25 pkgs/development/ocaml-modules/tezos/sapling.nix−35 pkgs/development/ocaml-modules/tezos/shell-context.nix−21 pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nix−32 pkgs/development/ocaml-modules/tezos/shell-services.nix−30 pkgs/development/ocaml-modules/tezos/shell.nix−44 pkgs/development/ocaml-modules/tezos/signer-backends.nix−30 pkgs/development/ocaml-modules/tezos/signer-services.nix−21 pkgs/development/ocaml-modules/tezos/stdlib-unix.nix−33 pkgs/development/ocaml-modules/tezos/stdlib.nix−64 pkgs/development/ocaml-modules/tezos/store.nix−50 pkgs/development/ocaml-modules/tezos/test-helpers.nix−28 pkgs/development/ocaml-modules/tezos/validation.nix−28 pkgs/development/ocaml-modules/tezos/version.nix−21 pkgs/development/ocaml-modules/tezos/workers.nix−21 pkgs/development/ocaml-modules/uuuu/default.nix+6−9 pkgs/development/ocaml-modules/xdg/default.nix+17 pkgs/development/octave-modules/octproj/default.nix+1 pkgs/development/php-packages/openswoole/default.nix+22 pkgs/development/php-packages/pdepend/default.nix+41 pkgs/development/python-modules/Nikola/default.nix+2−2 pkgs/development/python-modules/Theano/default.nix+1−1 pkgs/development/python-modules/XlsxWriter/default.nix+2−2 pkgs/development/python-modules/advocate/default.nix+45 pkgs/development/python-modules/afsapi/default.nix+3−3 pkgs/development/python-modules/aioairzone/default.nix+2−2 pkgs/development/python-modules/aiohttp-apispec/default.nix+2−7 pkgs/development/python-modules/aiolifx/default.nix+2−2 pkgs/development/python-modules/aiomysql/default.nix+17−27 pkgs/development/python-modules/aiooncue/default.nix+2−2 pkgs/development/python-modules/aioqsw/default.nix+3−3 pkgs/development/python-modules/aioslimproto/default.nix+41 pkgs/development/python-modules/amqp/default.nix+3−3 pkgs/development/python-modules/androidtv/default.nix+2−2 pkgs/development/python-modules/ansible-doctor/default.nix+25−25 pkgs/development/python-modules/ansible-later/default.nix+2−2 pkgs/development/python-modules/ansible/default.nix+3−2 pkgs/development/python-modules/apispec/default.nix+13−9 pkgs/development/python-modules/apprise/default.nix+2−2 pkgs/development/python-modules/async-upnp-client/default.nix+2−2 pkgs/development/python-modules/av/default.nix+8−2 pkgs/development/python-modules/aws-adfs/default.nix+2−12 pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3 pkgs/development/python-modules/awscrt/default.nix+2−2 pkgs/development/python-modules/azure-identity/default.nix+15−18 pkgs/development/python-modules/beautifulsoup4/default.nix+9−3 pkgs/development/python-modules/bleach/default.nix+2−2 pkgs/development/python-modules/bleak/default.nix+2−2 pkgs/development/python-modules/bpython/default.nix+16−2 pkgs/development/python-modules/breezy/default.nix+20−5 pkgs/development/python-modules/browser-cookie3/default.nix+6−5 pkgs/development/python-modules/bsblan/default.nix+14−13 pkgs/development/python-modules/can/default.nix+1−1 pkgs/development/python-modules/canonicaljson/default.nix+3−3 pkgs/development/python-modules/casbin/default.nix+2−2 pkgs/development/python-modules/cert-chain-resolver/default.nix+22−7 pkgs/development/python-modules/codepy/default.nix+35 pkgs/development/python-modules/commoncode/default.nix+2−2 pkgs/development/python-modules/connexion/default.nix+10−16 pkgs/development/python-modules/contexttimer/default.nix+42 pkgs/development/python-modules/dask-yarn/default.nix+47 pkgs/development/python-modules/deezer-python/default.nix+2−2 pkgs/development/python-modules/deltachat/default.nix+7−3 pkgs/development/python-modules/denonavr/default.nix+2−2 pkgs/development/python-modules/devito/default.nix+100 pkgs/development/python-modules/django-taggit/default.nix+2−2 pkgs/development/python-modules/dockerfile-parse/default.nix+27−9 pkgs/development/python-modules/docstring-parser/default.nix+25−11 pkgs/development/python-modules/dropbox/default.nix+3 pkgs/development/python-modules/duckdb-engine/default.nix+40 pkgs/development/python-modules/dungeon-eos/default.nix+2−2 pkgs/development/python-modules/durus/default.nix+28 pkgs/development/python-modules/elementpath/default.nix+4−4 pkgs/development/python-modules/elkm1-lib/default.nix+2−2 pkgs/development/python-modules/envs/default.nix+15−11 pkgs/development/python-modules/exceptiongroup/default.nix+39 pkgs/development/python-modules/faraday-agent-parameters-types/default.nix+6−1 pkgs/development/python-modules/faraday-plugins/default.nix+2−2 pkgs/development/python-modules/fastavro/default.nix+3−3 pkgs/development/python-modules/fastbencode/default.nix+26 pkgs/development/python-modules/fastjsonschema/default.nix+3−14 pkgs/development/python-modules/filetype/default.nix+26−6 pkgs/development/python-modules/flake8-debugger/default.nix+23−14 pkgs/development/python-modules/flask-compress/default.nix+2−2 pkgs/development/python-modules/flask-jwt-extended/default.nix+31−10 pkgs/development/python-modules/flask-login/default.nix+2−2 pkgs/development/python-modules/flask-testing/default.nix+41−15 pkgs/development/python-modules/flatdict/default.nix+2−2 pkgs/development/python-modules/fontmake/default.nix+42 pkgs/development/python-modules/fonttools/default.nix+7−3 pkgs/development/python-modules/fqdn/default.nix+36 pkgs/development/python-modules/garminconnect/default.nix+3−3 pkgs/development/python-modules/gbulb/default.nix+43 pkgs/development/python-modules/gcal-sync/default.nix+46 pkgs/development/python-modules/gehomesdk/default.nix+2−2 pkgs/development/python-modules/gensim/default.nix+37−20 pkgs/development/python-modules/ghp-import/default.nix+12−4 pkgs/development/python-modules/glances-api/default.nix+2−2 pkgs/development/python-modules/glyphslib/default.nix+59 pkgs/development/python-modules/google-cloud-videointelligence/default.nix+2−2 pkgs/development/python-modules/gradient/default.nix+2−2 pkgs/development/python-modules/gtts/default.nix+2−2 pkgs/development/python-modules/hahomematic/default.nix+3−3 pkgs/development/python-modules/hatasmota/default.nix+3−3 pkgs/development/python-modules/hatchling/default.nix+2−2 pkgs/development/python-modules/hg-evolve/default.nix+2−2 pkgs/development/python-modules/howdoi/default.nix+16−2 pkgs/development/python-modules/http-message-signatures/default.nix+56 pkgs/development/python-modules/http-sfv/default.nix+39 pkgs/development/python-modules/ibis-framework/default.nix+34−47 pkgs/development/python-modules/identify/default.nix+2−2 pkgs/development/python-modules/ihatemoney/default.nix+36−35 pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix+26 pkgs/development/python-modules/ipython-sql/default.nix+58 pkgs/development/python-modules/ismartgate/default.nix+12−2 pkgs/development/python-modules/isoduration/default.nix+50 pkgs/development/python-modules/jc/default.nix+2−2 pkgs/development/python-modules/jedi-language-server/default.nix+3−3 pkgs/development/python-modules/json-schema-for-humans/default.nix+2−2 pkgs/development/python-modules/jsonrpc-async/default.nix+25−4 pkgs/development/python-modules/jsonrpc-base/default.nix+9−1 pkgs/development/python-modules/jug/default.nix+31−18 pkgs/development/python-modules/jwcrypto/default.nix+2−2 pkgs/development/python-modules/lektor/default.nix+2−2 pkgs/development/python-modules/lightwave2/default.nix+2−2 pkgs/development/python-modules/limnoria/default.nix+2−2 pkgs/development/python-modules/loo-py/default.nix → pkgs/development/python-modules/loopy/default.nix+28−24 pkgs/development/python-modules/luxtronik/default.nix+2−2 pkgs/development/python-modules/mailchecker/default.nix+2−2 pkgs/development/python-modules/marshmallow-dataclass/default.nix+2−2 pkgs/development/python-modules/mat2/default.nix+2−2 pkgs/development/python-modules/mautrix/default.nix+3−3 pkgs/development/python-modules/meater-python/default.nix+37 pkgs/development/python-modules/meshtastic/default.nix+2−2 pkgs/development/python-modules/mkdocs-minify/default.nix+37 pkgs/development/python-modules/mkdocs-redirects/default.nix+31 pkgs/development/python-modules/monty/default.nix+3−3 pkgs/development/python-modules/murmurhash/default.nix+2−2 pkgs/development/python-modules/mwdblib/default.nix+2−2 pkgs/development/python-modules/mypy-boto3-s3/default.nix+2−2 pkgs/development/python-modules/namedlist/default.nix+30−9 pkgs/development/python-modules/nbclient/default.nix+33−10 pkgs/development/python-modules/nbconvert/default.nix+8−7 pkgs/development/python-modules/nettigo-air-monitor/default.nix+2−2 pkgs/development/python-modules/netutils/default.nix+66 pkgs/development/python-modules/nutils/default.nix+32 pkgs/development/python-modules/nvchecker/default.nix+2−2 pkgs/development/python-modules/openstep-plist/default.nix+31 pkgs/development/python-modules/pandas/default.nix+2 pkgs/development/python-modules/pathy/default.nix+37−14 pkgs/development/python-modules/peaqevcore/default.nix+38 pkgs/development/python-modules/peewee/default.nix+7−4 pkgs/development/python-modules/pex/default.nix+2−2 pkgs/development/python-modules/pilkit/default.nix+29−17 pkgs/development/python-modules/pims/default.nix+42−19 pkgs/development/python-modules/pipdate/default.nix+9−5 pkgs/development/python-modules/pipdeptree/default.nix+41 pkgs/development/python-modules/plugwise/default.nix+2−2 pkgs/development/python-modules/poetry-dynamic-versioning/default.nix+58 pkgs/development/python-modules/policyuniverse/default.nix+2−2 pkgs/development/python-modules/preprocess-cancellation/default.nix+36−6 pkgs/development/python-modules/preprocess-cancellation/pep-621.patch+20 pkgs/development/python-modules/proton-client/0001-OpenSSL-path-fix.patch+41 pkgs/development/python-modules/proton-client/default.nix+18−8 pkgs/development/python-modules/pubnub/default.nix+2−2 pkgs/development/python-modules/py-desmume/default.nix+3−14 pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2 pkgs/development/python-modules/pybind11/default.nix+3−2 pkgs/development/python-modules/pybullet/default.nix+2−2 pkgs/development/python-modules/pychromecast/default.nix+2−2 pkgs/development/python-modules/pycm/default.nix+3−3 pkgs/development/python-modules/pydantic/default.nix+2 pkgs/development/python-modules/pydeconz/default.nix+6−4 pkgs/development/python-modules/pydeps/default.nix+60 pkgs/development/python-modules/pyeapi/default.nix+36−8 pkgs/development/python-modules/pyevilgenius/default.nix+2−2 pkgs/development/python-modules/pyezviz/default.nix+2−2 pkgs/development/python-modules/pyfritzhome/default.nix+3−3 pkgs/development/python-modules/pyhiveapi/default.nix+4−2 pkgs/development/python-modules/pyinfra/default.nix+2−2 pkgs/development/python-modules/pyinsteon/default.nix+3−3 pkgs/development/python-modules/pyiqvia/default.nix+3−3 pkgs/development/python-modules/pykulersky/default.nix+2−2 pkgs/development/python-modules/pylast/default.nix+5−5 pkgs/development/python-modules/pymyq/default.nix+3−3 pkgs/development/python-modules/pync/default.nix−2 pkgs/development/python-modules/pynetgear/default.nix+2−2 pkgs/development/python-modules/pynrrd/default.nix+14−4 pkgs/development/python-modules/pynws/default.nix+2−2 pkgs/development/python-modules/pyomo/default.nix+34−22 pkgs/development/python-modules/pyopenuv/default.nix+4−4 pkgs/development/python-modules/pyplatec/default.nix+2 pkgs/development/python-modules/pyqtwebengine/default.nix+1−1 pkgs/development/python-modules/pyradios/default.nix+2 pkgs/development/python-modules/pyrevolve/default.nix+41 pkgs/development/python-modules/pyrogram/default.nix+2−2 pkgs/development/python-modules/pysensibo/default.nix+2−2 pkgs/development/python-modules/pyshp/default.nix+2−2 pkgs/development/python-modules/pysigma/default.nix+2−7 pkgs/development/python-modules/pytenable/default.nix+2−2 pkgs/development/python-modules/pytest-aiohttp/default.nix+11−13 pkgs/development/python-modules/pytest-datafiles/default.nix+33−8 pkgs/development/python-modules/python-benedict/default.nix+3−3 pkgs/development/python-modules/python-efl/default.nix+1−1 pkgs/development/python-modules/python-gitlab/default.nix+2−2 pkgs/development/python-modules/python-kasa/default.nix+4−2 pkgs/development/python-modules/python-smarttub/default.nix+2−2 pkgs/development/python-modules/python-sql/default.nix+24−8 pkgs/development/python-modules/pytomorrowio/default.nix+4−2 pkgs/development/python-modules/pytorch-metric-learning/default.nix+1 pkgs/development/python-modules/pytorch-pfn-extras/default.nix+3−3 pkgs/development/python-modules/pytorch/default.nix+6−2 pkgs/development/python-modules/pytrafikverket/default.nix+11−4 pkgs/development/python-modules/pyvo/default.nix+1−1 pkgs/development/python-modules/pywinrm/default.nix+28−12 pkgs/development/python-modules/ratelimiter/default.nix+21−13 pkgs/development/python-modules/reorder-python-imports/default.nix+2−2 pkgs/development/python-modules/requests-cache/default.nix+2−2 pkgs/development/python-modules/requests-http-signature/default.nix+16−4 pkgs/development/python-modules/requests-pkcs12/default.nix+10−3 pkgs/development/python-modules/rns/default.nix+2−2 pkgs/development/python-modules/ropper/default.nix+26−15 pkgs/development/python-modules/s3-credentials/default.nix+2−2 pkgs/development/python-modules/scikit-survival/default.nix+2−2 pkgs/development/python-modules/scmrepo/default.nix+2−2 pkgs/development/python-modules/secretstorage/default.nix+17−6 pkgs/development/python-modules/segyio/default.nix+55 pkgs/development/python-modules/sentry-sdk/default.nix+2−2 pkgs/development/python-modules/signedjson/default.nix+31−18 pkgs/development/python-modules/simplisafe-python/default.nix+6−2 pkgs/development/python-modules/skein/default.nix+34−13 pkgs/development/python-modules/skein/skeinjar.nix+11−12 pkgs/development/python-modules/skein/skeinrepo.nix−44 pkgs/development/python-modules/skia-pathops/default.nix+43 pkgs/development/python-modules/skytemple-files/default.nix+2−2 pkgs/development/python-modules/skytemple-rust/default.nix+15−6 pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2 pkgs/development/python-modules/slack-sdk/default.nix+3−3 pkgs/development/python-modules/slixmpp/0001-xep_0030-allow-extra-args-in-get_info_from_domain.patch+36 pkgs/development/python-modules/slixmpp/default.nix+2 pkgs/development/python-modules/smart-open/default.nix+8−26 pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2 pkgs/development/python-modules/snowflake-sqlalchemy/default.nix+2−2 pkgs/development/python-modules/socid-extractor/default.nix+7−1 pkgs/development/python-modules/spacy-transformers/default.nix+8−6 pkgs/development/python-modules/spacy/default.nix+26−21 pkgs/development/python-modules/sphinxcontrib-spelling/default.nix+21−7 pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3 pkgs/development/python-modules/sqlmap/default.nix+2−2 pkgs/development/python-modules/srvlookup/default.nix+28−11 pkgs/development/python-modules/stringly/default.nix+28 pkgs/development/python-modules/stripe/default.nix+2−2 pkgs/development/python-modules/superqt/default.nix+3−3 pkgs/development/python-modules/svdtools/default.nix+2−2 pkgs/development/python-modules/swspotify/default.nix+36−19 pkgs/development/python-modules/tern/default.nix+2−2 pkgs/development/python-modules/teslajsonpy/default.nix+3−3 pkgs/development/python-modules/textual/default.nix+16−13 pkgs/development/python-modules/timetagger/default.nix+3−3 pkgs/development/python-modules/total-connect-client/default.nix+2−2 pkgs/development/python-modules/treelog/default.nix+28 pkgs/development/python-modules/trimesh/default.nix+2−2 pkgs/development/python-modules/twitch-python/default.nix+2−2 pkgs/development/python-modules/types-cryptography/default.nix+2−2 pkgs/development/python-modules/types-dateutil/default.nix+2−2 pkgs/development/python-modules/types-decorator/default.nix+2−2 pkgs/development/python-modules/types-paramiko/default.nix+2−2 pkgs/development/python-modules/types-pytz/default.nix+2−2 pkgs/development/python-modules/types-requests/default.nix+2−2 pkgs/development/python-modules/types-tabulate/default.nix+2−2 pkgs/development/python-modules/types-toml/default.nix+2−2 pkgs/development/python-modules/types-typed-ast/default.nix+2−2 pkgs/development/python-modules/types-urllib3/default.nix+2−2 pkgs/development/python-modules/typical/default.nix+10−9 pkgs/development/python-modules/ufo2ft/default.nix+2−2 pkgs/development/python-modules/ufoLib2/default.nix+3 pkgs/development/python-modules/voluptuous/default.nix+15−11 pkgs/development/python-modules/wandb/default.nix+20−12 pkgs/development/python-modules/webssh/default.nix+2−2 pkgs/development/python-modules/xknx/default.nix+9−4 pkgs/development/python-modules/youtube-search-python/default.nix+2−2 pkgs/development/python-modules/yte/default.nix+57 pkgs/development/python-modules/zeroconf/default.nix+4−2 pkgs/development/python-modules/zha-quirks/default.nix+10−4 pkgs/development/python-modules/zigpy-deconz/default.nix+6−3 pkgs/development/python-modules/zigpy/default.nix+4−2 pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2 pkgs/development/quickemu/default.nix+2−2 pkgs/development/tools/altair-graphql-client/default.nix+3−4 pkgs/development/tools/analysis/brakeman/Gemfile.lock+2−2 pkgs/development/tools/analysis/brakeman/gemset.nix+2−2 pkgs/development/tools/analysis/checkov/default.nix+3−2 pkgs/development/tools/analysis/codeql/default.nix+4−4 pkgs/development/tools/analysis/cvehound/default.nix+17−12 pkgs/development/tools/analysis/tfsec/default.nix+3−3 pkgs/development/tools/build-managers/alibuild/default.nix+9−6 pkgs/development/tools/build-managers/bazel/bazel_4/default.nix−3 pkgs/development/tools/build-managers/bazel/bazel_5/default.nix−3 pkgs/development/tools/build-managers/bloop/default.nix+16−46 pkgs/development/tools/build-managers/mage/default.nix+2−2 pkgs/development/tools/build-managers/meson/default.nix+7 pkgs/development/tools/build-managers/redo-apenwarr/default.nix+1−2 pkgs/development/tools/build-managers/rocm-cmake/default.nix+2−2 pkgs/development/tools/build-managers/scala-cli/default.nix+3−3 pkgs/development/tools/build-managers/tup/default.nix+2 pkgs/development/tools/build-managers/tup/fusermount-setuid.patch+31 pkgs/development/tools/continuous-integration/github-runner/default.nix+2 pkgs/development/tools/database/liquibase/default.nix+22−7 pkgs/development/tools/database/pg_activity/default.nix+3−3 pkgs/development/tools/database/prisma-engines/default.nix+15−3 pkgs/development/tools/ddosify/default.nix+3−3 pkgs/development/tools/dive/default.nix−2 pkgs/development/tools/earthly/default.nix+2−2 pkgs/development/tools/fq/default.nix+3−3 pkgs/development/tools/fx/default.nix+22 pkgs/development/tools/ginkgo/default.nix+3−3 pkgs/development/tools/go-motion/default.nix+10−13 pkgs/development/tools/go-toml/default.nix+8−6 pkgs/development/tools/gosec/default.nix−2 pkgs/development/tools/hcloud/default.nix+1−1 pkgs/development/tools/hjson-go/default.nix+14−12 pkgs/development/tools/jdt-language-server/default.nix+103 pkgs/development/tools/just/default.nix+3−3 pkgs/development/tools/kdash/default.nix+34 pkgs/development/tools/krankerl/default.nix−2 pkgs/development/tools/metals/default.nix+6−11 pkgs/development/tools/misc/binutils/default.nix+4−6 pkgs/development/tools/misc/blackfire/default.nix+6−6 pkgs/development/tools/misc/blackfire/php-probe.nix+158−16 pkgs/development/tools/misc/clojure-lsp/default.nix+3−3 pkgs/development/tools/misc/d-feet/default.nix+1−1 pkgs/development/tools/misc/mkcert/default.nix+3−3 pkgs/development/tools/misc/saleae-logic-2/default.nix+2−2 pkgs/development/tools/misc/universal-ctags/default.nix+1−1 pkgs/development/tools/mold/default.nix+2−2 pkgs/development/tools/mustache-go/default.nix+9−6 pkgs/development/tools/mysql-shell/default.nix−1 pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+2 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json+11 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json+11 pkgs/development/tools/parsing/tree-sitter/update.nix+8 pkgs/development/tools/poetry2nix/poetry2nix/default.nix+10−2 pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1 pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+153−5 pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+98−4 pkgs/development/tools/protoc-gen-entgrpc/default.nix+28 pkgs/development/tools/protolint/default.nix+39 pkgs/development/tools/purescript/spago/spago.nix+3−3 pkgs/development/tools/reflex/default.nix+8−7 pkgs/development/tools/relic/default.nix+23 pkgs/development/tools/rocminfo/default.nix+2−2 pkgs/development/tools/rust/cargo-make/default.nix+3−3 pkgs/development/tools/rust/cargo-sync-readme/default.nix+4−3 pkgs/development/tools/rust/cbindgen/default.nix+4−4 pkgs/development/tools/rust/rust-analyzer/default.nix+3−3 pkgs/development/tools/scalafix/default.nix+10−7 pkgs/development/tools/snazy/default.nix+34 pkgs/development/tools/spirv-tools/default.nix+2−2 pkgs/development/tools/sumneko-lua-language-server/default.nix+2−2 pkgs/development/tools/tracy/default.nix+6−4 pkgs/development/tools/unityhub/default.nix+5−6 pkgs/development/tools/vala-language-server/default.nix−2 pkgs/development/tools/vulkan-validation-layers/default.nix+15−9 pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix+33 pkgs/development/tools/wails/default.nix+3−3 pkgs/development/tools/wp4nix/default.nix+30 pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js+2−1 pkgs/development/tools/yq-go/default.nix+2−2 pkgs/development/web/cypress/default.nix+2−2 pkgs/development/web/deno/default.nix+3−3 pkgs/development/web/nodejs/nodejs.nix+2−2 pkgs/development/web/nodejs/v14.nix+2−2 pkgs/development/web/nodejs/v16.nix+3−9 pkgs/development/web/nodejs/v18.nix+2−2 pkgs/games/7kaa/default.nix+7−10 pkgs/games/assaultcube/default.nix+55−29 pkgs/games/dwarf-fortress/dfhack/default.nix+3 pkgs/games/factorio/versions.json+24−24 pkgs/games/hedgewars/default.nix+5 pkgs/games/kabeljau/default.nix+9−7 pkgs/games/mindustry/default.nix+11−9 pkgs/games/quake2/yquake2/default.nix+19−27 pkgs/games/quake2/yquake2/games.nix+2−4 pkgs/games/quakespasm/vulkan.nix+2−2 pkgs/games/tintin/default.nix−35 pkgs/misc/cups/drivers/kyodialog3/default.nix+1−1 pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix+2−2 pkgs/misc/drivers/pantum-driver/default.nix+52 pkgs/misc/openrussian-cli/default.nix+2−2 pkgs/misc/platformsh/default.nix+4−4 pkgs/misc/rich-cli/default.nix+18−8 pkgs/misc/scrcpy/default.nix+3−3 pkgs/misc/tpm2-pkcs11/default.nix+4−4 pkgs/misc/uboot/default.nix+6−29 pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix+2−2 pkgs/os-specific/darwin/mas/default.nix+2−2 pkgs/os-specific/linux/apparmor/default.nix−1 pkgs/os-specific/linux/bionic-prebuilt/default.nix+38−12 pkgs/os-specific/linux/cifs-utils/default.nix+17−1 pkgs/os-specific/linux/device-tree/default.nix+2−2 pkgs/os-specific/linux/ell/default.nix+4−3 pkgs/os-specific/linux/evdi/default.nix+2−2 pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix+62 pkgs/os-specific/linux/firmware/fwupd/default.nix+17−19 pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch+10−10 pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix+8−9 pkgs/os-specific/linux/kernel-headers/default.nix+2−2 pkgs/os-specific/linux/kernel/hardened/patches.json+25−25 pkgs/os-specific/linux/kernel/hardened/update.py+9 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.15.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.16.nix−18 pkgs/os-specific/linux/kernel/linux-5.17.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+2−2 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+3−3 pkgs/os-specific/linux/kernel/linux-zen.nix+2−2 pkgs/os-specific/linux/kernel/manual-config.nix+2−2 pkgs/os-specific/linux/kernel/update-zen.sh+1−1 pkgs/os-specific/linux/libcap-ng/default.nix+2−2 pkgs/os-specific/linux/multipath-tools/default.nix+2−2 pkgs/os-specific/linux/musl-obstack/default.nix+2−2 pkgs/os-specific/linux/nftables/default.nix+7−9 pkgs/os-specific/linux/nvidia-x11/default.nix+4−4 pkgs/os-specific/linux/s6-linux-init/default.nix+2−2 pkgs/os-specific/linux/sasutils/default.nix+7−1 pkgs/os-specific/linux/sgx/ssl/default.nix+2−2 pkgs/os-specific/linux/sysstat/default.nix+2−2 pkgs/os-specific/linux/vmware/default.nix+47 pkgs/servers/adguardhome/bins.nix+8−4 pkgs/servers/adguardhome/default.nix+7−3 pkgs/servers/adguardhome/update.sh+3−2 pkgs/servers/calibre-web/default.nix+10−7 pkgs/servers/dict/wiktionary/default.nix+2−2 pkgs/servers/dns/knot-dns/default.nix+2−2 pkgs/servers/dns/pdns/default.nix+2−2 pkgs/servers/etebase/default.nix+8−23 pkgs/servers/foundationdb/vsmake.nix+2−2 pkgs/servers/gpm/default.nix+13−26 pkgs/servers/heisenbridge/default.nix+2−5 pkgs/servers/home-assistant/component-packages.nix+35−14 pkgs/servers/home-assistant/default.nix+15−4 pkgs/servers/home-assistant/frontend.nix+2−2 pkgs/servers/hqplayerd/default.nix+30−27 pkgs/servers/http/couchdb/3.nix+6−6 pkgs/servers/http/unit/default.nix−3 pkgs/servers/irc/inspircd/default.nix+2−2 pkgs/servers/keycloak/default.nix+4−4 pkgs/servers/mail/opensmtpd/cross_fix.diff+13 pkgs/servers/mail/opensmtpd/default.nix+1 pkgs/servers/mastodon/default.nix+1−1 pkgs/servers/mastodon/gemset.nix+72−72 pkgs/servers/mastodon/source.nix+2−2 pkgs/servers/mastodon/version.nix+1−1 pkgs/servers/matrix-synapse/default.nix+2−2 pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1 pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+7−7 pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2 pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4 pkgs/servers/mattermost/matterircd.nix+7−5 pkgs/servers/mautrix-facebook/default.nix+2−2 pkgs/servers/mautrix-signal/default.nix+2−2 pkgs/servers/mautrix-telegram/default.nix+5−5 pkgs/servers/monitoring/grafana/default.nix+4−4 pkgs/servers/monitoring/net-snmp/default.nix+2−2 pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7 pkgs/servers/monitoring/prometheus/default.nix+60−119 pkgs/servers/monitoring/prometheus/haproxy-exporter.nix+9−7 pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nix−17 pkgs/servers/monitoring/prometheus/webui/codemirror-promql/node-packages.nix−9436 pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package-lock.json−22167 pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package.json−93 pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh−32 pkgs/servers/monitoring/prometheus/webui/webui/default.nix−17 pkgs/servers/monitoring/prometheus/webui/webui/node-packages.nix−17600 pkgs/servers/monitoring/prometheus/webui/webui/package-lock.json−48650 pkgs/servers/monitoring/prometheus/webui/webui/package.json−109 pkgs/servers/monitoring/uchiwa/bower-packages.nix−25 pkgs/servers/monitoring/uchiwa/default.nix−53 pkgs/servers/monitoring/uchiwa/src.nix−4 pkgs/servers/monitoring/uchiwa/update.sh−42 pkgs/servers/moonraker/default.nix+3−3 pkgs/servers/nosql/cassandra/generic.nix+1−2 pkgs/servers/nosql/redis/default.nix+8−2 pkgs/servers/openvscode-server/default.nix+11−14 pkgs/servers/openvscode-server/remove-node-download.patch+9−7 pkgs/servers/pulseaudio/default.nix+10−3 pkgs/servers/redpanda/default.nix+35 pkgs/servers/roon-server/default.nix+2−2 pkgs/servers/sabnzbd/default.nix+15−1 pkgs/servers/tailscale/default.nix+6−7 pkgs/servers/unifi/default.nix+2−2 pkgs/servers/vouch-proxy/default.nix+3−3 pkgs/servers/web-apps/nifi/default.nix+2−2 pkgs/servers/web-apps/sogo/default.nix+2−2 pkgs/servers/web-apps/wallabag/default.nix+3−1 pkgs/servers/wishlist/default.nix+27 pkgs/servers/xmpp/prosody/default.nix+9−22 pkgs/servers/zookeeper/default.nix+5−2 pkgs/shells/fish/plugins/fzf-fish.nix+2−2 pkgs/shells/zsh/oh-my-zsh/default.nix+3−3 pkgs/stdenv/darwin/default.nix+1−1 pkgs/stdenv/freebsd/default.nix+1−1 pkgs/stdenv/generic/check-meta.nix+40−15 pkgs/stdenv/generic/default.nix+1−1 pkgs/stdenv/generic/make-derivation.nix+71−6 pkgs/stdenv/linux/default.nix+1−1 pkgs/stdenv/linux/make-bootstrap-tools.nix+1−1 pkgs/tools/X11/libstrangle/default.nix+6−4 pkgs/tools/X11/libstrangle/nixos.patch+1−1 pkgs/tools/X11/mmutils/default.nix+24 pkgs/tools/X11/opentabletdriver/default.nix+2−2 pkgs/tools/X11/opentabletdriver/deps.nix+1−1 pkgs/tools/admin/aws-google-auth/default.nix+3−3 pkgs/tools/admin/cli53/default.nix+17−8 pkgs/tools/admin/colmena/default.nix+10−5 pkgs/tools/admin/eksctl/default.nix+3−3 pkgs/tools/admin/lxd/default.nix+5−5 pkgs/tools/admin/pgadmin/default.nix+87−54 pkgs/tools/admin/pgadmin/package.json+7−4 pkgs/tools/admin/pgadmin/yarn.lock+231−22 pkgs/tools/admin/pgadmin/yarn.nix+226−18 pkgs/tools/admin/pulumi/data.nix+73−73 pkgs/tools/admin/pulumi/update.sh+4−2 pkgs/tools/admin/scaleway-cli/default.nix+10 pkgs/tools/admin/ssh-import-id/default.nix+7−1 pkgs/tools/admin/stripe-cli/default.nix+48−7 pkgs/tools/admin/syft/default.nix+3−3 pkgs/tools/admin/trivy/default.nix+3−3 pkgs/tools/admin/winbox/default.nix+1−1 pkgs/tools/archivers/gbl/default.nix+2−2 pkgs/tools/audio/abcmidi/default.nix+2−2 pkgs/tools/audio/mictray/default.nix+53 pkgs/tools/audio/mpdsync/default.nix−25 pkgs/tools/backup/duply/default.nix+5−5 pkgs/tools/cd-dvd/ventoy-bin/default.nix+11−6 pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop+10 pkgs/tools/filesystems/bcachefs-tools/default.nix+3−3 pkgs/tools/filesystems/ceph/default.nix+2−2 pkgs/tools/filesystems/fuse-7z-ng/default.nix+1−1 pkgs/tools/filesystems/httm/default.nix+32 pkgs/tools/filesystems/irods/common.nix+2−2 pkgs/tools/filesystems/irods/default.nix+2−3 pkgs/tools/filesystems/squashfs/default.nix+10−1 pkgs/tools/filesystems/xfsprogs/default.nix+2−2 pkgs/tools/filesystems/zkfuse/default.nix+1−2 pkgs/tools/graphics/feedgnuplot/default.nix+2−2 pkgs/tools/graphics/gnuplot/default.nix+2−2 pkgs/tools/graphics/graphviz/default.nix+3−14 pkgs/tools/graphics/pfstools/default.nix+1−1 pkgs/tools/graphics/pfstools/glut.patch+12 pkgs/tools/graphics/pixel2svg/default.nix+20 pkgs/tools/graphics/svgcleaner/default.nix+26 pkgs/tools/graphics/vulkan-extension-layer/default.nix+2−2 pkgs/tools/graphics/vulkan-tools-lunarg/default.nix+2−2 pkgs/tools/graphics/vulkan-tools/default.nix+38−6 pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch+18 pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix+2 pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix+5−2 pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix+3−7 pkgs/tools/inputmethods/lisgd/default.nix+2−2 pkgs/tools/misc/agedu/default.nix+9−5 pkgs/tools/misc/antimicrox/default.nix+2−2 pkgs/tools/misc/bat-extras/default.nix+6−4 pkgs/tools/misc/bcunit/default.nix+4−6 pkgs/tools/misc/calamares-nixos-extensions/default.nix+30 pkgs/tools/misc/calamares/default.nix+52−14 pkgs/tools/misc/calamares/nixos-extensions-paths.patch+46 pkgs/tools/misc/calamares/nonroot.patch+105 pkgs/tools/misc/calamares/packagechooserq.patch+136 pkgs/tools/misc/calamares/partitions.patch+28 pkgs/tools/misc/calamares/uimod.patch+85 pkgs/tools/misc/calamares/unfreeq.patch+109 pkgs/tools/misc/calamares/userjob.patch+31 pkgs/tools/misc/chezmoi/default.nix+3−3 pkgs/tools/misc/cht.sh/default.nix+3−3 pkgs/tools/misc/cmdpack/default.nix+136 pkgs/tools/misc/dsq/default.nix+33−29 pkgs/tools/misc/fclones/default.nix+3−3 pkgs/tools/misc/fortune/default.nix+5 pkgs/tools/misc/geekbench/4.nix+41 pkgs/tools/misc/gosu/default.nix+2−2 pkgs/tools/misc/idutils/default.nix+2−2 pkgs/tools/misc/ikill/default.nix+23 pkgs/tools/misc/lookatme/default.nix−67 pkgs/tools/misc/lrzsz/default.nix+2 pkgs/tools/misc/lsd/default.nix+5−1 pkgs/tools/misc/man-db/default.nix+7−18 pkgs/tools/misc/mutagen/default.nix+6−6 pkgs/tools/misc/ncdu_2/c-import-order.patch−17 pkgs/tools/misc/ncdu_2/default.nix+3−7 pkgs/tools/misc/ntfy-sh/default.nix+3−3 pkgs/tools/misc/partition-manager/default.nix+5−5 pkgs/tools/misc/pferd/default.nix+2−2 pkgs/tools/misc/phoronix-test-suite/default.nix+2−2 pkgs/tools/misc/pouf/default.nix+5−3 pkgs/tools/misc/rpm-ostree/default.nix+2−2 pkgs/tools/misc/rust-motd/default.nix+5−3 pkgs/tools/misc/s6-portable-utils/default.nix+2−2 pkgs/tools/misc/sharedown/default.nix+2−2 pkgs/tools/misc/sharedown/yarn.lock+217−258 pkgs/tools/misc/sharedown/yarndeps.nix+204−260 pkgs/tools/misc/snapper/default.nix+2−2 pkgs/tools/misc/starship/default.nix+3−3 pkgs/tools/misc/swaglyrics/default.nix+30−8 pkgs/tools/misc/tlp/default.nix+1−1 pkgs/tools/misc/topgrade/default.nix+14−6 pkgs/tools/misc/wlc/default.nix+2−2 pkgs/tools/misc/yle-dl/default.nix+2−2 pkgs/tools/misc/you-get/default.nix+2−2 pkgs/tools/misc/yt-dlp/default.nix+4−2 pkgs/tools/misc/ytarchive/default.nix+10−4 pkgs/tools/misc/yubico-piv-tool/default.nix+13−4 pkgs/tools/misc/zellij/default.nix+3−3 pkgs/tools/networking/bore-cli/default.nix+14−4 pkgs/tools/networking/corerad/default.nix+3−3 pkgs/tools/networking/croc/default.nix+3−3 pkgs/tools/networking/curl/default.nix+6−5 pkgs/tools/networking/frp/default.nix+3−3 pkgs/tools/networking/globalprotect-openconnect/default.nix+2−2 pkgs/tools/networking/godns/default.nix+2−2 pkgs/tools/networking/gof5/default.nix+30 pkgs/tools/networking/magic-wormhole-rs/default.nix+2−2 pkgs/tools/networking/mqttui/default.nix+3−3 pkgs/tools/networking/networkmanager/l2tp/default.nix+2−2 pkgs/tools/networking/ntopng/default.nix+2−2 pkgs/tools/networking/ooniprobe-cli/default.nix+27 pkgs/tools/networking/philter/default.nix−32 pkgs/tools/networking/pssh/default.nix+7−4 pkgs/tools/networking/slirp4netns/default.nix+2−2 pkgs/tools/networking/sstp/default.nix+1−1 pkgs/tools/networking/termscp/default.nix+3−3 pkgs/tools/networking/tun2socks/default.nix+31 pkgs/tools/networking/urlwatch/default.nix+2−2 pkgs/tools/package-management/comma/default.nix+2−2 pkgs/tools/package-management/nix-eval-jobs/default.nix+2−2 pkgs/tools/package-management/nix/default.nix+3−3 pkgs/tools/package-management/packagekit/default.nix+2−10 pkgs/tools/security/adreaper/default.nix+33 pkgs/tools/security/bitwarden/default.nix+2−2 pkgs/tools/security/browserpass/default.nix+5−5 pkgs/tools/security/cosign/default.nix+3−3 pkgs/tools/security/cryptomator/default.nix+3−3 pkgs/tools/security/exploitdb/default.nix+2−2 pkgs/tools/security/fulcio/default.nix+26−16 pkgs/tools/security/gitleaks/default.nix+2−2 pkgs/tools/security/gopass/default.nix+3−3 pkgs/tools/security/grype/default.nix+3−3 pkgs/tools/security/jadx/default.nix+3−3 pkgs/tools/security/john/default.nix+17−7 pkgs/tools/security/jwt-cli/default.nix+3−3 pkgs/tools/security/libtpms/default.nix+2−2 pkgs/tools/security/metasploit/Gemfile+1−1 pkgs/tools/security/metasploit/Gemfile.lock+21−21 pkgs/tools/security/metasploit/default.nix+2−2 pkgs/tools/security/metasploit/gemset.nix+23−23 pkgs/tools/security/munge/default.nix+2−2 pkgs/tools/security/nmap/default.nix+6−18 pkgs/tools/security/oath-toolkit/update.sh+1−1 pkgs/tools/security/pass/extensions/otp.nix+3−3 pkgs/tools/security/plasma-pass/default.nix+2−2 pkgs/tools/security/rage/default.nix+15−6 pkgs/tools/security/sigma-cli/default.nix+4−3 pkgs/tools/security/step-cli/default.nix+3−3 pkgs/tools/security/tor/default.nix+9−5 pkgs/tools/security/vault/default.nix+3−3 pkgs/tools/security/vault/vault-bin.nix+6−6 pkgs/tools/security/wprecon/default.nix+8−4 pkgs/tools/security/yara/default.nix+2−2 pkgs/tools/system/envconsul/default.nix+13−8 pkgs/tools/system/freeipmi/default.nix+6−1 pkgs/tools/system/htop/default.nix+11−13 pkgs/tools/system/rocm-smi/default.nix+2−2 pkgs/tools/system/runitor/default.nix+52 pkgs/tools/system/s6-rc/default.nix+2−2 pkgs/tools/system/s6/default.nix+2−2 pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch+25 pkgs/tools/text/bashblog/default.nix+59 pkgs/tools/text/cmigemo/default.nix+2−2 pkgs/tools/text/groff/default.nix+10−2 pkgs/tools/text/gucci/default.nix+14−12 pkgs/tools/text/gucci/deps.nix−30 pkgs/tools/text/vale/default.nix+4−4 pkgs/tools/text/xml/xpf/default.nix−21 pkgs/tools/typesetting/tectonic/default.nix+6−5 pkgs/tools/virtualization/lxd-image-server/default.nix+3 pkgs/tools/virtualization/nixos-container/default.nix+21−1 pkgs/tools/virtualization/nixos-container/nixos-container.pl+24−10 pkgs/tools/wayland/swaysome/default.nix+3−3 pkgs/top-level/aliases.nix+21−7 pkgs/top-level/all-packages.nix+185−80 pkgs/top-level/config.nix+59 pkgs/top-level/coq-packages.nix+1 pkgs/top-level/linux-kernels.nix+18−11 pkgs/top-level/ocaml-packages.nix+14−61 pkgs/top-level/perl-packages.nix+33−2 pkgs/top-level/php-packages.nix+2 pkgs/top-level/python-aliases.nix+2 pkgs/top-level/python-packages.nix+91−7 pkgs/top-level/qt5-packages.nix−6 pkgs/top-level/release-haskell.nix+12−11 pkgs/top-level/release-lib.nix+1−1
.editorconfig+5
@@ -55,6 +55,11 @@ trim_trailing_whitespace = unset
5555[*.lock]
5656indent_size = unset
5757
58+# trailing whitespace is an actual syntax element of classic Markdown/
59+# CommonMark to enforce a line break
60+[*.md]
61+trim_trailing_whitespace = unset
62+
5863[eggs.nix]
5964trim_trailing_whitespace = unset
6065
.github/workflows/update-terraform-providers.yml+6−5
@@ -25,14 +25,15 @@ jobs:
2525 git commit -m "${{ steps.setup.outputs.title }}" providers.json
2626 popd
2727 - name: create PR
28− uses: peter-evans/create-pull-request@v3
28+ uses: peter-evans/create-pull-request@v4
2929 with:
3030 body: |
31− Automatic update of terraform providers.
31+ Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
3232
33− Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
34−
35− Check that all providers build with `@ofborg build terraform-full`
33+ Check that all providers build with:
34+ ```
35+ @ofborg build terraform-full
36+ ```
3637 branch: terraform-providers-update
3738 delete-branch: false
3839 labels: "2.status: work-in-progress"
doc/builders/fetchers.chapter.md+11−11
@@ -10,7 +10,7 @@ For those who develop and maintain fetchers, a similar problem arises with chang
1010
1111## `fetchurl` and `fetchzip` {#fetchurl}
1212
13−Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below.
13+Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of `fetchurl` is provided below.
1414
1515```nix
1616{ stdenv, fetchurl }:
@@ -24,9 +24,9 @@ stdenv.mkDerivation {
2424}
2525```
2626
27−The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
27+The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand, will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.
2828
29−`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
29+`fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example, it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.
3030
3131Most other fetchers return a directory rather than a single file.
3232
@@ -38,9 +38,9 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha25
3838
3939Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`.
4040
41−Additionally the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.
41+Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.
4242
43−If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more infomation:
43+If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information:
4444
4545```nix
4646{ stdenv, fetchgit }:
@@ -78,17 +78,17 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m
7878
7979## `fetchFromGitHub` {#fetchfromgithub}
8080
81−`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred.
81+`fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available, but `sha256` is currently preferred.
8282
8383`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options.
8484
8585## `fetchFromGitLab` {#fetchfromgitlab}
8686
87−This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above.
87+This is used with GitLab repositories. The arguments expected are very similar to `fetchFromGitHub` above.
8888
8989## `fetchFromGitiles` {#fetchfromgitiles}
9090
91−This is used with Gitiles repositories. The arguments expected are similar to fetchgit.
91+This is used with Gitiles repositories. The arguments expected are similar to `fetchgit`.
9292
9393## `fetchFromBitbucket` {#fetchfrombitbucket}
9494
@@ -96,11 +96,11 @@ This is used with BitBucket repositories. The arguments expected are very simila
9696
9797## `fetchFromSavannah` {#fetchfromsavannah}
9898
99−This is used with Savannah repositories. The arguments expected are very similar to fetchFromGitHub above.
99+This is used with Savannah repositories. The arguments expected are very similar to `fetchFromGitHub` above.
100100
101101## `fetchFromRepoOrCz` {#fetchfromrepoorcz}
102102
103−This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above.
103+This is used with repo.or.cz repositories. The arguments expected are very similar to `fetchFromGitHub` above.
104104
105105## `fetchFromSourcehut` {#fetchfromsourcehut}
106106
@@ -111,4 +111,4 @@ or "hg"), `domain` and `fetchSubmodules`.
111111
112112If `fetchSubmodules` is `true`, `fetchFromSourcehut` uses `fetchgit`
113113or `fetchhg` with `fetchSubmodules` or `fetchSubrepos` set to `true`,
114−respectively. Otherwise the fetcher uses `fetchzip`.
114+respectively. Otherwise, the fetcher uses `fetchzip`.
doc/builders/images/dockertools.section.md+8−8
@@ -58,7 +58,7 @@ After the new layer has been created, its closure (to which `contents`, `config`
5858
5959At the end of the process, only one new single layer will be produced and added to the resulting image.
6060
61−The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage) it would be `redis/latest`.
61+The resulting repository will only list the single image `image/tag`. In the case of [the `buildImage` example](#ex-dockerTools-buildImage), it would be `redis/latest`.
6262
6363It is possible to inspect the arguments with which an image was built using its `buildArgs` attribute.
6464
@@ -87,7 +87,7 @@ pkgs.dockerTools.buildImage {
8787}
8888```
8989
90−and now the Docker CLI will display a reasonable date and sort the images as expected:
90+Now the Docker CLI will display a reasonable date and sort the images as expected:
9191
9292```ShellSession
9393$ docker images
@@ -95,7 +95,7 @@ REPOSITORY TAG IMAGE ID CREATED SIZE
9595hello latest de2bf4786de6 About a minute ago 25.2MB
9696```
9797
98−however, the produced images will not be binary reproducible.
98+However, the produced images will not be binary reproducible.
9999
100100## buildLayeredImage {#ssec-pkgs-dockerTools-buildLayeredImage}
101101
@@ -119,13 +119,13 @@ Create a Docker image with many of the store paths being on their own layer to i
119119
120120`contents` _optional_
121121
122−: Top level paths in the container. Either a single derivation, or a list of derivations.
122+: Top-level paths in the container. Either a single derivation, or a list of derivations.
123123
124124 *Default:* `[]`
125125
126126`config` _optional_
127127
128−: Run-time configuration of the container. A full list of the options are available at in the [ Docker Image Specification v1.2.0 ](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
128+: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions).
129129
130130 *Default:* `{}`
131131
@@ -195,9 +195,9 @@ pkgs.dockerTools.buildLayeredImage {
195195
196196Increasing the `maxLayers` increases the number of layers which have a chance to be shared between different images.
197197
198−Modern Docker installations support up to 128 layers, however older versions support as few as 42.
198+Modern Docker installations support up to 128 layers, but older versions support as few as 42.
199199
200−If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further.
200+If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However, it will be impossible to extend the image further.
201201
202202The first (`maxLayers-2`) most "popular" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining "unpopular" paths, and finally layer \#`maxLayers` will contain the Image configuration.
203203
@@ -213,7 +213,7 @@ The image produced by running the output script can be piped directly into `dock
213213$(nix-build) | docker load
214214```
215215
216−Alternatively, the image be piped via `gzip` into `skopeo`, e.g. to copy it into a registry:
216+Alternatively, the image be piped via `gzip` into `skopeo`, e.g., to copy it into a registry:
217217
218218```ShellSession
219219$(nix-build) | gzip --fast | skopeo copy docker-archive:/dev/stdin docker://some_docker_registry/myimage:tag
doc/builders/images/ocitools.section.md+3−3
@@ -1,10 +1,10 @@
11# pkgs.ociTools {#sec-pkgs-ociTools}
22
3−`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that it makes no assumptions about the container runner you choose to use to run the created container.
3+`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container.
44
55## buildContainer {#ssec-pkgs-ociTools-buildContainer}
66
7−This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory.The nix store of the container will contain all referenced dependencies of the given command.
7+This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command.
88
99The parameters of `buildContainer` with an example value are described below:
1010
@@ -30,7 +30,7 @@ buildContainer {
3030}
3131```
3232
33−- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container
33+- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container.
3434
3535- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs)
3636
doc/builders/images/snaptools.section.md+1−1
@@ -33,7 +33,7 @@ in snapTools.makeSnap {
3333
3434## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox}
3535
36−Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package.
36+Graphical programs require many more integrations with the host. This example uses Firefox as an example because it is one of the most complicated programs we could package.
3737
3838``` {#ex-snapTools-buildSnap-firefox .nix}
3939let
doc/builders/packages/citrix.section.md+5−5
@@ -4,13 +4,13 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a
44
55## Basic usage {#sec-citrix-base}
66
7−The tarball archive needs to be downloaded manually as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store the package can be built and installed with Nix.
7+The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix.
88
9−## Citrix Selfservice {#sec-citrix-selfservice}
9+## Citrix Self-service {#sec-citrix-selfservice}
1010
11−The [selfservice](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
11+The [self-service](https://support.citrix.com/article/CTX200337) is an application managing Citrix desktops and applications. Please note that this feature only works with at least citrix_workspace_20_06_0 and later versions.
1212
13−In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that you can configure the `selfservice` like this:
13+In order to set this up, you first have to [download the `.cr` file from the Netscaler Gateway](https://its.uiowa.edu/support/article/102186). After that, you can configure the `selfservice` like this:
1414
1515```ShellSession
1616$ storebrowse -C ~/Downloads/receiverconfig.cr
@@ -19,7 +19,7 @@ $ selfservice
1919
2020## Custom certificates {#sec-citrix-custom-certs}
2121
22−The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However several companies using Citrix might require their own corporate certificate. On distros with imperative packaging these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
22+The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`:
2323
2424```nix
2525with import <nixpkgs> { config.allowUnfree = true; };
doc/builders/packages/eclipse.section.md+5−5
@@ -8,9 +8,9 @@ Nixpkgs provides a number of packages that will install Eclipse in its various f
88$ nix-env -f '<nixpkgs>' -qaP -A eclipses --description
99```
1010
11−Once an Eclipse variant is installed it can be run using the `eclipse` command, as expected. From within Eclipse it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
11+Once an Eclipse variant is installed, it can be run using the `eclipse` command, as expected. From within Eclipse, it is then possible to install plugins in the usual manner by either manually specifying an Eclipse update site or by installing the Marketplace Client plugin and using it to discover and install other plugins. This installation method provides an Eclipse installation that closely resemble a manually installed Eclipse.
1212
13−If you prefer to install plugins in a more declarative manner then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add
13+If you prefer to install plugins in a more declarative manner, then Nixpkgs also offer a number of Eclipse plugins that can be installed in an _Eclipse environment_. This type of environment is created using the function `eclipseWithPlugins` found inside the `nixpkgs.eclipses` attribute set. This function takes as argument `{ eclipse, plugins ? [], jvmArgs ? [] }` where `eclipse` is a one of the Eclipse packages described above, `plugins` is a list of plugin derivations, and `jvmArgs` is a list of arguments given to the JVM running the Eclipse. For example, say you wish to install the latest Eclipse Platform with the popular Eclipse Color Theme plugin and also allow Eclipse to use more RAM. You could then add:
1414
1515```nix
1616packageOverrides = pkgs: {
@@ -22,15 +22,15 @@ packageOverrides = pkgs: {
2222}
2323```
2424
25−to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running
25+to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by running `nix-env -f '<nixpkgs>' -iA myEclipse` and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation using `eclipseWithPlugins` by running:
2626
2727```ShellSession
2828$ nix-env -f '<nixpkgs>' -qaP -A eclipses.plugins --description
2929```
3030
31−If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
31+If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively.
3232
33−Expanding the previous example with two plugins using the above functions we have
33+Expanding the previous example with two plugins using the above functions, we have:
3434
3535```nix
3636packageOverrides = pkgs: {
doc/builders/packages/elm.section.md+1−1
@@ -1,6 +1,6 @@
11# Elm {#sec-elm}
22
3−To start a development environment do
3+To start a development environment, run:
44
55```ShellSession
66nix-shell -p elmPackages.elm elmPackages.elm-format
doc/builders/packages/emacs.section.md+3−3
@@ -20,7 +20,7 @@ The Emacs package comes with some extra helpers to make it easier to configure.
2020}
2121```
2222
23−You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provide a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
23+You can install it like any other packages via `nix-env -iA myEmacs`. However, this will only install those packages. It will not `configure` them for us. To do this, we need to provide a configuration file. Luckily, it is possible to do this from within Nix! By modifying the above example, we can make Emacs load a custom config file. The key is to create a package that provides a `default.el` file in `/share/emacs/site-start/`. Emacs knows to load this file automatically when it starts.
2424
2525```nix
2626{
@@ -101,9 +101,9 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
101101}
102102```
103103
104−This provides a fairly full Emacs start file. It will load in addition to the user's presonal config. You can always disable it by passing `-q` to the Emacs command.
104+This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
105105
106−Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control this priorities when some package is installed as a dependency. You can override it on per-package-basis, providing all the required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use `overrideScope'`.
106+Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope'`.
107107
108108```nix
109109overrides = self: super: rec {
doc/builders/packages/etc-files.section.md+4−4
@@ -1,10 +1,10 @@
11# /etc files {#etc}
22
3−Certain calls in glibc require access to runtime files found in /etc such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.
3+Certain calls in glibc require access to runtime files found in `/etc` such as `/etc/protocols` or `/etc/services` -- [getprotobyname](https://linux.die.net/man/3/getprotobyname) is one such function.
44
5−On non-NixOS distributions these files are typically provided by packages (i.e. [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.
5+On non-NixOS distributions these files are typically provided by packages (i.e., [netbase](https://packages.debian.org/sid/netbase)) if not already pre-installed in your distribution. This can cause non-reproducibility for code if they rely on these files being present.
66
7−If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your _buildInputs_ then it will set the environment varaibles `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a _setup-hook_.
7+If [iana-etc](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.iana-etc.x86_64-linux) is part of your `buildInputs`, then it will set the environment variables `NIX_ETC_PROTOCOLS` and `NIX_ETC_SERVICES` to the corresponding files in the package through a setup hook.
88
99
1010```bash
@@ -15,4 +15,4 @@ NIX_ETC_SERVICES=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/e
1515NIX_ETC_PROTOCOLS=/nix/store/aj866hr8fad8flnggwdhrldm0g799ccz-iana-etc-20210225/etc/protocols
1616```
1717
18−Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variable are *not set*, then it will attempt to find the files at the default location within _/etc_.
18+Nixpkg's version of [glibc](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/default.nix) has been patched to check for the existence of these environment variables. If the environment variables are *not* set, then it will attempt to find the files at the default location within `/etc`.
doc/builders/packages/firefox.section.md+7−8
@@ -2,7 +2,7 @@
22
33## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies}
44
5−The `wrapFirefox` function allows to pass policies, preferences and extension that are available to Firefox. With the help of `fetchFirefoxAddon` this allows build a Firefox version that already comes with addons pre-installed:
5+The `wrapFirefox` function allows to pass policies, preferences and extensions that are available to Firefox. With the help of `fetchFirefoxAddon` this allows to build a Firefox version that already comes with add-ons pre-installed:
66
77```nix
88{
@@ -40,13 +40,12 @@ The `wrapFirefox` function allows to pass policies, preferences and extension th
4040}
4141```
4242
43−If `nixExtensions != null` then all manually installed addons will be uninstalled from your browser profile.
44−To view available enterprise policies visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
45−or type into the Firefox url bar: `about:policies#documentation`.
46−Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings.
43+If `nixExtensions != null`, then all manually installed add-ons will be uninstalled from your browser profile.
44+To view available enterprise policies, visit [enterprise policies](https://github.com/mozilla/policy-templates#enterprisepoliciesenabled)
45+or type into the Firefox URL bar: `about:policies#documentation`.
46+Nix installed add-ons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded add-ons are checksummed and manual add-ons can't be installed. Also, make sure that the `name` field of `fetchFirefoxAddon` is unique. If you remove an add-on from the `nixExtensions` array, rebuild and start Firefox: the removed add-on will be completely removed with all of its settings.
4747
4848## Troubleshooting {#sec-firefox-troubleshooting}
49−If addons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for addons thus nix addons get disabled by the normal Firefox binary.
50−
51−If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode.
49+If add-ons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for add-ons thus nix add-ons get disabled by the normal Firefox binary.
5250
51+If add-ons do not appear installed despite being defined in your nix configuration file, reset the local add-on state of your Firefox profile by clicking `Help -> More Troubleshooting Information -> Refresh Firefox`. This can happen if you switch from manual add-on mode to nix add-on mode and then back to manual mode and then again to nix add-on mode.
doc/builders/packages/fish.section.md+1−1
@@ -36,7 +36,7 @@ using `buildFishPlugin` and running unit tests with the `fishtape` test runner.
3636## Fish wrapper {#sec-fish-wrapper}
3737
3838The `wrapFish` package is a wrapper around Fish which can be used to create
39−Fish shells initialised with some plugins as well as completions, configuration
39+Fish shells initialized with some plugins as well as completions, configuration
4040snippets and functions sourced from the given paths. This provides a convenient
4141way to test Fish plugins and scripts without having to alter the environment.
4242
doc/builders/packages/fuse.section.md+2−2
@@ -24,10 +24,10 @@ packages on macOS:
2424 checking for fuse.h... no
2525 configure: error: No fuse.h found.
2626
27−This happens on autoconf based projects that uses `AC_CHECK_HEADERS` or
27+This happens on autoconf based projects that use `AC_CHECK_HEADERS` or
2828`AC_CHECK_LIBS` to detect libfuse, and will occur even when the `fuse` package
2929is included in `buildInputs`. It happens because libfuse headers throw an error
30−on macOS if the `FUSE_USE_VERSION` macro is undefined. Many proejcts do define
30+on macOS if the `FUSE_USE_VERSION` macro is undefined. Many projects do define
3131`FUSE_USE_VERSION`, but only inside C source files. This results in the above
3232error at configure time because the configure script would attempt to compile
3333sample FUSE programs without defining `FUSE_USE_VERSION`.
doc/builders/packages/ibus.section.md+3−3
@@ -6,7 +6,7 @@ This package is an ibus-based completion method to speed up typing.
66
77IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html).
88
9−On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
9+On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module:
1010
1111```nix
1212{ pkgs, ... }: {
@@ -19,7 +19,7 @@ On NixOS you need to explicitly enable `ibus` with given engines before customiz
1919
2020## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell}
2121
22−The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
22+The IBus engine is based on `hunspell` to support completion in many languages. By default, the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this:
2323
2424```nix
2525ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; }
@@ -31,7 +31,7 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe
3131
3232The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
3333
34−On NixOS it can be installed using the following expression:
34+On NixOS, it can be installed using the following expression:
3535
3636```nix
3737{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; }
doc/builders/packages/linux.section.md+7−7
@@ -4,7 +4,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke
44
55The function that builds the kernel has an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).
66
7−The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e. has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
7+The kernel derivation exports an attribute `features` specifying whether optional functionality is or isn’t enabled. This is used in NixOS to implement kernel-specific behaviour. For instance, if the kernel has the `iwlwifi` feature (i.e., has built-in support for Intel wireless chipsets), then NixOS doesn’t have to build the external `iwlwifi` package:
88
99```nix
1010modulesTree = [kernel]
@@ -14,19 +14,19 @@ modulesTree = [kernel]
1414
1515How to add a new (major) version of the Linux kernel to Nixpkgs:
1616
17−1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it.
17+1. Copy the old Nix expression (e.g., `linux-2.6.21.nix`) to the new one (e.g., `linux-2.6.22.nix`) and update it.
1818
19192. Add the new kernel to the `kernels` attribute set in `linux-kernels.nix` (e.g., create an attribute `kernel_2_6_22`).
2020
21213. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following:
2222
23− 1. Make an copy from the old config (e.g. `config-2.6.21-i686-smp`) to the new one (e.g. `config-2.6.22-i686-smp`).
23+ 1. Make a copy from the old config (e.g., `config-2.6.21-i686-smp`) to the new one (e.g., `config-2.6.22-i686-smp`).
2424
25− 2. Copy the config file for this platform (e.g. `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
25+ 2. Copy the config file for this platform (e.g., `config-2.6.22-i686-smp`) to `.config` in the kernel source tree.
2626
27− 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e. don’t enable some feature on `i686` and disable it on `x86_64`).
27+ 3. Run `make oldconfig ARCH={i386,x86_64,um}` and answer all questions. (For the uml configuration, also add `SHELL=bash`.) Make sure to keep the configuration consistent between platforms (i.e., don’t enable some feature on `i686` and disable it on `x86_64`).
2828
29− 4. If needed you can also run `make menuconfig`:
29+ 4. If needed, you can also run `make menuconfig`:
3030
3131 ```ShellSession
3232 $ nix-env -f "<nixpkgs>" -iA ncurses
@@ -34,7 +34,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs:
3434 $ make menuconfig ARCH=arch
3535 ```
3636
37− 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`).
37+ 5. Copy `.config` over the new config file (e.g., `config-2.6.22-i686-smp`).
3838
39394. Test building the kernel: `nix-build -A linuxKernel.kernels.kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it.
4040
doc/builders/packages/locales.section.md+2−2
@@ -1,5 +1,5 @@
11# Locales {#locales}
22
3−To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
3+To allow simultaneous use of packages linked against different versions of `glibc` with different locale archive formats, Nixpkgs patches `glibc` to rely on `LOCALE_ARCHIVE` environment variable.
44
5−On non-NixOS distributions this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
5+On non-NixOS distributions, this variable is obviously not set. This can cause regressions in language support or even crashes in some Nixpkgs-provided programs. The simplest way to mitigate this problem is exporting the `LOCALE_ARCHIVE` variable pointing to `${glibcLocales}/lib/locale/locale-archive`. The drawback (and the reason this is not the default) is the relatively large (a hundred MiB) size of the full set of locales. It is possible to build a custom set of locales by overriding parameters `allLocales` and `locales` of the package.
doc/builders/packages/nginx.section.md+2−2
@@ -4,8 +4,8 @@
44
55## ETags on static files served from the Nix store {#sec-nginx-etag}
66
7−HTTP has a couple different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store, because all file timestamps are set to 0 (for reasons related to build reproducibility).
7+HTTP has a couple of different mechanisms for caching to prevent clients from having to download the same content repeatedly if a resource has not changed since the last time it was requested. When nginx is used as a server for static files, it implements the caching mechanism based on the [`Last-Modified`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified) response header automatically; unfortunately, it works by using filesystem timestamps to determine the value of the `Last-Modified` header. This doesn't give the desired behavior when the file is in the Nix store because all file timestamps are set to 0 (for reasons related to build reproducibility).
88
9−Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g. a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
9+Fortunately, HTTP supports an alternative (and more effective) caching mechanism: the [`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) response header. The value of the `ETag` header specifies some identifier for the particular content that the server is sending (e.g., a hash). When a client makes a second request for the same resource, it sends that value back in an `If-None-Match` header. If the ETag value is unchanged, then the server does not need to resend the content.
1010
1111As of NixOS 19.09, the nginx package in Nixpkgs is patched such that when nginx serves a file out of `/nix/store`, the hash in the store path is used as the `ETag` header in the HTTP response, thus providing proper caching functionality. This happens automatically; you do not need to do modify any configuration to get this behavior.
doc/builders/packages/opengl.section.md+1−1
@@ -12,4 +12,4 @@ The NixOS desktop or other non-headless configurations are the primary target fo
1212
1313If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.
1414
15−For proprietary video drivers you might have luck with also adding the corresponding video driver package.
15+For proprietary video drivers, you might have luck with also adding the corresponding video driver package.
doc/builders/packages/shell-helpers.section.md+1−1
@@ -4,7 +4,7 @@ Some packages provide the shell integration to be more useful. But unlike other
44
55- `fzf` : `fzf-share`
66
7−E.g. `fzf` can then used in the `.bashrc` like this:
7+E.g. `fzf` can then be used in the `.bashrc` like this:
88
99```bash
1010source "$(fzf-share)/completion.bash"
doc/builders/packages/steam.section.md+8−8
@@ -2,20 +2,20 @@
22
33## Steam in Nix {#sec-steam-nix}
44
5−Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in \$HOME.
5+Steam is distributed as a `.deb` file, for now only as an i686 package (the amd64 package only has documentation). When unpacked, it has a script called `steam` that in Ubuntu (their target distro) would go to `/usr/bin`. When run for the first time, this script copies some files to the user's home, which include another script that is the ultimate responsible for launching the steam binary, which is also in `$HOME`.
66
77Nix problems and constraints:
88
9−- We don't have `/bin/bash` and many scripts point there. Similarly for `/usr/bin/python`.
9+- We don't have `/bin/bash` and many scripts point there. Same thing for `/usr/bin/python`.
1010- We don't have the dynamic loader in `/lib`.
11−- The `steam.sh` script in \$HOME can not be patched, as it is checked and rewritten by steam.
11+- The `steam.sh` script in `$HOME` cannot be patched, as it is checked and rewritten by steam.
1212- The steam binary cannot be patched, it's also checked.
1313
1414The current approach to deploy Steam in NixOS is composing a FHS-compatible chroot environment, as documented [here](http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html). This allows us to have binaries in the expected paths without disrupting the system, and to avoid patching them to work in a non FHS environment.
1515
1616## How to play {#sec-steam-play}
1717
18−Use `programs.steam.enable = true;` if you want to add steam to systemPackages and also enable a few workarrounds aswell as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pr.
18+Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` and also enable a few workarounds as well as Steam controller support or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro Controller.
1919
2020## Troubleshooting {#sec-steam-troub}
2121
@@ -32,7 +32,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a
3232- **Using the FOSS Radeon or nouveau (nvidia) drivers**
3333
3434 - The `newStdcpp` parameter was removed since NixOS 17.09 and should not be needed anymore.
35− - Steam ships statically linked with a version of libcrypto that conflics with the one dynamically loaded by radeonsi_dri.so. If you get the error
35+ - Steam ships statically linked with a version of `libcrypto` that conflicts with the one dynamically loaded by radeonsi_dri.so. If you get the error:
3636
3737 ```
3838 steam.sh: line 713: 7842 Segmentation fault (core dumped)
@@ -42,13 +42,13 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a
4242
4343- **Java**
4444
45− 1. There is no java in steam chrootenv by default. If you get a message like
45+ 1. There is no java in steam chrootenv by default. If you get a message like:
4646
4747 ```
4848 /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
4949 ```
5050
51− you need to add
51+ you need to add:
5252
5353 ```nix
5454 steam.override { withJava = true; };
@@ -56,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a
5656
5757## steam-run {#sec-steam-run}
5858
59−The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with
59+The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with:
6060
6161```
6262steam-run ./foo
doc/builders/packages/urxvt.section.md+4−4
@@ -4,7 +4,7 @@ Urxvt, also known as rxvt-unicode, is a highly customizable terminal emulator.
44
55## Configuring urxvt {#sec-urxvt-conf}
66
7−In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as
7+In `nixpkgs`, urxvt is provided by the package `rxvt-unicode`. It can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as:
88
99```nix
1010rxvt-unicode.override {
@@ -58,14 +58,14 @@ rxvt-unicode.override {
5858
5959## Packaging urxvt plugins {#sec-urxvt-pkg}
6060
61−Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
61+Urxvt plugins resides in `pkgs/applications/misc/rxvt-unicode-plugins`. To add a new plugin, create an expression in a subdirectory and add the package to the set in `pkgs/applications/misc/rxvt-unicode-plugins/default.nix`.
6262
6363A plugin can be any kind of derivation, the only requirement is that it should always install perl scripts in `$out/lib/urxvt/perl`. Look for existing plugins for examples.
6464
65−If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough:
65+If the plugin is itself a Perl package that needs to be imported from other plugins or scripts, add the following passthrough:
6666
6767```nix
6868passthru.perlPackages = [ "self" ];
6969```
7070
71−This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly.
71+This will make the urxvt wrapper pick up the dependency and set up the Perl path accordingly.
doc/builders/packages/weechat.section.md+5−5
@@ -1,6 +1,6 @@
1−# Weechat {#sec-weechat}
1+# WeeChat {#sec-weechat}
22
3−Weechat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration such as
3+WeeChat can be configured to include your choice of plugins, reducing its closure size from the default configuration which includes all available plugins. To make use of this functionality, install an expression that overrides its configuration, such as:
44
55```nix
66weechat.override {configure = {availablePlugins, ...}: {
@@ -13,7 +13,7 @@ If the `configure` function returns an attrset without the `plugins` attribute,
1313
1414The plugins currently available are `python`, `perl`, `ruby`, `guile`, `tcl` and `lua`.
1515
16−The python and perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
16+The Python and Perl plugins allows the addition of extra libraries. For instance, the `inotify.py` script in `weechat-scripts` requires D-Bus or libnotify, and the `fish.py` script requires `pycrypto`. To use these scripts, use the plugin's `withPackages` attribute:
1717
1818```nix
1919weechat.override { configure = {availablePlugins, ...}: {
@@ -49,7 +49,7 @@ weechat.override {
4949
5050Further values can be added to the list of commands when running `weechat --run-command "your-commands"`.
5151
52−Additionally it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:
52+Additionally, it's possible to specify scripts to be loaded when starting `weechat`. These will be loaded before the commands from `init`:
5353
5454```nix
5555weechat.override {
@@ -64,7 +64,7 @@ weechat.override {
6464}
6565```
6666
67−In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute which contains a list of all scripts inside the store path. Furthermore all scripts have to live in `$out/share`. An exemplary derivation looks like this:
67+In `nixpkgs` there's a subpackage which contains derivations for WeeChat scripts. Such derivations expect a `passthru.scripts` attribute, which contains a list of all scripts inside the store path. Furthermore, all scripts have to live in `$out/share`. An exemplary derivation looks like this:
6868
6969```nix
7070{ stdenv, fetchurl }:
doc/builders/trivial-builders.chapter.md+3−3
@@ -35,10 +35,10 @@ This works just like `runCommand`. The only difference is that it also provides
3535
3636## `runCommandLocal` {#trivial-builder-runCommandLocal}
3737
38−Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
38+Variant of `runCommand` that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network round-trip and can speed up a build.
3939
4040::: {.note}
41−This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the `system` is usually the same as `builtins.currentSystem`.
41+This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr-allowSubstitutes), so only use `runCommandLocal` if you are certain the user will always have a builder for the `system` of the derivation. This should be true for most trivial use cases (e.g., just copying some files to a different location or adding symlinks) because there the `system` is usually the same as `builtins.currentSystem`.
4242:::
4343
4444## `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin` {#trivial-builder-writeText}
@@ -219,5 +219,5 @@ produces an output path `/nix/store/<hash>-runtime-references` containing
219219/nix/store/<hash>-hello-2.10
220220```
221221
222−but none of `hello`'s dependencies, because those are not referenced directly
222+but none of `hello`'s dependencies because those are not referenced directly
223223by `hi`'s output.
doc/contributing/submitting-changes.chapter.md+1−1
@@ -96,7 +96,7 @@ We use jbidwatcher as an example for a discontinued project here.
9696
97971. Have Nixpkgs checked out locally and up to date.
98981. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`
99−1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`
99+1. Remove the actual package including its directory, e.g. `git rm -rf pkgs/applications/misc/jbidwatcher`
1001001. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).
1011011. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)
102102
doc/stdenv/meta.chapter.md+34
@@ -175,6 +175,40 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For
175175
176176NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).
177177
178+Alternatively, you can specify other derivations as tests. You can make use of
179+the optional parameter to inject the correct package without
180+relying on non-local definitions, even in the presence of `overrideAttrs`.
181+Here that's `finalAttrs.finalPackage`, but you could choose a different name if
182+`finalAttrs` already exists in your scope.
183+
184+`(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the
185+definition of `tests` does not rely on the original `mypkg` or overrides it in
186+all places.
187+
188+```nix
189+# my-package/default.nix
190+{ stdenv, callPackage }:
191+stdenv.mkDerivation (finalAttrs: {
192+ # ...
193+ passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; };
194+})
195+```
196+
197+```nix
198+# my-package/example.nix
199+{ runCommand, lib, my-package, ... }:
200+runCommand "my-package-test" {
201+ nativeBuildInputs = [ my-package ];
202+ src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];
203+} ''
204+ my-package --help
205+ my-package <example.in >example.actual
206+ diff -U3 --color=auto example.expected example.actual
207+ mkdir $out
208+''
209+```
210+
211+
178212### `timeout` {#var-meta-timeout}
179213
180214A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`.
doc/stdenv/stdenv.chapter.md+54
@@ -317,6 +317,60 @@ The script will be usually run from the root of the Nixpkgs repository but you s
317317
318318For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.
319319
320+### Recursive attributes in `mkDerivation`
321+
322+If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example:
323+
324+```nix
325+mkDerivation (finalAttrs: {
326+ pname = "hello";
327+ withFeature = true;
328+ configureFlags =
329+ lib.optionals finalAttrs.withFeature ["--with-feature"];
330+})
331+```
332+
333+Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`.
334+The `rec` keyword works at the syntax level and is unaware of overriding.
335+
336+Instead, the definition references `finalAttrs`, allowing users to change `withFeature`
337+consistently with `overrideAttrs`.
338+
339+`finalAttrs` also contains the attribute `finalPackage`, which includes the output paths, etc.
340+
341+Let's look at a more elaborate example to understand the differences between
342+various bindings:
343+
344+```nix
345+# `pkg` is the _original_ definition (for illustration purposes)
346+let pkg =
347+ mkDerivation (finalAttrs: {
348+ # ...
349+
350+ # An example attribute
351+ packages = [];
352+
353+ # `passthru.tests` is a commonly defined attribute.
354+ passthru.tests.simple = f finalAttrs.finalPackage;
355+
356+ # An example of an attribute containing a function
357+ passthru.appendPackages = packages':
358+ finalAttrs.finalPackage.overrideAttrs (newSelf: super: {
359+ packages = super.packages ++ packages';
360+ });
361+
362+ # For illustration purposes; referenced as
363+ # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.
364+ passthru.finalAttrs = finalAttrs;
365+ passthru.original = pkg;
366+ });
367+in pkg
368+```
369+
370+Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`.
371+
372+See also the section about [`passthru.tests`](#var-meta-tests).
373+
320374## Phases {#sec-stdenv-phases}
321375
322376`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder.
doc/using/overrides.chapter.md+6−2
@@ -39,14 +39,18 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st
3939Example usage:
4040
4141```nix
42−helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
42+helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {
4343 separateDebugInfo = true;
4444});
4545```
4646
4747In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.
4848
49−The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
49+The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.
50+
51+The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `finalPackage` attribute which is equal to the result of `mkDerivation` or subsequent `overrideAttrs` calls.
52+
53+If only a one-argument function is written, the argument has the meaning of `previousAttrs`.
5054
5155::: {.note}
5256Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).
lib/default.nix+7−2
@@ -11,6 +11,9 @@ let
1111 callLibs = file: import file { lib = self; };
1212 in {
1313
14+ # interacting with flakes
15+ flakes = callLibs ./flakes.nix;
16+
1417 # often used, or depending on very little
1518 trivial = callLibs ./trivial.nix;
1619 fixedPoints = callLibs ./fixed-points.nix;
@@ -59,6 +62,7 @@ let
5962 # linux kernel configuration
6063 kernel = callLibs ./kernel.nix;
6164
65+ inherit (self.flakes) callLocklessFlake;
6266 inherit (builtins) add addErrorContext attrNames concatLists
6367 deepSeq elem elemAt filter genericClosure genList getAttr
6468 hasAttr head isAttrs isBool isInt isList isString length
@@ -94,7 +98,8 @@ let
9498 concatImapStringsSep makeSearchPath makeSearchPathOutput
9599 makeLibraryPath makeBinPath optionalString
96100 hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
97− escapeShellArg escapeShellArgs escapeRegex escapeXML replaceChars lowerChars
101+ escapeShellArg escapeShellArgs isValidPosixName toShellVar toShellVars
102+ escapeRegex escapeXML replaceChars lowerChars
98103 upperChars toLower toUpper addContextFrom splitString
99104 removePrefix removeSuffix versionOlder versionAtLeast
100105 getName getVersion
@@ -108,7 +113,7 @@ let
108113 makeScope makeScopeWithSplicing;
109114 inherit (self.meta) addMetaAttrs dontDistribute setName updateName
110115 appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
111− hiPrioSet getLicenseFromSpdxId;
116+ hiPrioSet getLicenseFromSpdxId getExe;
112117 inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
113118 cleanSource sourceByRegex sourceFilesBySuffices
114119 commitIdFromGitRepo cleanSourceWith pathHasContext
lib/flakes.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib }:
2+
3+rec {
4+
5+ /* imports a flake.nix without acknowledging its lock file, useful for
6+ referencing subflakes from a parent flake. The second argument allows
7+ specifying the inputs of this flake.
8+
9+ Example:
10+ callLocklessFlake {
11+ path = ./directoryContainingFlake;
12+ inputs = { inherit nixpkgs; };
13+ }
14+ */
15+ callLocklessFlake = { path, inputs ? { } }:
16+ let
17+ self = { outPath = path; } //
18+ ((import (path + "/flake.nix")).outputs (inputs // { self = self; }));
19+ in
20+ self;
21+
22+}
lib/meta.nix+14
@@ -126,4 +126,18 @@ rec {
126126 lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}"
127127 { shortName = licstr; }
128128 );
129+
130+ /* Get the path to the main program of a derivation with either
131+ meta.mainProgram or pname or name
132+
133+ Type: getExe :: derivation -> string
134+
135+ Example:
136+ getExe pkgs.hello
137+ => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello"
138+ getExe pkgs.mustache-go
139+ => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
140+ */
141+ getExe = x:
142+ "${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
129143}
lib/modules.nix+4−1
@@ -160,7 +160,10 @@ rec {
160160 type = types.lazyAttrsOf types.raw;
161161 # Only render documentation once at the root of the option tree,
162162 # not for all individual submodules.
163− internal = prefix != [];
163+ # Allow merging option decls to make this internal regardless.
164+ ${if prefix == []
165+ then null # unset => visible
166+ else "internal"} = true;
164167 # TODO: Change the type of this option to a submodule with a
165168 # freeformType, so that individual arguments can be documented
166169 # separately
lib/strings.nix+61−1
@@ -17,6 +17,7 @@ rec {
1717 head
1818 isInt
1919 isList
20+ isAttrs
2021 isString
2122 match
2223 parseDrvName
@@ -253,7 +254,7 @@ rec {
253254 => false
254255 */
255256 hasInfix = infix: content:
256− builtins.match ".*${escapeRegex infix}.*" content != null;
257+ builtins.match ".*${escapeRegex infix}.*" "${content}" != null;
257258
258259 /* Convert a string to a list of characters (i.e. singleton strings).
259260 This allows you to, e.g., map a function over each character. However,
@@ -324,6 +325,65 @@ rec {
324325 */
325326 escapeShellArgs = concatMapStringsSep " " escapeShellArg;
326327
328+ /* Test whether the given name is a valid POSIX shell variable name.
329+
330+ Type: string -> bool
331+
332+ Example:
333+ isValidPosixName "foo_bar000"
334+ => true
335+ isValidPosixName "0-bad.jpg"
336+ => false
337+ */
338+ isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
339+
340+ /* Translate a Nix value into a shell variable declaration, with proper escaping.
341+
342+ Supported value types are strings (mapped to regular variables), lists of strings
343+ (mapped to Bash-style arrays) and attribute sets of strings (mapped to Bash-style
344+ associative arrays). Note that "strings" include string-coercible values like paths.
345+
346+ Strings are translated into POSIX sh-compatible code; lists and attribute sets
347+ assume a shell that understands Bash syntax (e.g. Bash or ZSH).
348+
349+ Type: string -> (string | listOf string | attrsOf string) -> string
350+
351+ Example:
352+ ''
353+ ${toShellVar "foo" "some string"}
354+ [[ "$foo" == "some string" ]]
355+ ''
356+ */
357+ toShellVar = name: value:
358+ lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
359+ if isAttrs value then
360+ "declare -A ${name}=(${
361+ concatStringsSep " " (lib.mapAttrsToList (n: v:
362+ "[${escapeShellArg n}]=${escapeShellArg v}"
363+ ) value)
364+ })"
365+ else if isList value then
366+ "declare -a ${name}=(${escapeShellArgs value})"
367+ else
368+ "${name}=${escapeShellArg value}"
369+ );
370+
371+ /* Translate an attribute set into corresponding shell variable declarations
372+ using `toShellVar`.
373+
374+ Type: attrsOf (string | listOf string | attrsOf string) -> string
375+
376+ Example:
377+ let
378+ foo = "value";
379+ bar = foo;
380+ in ''
381+ ${toShellVars { inherit foo bar; }}
382+ [[ "$foo" == "$bar" ]]
383+ ''
384+ */
385+ toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
386+
327387 /* Turn a string into a Nix expression representing that string
328388
329389 Type: string -> string
lib/systems/doubles.nix+2
@@ -74,6 +74,8 @@ in {
7474 mips = filterDoubles predicates.isMips;
7575 mmix = filterDoubles predicates.isMmix;
7676 riscv = filterDoubles predicates.isRiscV;
77+ riscv32 = filterDoubles predicates.isRiscV32;
78+ riscv64 = filterDoubles predicates.isRiscV64;
7779 vc4 = filterDoubles predicates.isVc4;
7880 or1k = filterDoubles predicates.isOr1k;
7981 m68k = filterDoubles predicates.isM68k;
lib/systems/inspect.nix+2
@@ -24,6 +24,8 @@ rec {
2424 isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; };
2525 isMmix = { cpu = { family = "mmix"; }; };
2626 isRiscV = { cpu = { family = "riscv"; }; };
27+ isRiscV32 = { cpu = { family = "riscv"; bits = 32; }; };
28+ isRiscV64 = { cpu = { family = "riscv"; bits = 64; }; };
2729 isSparc = { cpu = { family = "sparc"; }; };
2830 isWasm = { cpu = { family = "wasm"; }; };
2931 isMsp430 = { cpu = { family = "msp430"; }; };
lib/systems/platforms.nix+2−2
@@ -3,7 +3,7 @@
33# targetPlatform, etc) containing at least the minimal set of attrs
44# required (see types.parsedPlatform in lib/systems/parse.nix). This
55# file takes an already-valid platform and further elaborates it with
6−# optional fields such as linux-kernel, gcc, etc.
6+# optional fields; currently these are: linux-kernel, gcc, and rustc.
77
88{ lib }:
99rec {
@@ -568,5 +568,5 @@ rec {
568568
569569 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv
570570
571− else pc;
571+ else { };
572572}
lib/tests/flakes/subflakeTest/flake.nixnew file+8
@@ -0,0 +1,8 @@
1+{
2+ outputs = { self, subflake, callLocklessFlake }: rec {
3+ x = (callLocklessFlake {
4+ path = subflake;
5+ inputs = {};
6+ }).subflakeOutput;
7+ };
8+}
lib/tests/flakes/subflakeTest/subflake/flake.nixnew file+5
@@ -0,0 +1,5 @@
1+{
2+ outputs = { self }: {
3+ subflakeOutput = 1;
4+ };
5+}
lib/tests/misc.nix+59
@@ -22,6 +22,15 @@ in
2222
2323runTests {
2424
25+# FLAKES
26+
27+ testCallLocklessFlake = {
28+ expr = callLocklessFlake {
29+ path = ./flakes/subflakeTest;
30+ inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
31+ };
32+ expected = { x = 1; outPath = ./flakes/subflakeTest; };
33+ };
2534
2635# TRIVIAL
2736
@@ -251,6 +260,56 @@ runTests {
251260 expected = "&quot;test&quot; &apos;test&apos; &lt; &amp; &gt;";
252261 };
253262
263+ testToShellVars = {
264+ expr = ''
265+ ${toShellVars {
266+ STRing01 = "just a 'string'";
267+ _array_ = [ "with" "more strings" ];
268+ assoc."with some" = ''
269+ strings
270+ possibly newlines
271+ '';
272+ }}
273+ '';
274+ expected = ''
275+ STRing01='just a '\'''string'\''''
276+ declare -a _array_=('with' 'more strings')
277+ declare -A assoc=(['with some']='strings
278+ possibly newlines
279+ ')
280+ '';
281+ };
282+
283+ testHasInfixFalse = {
284+ expr = hasInfix "c" "abde";
285+ expected = false;
286+ };
287+
288+ testHasInfixTrue = {
289+ expr = hasInfix "c" "abcde";
290+ expected = true;
291+ };
292+
293+ testHasInfixDerivation = {
294+ expr = hasInfix "hello" (import ../.. { system = "x86_64-linux"; }).hello;
295+ expected = true;
296+ };
297+
298+ testHasInfixPath = {
299+ expr = hasInfix "tests" ./.;
300+ expected = true;
301+ };
302+
303+ testHasInfixPathStoreDir = {
304+ expr = hasInfix builtins.storeDir ./.;
305+ expected = true;
306+ };
307+
308+ testHasInfixToString = {
309+ expr = hasInfix "a" { __toString = _: "a"; };
310+ expected = true;
311+ };
312+
254313# LISTS
255314
256315 testFilter = {
lib/tests/systems.nix+3
@@ -19,6 +19,9 @@ with lib.systems.doubles; lib.runTests {
1919 testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
2020 testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
2121 testmmix = mseteq mmix [ "mmix-mmixware" ];
22+ testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
23+ testriscv32 = mseteq riscv32 [ "riscv32-linux" "riscv32-netbsd" "riscv32-none" ];
24+ testriscv64 = mseteq riscv64 [ "riscv64-linux" "riscv64-netbsd" "riscv64-none" ];
2225 testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
2326
2427 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
maintainers/maintainer-list.nix+108−12
@@ -525,6 +525,12 @@
525525 githubId = 38869148;
526526 name = "Alex Eyre";
527527 };
528+ algram = {
529+ email = "aliasgram@gmail.com";
530+ github = "Algram";
531+ githubId = 5053729;
532+ name = "Alias Gram";
533+ };
528534 alibabzo = {
529535 email = "alistair.bill@gmail.com";
530536 github = "alibabzo";
@@ -681,6 +687,12 @@
681687 github = "an-empty-string";
682688 githubId = 681716;
683689 };
690+ AnatolyPopov = {
691+ email = "aipopov@live.ru";
692+ github = "AnatolyPopov";
693+ githubId = 2312534;
694+ name = "Anatolii Popov";
695+ };
684696 andehen = {
685697 email = "git@andehen.net";
686698 github = "andehen";
@@ -829,6 +841,13 @@
829841 githubId = 5327697;
830842 name = "Anatolii Prylutskyi";
831843 };
844+ anselmschueler = {
845+ email = "mail@anselmschueler.com";
846+ github = "schuelermine";
847+ githubId = 48802534;
848+ name = "Anselm Schüler";
849+ matrix = "@schuelermine:matrix.org";
850+ };
832851 antoinerg = {
833852 email = "roygobeil.antoine@gmail.com";
834853 github = "antoinerg";
@@ -1390,6 +1409,12 @@
13901409 githubId = 164148;
13911410 name = "Ben Darwin";
13921411 };
1412+ bdd = {
1413+ email = "bdd@mindcast.org";
1414+ github = "bdd";
1415+ githubId = 11135;
1416+ name = "Berk D. Demir";
1417+ };
13931418 bdesham = {
13941419 email = "benjamin@esham.io";
13951420 github = "bdesham";
@@ -2061,6 +2086,12 @@
20612086 githubId = 8228888;
20622087 name = "Charlie Hanley";
20632088 };
2089+ charlesbaynham = {
2090+ email = "charlesbaynham@gmail.com";
2091+ github = "charlesbaynham";
2092+ githubId = 4397637;
2093+ name = "Charles Baynham";
2094+ };
20642095 CharlesHD = {
20652096 email = "charleshdespointes@gmail.com";
20662097 github = "CharlesHD";
@@ -2272,6 +2303,7 @@
22722303 fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215";
22732304 }];
22742305 name = "ckie";
2306+ matrix = "@ckie:ckie.dev";
22752307 };
22762308 clkamp = {
22772309 email = "c@lkamp.de";
@@ -4092,11 +4124,18 @@
40924124 matrix = "@felschr:matrix.org";
40934125 github = "felschr";
40944126 githubId = 3314323;
4095− name = "Felix Tenley";
4096− keys = [{
4097− longkeyid = "ed25519/0x910ACB9F6BD26F58";
4098− fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
4099− }];
4127+ name = "Felix Schröter";
4128+ keys = [
4129+ {
4130+ # historical
4131+ longkeyid = "ed25519/0x910ACB9F6BD26F58";
4132+ fingerprint = "6AB3 7A28 5420 9A41 82D9 0068 910A CB9F 6BD2 6F58";
4133+ }
4134+ {
4135+ longkeyid = "ed25519/0x671E39E6744C807D";
4136+ fingerprint = "7E08 6842 0934 AA1D 6821 1F2A 671E 39E6 744C 807D";
4137+ }
4138+ ];
41004139 };
41014140 ffinkdevs = {
41024141 email = "fink@h0st.space";
@@ -4715,6 +4754,12 @@
47154754 githubId = 201997;
47164755 name = "Eric Seidel";
47174756 };
4757+ grindhold = {
4758+ name = "grindhold";
4759+ email = "grindhold+nix@skarphed.org";
4760+ github = "grindhold";
4761+ githubId = 2592640;
4762+ };
47184763 gspia = {
47194764 email = "iahogsp@gmail.com";
47204765 github = "gspia";
@@ -5604,6 +5649,12 @@
56045649 githubId = 488556;
56055650 name = "Javier Aguirre";
56065651 };
5652+ jayesh-bhoot = {
5653+ name = "Jayesh Bhoot";
5654+ email = "jayesh@bhoot.sh";
5655+ github = "jayesh-bhoot";
5656+ githubId = 1915507;
5657+ };
56075658 jb55 = {
56085659 email = "jb55@jb55.com";
56095660 github = "jb55";
@@ -6834,12 +6885,6 @@
68346885 githubId = 99639;
68356886 name = "Pawel Kruszewski";
68366887 };
6837− ktosiek = {
6838− email = "tomasz.kontusz@gmail.com";
6839− github = "ktosiek";
6840− githubId = 278013;
6841− name = "Tomasz Kontusz";
6842− };
68436888 kubukoz = {
68446889 email = "kubukoz@gmail.com";
68456890 github = "kubukoz";
@@ -7173,6 +7218,13 @@
71737218 githubId = 1769386;
71747219 name = "Liam Diprose";
71757220 };
7221+ libjared = {
7222+ email = "jared@perrycode.com";
7223+ github = "libjared";
7224+ githubId = 3746656;
7225+ matrix = "@libjared:matrix.org";
7226+ name = "Jared Perry";
7227+ };
71767228 liff = {
71777229 email = "liff@iki.fi";
71787230 github = "liff";
@@ -11316,6 +11368,12 @@
1131611368 githubId = 307899;
1131711369 name = "Gurkan Gur";
1131811370 };
11371+ serge = {
11372+ email = "sb@canva.com";
11373+ github = "serge-belov";
11374+ githubId = 38824235;
11375+ name = "Serge Belov";
11376+ };
1131911377 sersorrel = {
1132011378 email = "ash@sorrel.sh";
1132111379 github = "sersorrel";
@@ -12005,6 +12063,12 @@
1200512063 githubId = 1694705;
1200612064 name = "Sam Stites";
1200712065 };
12066+ strager = {
12067+ email = "strager.nds@gmail.com";
12068+ github = "strager";
12069+ githubId = 48666;
12070+ name = "Matthew \"strager\" Glazar";
12071+ };
1200812072 stumoss = {
1200912073 email = "samoss@gmail.com";
1201012074 github = "stumoss";
@@ -12497,6 +12561,12 @@
1249712561 githubId = 844343;
1249812562 name = "Thiago K. Okada";
1249912563 };
12564+ thibaultlemaire = {
12565+ email = "thibault.lemaire@protonmail.com";
12566+ github = "ThibaultLemaire";
12567+ githubId = 21345269;
12568+ name = "Thibault Lemaire";
12569+ };
1250012570 thibautmarty = {
1250112571 email = "github@thibautmarty.fr";
1250212572 matrix = "@thibaut:thibautmarty.fr";
@@ -12743,6 +12813,13 @@
1274312813 githubId = 90456;
1274412814 name = "Rebecca (Bex) Kelly";
1274512815 };
12816+ tpw_rules = {
12817+ name = "Thomas Watson";
12818+ email = "twatson52@icloud.com";
12819+ matrix = "@tpw_rules:matrix.org";
12820+ github = "tpwrules";
12821+ githubId = 208010;
12822+ };
1274612823 travisbhartwell = {
1274712824 email = "nafai@travishartwell.net";
1274812825 github = "travisbhartwell";
@@ -13217,6 +13294,12 @@
1321713294 githubId = 1771332;
1321813295 name = "László Vaskó";
1321913296 };
13297+ vlinkz = {
13298+ email = "vmfuentes64@gmail.com";
13299+ github = "vlinkz";
13300+ githubId = 20145996;
13301+ name = "Victor Fuentes";
13302+ };
1322013303 vlstill = {
1322113304 email = "xstill@fi.muni.cz";
1322213305 github = "vlstill";
@@ -13509,7 +13592,7 @@
1350913592 name = "Andrei Pampu";
1351013593 };
1351113594 wolfangaukang = {
13512− email = "liquid.query960@4wrd.cc";
13595+ email = "clone.gleeful135+nixpkgs@anonaddy.me";
1351313596 github = "wolfangaukang";
1351413597 githubId = 8378365;
1351513598 name = "P. R. d. O.";
@@ -13562,6 +13645,13 @@
1356213645 github = "wunderbrick";
1356313646 githubId = 52174714;
1356413647 };
13648+ wyndon = {
13649+ email = "72203260+wyndon@users.noreply.github.com";
13650+ matrix = "@wyndon:envs.net";
13651+ github = "wyndon";
13652+ githubId = 72203260;
13653+ name = "wyndon";
13654+ };
1356513655 wyvie = {
1356613656 email = "elijahrum@gmail.com";
1356713657 github = "wyvie";
@@ -14121,6 +14211,12 @@
1412114211 github = "deifactor";
1412214212 githubId = 30192992;
1412314213 };
14214+ deinferno = {
14215+ name = "deinferno";
14216+ email = "14363193+deinferno@users.noreply.github.com";
14217+ github = "deinferno";
14218+ githubId = 14363193;
14219+ };
1412414220 fzakaria = {
1412514221 name = "Farid Zakaria";
1412614222 email = "farid.m.zakaria@gmail.com";
maintainers/scripts/luarocks-packages.csv+2−1
@@ -52,7 +52,7 @@ luadbi-postgresql,,,,,,
5252luadbi-sqlite3,,,,,,
5353luaepnf,,,,,,
5454luaevent,,,,,,
55−luaexpat,,,,1.3.0-1,,arobyn flosse
55+luaexpat,,,,1.4.1-1,,arobyn flosse
5656luaffi,,,http://luarocks.org/dev,,,
5757luafilesystem,,,,1.7.0-2,,flosse
5858lualogging,,,,,,
@@ -64,6 +64,7 @@ luasocket,,,,,,
6464luasql-sqlite3,,,,,,vyp
6565luassert,,,,,,
6666luasystem,,,,,,
67+luaunbound,,,,,
6768luautf8,,,,,,pstn
6869luazip,,,,,,
6970lua-yajl,,,,,,pstn
maintainers/scripts/pluginupdate.py+43−37
@@ -87,7 +87,8 @@ def make_request(url: str, token=None) -> urllib.request.Request:
8787 return urllib.request.Request(url, headers=headers)
8888
8989
90−Redirects = Dict['Repo', 'Repo']
90+# a dictionary of plugins and their new repositories
91+Redirects = Dict['PluginDesc', 'Repo']
9192
9293class Repo:
9394 def __init__(
@@ -96,8 +97,8 @@ class Repo:
9697 self.uri = uri
9798 '''Url to the repo'''
9899 self._branch = branch
99− # {old_uri: new_uri}
100− self.redirect: Redirects = {}
100+ # Redirect is the new Repo to use
101+ self.redirect: Optional['Repo'] = None
101102 self.token = "dummy_token"
102103
103104 @property
@@ -207,7 +208,7 @@ class RepoGitHub(Repo):
207208 )
208209
209210 new_repo = RepoGitHub(owner=new_owner, repo=new_name, branch=self.branch)
210− self.redirect[self] = new_repo
211+ self.redirect = new_repo
211212
212213
213214 def prefetch(self, commit: str) -> str:
@@ -237,7 +238,7 @@ class RepoGitHub(Repo):
237238 }}'''
238239
239240
240−@dataclass
241+@dataclass(frozen=True)
241242class PluginDesc:
242243 repo: Repo
243244 branch: str
@@ -310,6 +311,16 @@ def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[Plugin
310311
311312 return plugins
312313
314+def run_nix_expr(expr):
315+ with CleanEnvironment():
316+ cmd = ["nix", "eval", "--extra-experimental-features",
317+ "nix-command", "--impure", "--json", "--expr", expr]
318+ log.debug("Running command %s", cmd)
319+ out = subprocess.check_output(cmd)
320+ data = json.loads(out)
321+ return data
322+
323+
313324class Editor:
314325 """The configuration of the update script."""
315326
@@ -332,9 +343,15 @@ class Editor:
332343 self.deprecated = deprecated or root.joinpath("deprecated.json")
333344 self.cache_file = cache_file or f"{name}-plugin-cache.json"
334345
335− def get_current_plugins(self):
346+ def get_current_plugins(self) -> List[Plugin]:
336347 """To fill the cache"""
337− return get_current_plugins(self)
348+ data = run_nix_expr(self.get_plugins)
349+ plugins = []
350+ for name, attr in data.items():
351+ print("get_current_plugins: name %s" % name)
352+ p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
353+ plugins.append(p)
354+ return plugins
338355
339356 def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]:
340357 '''CSV spec'''
@@ -448,24 +465,10 @@ class CleanEnvironment(object):
448465 self.empty_config.close()
449466
450467
451−def get_current_plugins(editor: Editor) -> List[Plugin]:
452− with CleanEnvironment():
453− cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins]
454− log.debug("Running command %s", cmd)
455− out = subprocess.check_output(cmd)
456− data = json.loads(out)
457− plugins = []
458− for name, attr in data.items():
459− print("get_current_plugins: name %s" % name)
460− p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
461− plugins.append(p)
462− return plugins
463−
464−
465468def prefetch_plugin(
466469 p: PluginDesc,
467470 cache: "Optional[Cache]" = None,
468−) -> Tuple[Plugin, Redirects]:
471+) -> Tuple[Plugin, Optional[Repo]]:
469472 repo, branch, alias = p.repo, p.branch, p.alias
470473 name = alias or p.repo.name
471474 commit = None
@@ -479,7 +482,7 @@ def prefetch_plugin(
479482 return cached_plugin, repo.redirect
480483
481484 has_submodules = repo.has_submodules()
482− print(f"prefetch {name}")
485+ log.debug(f"prefetch {name}")
483486 sha256 = repo.prefetch(commit)
484487
485488 return (
@@ -488,7 +491,7 @@ def prefetch_plugin(
488491 )
489492
490493
491−def print_download_error(plugin: str, ex: Exception):
494+def print_download_error(plugin: PluginDesc, ex: Exception):
492495 print(f"{plugin}: {ex}", file=sys.stderr)
493496 ex_traceback = ex.__traceback__
494497 tb_lines = [
@@ -498,19 +501,21 @@ def print_download_error(plugin: str, ex: Exception):
498501 print("\n".join(tb_lines))
499502
500503def check_results(
501− results: List[Tuple[PluginDesc, Union[Exception, Plugin], Redirects]]
504+ results: List[Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]]
502505) -> Tuple[List[Tuple[PluginDesc, Plugin]], Redirects]:
503506 ''' '''
504− failures: List[Tuple[str, Exception]] = []
507+ failures: List[Tuple[PluginDesc, Exception]] = []
505508 plugins = []
506− # {old: new} plugindesc
507− redirects: Dict[Repo, Repo] = {}
509+ redirects: Redirects = {}
508510 for (pdesc, result, redirect) in results:
509511 if isinstance(result, Exception):
510− failures.append((pdesc.name, result))
512+ failures.append((pdesc, result))
511513 else:
512− plugins.append((pdesc, result))
513− redirects.update(redirect)
514+ new_pdesc = pdesc
515+ if redirect is not None:
516+ redirects.update({pdesc: redirect})
517+ new_pdesc = PluginDesc(redirect, pdesc.branch, pdesc.alias)
518+ plugins.append((new_pdesc, result))
514519
515520 print(f"{len(results) - len(failures)} plugins were checked", end="")
516521 if len(failures) == 0:
@@ -591,13 +596,13 @@ class Cache:
591596
592597def prefetch(
593598 pluginDesc: PluginDesc, cache: Cache
594−) -> Tuple[PluginDesc, Union[Exception, Plugin], dict]:
599+) -> Tuple[PluginDesc, Union[Exception, Plugin], Optional[Repo]]:
595600 try:
596601 plugin, redirect = prefetch_plugin(pluginDesc, cache)
597602 cache[plugin.commit] = plugin
598603 return (pluginDesc, plugin, redirect)
599604 except Exception as e:
600− return (pluginDesc, e, {})
605+ return (pluginDesc, e, None)
601606
602607
603608
@@ -606,7 +611,7 @@ def rewrite_input(
606611 input_file: Path,
607612 deprecated: Path,
608613 # old pluginDesc and the new
609− redirects: Dict[PluginDesc, PluginDesc] = {},
614+ redirects: Redirects = {},
610615 append: List[PluginDesc] = [],
611616):
612617 plugins = load_plugins_from_csv(config, input_file,)
@@ -618,9 +623,10 @@ def rewrite_input(
618623 cur_date_iso = datetime.now().strftime("%Y-%m-%d")
619624 with open(deprecated, "r") as f:
620625 deprecations = json.load(f)
621− for old, new in redirects.items():
622− old_plugin, _ = prefetch_plugin(old)
623− new_plugin, _ = prefetch_plugin(new)
626+ for pdesc, new_repo in redirects.items():
627+ new_pdesc = PluginDesc(new_repo, pdesc.branch, pdesc.alias)
628+ old_plugin, _ = prefetch_plugin(pdesc)
629+ new_plugin, _ = prefetch_plugin(new_pdesc)
624630 if old_plugin.normalized_name != new_plugin.normalized_name:
625631 deprecations[old_plugin.normalized_name] = {
626632 "new": new_plugin.normalized_name,
maintainers/team-list.nix+36
@@ -198,6 +198,18 @@ with lib.maintainers; {
198198 enableFeatureFreezePing = true;
199199 };
200200
201+ enlightenment = {
202+ members = [
203+ romildo
204+ ];
205+ githubTeams = [
206+ "enlightenment"
207+ ];
208+ scope = "Maintain Enlightenment desktop environment and related packages.";
209+ shortName = "Enlightenment";
210+ enableFeatureFreezePing = true;
211+ };
212+
201213 # Dummy group for the "everyone else" section
202214 feature-freeze-everyone-else = {
203215 members = [ ];
@@ -343,6 +355,30 @@ with lib.maintainers; {
343355 shortName = "Linux Kernel";
344356 };
345357
358+ lumina = {
359+ members = [
360+ romildo
361+ ];
362+ githubTeams = [
363+ "lumina"
364+ ];
365+ scope = "Maintain lumina desktop environment and related packages.";
366+ shortName = "Lumina";
367+ enableFeatureFreezePing = true;
368+ };
369+
370+ lxqt = {
371+ members = [
372+ romildo
373+ ];
374+ githubTeams = [
375+ "lxqt"
376+ ];
377+ scope = "Maintain LXQt desktop environment and related packages.";
378+ shortName = "LXQt";
379+ enableFeatureFreezePing = true;
380+ };
381+
346382 marketing = {
347383 members = [
348384 garbas
nixos/doc/manual/administration/declarative-containers.section.md+1−1
@@ -40,7 +40,7 @@ section for details on container networking.)
4040To disable the container, just remove it from `configuration.nix` and
4141run `nixos-rebuild
4242 switch`. Note that this will not delete the root directory of the
43−container in `/var/lib/containers`. Containers can be destroyed using
43+container in `/var/lib/nixos-containers`. Containers can be destroyed using
4444the imperative method: `nixos-container destroy foo`.
4545
4646Declarative containers can be started and stopped using the
nixos/doc/manual/administration/imperative-containers.section.md+2−2
@@ -10,8 +10,8 @@ You create a container with identifier `foo` as follows:
1010# nixos-container create foo
1111```
1212
13−This creates the container's root directory in `/var/lib/containers/foo`
14−and a small configuration file in `/etc/containers/foo.conf`. It also
13+This creates the container's root directory in `/var/lib/nixos-containers/foo`
14+and a small configuration file in `/etc/nixos-containers/foo.conf`. It also
1515builds the container's initial system configuration and stores it in
1616`/nix/var/nix/profiles/per-container/foo/system`. You can modify the
1717initial configuration of the container on the command line. For
nixos/doc/manual/from_md/administration/declarative-containers.section.xml+2−2
@@ -48,8 +48,8 @@ containers.database = {
4848 <literal>configuration.nix</literal> and run
4949 <literal>nixos-rebuild switch</literal>. Note that this will not
5050 delete the root directory of the container in
51− <literal>/var/lib/containers</literal>. Containers can be destroyed
52− using the imperative method:
51+ <literal>/var/lib/nixos-containers</literal>. Containers can be
52+ destroyed using the imperative method:
5353 <literal>nixos-container destroy foo</literal>.
5454 </para>
5555 <para>
nixos/doc/manual/from_md/administration/imperative-containers.section.xml+3−2
@@ -14,8 +14,9 @@
1414</programlisting>
1515 <para>
1616 This creates the container’s root directory in
17− <literal>/var/lib/containers/foo</literal> and a small configuration
18− file in <literal>/etc/containers/foo.conf</literal>. It also builds
17+ <literal>/var/lib/nixos-containers/foo</literal> and a small
18+ configuration file in
19+ <literal>/etc/nixos-containers/foo.conf</literal>. It also builds
1920 the container’s initial system configuration and stores it in
2021 <literal>/nix/var/nix/profiles/per-container/foo/system</literal>.
2122 You can modify the initial configuration of the container on the
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+102−1
@@ -43,6 +43,33 @@
4343 Shell.
4444 </para>
4545 </listitem>
46+ <listitem>
47+ <para>
48+ <literal>stdenv.mkDerivation</literal> now supports a
49+ self-referencing <literal>finalAttrs:</literal> parameter
50+ containing the final <literal>mkDerivation</literal> arguments
51+ including overrides. <literal>drv.overrideAttrs</literal> now
52+ supports two parameters
53+ <literal>finalAttrs: previousAttrs:</literal>. This allows
54+ packaging configuration to be overridden in a consistent
55+ manner by providing an alternative to
56+ <literal>rec {}</literal> syntax.
57+ </para>
58+ <para>
59+ Additionally, <literal>passthru</literal> can now reference
60+ <literal>finalAttrs.finalPackage</literal> containing the
61+ final package, including attributes such as the output paths
62+ and <literal>overrideAttrs</literal>.
63+ </para>
64+ <para>
65+ New language integrations can be simplified by overriding a
66+ <quote>prototype</quote> package containing the
67+ language-specific logic. This removes the need for a extra
68+ layer of overriding for the <quote>generic builder</quote>
69+ arguments, thus removing a usability problem and source of
70+ error.
71+ </para>
72+ </listitem>
4673 <listitem>
4774 <para>
4875 PHP 8.1 is now available
@@ -73,6 +100,22 @@
73100 Systemd has been upgraded to the version 250.
74101 </para>
75102 </listitem>
103+ <listitem>
104+ <para>
105+ Pulseaudio has been upgraded to version 15.0 and now
106+ optionally
107+ <link xlink:href="https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters">supports
108+ additional Bluetooth audio codecs</link> like aptX or LDAC,
109+ with codec switching support being available in
110+ <literal>pavucontrol</literal>. This feature is disabled by
111+ default but can be enabled by using
112+ <literal>hardware.pulseaudio.package = pkgs.pulseaudioFull;</literal>.
113+ Existing 3rd party modules that provided similar
114+ functionality, like <literal>pulseaudio-modules-bt</literal>
115+ or <literal>pulseaudio-hsphfpd</literal> are deprecated and
116+ have been removed.
117+ </para>
118+ </listitem>
76119 <listitem>
77120 <para>
78121 The new
@@ -108,6 +151,14 @@
108151 default.
109152 </para>
110153 </listitem>
154+ <listitem>
155+ <para>
156+ The GNOME and Plasma installation CDs now use
157+ <literal>pkgs.calamares</literal> and
158+ <literal>pkgs.calamares-nixos-extensions</literal> to allow
159+ users to easily install and set up NixOS with a GUI.
160+ </para>
161+ </listitem>
111162 </itemizedlist>
112163 </section>
113164 <section xml:id="sec-release-22.05-new-services">
@@ -471,6 +522,41 @@
471522 new versions will release.
472523 </para>
473524 </listitem>
525+ <listitem>
526+ <para>
527+ The configuration and state directories used by
528+ <literal>nixos-containers</literal> have been moved from
529+ <literal>/etc/containers</literal> and
530+ <literal>/var/lib/containers</literal> to
531+ <literal>/etc/nixos-containers</literal> and
532+ <literal>/var/lib/nixos-containers</literal>.
533+ </para>
534+ <para>
535+ If you are changing <literal>system.stateVersion</literal> to
536+ <literal>&quot;22.05&quot;</literal> manually on an existing
537+ system you are responsible for migrating these directories
538+ yourself.
539+ </para>
540+ <para>
541+ This is to improve compatibility with
542+ <literal>libcontainer</literal> based software such as Podman
543+ and Skopeo which assumes they have ownership over
544+ <literal>/etc/containers</literal>.
545+ </para>
546+ </listitem>
547+ <listitem>
548+ <para>
549+ For new installations
550+ <literal>virtualisation.oci-containers.backend</literal> is
551+ now set to <literal>podman</literal> by default. If you still
552+ want to use Docker on systems where
553+ <literal>system.stateVersion</literal> is set to to
554+ <literal>&quot;22.05&quot;</literal> set
555+ <literal>virtualisation.oci-containers.backend = &quot;docker&quot;;</literal>.Old
556+ systems with older <literal>stateVersion</literal>s stay with
557+ <quote>docker</quote>.
558+ </para>
559+ </listitem>
474560 <listitem>
475561 <para>
476562 <literal>security.klogd</literal> was removed. Logging of
@@ -791,6 +877,11 @@
791877 to the new location if the <literal>stateVersion</literal> is
792878 updated.
793879 </para>
880+ <para>
881+ As of Synapse 1.58.0, the old groups/communities feature has
882+ been disabled by default. It will be completely removed with
883+ Synapse 1.61.0.
884+ </para>
794885 </listitem>
795886 <listitem>
796887 <para>
@@ -1266,7 +1357,7 @@
12661357 <literal>systemd-shutdown</literal> is now properly linked on
12671358 shutdown to unmount all filesystems and device mapper devices
12681359 cleanly. This can be disabled using
1269− <literal>boot.systemd.shutdown.enable</literal>.
1360+ <literal>systemd.shutdownRamfs.enable</literal>.
12701361 </para>
12711362 </listitem>
12721363 <listitem>
@@ -1332,6 +1423,16 @@
13321423 <literal>otelcorecol</literal> and enjoy a 7x smaller binary.
13331424 </para>
13341425 </listitem>
1426+ <listitem>
1427+ <para>
1428+ <literal>services.zookeeper</literal> has a new option
1429+ <literal>jre</literal> for specifying the JRE to start
1430+ zookeeper with. It defaults to the JRE that
1431+ <literal>pkgs.zookeeper</literal> was wrapped with, instead of
1432+ <literal>pkgs.jre</literal>. This changes the JRE to
1433+ <literal>pkgs.jdk11_headless</literal> by default.
1434+ </para>
1435+ </listitem>
13351436 <listitem>
13361437 <para>
13371438 <literal>pkgs.pgadmin</literal> now refers to
nixos/doc/manual/release-notes/rl-2205.section.md+40−1
@@ -17,6 +17,21 @@ In addition to numerous new and upgraded packages, this release has the followin
1717
1818- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell.
1919
20+- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter
21+ containing the final `mkDerivation` arguments including overrides.
22+ `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`.
23+ This allows packaging configuration to be overridden in a consistent manner by
24+ providing an alternative to `rec {}` syntax.
25+
26+ Additionally, `passthru` can now reference `finalAttrs.finalPackage` containing
27+ the final package, including attributes such as the output paths and
28+ `overrideAttrs`.
29+
30+ New language integrations can be simplified by overriding a "prototype"
31+ package containing the language-specific logic. This removes the need for a
32+ extra layer of overriding for the "generic builder" arguments, thus removing a
33+ usability problem and source of error.
34+
2035- PHP 8.1 is now available
2136
2237- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).
@@ -27,6 +42,9 @@ In addition to numerous new and upgraded packages, this release has the followin
2742
2843- Systemd has been upgraded to the version 250.
2944
45+- Pulseaudio has been upgraded to version 15.0 and now optionally [supports additional Bluetooth audio codecs](https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/15.0/#supportforldacandaptxbluetoothcodecsplussbcxqsbcwithhigher-qualityparameters) like aptX or LDAC, with codec switching support being available in `pavucontrol`. This feature is disabled by default but can be enabled by using `hardware.pulseaudio.package = pkgs.pulseaudioFull;`.
46+ Existing 3rd party modules that provided similar functionality, like `pulseaudio-modules-bt` or `pulseaudio-hsphfpd` are deprecated and have been removed.
47+
3048- The new [`postgresqlTestHook`](https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook) runs a PostgreSQL server for the duration of package checks.
3149
3250- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details.
@@ -35,6 +53,8 @@ In addition to numerous new and upgraded packages, this release has the followin
3553
3654- The default GHC version has been updated from 8.10.7 to 9.0.2. `pkgs.haskellPackages` and `pkgs.ghc` will now use this version by default.
3755
56+- The GNOME and Plasma installation CDs now use `pkgs.calamares` and `pkgs.calamares-nixos-extensions` to allow users to easily install and set up NixOS with a GUI.
57+
3858## New Services {#sec-release-22.05-new-services}
3959
4060- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).
@@ -151,6 +171,19 @@ In addition to numerous new and upgraded packages, this release has the followin
151171 org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
152172 `pkgs.emacsPackages.nongnuPackages` where the new versions will release.
153173
174+- The configuration and state directories used by `nixos-containers` have been
175+ moved from `/etc/containers` and `/var/lib/containers` to
176+ `/etc/nixos-containers` and `/var/lib/nixos-containers`.
177+
178+ If you are changing `system.stateVersion` to `"22.05"` manually on an existing
179+ system you are responsible for migrating these directories yourself.
180+
181+ This is to improve compatibility with `libcontainer` based software such as Podman and Skopeo
182+ which assumes they have ownership over `/etc/containers`.
183+
184+- For new installations `virtualisation.oci-containers.backend` is now set to `podman` by default.
185+ If you still want to use Docker on systems where `system.stateVersion` is set to to `"22.05"` set `virtualisation.oci-containers.backend = "docker";`.Old systems with older `stateVersion`s stay with "docker".
186+
154187- `security.klogd` was removed. Logging of kernel messages is handled
155188 by systemd since Linux 3.5.
156189
@@ -329,6 +362,8 @@ In addition to numerous new and upgraded packages, this release has the followin
329362 `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new
330363 location if the `stateVersion` is updated.
331364
365+ As of Synapse 1.58.0, the old groups/communities feature has been disabled by default. It will be completely removed with Synapse 1.61.0.
366+
332367- The Keycloak package (`pkgs.keycloak`) has been switched from the
333368 Wildfly version, which will soon be deprecated, to the Quarkus based
334369 version. The Keycloak service (`services.keycloak`) has been updated
@@ -500,7 +535,7 @@ In addition to numerous new and upgraded packages, this release has the followin
500535
501536- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn.<name>.execConfig.PrivateUsers = false`
502537
503−- `systemd-shutdown` is now properly linked on shutdown to unmount all filesystems and device mapper devices cleanly. This can be disabled using `boot.systemd.shutdown.enable`.
538+- `systemd-shutdown` is now properly linked on shutdown to unmount all filesystems and device mapper devices cleanly. This can be disabled using `systemd.shutdownRamfs.enable`.
504539
505540- The Tor SOCKS proxy is now actually disabled if `services.tor.client.enable` is set to `false` (the default). If you are using this functionality but didn't change the setting or set it to `false`, you now need to set it to `true`.
506541
@@ -528,6 +563,10 @@ In addition to numerous new and upgraded packages, this release has the followin
528563 you should change the package you refer to. If you don't need them update your
529564 commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary.
530565
566+- `services.zookeeper` has a new option `jre` for specifying the JRE to start
567+ zookeeper with. It defaults to the JRE that `pkgs.zookeeper` was wrapped with,
568+ instead of `pkgs.jre`. This changes the JRE to `pkgs.jdk11_headless` by default.
569+
531570- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed.
532571
533572- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`
nixos/lib/systemd-types.nix+33−1
@@ -1,4 +1,4 @@
1−{ lib, systemdUtils }:
1+{ lib, systemdUtils, pkgs }:
22
33with systemdUtils.lib;
44with systemdUtils.unitOptions;
@@ -34,4 +34,36 @@ rec {
3434
3535 automounts = with types; listOf (submodule [ stage2AutomountOptions unitConfig automountConfig ]);
3636 initrdAutomounts = with types; attrsOf (submodule [ stage1AutomountOptions unitConfig automountConfig ]);
37+
38+ initrdContents = types.attrsOf (types.submodule ({ config, options, name, ... }: {
39+ options = {
40+ enable = mkEnableOption "copying of this file and symlinking it" // { default = true; };
41+
42+ target = mkOption {
43+ type = types.path;
44+ description = ''
45+ Path of the symlink.
46+ '';
47+ default = name;
48+ };
49+
50+ text = mkOption {
51+ default = null;
52+ type = types.nullOr types.lines;
53+ description = "Text of the file.";
54+ };
55+
56+ source = mkOption {
57+ type = types.path;
58+ description = "Path of the source file.";
59+ };
60+ };
61+
62+ config = {
63+ source = mkIf (config.text != null) (
64+ let name' = "initrd-" + baseNameOf name;
65+ in mkDerivedConfig options.text (pkgs.writeText name')
66+ );
67+ };
68+ }));
3769}
nixos/lib/utils.nix+1−1
@@ -213,6 +213,6 @@ rec {
213213 systemdUtils = {
214214 lib = import ./systemd-lib.nix { inherit lib config pkgs; };
215215 unitOptions = import ./systemd-unit-options.nix { inherit lib systemdUtils; };
216− types = import ./systemd-types.nix { inherit lib systemdUtils; };
216+ types = import ./systemd-types.nix { inherit lib systemdUtils pkgs; };
217217 };
218218}
nixos/maintainers/scripts/lxd/lxd-image.nix+1−1
@@ -27,7 +27,7 @@ with lib;
2727 networking.useDHCP = false;
2828 networking.interfaces.eth0.useDHCP = true;
2929
30− # As this is intended as a stadalone image, undo some of the minimal profile stuff
30+ # As this is intended as a standalone image, undo some of the minimal profile stuff
3131 documentation.enable = true;
3232 documentation.nixos.enable = true;
3333 environment.noXlibs = false;
nixos/modules/config/console.nix+5−6
@@ -149,8 +149,11 @@ in
149149 '');
150150
151151 boot.initrd.systemd.contents = {
152− "/etc/kbd".source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share";
153152 "/etc/vconsole.conf".source = vconsoleConf;
153+ # Add everything if we want full console setup...
154+ "/etc/kbd" = lib.mkIf cfg.earlySetup { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share"; };
155+ # ...but only the keymaps if we don't
156+ "/etc/kbd/keymaps" = lib.mkIf (!cfg.earlySetup) { source = "${consoleEnv config.boot.initrd.systemd.package.kbd}/share/keymaps"; };
154157 };
155158 boot.initrd.systemd.storePaths = [
156159 "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup"
@@ -180,7 +183,7 @@ in
180183 ];
181184 })
182185
183− (mkIf cfg.earlySetup {
186+ (mkIf (cfg.earlySetup && !config.boot.initrd.systemd.enable) {
184187 boot.initrd.extraUtilsCommands = ''
185188 mkdir -p $out/share/consolefonts
186189 ${if substring 0 1 cfg.font == "/" then ''
@@ -194,10 +197,6 @@ in
194197 cp -L $font $out/share/consolefonts/font.psf
195198 fi
196199 '';
197− assertions = [{
198− assertion = !config.boot.initrd.systemd.enable;
199− message = "console.earlySetup is implied by systemd stage 1";
200− }];
201200 })
202201 ]))
203202 ];
nixos/modules/hardware/all-firmware.nix+7−3
@@ -27,7 +27,8 @@ in {
2727 };
2828
2929 hardware.enableRedistributableFirmware = mkOption {
30− default = false;
30+ default = config.hardware.enableAllFirmware;
31+ defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
3132 type = types.bool;
3233 description = ''
3334 Turn on this option if you want to enable all the firmware with a license allowing redistribution.
@@ -71,7 +72,7 @@ in {
7172 })
7273 (mkIf cfg.enableAllFirmware {
7374 assertions = [{
74− assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);
75+ assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree;
7576 message = ''
7677 the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
7778 This requires nixpkgs.config.allowUnfree to be true.
@@ -84,7 +85,10 @@ in {
8485 b43Firmware_6_30_163_46
8586 b43FirmwareCutter
8687 xow_dongle-firmware
87− ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware;
88+ ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
89+ facetimehd-calibration
90+ facetimehd-firmware
91+ ];
8892 })
8993 (mkIf cfg.wirelessRegulatoryDatabase {
9094 hardware.firmware = [ pkgs.wireless-regdb ];
nixos/modules/hardware/raid/hpsa.nix+4−1
@@ -8,7 +8,10 @@ let
88 version = "2.40-13.0";
99
1010 src = pkgs.fetchurl {
11− url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb";
11+ urls = [
12+ "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${pname}-${version}_amd64.deb"
13+ "http://apt.netangels.net/pool/main/h/hpssacli/${pname}-${version}_amd64.deb"
14+ ];
1215 sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
1316 };
1417
nixos/modules/hardware/video/nvidia.nix+5−4
@@ -361,11 +361,12 @@ in
361361 services.udev.extraRules =
362362 ''
363363 # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
364− KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'"
365− KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'"
366− KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%n c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) %n'"
364+ KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
365+ KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'"
366+ KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", PROGRAM="${pkgs.gnugrep}/bin/grep 'Device Minor:' /proc/driver/nvidia/gpus/%b/information", \
367+ RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}"
367368 KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
368− KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
369+ KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
369370 '' + optionalString cfg.powerManagement.finegrained ''
370371 # Remove NVIDIA USB xHCI Host Controller devices, if present
371372 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
nixos/modules/hardware/video/webcam/facetimehd.nix+14−1
@@ -14,6 +14,18 @@ in
1414
1515 options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
1616
17+ options.hardware.facetimehd.withCalibration = mkOption {
18+ default = false;
19+ example = true;
20+ type = types.bool;
21+ description = ''
22+ Whether to include sensor calibration files for facetimehd.
23+ This makes colors look much better but is experimental, see
24+ <link xlink:href="https://github.com/patjak/facetimehd/wiki/Extracting-the-sensor-calibration-files"/>
25+ for details.
26+ '';
27+ };
28+
1729 config = mkIf cfg.enable {
1830
1931 boot.kernelModules = [ "facetimehd" ];
@@ -22,7 +34,8 @@ in
2234
2335 boot.extraModulePackages = [ kernelPackages.facetimehd ];
2436
25− hardware.firmware = [ pkgs.facetimehd-firmware ];
37+ hardware.firmware = [ pkgs.facetimehd-firmware ]
38+ ++ optional cfg.withCalibration pkgs.facetimehd-calibration;
2639
2740 # unload module during suspend/hibernate as it crashes the whole system
2841 powerManagement.powerDownCommands = ''
nixos/modules/i18n/input-method/fcitx5.nix+21−6
@@ -5,7 +5,9 @@ with lib;
55let
66 im = config.i18n.inputMethod;
77 cfg = im.fcitx5;
8− fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; };
8+ addons = cfg.addons ++ optional cfg.enableRimeData pkgs.rime-data;
9+ fcitx5Package = pkgs.fcitx5-with-addons.override { inherit addons; };
10+ whetherRimeDataDir = any (p: p.pname == "fcitx5-rime") cfg.addons;
911in {
1012 options = {
1113 i18n.inputMethod.fcitx5 = {
@@ -17,16 +19,29 @@ in {
1719 Enabled Fcitx5 addons.
1820 '';
1921 };
22+
23+ enableRimeData = mkEnableOption "default rime-data with fcitx5-rime";
2024 };
2125 };
2226
2327 config = mkIf (im.enabled == "fcitx5") {
2428 i18n.inputMethod.package = fcitx5Package;
2529
26− environment.variables = {
27− GTK_IM_MODULE = "fcitx";
28− QT_IM_MODULE = "fcitx";
29− XMODIFIERS = "@im=fcitx";
30− };
30+ environment = mkMerge [{
31+ variables = {
32+ GTK_IM_MODULE = "fcitx";
33+ QT_IM_MODULE = "fcitx";
34+ XMODIFIERS = "@im=fcitx";
35+ };
36+ }
37+ (mkIf whetherRimeDataDir {
38+ pathsToLink = [
39+ "/share/rime-data"
40+ ];
41+
42+ variables = {
43+ NIX_RIME_DATA_DIR = "/run/current-system/sw/share/rime-data";
44+ };
45+ })];
3146 };
3247}
nixos/modules/installer/cd-dvd/channel.nix+2−1
@@ -39,7 +39,8 @@ in
3939 echo "unpacking the NixOS/Nixpkgs sources..."
4040 mkdir -p /nix/var/nix/profiles/per-user/root
4141 ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/per-user/root/channels \
42− -i ${channelSources} --quiet --option build-use-substitutes false
42+ -i ${channelSources} --quiet --option build-use-substitutes false \
43+ ${optionalString config.boot.initrd.systemd.enable "--option sandbox false"} # There's an issue with pivot_root
4344 mkdir -m 0700 -p /root/.nix-defexpr
4445 ln -s /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
4546 mkdir -m 0755 -p /var/lib/nixos
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+14−8
@@ -35,22 +35,28 @@ with lib;
3535 # Enable sound in graphical iso's.
3636 hardware.pulseaudio.enable = true;
3737
38− environment.systemPackages = [
38+ # Spice guest additions
39+ services.spice-vdagentd.enable = true;
40+
41+ # Enable plymouth
42+ boot.plymouth.enable = true;
43+
44+ environment.defaultPackages = with pkgs; [
3945 # Include gparted for partitioning disks.
40− pkgs.gparted
46+ gparted
4147
4248 # Include some editors.
43− pkgs.vim
44− pkgs.bvi # binary editor
45− pkgs.joe
49+ vim
50+ nano
4651
4752 # Include some version control tools.
48− pkgs.git
53+ git
54+ rsync
4955
5056 # Firefox for reading the manual.
51− pkgs.firefox
57+ firefox
5258
53− pkgs.glxinfo
59+ glxinfo
5460 ];
5561
5662}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nixnew file+59
@@ -0,0 +1,59 @@
1+# This module defines a NixOS installation CD that contains GNOME.
2+
3+{ pkgs, ... }:
4+
5+{
6+ imports = [ ./installation-cd-graphical-calamares.nix ];
7+
8+ isoImage.edition = "gnome";
9+
10+ services.xserver.desktopManager.gnome = {
11+ # Add Firefox and other tools useful for installation to the launcher
12+ favoriteAppsOverride = ''
13+ [org.gnome.shell]
14+ favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]
15+ '';
16+
17+ # Override GNOME defaults to disable GNOME tour and disable suspend
18+ extraGSettingsOverrides = ''
19+ [org.gnome.shell]
20+ welcome-dialog-last-shown-version='9999999999'
21+
22+ [org.gnome.settings-daemon.plugins.power]
23+ sleep-inactive-ac-type='nothing'
24+ sleep-inactive-battery-type='nothing'
25+ '';
26+
27+ extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];
28+
29+ enable = true;
30+ };
31+
32+ # Theme calamares with GNOME theme
33+ qt5 = {
34+ enable = true;
35+ platformTheme = "gnome";
36+ };
37+
38+ # Fix scaling for calamares on wayland
39+ environment.variables = {
40+ QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";
41+ };
42+
43+ services.xserver.displayManager = {
44+ gdm = {
45+ enable = true;
46+ # autoSuspend makes the machine automatically suspend after inactivity.
47+ # It's possible someone could/try to ssh'd into the machine and obviously
48+ # have issues because it's inactive.
49+ # See:
50+ # * https://github.com/NixOS/nixpkgs/pull/63790
51+ # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22
52+ autoSuspend = false;
53+ };
54+ autoLogin = {
55+ enable = true;
56+ user = "nixos";
57+ };
58+ };
59+}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nixnew file+49
@@ -0,0 +1,49 @@
1+# This module defines a NixOS installation CD that contains X11 and
2+# Plasma 5.
3+
4+{ pkgs, ... }:
5+
6+{
7+ imports = [ ./installation-cd-graphical-calamares.nix ];
8+
9+ isoImage.edition = "plasma5";
10+
11+ services.xserver = {
12+ desktopManager.plasma5 = {
13+ enable = true;
14+ };
15+
16+ # Automatically login as nixos.
17+ displayManager = {
18+ sddm.enable = true;
19+ autoLogin = {
20+ enable = true;
21+ user = "nixos";
22+ };
23+ };
24+ };
25+
26+ environment.systemPackages = with pkgs; [
27+ # Graphical text editor
28+ kate
29+ ];
30+
31+ system.activationScripts.installerDesktop = let
32+
33+ # Comes from documentation.nix when xserver and nixos.enable are true.
34+ manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";
35+
36+ homeDir = "/home/nixos/";
37+ desktopDir = homeDir + "Desktop/";
38+
39+ in ''
40+ mkdir -p ${desktopDir}
41+ chown nixos ${homeDir} ${desktopDir}
42+
43+ ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}
44+ ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}
45+ ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}
46+ ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}
47+ '';
48+
49+}
nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nixnew file+20
@@ -0,0 +1,20 @@
1+# This module adds the calamares installer to the basic graphical NixOS
2+# installation CD.
3+
4+{ pkgs, ... }:
5+let
6+ calamares-nixos-autostart = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };
7+in
8+{
9+ imports = [ ./installation-cd-graphical-base.nix ];
10+
11+ environment.systemPackages = with pkgs; [
12+ # Calamares for graphical installation
13+ libsForQt5.kpmcore
14+ calamares-nixos
15+ calamares-nixos-autostart
16+ calamares-nixos-extensions
17+ # Needed for calamares QML module packagechooserq
18+ libsForQt5.full
19+ ];
20+}
nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+1−3
@@ -1,8 +1,6 @@
11# This module defines a NixOS installation CD that contains GNOME.
22
3−{ lib, ... }:
4−
5−with lib;
3+{ ... }:
64
75{
86 imports = [ ./installation-cd-graphical-base.nix ];
nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+1−3
@@ -1,9 +1,7 @@
11# This module defines a NixOS installation CD that contains X11 and
22# Plasma 5.
33
4−{ config, lib, pkgs, ... }:
5−
6−with lib;
4+{ pkgs, ... }:
75
86{
97 imports = [ ./installation-cd-graphical-base.nix ];
nixos/modules/installer/sd-card/sd-image-aarch64.nix+9
@@ -39,6 +39,12 @@
3939 # Supported in newer board revisions
4040 arm_boost=1
4141
42+ [cm4]
43+ # Enable host mode on the 2711 built-in XHCI USB controller.
44+ # This line should be removed if the legacy DWC2 controller is required
45+ # (e.g. for USB device mode) or if USB support is not required.
46+ otg_mode=1
47+
4248 [all]
4349 # Boot in 64-bit mode.
4450 arm_64bit=1
@@ -65,6 +71,9 @@
6571 cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
6672 cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
6773 cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
74+ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/
75+ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/
76+ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/
6877 '';
6978 populateRootCommands = ''
7079 mkdir -p ./files/boot
nixos/modules/module-list.nix+6−1
@@ -172,6 +172,7 @@
172172 ./programs/java.nix
173173 ./programs/k40-whisperer.nix
174174 ./programs/kclock.nix
175+ ./programs/k3b.nix
175176 ./programs/kdeconnect.nix
176177 ./programs/kbdlight.nix
177178 ./programs/less.nix
@@ -662,6 +663,7 @@
662663 ./services/monitoring/longview.nix
663664 ./services/monitoring/mackerel-agent.nix
664665 ./services/monitoring/metricbeat.nix
666+ ./services/monitoring/mimir.nix
665667 ./services/monitoring/monit.nix
666668 ./services/monitoring/munin.nix
667669 ./services/monitoring/nagios.nix
@@ -735,6 +737,7 @@
735737 ./services/networking/blocky.nix
736738 ./services/networking/charybdis.nix
737739 ./services/networking/cjdns.nix
740+ ./services/networking/cloudflare-dyndns.nix
738741 ./services/networking/cntlm.nix
739742 ./services/networking/connman.nix
740743 ./services/networking/consul.nix
@@ -1182,13 +1185,14 @@
11821185 ./system/boot/stage-2.nix
11831186 ./system/boot/systemd.nix
11841187 ./system/boot/systemd/coredump.nix
1188+ ./system/boot/systemd/initrd-secrets.nix
1189+ ./system/boot/systemd/initrd.nix
11851190 ./system/boot/systemd/journald.nix
11861191 ./system/boot/systemd/logind.nix
11871192 ./system/boot/systemd/nspawn.nix
11881193 ./system/boot/systemd/shutdown.nix
11891194 ./system/boot/systemd/tmpfiles.nix
11901195 ./system/boot/systemd/user.nix
1191− ./system/boot/systemd/initrd.nix
11921196 ./system/boot/timesyncd.nix
11931197 ./system/boot/tmp.nix
11941198 ./system/etc/etc-activation.nix
@@ -1252,6 +1256,7 @@
12521256 ./virtualisation/virtualbox-guest.nix
12531257 ./virtualisation/virtualbox-host.nix
12541258 ./virtualisation/vmware-guest.nix
1259+ ./virtualisation/vmware-host.nix
12551260 ./virtualisation/waydroid.nix
12561261 ./virtualisation/xen-dom0.nix
12571262 ./virtualisation/xe-guest-utilities.nix
nixos/modules/profiles/all-hardware.nix+3
@@ -40,6 +40,9 @@ in
4040 # SD cards.
4141 "sdhci_pci"
4242
43+ # NVMe drives
44+ "nvme"
45+
4346 # Firewire support. Not tested.
4447 "ohci1394" "sbp2"
4548
nixos/modules/profiles/installation-device.nix+4
@@ -99,6 +99,10 @@ with lib;
9999 stdenvNoCC # for runCommand
100100 busybox
101101 jq # for closureInfo
102+ # For boot.initrd.systemd
103+ makeInitrdNGTool
104+ systemdStage1
105+ systemdStage1Network
102106 ];
103107
104108 # Show all debug messages from the kernel but don't log refused packets
nixos/modules/profiles/qemu-guest.nix+2−2
@@ -1,13 +1,13 @@
11# Common configuration for virtual machines running under QEMU (using
22# virtio).
33
4−{ ... }:
4+{ config, lib, ... }:
55
66{
77 boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
88 boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
99
10− boot.initrd.postDeviceCommands =
10+ boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
1111 ''
1212 # Set the system time from the hardware clock to work around a
1313 # bug in qemu-kvm > 1.5.2 (where the VM clock is initialised
nixos/modules/programs/k3b.nixnew file+52
@@ -0,0 +1,52 @@
1+{ config, pkgs, lib, ... }:
2+
3+with lib;
4+
5+{
6+ # interface
7+ options.programs.k3b = {
8+ enable = mkOption {
9+ type = types.bool;
10+ default = false;
11+ description = ''
12+ Whether to enable k3b, the KDE disk burning application.
13+
14+ Additionally to installing <package>k3b</package> enabling this will
15+ add <literal>setuid</literal> wrappers in <literal>/run/wrappers/bin</literal>
16+ for both <package>cdrdao</package> and <package>cdrecord</package>. On first
17+ run you must manually configure the path of <package>cdrdae</package> and
18+ <package>cdrecord</package> to correspond to the appropriate paths under
19+ <literal>/run/wrappers/bin</literal> in the "Setup External Programs" menu.
20+ '';
21+ };
22+ };
23+
24+ # implementation
25+ config = mkIf config.programs.k3b.enable {
26+
27+ environment.systemPackages = with pkgs; [
28+ k3b
29+ dvdplusrwtools
30+ cdrdao
31+ cdrkit
32+ ];
33+
34+ security.wrappers = {
35+ cdrdao = {
36+ setuid = true;
37+ owner = "root";
38+ group = "cdrom";
39+ permissions = "u+wrx,g+x";
40+ source = "${pkgs.cdrdao}/bin/cdrdao";
41+ };
42+ cdrecord = {
43+ setuid = true;
44+ owner = "root";
45+ group = "cdrom";
46+ permissions = "u+wrx,g+x";
47+ source = "${pkgs.cdrkit}/bin/cdrecord";
48+ };
49+ };
50+
51+ };
52+}
nixos/modules/programs/thefuck.nix+7−6
@@ -6,9 +6,12 @@ let
66 prg = config.programs;
77 cfg = prg.thefuck;
88
9− initScript = ''
9+ bashAndZshInitScript = ''
1010 eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
1111 '';
12+ fishInitScript = ''
13+ ${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source
14+ '';
1215in
1316 {
1417 options = {
@@ -30,10 +33,8 @@ in
3033 config = mkIf cfg.enable {
3134 environment.systemPackages = with pkgs; [ thefuck ];
3235
33− programs.bash.interactiveShellInit = initScript;
34− programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
35− programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
36− ${pkgs.thefuck}/bin/thefuck --alias | source
37− '';
36+ programs.bash.interactiveShellInit = bashAndZshInitScript;
37+ programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;
38+ programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;
3839 };
3940 }
nixos/modules/security/pam.nix+3−3
@@ -492,7 +492,7 @@ let
492492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}
493493 '') +
494494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''
495− auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
495+ auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}
496496 '') +
497497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''
498498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}
@@ -1131,7 +1131,7 @@ in
11311131 ++ optional config.services.sssd.enable pkgs.sssd
11321132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
11331133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
1134− ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
1134+ ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]
11351135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]
11361136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
11371137
@@ -1221,7 +1221,7 @@ in
12211221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,
12221222 '' +
12231223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''
1224− "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,
1224+ "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,
12251225 '' +
12261226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''
12271227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,
nixos/modules/services/continuous-integration/gitlab-runner.nix+9−2
@@ -36,12 +36,12 @@ let
3636
3737 # register new services
3838 ${concatStringsSep "\n" (mapAttrsToList (name: service: ''
39− if echo "$NEW_SERVICES" | grep -xq ${name}; then
39+ if echo "$NEW_SERVICES" | grep -xq "${name}"; then
4040 bash -c ${escapeShellArg (concatStringsSep " \\\n " ([
4141 "set -a && source ${service.registrationConfigFile} &&"
4242 "gitlab-runner register"
4343 "--non-interactive"
44− "--name ${name}"
44+ (if service.description != null then "--description \"${service.description}\"" else "--name '${name}'")
4545 "--executor ${service.executor}"
4646 "--limit ${toString service.limit}"
4747 "--request-concurrency ${toString service.requestConcurrency}"
@@ -365,6 +365,13 @@ in
365365 with <literal>RUNNER_ENV</literal> variable set.
366366 '';
367367 };
368+ description = mkOption {
369+ type = types.nullOr types.str;
370+ default = null;
371+ description = ''
372+ Name/description of the runner.
373+ '';
374+ };
368375 executor = mkOption {
369376 type = types.str;
370377 default = "docker";
nixos/modules/services/databases/couchdb.nix+6
@@ -193,6 +193,11 @@ in {
193193
194194 preStart = ''
195195 touch ${cfg.configFile}
196+ if ! test -e ${cfg.databaseDir}/.erlang.cookie; then
197+ touch ${cfg.databaseDir}/.erlang.cookie
198+ chmod 600 ${cfg.databaseDir}/.erlang.cookie
199+ dd if=/dev/random bs=16 count=1 | base64 > ${cfg.databaseDir}/.erlang.cookie
200+ fi
196201 '';
197202
198203 environment = {
@@ -204,6 +209,7 @@ in {
204209 ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
205210 # 5. the vm.args file
206211 COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
212+ HOME =''${cfg.databaseDir}'';
207213 };
208214
209215 serviceConfig = {
nixos/modules/services/hardware/udev.nix+32−7
@@ -8,6 +8,24 @@ let
88
99 cfg = config.services.udev;
1010
11+ initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} ''
12+ mkdir -p $out/etc/udev/rules.d
13+ for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do
14+ ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d
15+ done
16+ '';
17+
18+
19+ # networkd link files are used early by udev to set up interfaces early.
20+ # This must be done in stage 1 to avoid race conditions between udev and
21+ # network daemons.
22+ # TODO move this into the initrd-network module when it exists
23+ initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''
24+ mkdir -p $out
25+ ln -s ${udev}/lib/systemd/network/*.link $out/
26+ ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}
27+ '';
28+
1129 extraUdevRules = pkgs.writeTextFile {
1230 name = "extra-udev-rules";
1331 text = cfg.extraRules;
@@ -350,7 +368,10 @@ in
350368 ];
351369 boot.initrd.systemd.storePaths = [
352370 "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
353− "${config.boot.initrd.systemd.package}/lib/udev"
371+ "${config.boot.initrd.systemd.package}/lib/udev/ata_id"
372+ "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
373+ "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
374+ "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
354375 ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
355376
356377 # Generate the udev rules for the initrd
@@ -364,13 +385,17 @@ in
364385 systemd = config.boot.initrd.systemd.package;
365386 binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];
366387 };
388+ "/etc/systemd/network".source = initrdLinkUnits;
367389 };
368− # Insert custom rules
369− boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
370− name = "initrd-udev-rules";
371− destination = "/etc/udev/rules.d/99-local.rules";
372− text = config.boot.initrd.services.udev.rules;
373− });
390+ # Insert initrd rules
391+ boot.initrd.services.udev.packages = [
392+ initrdUdevRules
393+ (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
394+ name = "initrd-udev-rules";
395+ destination = "/etc/udev/rules.d/99-local.rules";
396+ text = config.boot.initrd.services.udev.rules;
397+ }))
398+ ];
374399
375400 environment.etc =
376401 {
nixos/modules/services/misc/zookeeper.nix+8−1
@@ -114,6 +114,13 @@ in {
114114 type = types.package;
115115 };
116116
117+ jre = mkOption {
118+ description = "The JRE with which to run Zookeeper";
119+ default = cfg.package.jre;
120+ defaultText = literalExpression "pkgs.zookeeper.jre";
121+ example = literalExpression "pkgs.jre";
122+ type = types.package;
123+ };
117124 };
118125
119126
@@ -131,7 +138,7 @@ in {
131138 after = [ "network.target" ];
132139 serviceConfig = {
133140 ExecStart = ''
134− ${pkgs.jre}/bin/java \
141+ ${cfg.jre}/bin/java \
135142 -cp "${cfg.package}/lib/*:${configDir}" \
136143 ${escapeShellArgs cfg.extraCmdLineOptions} \
137144 -Dzookeeper.datadir.autocreate=false \
nixos/modules/services/monitoring/mimir.nixnew file+63
@@ -0,0 +1,63 @@
1+{ config, lib, pkgs, ... }:
2+
3+let
4+ inherit (lib) escapeShellArgs mkEnableOption mkIf mkOption types;
5+
6+ cfg = config.services.mimir;
7+
8+ settingsFormat = pkgs.formats.yaml {};
9+in {
10+ options.services.mimir = {
11+ enable = mkEnableOption "mimir";
12+
13+ configuration = mkOption {
14+ type = (pkgs.formats.json {}).type;
15+ default = {};
16+ description = ''
17+ Specify the configuration for Mimir in Nix.
18+ '';
19+ };
20+
21+ configFile = mkOption {
22+ type = types.nullOr types.path;
23+ default = null;
24+ description = ''
25+ Specify a configuration file that Mimir should use.
26+ '';
27+ };
28+ };
29+
30+ config = mkIf cfg.enable {
31+ assertions = [{
32+ assertion = (
33+ (cfg.configuration == {} -> cfg.configFile != null) &&
34+ (cfg.configFile != null -> cfg.configuration == {})
35+ );
36+ message = ''
37+ Please specify either
38+ 'services.mimir.configuration' or
39+ 'services.mimir.configFile'.
40+ '';
41+ }];
42+
43+ systemd.services.mimir = {
44+ description = "mimir Service Daemon";
45+ wantedBy = [ "multi-user.target" ];
46+
47+ serviceConfig = let
48+ conf = if cfg.configFile == null
49+ then settingsFormat.generate "config.yaml" cfg.configuration
50+ else cfg.configFile;
51+ in
52+ {
53+ ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
54+ DynamicUser = true;
55+ Restart = "always";
56+ ProtectSystem = "full";
57+ DevicePolicy = "closed";
58+ NoNewPrivileges = true;
59+ StateDirectory = "mimir";
60+ };
61+ };
62+ };
63+}
nixos/modules/services/networking/asterisk.nix+11−43
@@ -14,28 +14,9 @@ let
1414
1515 # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override
1616 defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;
17− allConfFiles =
18− cfg.confFiles //
19− builtins.listToAttrs (map (x: { name = x;
20− value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })
21− defaultConfFiles);
22−
23− asteriskEtc = pkgs.stdenv.mkDerivation
24− ((mapAttrs' (name: value: nameValuePair
25− # Fudge the names to make bash happy
26− ((replaceChars ["."] ["_"] name) + "_")
27− (value)
28− ) allConfFiles) //
29− {
30− confFilesString = concatStringsSep " " (
31− attrNames allConfFiles
32− );
33−
34− name = "asterisk-etc";
35−
17+ allConfFiles = {
3618 # Default asterisk.conf file
37− # (Notice that astetcdir will be set to the path of this derivation)
38− asteriskConf = ''
19+ "asterisk.conf".text = ''
3920 [directories]
4021 astetcdir => /etc/asterisk
4122 astmoddir => ${cfg.package}/lib/asterisk/modules
@@ -48,43 +29,28 @@ let
4829 astrundir => /run/asterisk
4930 astlogdir => /var/log/asterisk
5031 astsbindir => ${cfg.package}/sbin
32+ ${cfg.extraConfig}
5133 '';
52− extraConf = cfg.extraConfig;
5334
5435 # Loading all modules by default is considered sensible by the authors of
5536 # "Asterisk: The Definitive Guide". Secure sites will likely want to
5637 # specify their own "modules.conf" in the confFiles option.
57− modulesConf = ''
38+ "modules.conf".text = ''
5839 [modules]
5940 autoload=yes
6041 '';
6142
6243 # Use syslog for logging so logs can be viewed with journalctl
63− loggerConf = ''
44+ "logger.conf".text = ''
6445 [general]
6546
6647 [logfiles]
6748 syslog.local0 => notice,warning,error
6849 '';
50+ } //
51+ mapAttrs (name: text: { inherit text; }) cfg.confFiles //
52+ listToAttrs (map (x: nameValuePair x { source = cfg.package + "/etc/asterisk/" + x; }) defaultConfFiles);
6953
70− buildCommand = ''
71− mkdir -p "$out"
72−
73− # Create asterisk.conf, pointing astetcdir to the path of this derivation
74− echo "$asteriskConf" | sed "s|@out@|$out|g" > "$out"/asterisk.conf
75− echo "$extraConf" >> "$out"/asterisk.conf
76−
77− echo "$modulesConf" > "$out"/modules.conf
78−
79− echo "$loggerConf" > "$out"/logger.conf
80−
81− # Config files specified in confFiles option override all other files
82− for i in $confFilesString; do
83− conf=$(echo "$i"_ | sed 's/\./_/g')
84− echo "''${!conf}" > "$out"/"$i"
85− done
86− '';
87− });
8854in
8955
9056{
@@ -209,7 +175,9 @@ in
209175 config = mkIf cfg.enable {
210176 environment.systemPackages = [ cfg.package ];
211177
212− environment.etc.asterisk.source = asteriskEtc;
178+ environment.etc = mapAttrs' (name: value:
179+ nameValuePair "asterisk/${name}" value
180+ ) allConfFiles;
213181
214182 users.users.asterisk =
215183 { name = asteriskUser;
nixos/modules/services/networking/cloudflare-dyndns.nixnew file+93
@@ -0,0 +1,93 @@
1+{ config, pkgs, lib, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.cloudflare-dyndns;
7+in
8+{
9+ options = {
10+ services.cloudflare-dyndns = {
11+ enable = mkEnableOption "Cloudflare Dynamic DNS Client";
12+
13+ apiTokenFile = mkOption {
14+ type = types.nullOr types.str;
15+ default = null;
16+ description = ''
17+ The path to a file containing the CloudFlare API token.
18+
19+ The file must have the form `CLOUDFLARE_API_TOKEN=...`
20+ '';
21+ };
22+
23+ domains = mkOption {
24+ type = types.listOf types.str;
25+ default = [ ];
26+ description = ''
27+ List of domain names to update records for.
28+ '';
29+ };
30+
31+ proxied = mkOption {
32+ type = types.bool;
33+ default = false;
34+ description = ''
35+ Whether this is a DNS-only record, or also being proxied through CloudFlare.
36+ '';
37+ };
38+
39+ ipv4 = mkOption {
40+ type = types.bool;
41+ default = true;
42+ description = ''
43+ Whether to enable setting IPv4 A records.
44+ '';
45+ };
46+
47+ ipv6 = mkOption {
48+ type = types.bool;
49+ default = false;
50+ description = ''
51+ Whether to enable setting IPv6 AAAA records.
52+ '';
53+ };
54+
55+ deleteMissing = mkOption {
56+ type = types.bool;
57+ default = false;
58+ description = ''
59+ Whether to delete the record when no IP address is found.
60+ '';
61+ };
62+ };
63+ };
64+
65+ config = mkIf cfg.enable {
66+ systemd.services.cloudflare-dyndns = {
67+ description = "CloudFlare Dynamic DNS Client";
68+ after = [ "network.target" ];
69+ wantedBy = [ "multi-user.target" ];
70+ startAt = "*:0/5";
71+
72+ environment = {
73+ CLOUDFLARE_DOMAINS = toString cfg.domains;
74+ };
75+
76+ serviceConfig = {
77+ Type = "simple";
78+ DynamicUser = true;
79+ StateDirectory = "cloudflare-dyndns";
80+ EnvironmentFile = cfg.apiTokenFile;
81+ ExecStart =
82+ let
83+ args = [ "--cache-file /var/lib/cloudflare-dyndns/ip.cache" ]
84+ ++ (if cfg.ipv4 then [ "-4" ] else [ "-no-4" ])
85+ ++ (if cfg.ipv6 then [ "-6" ] else [ "-no-6" ])
86+ ++ optional cfg.deleteMissing "--delete-missing"
87+ ++ optional cfg.proxied "--proxied";
88+ in
89+ "${pkgs.cloudflare-dyndns}/bin/cloudflare-dyndns ${toString args}";
90+ };
91+ };
92+ };
93+}
nixos/modules/services/networking/prosody.nix+1
@@ -820,6 +820,7 @@ in
820820 '') cfg.muc}
821821
822822 ${ lib.optionalString (cfg.uploadHttp != null) ''
823+ -- TODO: think about migrating this to mod-http_file_share instead.
823824 Component ${toLua cfg.uploadHttp.domain} "http_upload"
824825 http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit}
825826 http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter}
nixos/modules/services/networking/ssh/sshd.nix+1
@@ -441,6 +441,7 @@ in
441441
442442 ${flip concatMapStrings cfg.hostKeys (k: ''
443443 if ! [ -s "${k.path}" ]; then
444+ rm -f "${k.path}"
444445 ssh-keygen \
445446 -t "${k.type}" \
446447 ${if k ? bits then "-b ${toString k.bits}" else ""} \
nixos/modules/services/networking/supplicant.nix+1−1
@@ -43,7 +43,7 @@ let
4343 path = [ pkgs.coreutils ];
4444
4545 preStart = ''
46− ${optionalString (suppl.configFile.path!=null) ''
46+ ${optionalString (suppl.configFile.path!=null && suppl.configFile.writable) ''
4747 (umask 077 && touch -a "${suppl.configFile.path}")
4848 ''}
4949 ${optionalString suppl.userControlled.enable ''
nixos/modules/services/system/nscd.nix+1−1
@@ -38,7 +38,7 @@ in
3838 default = if pkgs.stdenv.hostPlatform.libc == "glibc"
3939 then pkgs.stdenv.cc.libc.bin
4040 else pkgs.glibc.bin;
41− defaultText = literalExample ''
41+ defaultText = lib.literalExpression ''
4242 if pkgs.stdenv.hostPlatform.libc == "glibc"
4343 then pkgs.stdenv.cc.libc.bin
4444 else pkgs.glibc.bin;
nixos/modules/services/web-apps/galene.nix+29
@@ -164,6 +164,35 @@ in
164164 optional (cfg.dataDir == defaultdataDir) "galene/data" ++
165165 optional (cfg.groupsDir == defaultgroupsDir) "galene/groups" ++
166166 optional (cfg.recordingsDir == defaultrecordingsDir) "galene/recordings";
167+
168+ # Hardening
169+ CapabilityBoundingSet = [ "" ];
170+ DeviceAllow = [ "" ];
171+ LockPersonality = true;
172+ MemoryDenyWriteExecute = true;
173+ NoNewPrivileges = true;
174+ PrivateDevices = true;
175+ PrivateTmp = true;
176+ PrivateUsers = true;
177+ ProcSubset = "pid";
178+ ProtectClock = true;
179+ ProtectControlGroups = true;
180+ ProtectHome = true;
181+ ProtectHostname = true;
182+ ProtectKernelLogs = true;
183+ ProtectKernelModules = true;
184+ ProtectKernelTunables = true;
185+ ProtectProc = "invisible";
186+ ProtectSystem = "strict";
187+ ReadWritePaths = cfg.recordingsDir;
188+ RemoveIPC = true;
189+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
190+ RestrictNamespaces = true;
191+ RestrictRealtime = true;
192+ RestrictSUIDSGID = true;
193+ SystemCallArchitectures = "native";
194+ SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ];
195+ UMask = "0077";
167196 }
168197 ];
169198 };
nixos/modules/services/web-apps/keycloak.nix+2−1
@@ -540,7 +540,8 @@ in
540540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;
541541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;
542542 db-password._secret = cfg.database.passwordFile;
543− db-url-host = "${cfg.database.host}:${toString cfg.database.port}";
543+ db-url-host = cfg.database.host;
544+ db-url-port = toString cfg.database.port;
544545 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;
545546 db-url-properties = prefixUnlessEmpty "?" dbProps;
546547 db-url = null;
nixos/modules/services/x11/desktop-managers/enlightenment.nix+5
@@ -16,6 +16,10 @@ let
1616in
1717
1818{
19+ meta = {
20+ maintainers = teams.enlightenment.members;
21+ };
22+
1923 imports = [
2024 (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
2125 ];
@@ -92,6 +96,7 @@ in
9296
9397 services.udisks2.enable = true;
9498 services.upower.enable = config.powerManagement.enable;
99+ services.xserver.libinput.enable = mkDefault true;
95100
96101 services.dbus.packages = [ e.efl ];
97102
nixos/modules/services/x11/desktop-managers/lumina.nix+4
@@ -10,6 +10,10 @@ let
1010in
1111
1212{
13+ meta = {
14+ maintainers = teams.lumina.members;
15+ };
16+
1317 options = {
1418
1519 services.xserver.desktopManager.lumina.enable = mkOption {
nixos/modules/services/x11/desktop-managers/lxqt.nix+9
@@ -9,6 +9,10 @@ let
99in
1010
1111{
12+ meta = {
13+ maintainers = teams.lxqt.members;
14+ };
15+
1216 options = {
1317
1418 services.xserver.desktopManager.lxqt.enable = mkOption {
@@ -62,6 +66,11 @@ in
6266 services.gvfs.enable = true;
6367
6468 services.upower.enable = config.powerManagement.enable;
69+
70+ services.xserver.libinput.enable = mkDefault true;
71+
72+ xdg.portal.enable = true;
73+ xdg.portal.extraPortals = [ pkgs.lxqt.xdg-desktop-portal-lxqt ];
6574 };
6675
6776}
nixos/modules/services/x11/desktop-managers/mate.nix+1
@@ -73,6 +73,7 @@ in
7373 services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
7474 services.gvfs.enable = true;
7575 services.upower.enable = config.powerManagement.enable;
76+ services.xserver.libinput.enable = mkDefault true;
7677
7778 security.pam.services.mate-screensaver.unixAuth = true;
7879
nixos/modules/services/x11/desktop-managers/pantheon.xml+3−3
@@ -3,7 +3,7 @@
33 xml:id="chap-pantheon">
44 <title>Pantheon Desktop</title>
55 <para>
6− Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
6+ Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite.
77 </para>
88 <section xml:id="sec-pantheon-enable">
99 <title>Enabling Pantheon</title>
@@ -89,9 +89,9 @@ switchboard-with-plugs.override {
8989 </para>
9090 </listitem>
9191 </varlistentry>
92− <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
92+ <varlistentry xml:id="sec-pantheon-faq-gnome-and-pantheon">
9393 <term>
94− I cannot enable both GNOME 3 and Pantheon.
94+ I cannot enable both GNOME and Pantheon.
9595 </term>
9696 <listitem>
9797 <para>
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1
@@ -33,7 +33,7 @@ let
3333 netbootxyz = if cfg.netbootxyz.enable then pkgs.netbootxyz-efi else "";
3434
3535 copyExtraFiles = pkgs.writeShellScript "copy-extra-files" ''
36− empty_file=$(mktemp)
36+ empty_file=$(${pkgs.coreutils}/bin/mktemp)
3737
3838 ${concatStrings (mapAttrsToList (n: v: ''
3939 ${pkgs.coreutils}/bin/install -Dp "${v}" "${efi.efiSysMountPoint}/"${escapeShellArg n}
nixos/modules/system/boot/luksroot.nix+1
@@ -992,6 +992,7 @@ in
992992 ];
993993 storePaths = [
994994 "${config.boot.initrd.systemd.package}/lib/systemd/systemd-cryptsetup"
995+ "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-cryptsetup-generator"
995996 ];
996997
997998 };
nixos/modules/system/boot/stage-1-init.sh+1−5
@@ -318,11 +318,7 @@ checkFS() {
318318
319319 echo "checking $device..."
320320
321− fsckFlags=
322− if test "$fsType" != "btrfs"; then
323− fsckFlags="-V -a"
324− fi
325− fsck $fsckFlags "$device"
321+ fsck -V -a "$device"
326322 fsckResult=$?
327323
328324 if test $(($fsckResult | 2)) = $fsckResult; then
nixos/modules/system/boot/systemd/initrd-secrets.nixnew file+36
@@ -0,0 +1,36 @@
1+{ config, pkgs, lib, ... }:
2+
3+{
4+ config = lib.mkIf (config.boot.initrd.enable && config.boot.initrd.systemd.enable) {
5+ # Copy secrets into the initrd if they cannot be appended
6+ boot.initrd.systemd.contents = lib.mkIf (!config.boot.loader.supportsInitrdSecrets)
7+ (lib.mapAttrs' (dest: source: lib.nameValuePair "/.initrd-secrets/${dest}" { source = if source == null then dest else source; }) config.boot.initrd.secrets);
8+
9+ # Copy secrets to their respective locations
10+ boot.initrd.systemd.services.initrd-nixos-copy-secrets = lib.mkIf (config.boot.initrd.secrets != {}) {
11+ description = "Copy secrets into place";
12+ # Run as early as possible
13+ wantedBy = [ "sysinit.target" ];
14+ before = [ "cryptsetup-pre.target" ];
15+ unitConfig.DefaultDependencies = false;
16+
17+ # We write the secrets to /.initrd-secrets and move them because this allows
18+ # secrets to be written to /run. If we put the secret directly to /run and
19+ # drop this service, we'd mount the /run tmpfs over the secret, making it
20+ # invisible in stage 2.
21+ script = ''
22+ for secret in $(cd /.initrd-secrets; find . -type f); do
23+ mkdir -p "$(dirname "/$secret")"
24+ cp "/.initrd-secrets/$secret" "/$secret"
25+ done
26+ '';
27+
28+ unitConfig = {
29+ Type = "oneshot";
30+ RemainAfterExit = true;
31+ };
32+ };
33+ # The script needs this
34+ boot.initrd.systemd.extraBin.find = "${pkgs.findutils}/bin/find";
35+ };
36+}
nixos/modules/system/boot/systemd/initrd.nix+30−37
@@ -105,6 +105,9 @@ let
105105 opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs";
106106 in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems);
107107
108+ needMakefs = lib.any (fs: fs.autoFormat) fileSystems;
109+ needGrowfs = lib.any (fs: fs.autoResize) fileSystems;
110+
108111 kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
109112 modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
110113 firmware = config.hardware.firmware;
@@ -155,37 +158,7 @@ in {
155158 '';
156159 visible = false;
157160 default = {};
158− type = types.attrsOf (types.submodule ({ config, options, name, ... }: {
159− options = {
160− enable = mkEnableOption "copying of this file to initrd and symlinking it" // { default = true; };
161−
162− target = mkOption {
163− type = types.path;
164− description = ''
165− Path of the symlink.
166− '';
167− default = name;
168− };
169−
170− text = mkOption {
171− default = null;
172− type = types.nullOr types.lines;
173− description = "Text of the file.";
174− };
175−
176− source = mkOption {
177− type = types.path;
178− description = "Path of the source file.";
179− };
180− };
181−
182− config = {
183− source = mkIf (config.text != null) (
184− let name' = "initrd-" + baseNameOf name;
185− in mkDerivedConfig options.text (pkgs.writeText name')
186− );
187− };
188− }));
161+ type = utils.systemdUtils.types.initrdContents;
189162 };
190163
191164 storePaths = mkOption {
@@ -369,6 +342,7 @@ in {
369342 "/etc/fstab".source = fstab;
370343
371344 "/lib/modules".source = "${modulesClosure}/lib/modules";
345+ "/lib/firmware".source = "${modulesClosure}/lib/firmware";
372346
373347 "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules;
374348
@@ -390,18 +364,22 @@ in {
390364 storePaths = [
391365 # systemd tooling
392366 "${cfg.package}/lib/systemd/systemd-fsck"
393− "${cfg.package}/lib/systemd/systemd-growfs"
367+ (lib.mkIf needGrowfs "${cfg.package}/lib/systemd/systemd-growfs")
394368 "${cfg.package}/lib/systemd/systemd-hibernate-resume"
395369 "${cfg.package}/lib/systemd/systemd-journald"
396− "${cfg.package}/lib/systemd/systemd-makefs"
370+ (lib.mkIf needMakefs "${cfg.package}/lib/systemd/systemd-makefs")
397371 "${cfg.package}/lib/systemd/systemd-modules-load"
398372 "${cfg.package}/lib/systemd/systemd-remount-fs"
399373 "${cfg.package}/lib/systemd/systemd-shutdown"
400374 "${cfg.package}/lib/systemd/systemd-sulogin-shell"
401375 "${cfg.package}/lib/systemd/systemd-sysctl"
402376
403− # additional systemd directories
404− "${cfg.package}/lib/systemd/system-generators"
377+ # generators
378+ "${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
379+ "${cfg.package}/lib/systemd/system-generators/systemd-fstab-generator"
380+ "${cfg.package}/lib/systemd/system-generators/systemd-gpt-auto-generator"
381+ "${cfg.package}/lib/systemd/system-generators/systemd-hibernate-resume-generator"
382+ "${cfg.package}/lib/systemd/system-generators/systemd-run-generator"
405383
406384 # utilities needed by systemd
407385 "${cfg.package.util-linux}/bin/mount"
@@ -439,8 +417,8 @@ in {
439417 mkdir -p $out/etc/systemd/system
440418 touch $out/etc/systemd/system/systemd-{makefs,growfs}@.service
441419 '')];
442− services."systemd-makefs@".unitConfig.IgnoreOnIsolate = true;
443− services."systemd-growfs@".unitConfig.IgnoreOnIsolate = true;
420+ services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; };
421+ services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; };
444422
445423 services.initrd-nixos-activation = {
446424 after = [ "initrd-fs.target" ];
@@ -502,6 +480,21 @@ in {
502480 ''systemctl --no-block switch-root /sysroot "''${NEW_INIT}"''
503481 ];
504482 };
483+
484+ services.panic-on-fail = {
485+ wantedBy = ["emergency.target"];
486+ unitConfig = {
487+ DefaultDependencies = false;
488+ ConditionKernelCommandLine = [
489+ "|boot.panic_on_fail"
490+ "|stage1panic"
491+ ];
492+ };
493+ script = ''
494+ echo c > /proc/sysrq-trigger
495+ '';
496+ serviceConfig.Type = "oneshot";
497+ };
505498 };
506499
507500 boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ];
nixos/modules/system/boot/systemd/shutdown.nix+31−5
@@ -1,31 +1,57 @@
1−{ config, lib, ... }: let
1+{ config, lib, utils, pkgs, ... }: let
22
3− cfg = config.boot.systemd.shutdown;
3+ cfg = config.systemd.shutdownRamfs;
4+
5+ ramfsContents = let
6+ storePaths = map (p: "${p}\n") cfg.storePaths;
7+ contents = lib.mapAttrsToList (_: v: "${v.source}\n${v.target}") (lib.filterAttrs (_: v: v.enable) cfg.contents);
8+ in pkgs.writeText "shutdown-ramfs-contents" (lib.concatStringsSep "\n" (storePaths ++ contents));
49
510in {
6− options.boot.systemd.shutdown = {
11+ options.systemd.shutdownRamfs = {
712 enable = lib.mkEnableOption "pivoting back to an initramfs for shutdown" // { default = true; };
13+ contents = lib.mkOption {
14+ description = "Set of files that have to be linked into the shutdown ramfs";
15+ example = lib.literalExpression ''
16+ {
17+ "/lib/systemd/system-shutdown/zpool-sync-shutdown".source = writeShellScript "zpool" "exec ''${zfs}/bin/zpool sync"
18+ }
19+ '';
20+ type = utils.systemdUtils.types.initrdContents;
21+ };
22+
23+ storePaths = lib.mkOption {
24+ description = ''
25+ Store paths to copy into the shutdown ramfs as well.
26+ '';
27+ type = lib.types.listOf lib.types.singleLineStr;
28+ default = [];
29+ };
830 };
931
1032 config = lib.mkIf cfg.enable {
33+ systemd.shutdownRamfs.contents."/shutdown".source = "${config.systemd.package}/lib/systemd/systemd-shutdown";
34+ systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"];
35+
1136 systemd.services.generate-shutdown-ramfs = {
1237 description = "Generate shutdown ramfs";
38+ wantedBy = [ "shutdown.target" ];
1339 before = [ "shutdown.target" ];
1440 unitConfig = {
1541 DefaultDependencies = false;
1642 ConditionFileIsExecutable = [
1743 "!/run/initramfs/shutdown"
18− "/run/current-system/systemd/lib/systemd/systemd-shutdown"
1944 ];
2045 };
2146
47+ path = [pkgs.util-linux pkgs.makeInitrdNGTool];
2248 serviceConfig.Type = "oneshot";
2349 script = ''
2450 mkdir -p /run/initramfs
2551 if ! mountpoint -q /run/initramfs; then
2652 mount -t tmpfs tmpfs /run/initramfs
2753 fi
28− cp /run/current-system/systemd/lib/systemd/systemd-shutdown /run/initramfs/shutdown
54+ make-initrd-ng ${ramfsContents} /run/initramfs
2955 '';
3056 };
3157 };
nixos/modules/tasks/filesystems/xfs.nix+2−2
@@ -15,14 +15,14 @@ in
1515
1616 boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
1717
18− boot.initrd.extraUtilsCommands = mkIf (inInitrd && !boot.initrd.systemd.enable)
18+ boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
1919 ''
2020 copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
2121 copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/xfs_repair
2222 '';
2323
2424 # Trick just to set 'sh' after the extraUtils nuke-refs.
25− boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !boot.initrd.systemd.enable)
25+ boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
2626 ''
2727 sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
2828 '';
nixos/modules/tasks/filesystems/zfs.nix+5
@@ -466,6 +466,11 @@ in
466466 '') rootPools));
467467 };
468468
469+ systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/zpool".source = pkgs.writeShellScript "zpool-sync-shutdown" ''
470+ exec ${cfgZfs.package}/bin/zpool sync
471+ '';
472+ systemd.shutdownRamfs.storePaths = ["${cfgZfs.package}/bin/zpool"];
473+
469474 # TODO FIXME See https://github.com/NixOS/nixpkgs/pull/99386#issuecomment-798813567. To not break people's bootloader and as probably not everybody would read release notes that thoroughly add inSystem.
470475 boot.loader.grub = mkIf (inInitrd || inSystem) {
471476 zfsSupport = true;
nixos/modules/testing/test-instrumentation.nix+19−26
@@ -65,33 +65,26 @@ in
6565 };
6666 };
6767
68− boot.initrd.preDeviceCommands =
69− ''
70− echo 600 > /proc/sys/kernel/hung_task_timeout_secs
71− '';
72−
73− boot.initrd.postDeviceCommands =
74− ''
75− # Using acpi_pm as a clock source causes the guest clock to
76− # slow down under high host load. This is usually a bad
77− # thing, but for VM tests it should provide a bit more
78− # determinism (e.g. if the VM runs at lower speed, then
79− # timeouts in the VM should also be delayed).
80− echo acpi_pm > /sys/devices/system/clocksource/clocksource0/current_clocksource
81− '';
82−
83− boot.postBootCommands =
84− ''
85− # Panic on out-of-memory conditions rather than letting the
86− # OOM killer randomly get rid of processes, since this leads
87− # to failures that are hard to diagnose.
88− echo 2 > /proc/sys/vm/panic_on_oom
89− '';
68+ boot.kernel.sysctl = {
69+ "kernel.hung_task_timeout_secs" = 600;
70+ # Panic on out-of-memory conditions rather than letting the
71+ # OOM killer randomly get rid of processes, since this leads
72+ # to failures that are hard to diagnose.
73+ "vm.panic_on_oom" = lib.mkDefault 2;
74+ };
9075
91− # Panic if an error occurs in stage 1 (rather than waiting for
92− # user intervention).
93− boot.kernelParams =
94− [ "console=${qemu-common.qemuSerialDevice}" "panic=1" "boot.panic_on_fail" ];
76+ boot.kernelParams = [
77+ "console=${qemu-common.qemuSerialDevice}"
78+ # Panic if an error occurs in stage 1 (rather than waiting for
79+ # user intervention).
80+ "panic=1" "boot.panic_on_fail"
81+ # Using acpi_pm as a clock source causes the guest clock to
82+ # slow down under high host load. This is usually a bad
83+ # thing, but for VM tests it should provide a bit more
84+ # determinism (e.g. if the VM runs at lower speed, then
85+ # timeouts in the VM should also be delayed).
86+ "clock=acpi_pm"
87+ ];
9588
9689 # `xwininfo' is used by the test driver to query open windows.
9790 environment.systemPackages = [ pkgs.xorg.xwininfo ];
nixos/modules/virtualisation/nixos-containers.nix+26−11
@@ -4,6 +4,11 @@ with lib;
44
55let
66
7+ configurationPrefix = optionalString (versionAtLeast config.system.stateVersion "22.05") "nixos-";
8+ configurationDirectoryName = "${configurationPrefix}containers";
9+ configurationDirectory = "/etc/${configurationDirectoryName}";
10+ stateDirectory = "/var/lib/${configurationPrefix}containers";
11+
712 # The container's init script, a small wrapper around the regular
813 # NixOS stage-2 init script.
914 containerInit = (cfg:
@@ -77,7 +82,7 @@ let
7782 startScript = cfg:
7883 ''
7984 mkdir -p -m 0755 "$root/etc" "$root/var/lib"
80− mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers
85+ mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/nixos-containers
8186 if ! [ -e "$root/etc/os-release" ]; then
8287 touch "$root/etc/os-release"
8388 fi
@@ -249,11 +254,11 @@ let
249254
250255 SyslogIdentifier = "container %i";
251256
252− EnvironmentFile = "-/etc/containers/%i.conf";
257+ EnvironmentFile = "-${configurationDirectory}/%i.conf";
253258
254259 Type = "notify";
255260
256− RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i";
261+ RuntimeDirectory = lib.optional cfg.ephemeral "${configurationDirectoryName}/%i";
257262
258263 # Note that on reboot, systemd-nspawn returns 133, so this
259264 # unit will be restarted. On poweroff, it returns 0, so the
@@ -737,15 +742,21 @@ in
737742
738743 config = mkIf (config.boot.enableContainers) (let
739744
745+ warnings = flatten [
746+ (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") ''
747+ Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported.
748+ '')
749+ ];
750+
740751 unit = {
741752 description = "Container '%i'";
742753
743− unitConfig.RequiresMountsFor = "/var/lib/containers/%i";
754+ unitConfig.RequiresMountsFor = "${stateDirectory}/%i";
744755
745756 path = [ pkgs.iproute2 ];
746757
747758 environment = {
748− root = "/var/lib/containers/%i";
759+ root = "${stateDirectory}/%i";
749760 INSTANCE = "%i";
750761 };
751762
@@ -782,8 +793,8 @@ in
782793 script = startScript containerConfig;
783794 postStart = postStartScript containerConfig;
784795 serviceConfig = serviceDirectives containerConfig;
785− unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i";
786− environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i";
796+ unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i";
797+ environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i";
787798 } // (
788799 if containerConfig.autoStart then
789800 {
@@ -792,7 +803,7 @@ in
792803 after = [ "network.target" ];
793804 restartTriggers = [
794805 containerConfig.path
795− config.environment.etc."containers/${name}.conf".source
806+ config.environment.etc."${configurationDirectoryName}/${name}.conf".source
796807 ];
797808 restartIfChanged = true;
798809 }
@@ -800,12 +811,12 @@ in
800811 )) config.containers)
801812 ));
802813
803− # Generate a configuration file in /etc/containers for each
814+ # Generate a configuration file in /etc/nixos-containers for each
804815 # container so that container@.target can get the container
805816 # configuration.
806817 environment.etc =
807818 let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort);
808− in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
819+ in mapAttrs' (name: cfg: nameValuePair "${configurationDirectoryName}/${name}.conf"
809820 { text =
810821 ''
811822 SYSTEM_PATH=${cfg.path}
@@ -854,7 +865,11 @@ in
854865 ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1"
855866 '';
856867
857− environment.systemPackages = [ pkgs.nixos-container ];
868+ environment.systemPackages = [
869+ (pkgs.nixos-container.override {
870+ inherit stateDirectory configurationDirectory;
871+ })
872+ ];
858873
859874 boot.kernelModules = [
860875 "bridge"
nixos/modules/virtualisation/oci-containers.nix+1−5
@@ -338,11 +338,7 @@ in {
338338
339339 backend = mkOption {
340340 type = types.enum [ "podman" "docker" ];
341− default =
342− # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman
343− # if versionAtLeast config.system.stateVersion "20.09" then "podman"
344− # else "docker";
345− "docker";
341+ default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker";
346342 description = "The underlying Docker implementation to use.";
347343 };
348344
nixos/modules/virtualisation/qemu-vm.nix+8−3
@@ -754,13 +754,13 @@ in
754754 );
755755 boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";
756756
757− boot.initrd.extraUtilsCommands =
757+ boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
758758 ''
759759 # We need mke2fs in the initrd.
760760 copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs
761761 '';
762762
763− boot.initrd.postDeviceCommands =
763+ boot.initrd.postDeviceCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
764764 ''
765765 # If the disk image appears to be empty, run mke2fs to
766766 # initialise.
@@ -770,7 +770,7 @@ in
770770 fi
771771 '';
772772
773− boot.initrd.postMountCommands =
773+ boot.initrd.postMountCommands = lib.mkIf (!config.boot.initrd.systemd.enable)
774774 ''
775775 # Mark this as a NixOS machine.
776776 mkdir -p $targetRoot/etc
@@ -789,6 +789,11 @@ in
789789 ''}
790790 '';
791791
792+ systemd.tmpfiles.rules = lib.mkIf config.boot.initrd.systemd.enable [
793+ "f /etc/NIXOS 0644 root root -"
794+ "d /boot 0644 root root -"
795+ ];
796+
792797 # After booting, register the closure of the paths in
793798 # `virtualisation.additionalPaths' in the Nix database in the VM. This
794799 # allows Nix operations to work in the VM. The path to the
nixos/modules/virtualisation/vmware-host.nixnew file+166
@@ -0,0 +1,166 @@
1+{ config, pkgs, lib, ... }:
2+
3+let
4+ cfg = config.virtualisation.vmware.host;
5+ wrapperDir = "/run/vmware/bin"; # Perfectly fits as /usr/local/bin
6+ parentWrapperDir = dirOf wrapperDir;
7+ vmwareWrappers = # Needed as hardcoded paths workaround
8+ let mkVmwareSymlink =
9+ program:
10+ ''
11+ ln -s "${config.security.wrapperDir}/${program}" $wrapperDir/${program}
12+ '';
13+ in
14+ [
15+ (mkVmwareSymlink "pkexec")
16+ (mkVmwareSymlink "mount")
17+ (mkVmwareSymlink "umount")
18+ ];
19+in
20+{
21+ options = with lib; {
22+ virtualisation.vmware.host = {
23+ enable = mkEnableOption "VMware" // {
24+ description = ''
25+ This enables VMware host virtualisation for running VMs.
26+
27+ <important><para>
28+ <literal>vmware-vmx</literal> will cause kcompactd0 due to
29+ <literal>Transparent Hugepages</literal> feature in kernel.
30+ Apply <literal>[ "transparent_hugepage=never" ]</literal> in
31+ option <option>boot.kernelParams</option> to disable them.
32+ </para></important>
33+
34+ <note><para>
35+ If that didn't work disable <literal>TRANSPARENT_HUGEPAGE</literal>,
36+ <literal>COMPACTION</literal> configs and recompile kernel.
37+ </para></note>
38+ '';
39+ };
40+ package = mkOption {
41+ type = types.package;
42+ default = pkgs.vmware-workstation;
43+ defaultText = literalExpression "pkgs.vmware-workstation";
44+ description = "VMware host virtualisation package to use";
45+ };
46+ extraPackages = mkOption {
47+ type = with types; listOf package;
48+ default = with pkgs; [ ];
49+ description = "Extra packages to be used with VMware host.";
50+ example = "with pkgs; [ ntfs3g ]";
51+ };
52+ extraConfig = mkOption {
53+ type = types.lines;
54+ default = "";
55+ description = "Add extra config to /etc/vmware/config";
56+ example = ''
57+ # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU
58+ mks.gl.allowUnsupportedDrivers = "TRUE"
59+ mks.vk.allowUnsupportedDevices = "TRUE"
60+ '';
61+ };
62+ };
63+ };
64+
65+ config = lib.mkIf cfg.enable {
66+ boot.extraModulePackages = [ config.boot.kernelPackages.vmware ];
67+ boot.extraModprobeConfig = "alias char-major-10-229 fuse";
68+ boot.kernelModules = [ "vmw_pvscsi" "vmw_vmci" "vmmon" "vmnet" "fuse" ];
69+
70+ environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
71+ services.printing.drivers = [ cfg.package ];
72+
73+ environment.etc."vmware/config".text = ''
74+ ${builtins.readFile "${cfg.package}/etc/vmware/config"}
75+ ${cfg.extraConfig}
76+ '';
77+
78+ environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap";
79+ environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu";
80+ environment.etc."vmware-installer".source = "${cfg.package}/etc/vmware-installer";
81+
82+ # SUID wrappers
83+
84+ security.wrappers = {
85+ vmware-vmx = {
86+ setuid = true;
87+ owner = "root";
88+ group = "root";
89+ source = "${cfg.package}/lib/vmware/bin/.vmware-vmx-wrapped";
90+ };
91+ };
92+
93+ ###### wrappers activation script
94+
95+ system.activationScripts.vmwareWrappers =
96+ lib.stringAfter [ "specialfs" "users" ]
97+ ''
98+ mkdir -p "${parentWrapperDir}"
99+ chmod 755 "${parentWrapperDir}"
100+ # We want to place the tmpdirs for the wrappers to the parent dir.
101+ wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
102+ chmod a+rx "$wrapperDir"
103+ ${lib.concatStringsSep "\n" (vmwareWrappers)}
104+ if [ -L ${wrapperDir} ]; then
105+ # Atomically replace the symlink
106+ # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
107+ old=$(readlink -f ${wrapperDir})
108+ if [ -e "${wrapperDir}-tmp" ]; then
109+ rm --force --recursive "${wrapperDir}-tmp"
110+ fi
111+ ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"
112+ mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"
113+ rm --force --recursive "$old"
114+ else
115+ # For initial setup
116+ ln --symbolic "$wrapperDir" "${wrapperDir}"
117+ fi
118+ '';
119+
120+ # Services
121+
122+ systemd.services."vmware-authdlauncher" = {
123+ description = "VMware Authentification Daemon";
124+ serviceConfig = {
125+ Type = "forking";
126+ ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ];
127+ };
128+ wantedBy = [ "multi-user.target" ];
129+ };
130+
131+ systemd.services."vmware-networks-configuration" = {
132+ description = "VMware Networks Configuration Generation";
133+ unitConfig.ConditionPathExists = "!/etc/vmware/networking";
134+ serviceConfig = {
135+ UMask = "0077";
136+ ExecStart = [
137+ "${cfg.package}/bin/vmware-networks --postinstall vmware-player,0,1"
138+ ];
139+ Type = "oneshot";
140+ RemainAfterExit = "yes";
141+ };
142+ wantedBy = [ "multi-user.target" ];
143+ };
144+
145+ systemd.services."vmware-networks" = {
146+ description = "VMware Networks";
147+ after = [ "vmware-networks-configuration.service" ];
148+ requires = [ "vmware-networks-configuration.service" ];
149+ serviceConfig = {
150+ Type = "forking";
151+ ExecCondition = [ "${pkgs.kmod}/bin/modprobe vmnet" ];
152+ ExecStart = [ "${cfg.package}/bin/vmware-networks --start" ];
153+ ExecStop = [ "${cfg.package}/bin/vmware-networks --stop" ];
154+ };
155+ wantedBy = [ "multi-user.target" ];
156+ };
157+
158+ systemd.services."vmware-usbarbitrator" = {
159+ description = "VMware USB Arbitrator";
160+ serviceConfig = {
161+ ExecStart = [ "${cfg.package}/bin/vmware-usbarbitrator -f" ];
162+ };
163+ wantedBy = [ "multi-user.target" ];
164+ };
165+ };
166+}
nixos/release-combined.nix+2
@@ -132,12 +132,14 @@ in rec {
132132 # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314
133133 #(onFullSupported "nixos.tests.nfs3.simple")
134134 (onFullSupported "nixos.tests.nfs4.simple")
135+ (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman")
135136 (onFullSupported "nixos.tests.openssh")
136137 (onFullSupported "nixos.tests.pantheon")
137138 (onFullSupported "nixos.tests.php.fpm")
138139 (onFullSupported "nixos.tests.php.httpd")
139140 (onFullSupported "nixos.tests.php.pcre")
140141 (onFullSupported "nixos.tests.plasma5")
142+ (onSystems ["x86_64-linux"] "nixos.tests.podman")
141143 (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd")
142144 (onFullSupported "nixos.tests.predictable-interface-names.predictable")
143145 (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd")
nixos/release.nix+2−2
@@ -150,13 +150,13 @@ in rec {
150150 });
151151
152152 iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
153− module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;
153+ module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix;
154154 type = "plasma5";
155155 inherit system;
156156 });
157157
158158 iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
159− module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
159+ module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;
160160 type = "gnome";
161161 inherit system;
162162 });
nixos/tests/all-tests.nix+1−1
@@ -235,6 +235,7 @@ in
235235 input-remapper = handleTest ./input-remapper.nix {};
236236 inspircd = handleTest ./inspircd.nix {};
237237 installer = handleTest ./installer.nix {};
238+ installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {};
238239 invoiceplane = handleTest ./invoiceplane.nix {};
239240 iodine = handleTest ./iodine.nix {};
240241 ipfs = handleTest ./ipfs.nix {};
@@ -283,7 +284,6 @@ in
283284 loki = handleTest ./loki.nix {};
284285 lvm2 = handleTest ./lvm2 {};
285286 lxd = handleTest ./lxd.nix {};
286− lxd-image = handleTest ./lxd-image.nix {};
287287 lxd-nftables = handleTest ./lxd-nftables.nix {};
288288 lxd-image-server = handleTest ./lxd-image-server.nix {};
289289 #logstash = handleTest ./logstash.nix {};
nixos/tests/common/lxd/config.yamlnew file+24
@@ -0,0 +1,24 @@
1+storage_pools:
2+ - name: default
3+ driver: dir
4+ config:
5+ source: /var/lxd-pool
6+
7+networks:
8+ - name: lxdbr0
9+ type: bridge
10+ config:
11+ ipv4.address: auto
12+ ipv6.address: none
13+
14+profiles:
15+ - name: default
16+ devices:
17+ eth0:
18+ name: eth0
19+ network: lxdbr0
20+ type: nic
21+ root:
22+ path: /
23+ pool: default
24+ type: disk
nixos/tests/containers-ephemeral.nix+3−3
@@ -33,10 +33,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
3333 machine.succeed("nixos-container start webserver")
3434
3535 with subtest("Container got its own root folder"):
36− machine.succeed("ls /run/containers/webserver")
36+ machine.succeed("ls /run/nixos-containers/webserver")
3737
3838 with subtest("Container persistent directory is not created"):
39− machine.fail("ls /var/lib/containers/webserver")
39+ machine.fail("ls /var/lib/nixos-containers/webserver")
4040
4141 # Since "start" returns after the container has reached
4242 # multi-user.target, we should now be able to access it.
@@ -49,6 +49,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
4949 machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null")
5050
5151 with subtest("Container's root folder was removed"):
52− machine.fail("ls /run/containers/webserver")
52+ machine.fail("ls /run/nixos-containers/webserver")
5353 '';
5454})
nixos/tests/containers-imperative.nix+6−6
@@ -69,8 +69,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
6969
7070 with subtest(f"Put the root of {id2} into a bind mount"):
7171 machine.succeed(
72− f"mv /var/lib/containers/{id2} /id2-bindmount",
73− f"mount --bind /id2-bindmount /var/lib/containers/{id1}",
72+ f"mv /var/lib/nixos-containers/{id2} /id2-bindmount",
73+ f"mount --bind /id2-bindmount /var/lib/nixos-containers/{id1}",
7474 )
7575
7676 ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip()
@@ -88,7 +88,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
8888 "Create a directory with a dummy file and bind-mount it into both containers."
8989 ):
9090 for id in id1, id2:
91− important_path = f"/var/lib/containers/{id}/very/important/data"
91+ important_path = f"/var/lib/nixos-containers/{id}/very/important/data"
9292 machine.succeed(
9393 f"mkdir -p {important_path}",
9494 f"mount --bind /nested-bindmount {important_path}",
@@ -154,13 +154,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
154154 machine.succeed("grep -qF 'important data' /nested-bindmount/dummy")
155155
156156 with subtest("Ensure that the container path is gone"):
157− print(machine.succeed("ls -lsa /var/lib/containers"))
158− machine.succeed(f"test ! -e /var/lib/containers/{id1}")
157+ print(machine.succeed("ls -lsa /var/lib/nixos-containers"))
158+ machine.succeed(f"test ! -e /var/lib/nixos-containers/{id1}")
159159
160160 with subtest("Ensure that a failed container creation doesn'leave any state"):
161161 machine.fail(
162162 "nixos-container create b0rk --config-file ${brokenCfg}"
163163 )
164− machine.succeed("test ! -e /var/lib/containers/b0rk")
164+ machine.succeed("test ! -e /var/lib/nixos-containers/b0rk")
165165 '';
166166})
nixos/tests/containers-tmpfs.nix+5−5
@@ -62,7 +62,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
6262 machine.succeed(
6363 tmpfs_cmd("touch /root/test.file"),
6464 tmpfs_cmd("ls -l /root | grep -q test.file"),
65− "test -e /var/lib/containers/tmpfs/root/test.file",
65+ "test -e /var/lib/nixos-containers/tmpfs/root/test.file",
6666 )
6767
6868 with subtest(
@@ -73,7 +73,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
7373 tmpfs_cmd("touch /some/random/path/test.file"),
7474 tmpfs_cmd("test -e /some/random/path/test.file"),
7575 )
76− machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file")
76+ machine.fail("test -e /var/lib/nixos-containers/tmpfs/some/random/path/test.file")
7777
7878 with subtest(
7979 "files created in the hosts container dir in a path where a tmpfs "
@@ -81,9 +81,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
8181 + "the do not exist in the tmpfs"
8282 ):
8383 machine.succeed(
84− "touch /var/lib/containers/tmpfs/var/test.file",
85− "test -e /var/lib/containers/tmpfs/var/test.file",
86− "ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
84+ "touch /var/lib/nixos-containers/tmpfs/var/test.file",
85+ "test -e /var/lib/nixos-containers/tmpfs/var/test.file",
86+ "ls -l /var/lib/nixos-containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
8787 )
8888 machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file"))
8989 '';
nixos/tests/custom-ca.nix+104−90
@@ -1,9 +1,14 @@
11# Checks that `security.pki` options are working in curl and the main browser
2−# engines: Gecko (via Firefox), Chromium, QtWebEngine (Falkon) and WebKitGTK
3−# (via Midori). The test checks that certificates issued by a custom trusted
4−# CA are accepted but those from an unknown CA are rejected.
2+# engines: Gecko (via Firefox), Chromium, QtWebEngine (via qutebrowser) and
3+# WebKitGTK (via Midori). The test checks that certificates issued by a custom
4+# trusted CA are accepted but those from an unknown CA are rejected.
55
6−import ./make-test-python.nix ({ pkgs, lib, ... }:
6+{ system ? builtins.currentSystem,
7+ config ? {},
8+ pkgs ? import ../.. { inherit system config; }
9+}:
10+
11+with import ../lib/testing-python.nix { inherit system pkgs; };
712
813let
914 makeCert = { caName, domain }: pkgs.runCommand "example-cert"
@@ -68,24 +73,8 @@ let
6873 domain = "bad.example.com";
6974 };
7075
71−in
72−
73−{
74− name = "custom-ca";
75− meta.maintainers = with lib.maintainers; [ rnhmjoj ];
76−
77− enableOCR = true;
78−
79− nodes.machine = { pkgs, ... }:
80− { imports = [ ./common/user-account.nix ./common/x11.nix ];
81−
82− # chromium-based browsers refuse to run as root
83− test-support.displayManager.auto.user = "alice";
84−
85− # browsers may hang with the default memory
86− virtualisation.memorySize = 600;
87−
88− networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
76+ webserverConfig =
77+ { networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
8978 security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];
9079
9180 services.nginx.enable = true;
@@ -107,73 +96,98 @@ in
10796 return 200 'It does not work!';
10897 '';
10998 };
110−
111− environment.systemPackages = with pkgs; [
112− xdotool
113− firefox
114− chromium
115− qutebrowser
116− midori
117− ];
11899 };
119100
120− testScript = ''
121− from typing import Tuple
122− def execute_as(user: str, cmd: str) -> Tuple[int, str]:
123− """
124− Run a shell command as a specific user.
125− """
126− return machine.execute(f"sudo -u {user} {cmd}")
127−
128−
129− def wait_for_window_as(user: str, cls: str) -> None:
130− """
131− Wait until a X11 window of a given user appears.
132− """
133−
134− def window_is_visible(last_try: bool) -> bool:
135− ret, stdout = execute_as(user, f"xdotool search --onlyvisible --class {cls}")
136− if last_try:
137− machine.log(f"Last chance to match {cls} on the window list")
138− return ret == 0
139−
140− with machine.nested("Waiting for a window to appear"):
141− retry(window_is_visible)
142−
143−
144− machine.start()
145−
146− with subtest("Good certificate is trusted in curl"):
147− machine.wait_for_unit("nginx")
148− machine.wait_for_open_port(443)
149− machine.succeed("curl -fv https://good.example.com")
150−
151− with subtest("Unknown CA is untrusted in curl"):
152− machine.fail("curl -fv https://bad.example.com")
153−
154− browsers = {
155− "firefox": "Security Risk",
156− "chromium": "not private",
157− "qutebrowser -T": "Certificate error",
158− "midori": "Security"
159− }
160−
161− machine.wait_for_x()
162− for command, error in browsers.items():
163− browser = command.split()[0]
164− with subtest("Good certificate is trusted in " + browser):
165− execute_as(
166− "alice", f"{command} https://good.example.com >&2 &"
167− )
168− wait_for_window_as("alice", browser)
169− machine.wait_for_text("It works!")
170− machine.screenshot("good" + browser)
171− execute_as("alice", "xdotool key ctrl+w") # close tab
172−
173− with subtest("Unknown CA is untrusted in " + browser):
174− execute_as("alice", f"{command} https://bad.example.com >&2 &")
175− machine.wait_for_text(error)
176− machine.screenshot("bad" + browser)
177− machine.succeed("pkill -f " + browser)
178− '';
179−})
101+ curlTest = makeTest {
102+ name = "custom-ca-curl";
103+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
104+ nodes.machine = { ... }: webserverConfig;
105+ testScript = ''
106+ with subtest("Good certificate is trusted in curl"):
107+ machine.wait_for_unit("nginx")
108+ machine.wait_for_open_port(443)
109+ machine.succeed("curl -fv https://good.example.com")
110+
111+ with subtest("Unknown CA is untrusted in curl"):
112+ machine.fail("curl -fv https://bad.example.com")
113+ '';
114+ };
115+
116+ mkBrowserTest = browser: testParams: makeTest {
117+ name = "custom-ca-${browser}";
118+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
119+
120+ enableOCR = true;
121+
122+ nodes.machine = { pkgs, ... }:
123+ { imports =
124+ [ ./common/user-account.nix
125+ ./common/x11.nix
126+ webserverConfig
127+ ];
128+
129+ # chromium-based browsers refuse to run as root
130+ test-support.displayManager.auto.user = "alice";
131+
132+ # browsers may hang with the default memory
133+ virtualisation.memorySize = 600;
134+
135+ environment.systemPackages = [ pkgs.xdotool pkgs.${browser} ];
136+ };
137+
138+ testScript = ''
139+ from typing import Tuple
140+ def execute_as(user: str, cmd: str) -> Tuple[int, str]:
141+ """
142+ Run a shell command as a specific user.
143+ """
144+ return machine.execute(f"sudo -u {user} {cmd}")
145+
146+
147+ def wait_for_window_as(user: str, cls: str) -> None:
148+ """
149+ Wait until a X11 window of a given user appears.
150+ """
151+
152+ def window_is_visible(last_try: bool) -> bool:
153+ ret, stdout = execute_as(user, f"xdotool search --onlyvisible --class {cls}")
154+ if last_try:
155+ machine.log(f"Last chance to match {cls} on the window list")
156+ return ret == 0
157+
158+ with machine.nested("Waiting for a window to appear"):
159+ retry(window_is_visible)
160+
161+
162+ machine.start()
163+ machine.wait_for_x()
164+
165+ command = "${browser} ${testParams.args or ""}"
166+ with subtest("Good certificate is trusted in ${browser}"):
167+ execute_as(
168+ "alice", f"{command} https://good.example.com >&2 &"
169+ )
170+ wait_for_window_as("alice", "${browser}")
171+ machine.sleep(4)
172+ execute_as("alice", "xdotool key ctrl+r") # reload to be safe
173+ machine.wait_for_text("It works!")
174+ machine.screenshot("good${browser}")
175+ execute_as("alice", "xdotool key ctrl+w") # close tab
176+
177+ with subtest("Unknown CA is untrusted in ${browser}"):
178+ execute_as("alice", f"{command} https://bad.example.com >&2 &")
179+ machine.wait_for_text("${testParams.error}")
180+ machine.screenshot("bad${browser}")
181+ '';
182+ };
183+
184+in
185+
186+{
187+ curl = curlTest;
188+} // pkgs.lib.mapAttrs mkBrowserTest {
189+ firefox = { error = "Security Risk"; };
190+ chromium = { error = "not private"; };
191+ qutebrowser = { args = "-T"; error = "Certificate error"; };
192+ midori = { error = "Security"; };
193+}
nixos/tests/gitlab.nix+298−25
@@ -1,9 +1,31 @@
1−# This test runs gitlab and checks if it works
1+# This test runs gitlab and performs the following tests:
2+# - Creating users
3+# - Pushing commits
4+# - over the API
5+# - over SSH
6+# - Creating Merge Requests and merging them
7+# - Opening and closing issues.
8+# - Downloading repository archives as tar.gz and tar.bz2
9+import ./make-test-python.nix ({ pkgs, lib, ... }:
10+
11+with lib;
212
313let
14+ inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
415 initialRootPassword = "notproduction";
5−in
6−import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
16+ rootProjectId = "2";
17+
18+ aliceUsername = "alice";
19+ aliceUserId = "2";
20+ alicePassword = "alicepassword";
21+ aliceProjectId = "2";
22+ aliceProjectName = "test-alice";
23+
24+ bobUsername = "bob";
25+ bobUserId = "3";
26+ bobPassword = "bobpassword";
27+ bobProjectId = "3";
28+in {
729 name = "gitlab";
830 meta = with pkgs.lib.maintainers; {
931 maintainers = [ globin yayayayaka ];
@@ -31,6 +53,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
3153 };
3254 };
3355
56+ services.openssh.enable = true;
57+
3458 services.dovecot2 = {
3559 enable = true;
3660 enableImap = true;
@@ -77,8 +101,43 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
77101 password = initialRootPassword;
78102 });
79103
80− createProject = pkgs.writeText "create-project.json" (builtins.toJSON {
81− name = "test";
104+ createUserAlice = pkgs.writeText "create-user-alice.json" (builtins.toJSON rec {
105+ username = aliceUsername;
106+ name = username;
107+ email = "alice@localhost";
108+ password = alicePassword;
109+ skip_confirmation = true;
110+ });
111+
112+ createUserBob = pkgs.writeText "create-user-bob.json" (builtins.toJSON rec {
113+ username = bobUsername;
114+ name = username;
115+ email = "bob@localhost";
116+ password = bobPassword;
117+ skip_confirmation = true;
118+ });
119+
120+ aliceAuth = pkgs.writeText "alice-auth.json" (builtins.toJSON {
121+ grant_type = "password";
122+ username = aliceUsername;
123+ password = alicePassword;
124+ });
125+
126+ bobAuth = pkgs.writeText "bob-auth.json" (builtins.toJSON {
127+ grant_type = "password";
128+ username = bobUsername;
129+ password = bobPassword;
130+ });
131+
132+ aliceAddSSHKey = pkgs.writeText "alice-add-ssh-key.json" (builtins.toJSON {
133+ id = aliceUserId;
134+ title = "snakeoil@nixos";
135+ key = snakeOilPublicKey;
136+ });
137+
138+ createProjectAlice = pkgs.writeText "create-project-alice.json" (builtins.toJSON {
139+ name = aliceProjectName;
140+ visibility = "public";
82141 });
83142
84143 putFile = pkgs.writeText "put-file.json" (builtins.toJSON {
@@ -89,6 +148,23 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
89148 commit_message = "create a new file";
90149 });
91150
151+ mergeRequest = pkgs.writeText "merge-request.json" (builtins.toJSON {
152+ id = bobProjectId;
153+ target_project_id = aliceProjectId;
154+ source_branch = "master";
155+ target_branch = "master";
156+ title = "Add some other file";
157+ });
158+
159+ newIssue = pkgs.writeText "new-issue.json" (builtins.toJSON {
160+ title = "useful issue title";
161+ });
162+
163+ closeIssue = pkgs.writeText "close-issue.json" (builtins.toJSON {
164+ issue_iid = 1;
165+ state_event = "close";
166+ });
167+
92168 # Wait for all GitLab services to be fully started.
93169 waitForServices = ''
94170 gitlab.wait_for_unit("gitaly.service")
@@ -105,6 +181,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
105181 # The actual test of GitLab. Only push data to GitLab if
106182 # `doSetup` is is true.
107183 test = doSetup: ''
184+ GIT_SSH_COMMAND = "ssh -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null"
185+
108186 gitlab.succeed(
109187 "curl -isSf http://gitlab | grep -i location | grep http://gitlab/users/sign_in"
110188 )
@@ -115,27 +193,222 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
115193 "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
116194 )
117195 '' + optionalString doSetup ''
118− gitlab.succeed(
119− """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects)" = "201" ]"""
120− )
121− gitlab.succeed(
122− """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/2/repository/files/some-file.txt)" = "201" ]"""
123− )
196+ with subtest("Create user Alice"):
197+ gitlab.succeed(
198+ """[ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserAlice} http://gitlab/api/v4/users)" = "201" ]"""
199+ )
200+ gitlab.succeed(
201+ "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${aliceAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-alice"
202+ )
203+
204+ with subtest("Create user Bob"):
205+ gitlab.succeed(
206+ """ [ "$(curl -o /dev/null -w '%{http_code}' -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createUserBob} http://gitlab/api/v4/users)" = "201" ]"""
207+ )
208+ gitlab.succeed(
209+ "echo \"Authorization: Bearer $(curl -X POST -H 'Content-Type: application/json' -d @${bobAuth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers-bob"
210+ )
211+
212+ with subtest("Setup Git and SSH for Alice"):
213+ gitlab.succeed("git config --global user.name Alice")
214+ gitlab.succeed("git config --global user.email alice@nixos.invalid")
215+ gitlab.succeed("mkdir -m 700 /root/.ssh")
216+ gitlab.succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa")
217+ gitlab.succeed("chmod 600 /root/.ssh/id_ecdsa")
218+ gitlab.succeed(
219+ """
220+ [ "$(curl \
221+ -o /dev/null \
222+ -w '%{http_code}' \
223+ -X POST \
224+ -H 'Content-Type: application/json' \
225+ -H @/tmp/headers-alice -d @${aliceAddSSHKey} \
226+ http://gitlab/api/v4/user/keys)" = "201" ]
227+ """
228+ )
229+
230+ with subtest("Create a new repository"):
231+ # Alice creates a new repository
232+ gitlab.succeed(
233+ """
234+ [ "$(curl \
235+ -o /dev/null \
236+ -w '%{http_code}' \
237+ -X POST \
238+ -H 'Content-Type: application/json' \
239+ -H @/tmp/headers-alice \
240+ -d @${createProjectAlice} \
241+ http://gitlab/api/v4/projects)" = "201" ]
242+ """
243+ )
244+
245+ # Alice commits an initial commit
246+ gitlab.succeed(
247+ """
248+ [ "$(curl \
249+ -o /dev/null \
250+ -w '%{http_code}' \
251+ -X POST \
252+ -H 'Content-Type: application/json' \
253+ -H @/tmp/headers-alice \
254+ -d @${putFile} \
255+ http://gitlab/api/v4/projects/${aliceProjectId}/repository/files/some-file.txt)" = "201" ]"""
256+ )
257+
258+ with subtest("git clone over HTTP"):
259+ gitlab.succeed(
260+ """git clone http://gitlab/alice/${aliceProjectName}.git clone-via-http""",
261+ timeout=15
262+ )
263+
264+ with subtest("Push a commit via SSH"):
265+ gitlab.succeed(
266+ f"""GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git clone gitlab@gitlab:alice/${aliceProjectName}.git""",
267+ timeout=15
268+ )
269+ gitlab.succeed(
270+ """echo "a commit sent over ssh" > ${aliceProjectName}/ssh.txt"""
271+ )
272+ gitlab.succeed(
273+ """
274+ cd ${aliceProjectName} || exit 1
275+ git add .
276+ """
277+ )
278+ gitlab.succeed(
279+ """
280+ cd ${aliceProjectName} || exit 1
281+ git commit -m "Add a commit to be sent over ssh"
282+ """
283+ )
284+ gitlab.succeed(
285+ f"""
286+ cd ${aliceProjectName} || exit 1
287+ GIT_SSH_COMMAND="{GIT_SSH_COMMAND}" git push --set-upstream origin master
288+ """,
289+ timeout=15
290+ )
291+
292+ with subtest("Fork a project"):
293+ # Bob forks Alice's project
294+ gitlab.succeed(
295+ """
296+ [ "$(curl \
297+ -o /dev/null \
298+ -w '%{http_code}' \
299+ -X POST \
300+ -H 'Content-Type: application/json' \
301+ -H @/tmp/headers-bob \
302+ http://gitlab/api/v4/projects/${aliceProjectId}/fork)" = "201" ]
303+ """
304+ )
305+
306+ # Bob creates a commit
307+ gitlab.wait_until_succeeds(
308+ """
309+ [ "$(curl \
310+ -o /dev/null \
311+ -w '%{http_code}' \
312+ -X POST \
313+ -H 'Content-Type: application/json' \
314+ -H @/tmp/headers-bob \
315+ -d @${putFile} \
316+ http://gitlab/api/v4/projects/${bobProjectId}/repository/files/some-other-file.txt)" = "201" ]
317+ """
318+ )
319+
320+ with subtest("Create a Merge Request"):
321+ # Bob opens a merge request against Alice's repository
322+ gitlab.wait_until_succeeds(
323+ """
324+ [ "$(curl \
325+ -o /dev/null \
326+ -w '%{http_code}' \
327+ -X POST \
328+ -H 'Content-Type: application/json' \
329+ -H @/tmp/headers-bob \
330+ -d @${mergeRequest} \
331+ http://gitlab/api/v4/projects/${bobProjectId}/merge_requests)" = "201" ]
332+ """
333+ )
334+
335+ # Alice merges the MR
336+ gitlab.wait_until_succeeds(
337+ """
338+ [ "$(curl \
339+ -o /dev/null \
340+ -w '%{http_code}' \
341+ -X PUT \
342+ -H 'Content-Type: application/json' \
343+ -H @/tmp/headers-alice \
344+ -d @${mergeRequest} \
345+ http://gitlab/api/v4/projects/${aliceProjectId}/merge_requests/1/merge)" = "200" ]
346+ """
347+ )
348+
349+ with subtest("Create an Issue"):
350+ # Bob opens an issue on Alice's repository
351+ gitlab.succeed(
352+ """[ "$(curl \
353+ -o /dev/null \
354+ -w '%{http_code}' \
355+ -X POST \
356+ -H 'Content-Type: application/json' \
357+ -H @/tmp/headers-bob \
358+ -d @${newIssue} \
359+ http://gitlab/api/v4/projects/${aliceProjectId}/issues)" = "201" ]
360+ """
361+ )
362+
363+ # Alice closes the issue
364+ gitlab.wait_until_succeeds(
365+ """
366+ [ "$(curl \
367+ -o /dev/null \
368+ -w '%{http_code}' \
369+ -X PUT \
370+ -H 'Content-Type: application/json' \
371+ -H @/tmp/headers-alice -d @${closeIssue} http://gitlab/api/v4/projects/${aliceProjectId}/issues/1)" = "200" ]
372+ """
373+ )
124374 '' + ''
125− gitlab.succeed(
126− """[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz)" = "200" ]"""
127− )
128− gitlab.succeed(
129− """curl -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.gz > /tmp/archive.tar.gz"""
130− )
131− gitlab.succeed(
132− """[ "$(curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2)" = "200" ]"""
133− )
134− gitlab.succeed(
135− """curl -o /dev/null -w '%{http_code}' -H @/tmp/headers http://gitlab/api/v4/projects/2/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"""
136− )
137− gitlab.succeed("test -s /tmp/archive.tar.gz")
138− gitlab.succeed("test -s /tmp/archive.tar.bz2")
375+ with subtest("Download archive.tar.gz"):
376+ gitlab.succeed(
377+ """
378+ [ "$(curl \
379+ -o /dev/null \
380+ -w '%{http_code}' \
381+ -H @/tmp/headers-alice \
382+ http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz)" = "200" ]
383+ """
384+ )
385+ gitlab.succeed(
386+ """
387+ curl \
388+ -H @/tmp/headers-alice \
389+ http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.gz > /tmp/archive.tar.gz
390+ """
391+ )
392+ gitlab.succeed("test -s /tmp/archive.tar.gz")
393+
394+ with subtest("Download archive.tar.bz2"):
395+ gitlab.succeed(
396+ """
397+ [ "$(curl \
398+ -o /dev/null \
399+ -w '%{http_code}' \
400+ -H @/tmp/headers-alice \
401+ http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2)" = "200" ]
402+ """
403+ )
404+ gitlab.succeed(
405+ """
406+ curl \
407+ -H @/tmp/headers-alice \
408+ http://gitlab/api/v4/projects/${aliceProjectId}/repository/archive.tar.bz2 > /tmp/archive.tar.bz2
409+ """
410+ )
411+ gitlab.succeed("test -s /tmp/archive.tar.bz2")
139412 '';
140413
141414 in ''
nixos/tests/installer-systemd-stage-1.nixnew file+33
@@ -0,0 +1,33 @@
1+{ system ? builtins.currentSystem
2+, config ? {}
3+, pkgs ? import ../.. { inherit system config; }
4+}:
5+
6+{
7+ # Some of these tests don't work with systemd stage 1 yet. Uncomment
8+ # them when fixed.
9+ inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })
10+ # bcache
11+ # btrfsSimple
12+ # btrfsSubvolDefault
13+ # btrfsSubvols
14+ # encryptedFSWithKeyfile
15+ # grub1
16+ # luksroot
17+ # luksroot-format1
18+ # luksroot-format2
19+ # lvm
20+ separateBoot
21+ separateBootFat
22+ simple
23+ simpleLabels
24+ simpleProvided
25+ simpleSpecialised
26+ simpleUefiGrub
27+ simpleUefiGrubSpecialisation
28+ simpleUefiSystemdBoot
29+ # swraid
30+ # zfsroot
31+ ;
32+
33+}
nixos/tests/installer.nix+6−1
@@ -1,6 +1,7 @@
11{ system ? builtins.currentSystem,
22 config ? {},
3− pkgs ? import ../.. { inherit system config; }
3+ pkgs ? import ../.. { inherit system config; },
4+ systemdStage1 ? false
45}:
56
67with import ../lib/testing-python.nix { inherit system pkgs; };
@@ -23,6 +24,8 @@ let
2324 # To ensure that we can rebuild the grub configuration on the nixos-rebuild
2425 system.extraDependencies = with pkgs; [ stdenvNoCC ];
2526
27+ ${optionalString systemdStage1 "boot.initrd.systemd.enable = true;"}
28+
2629 ${optionalString (bootLoader == "grub") ''
2730 boot.loader.grub.version = ${toString grubVersion};
2831 ${optionalString (grubVersion == 1) ''
@@ -290,6 +293,8 @@ let
290293 virtualisation.cores = 8;
291294 virtualisation.memorySize = 1536;
292295
296+ boot.initrd.systemd.enable = systemdStage1;
297+
293298 # Use a small /dev/vdb as the root disk for the
294299 # installer. This ensures the target disk (/dev/vda) is
295300 # the same during and after installation.
nixos/tests/lxd-image-server.nix+15−48
@@ -1,54 +1,21 @@
1−import ./make-test-python.nix ({ pkgs, ...} :
1+import ./make-test-python.nix ({ pkgs, lib, ... } :
22
33let
4− # Since we don't have access to the internet during the tests, we have to
5− # pre-fetch lxd containers beforehand.
6− #
7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,
8− # generally, sufficient for our tests.
9− alpine-meta = pkgs.fetchurl {
10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";
11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";
12− };
13−
14− alpine-rootfs = pkgs.fetchurl {
15− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";
16− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";
4+ lxd-image = import ../release.nix {
5+ configuration = {
6+ # Building documentation makes the test unnecessarily take a longer time:
7+ documentation.enable = lib.mkForce false;
8+ };
179 };
1810
19− lxd-config = pkgs.writeText "config.yaml" ''
20− storage_pools:
21− - name: default
22− driver: dir
23− config:
24− source: /var/lxd-pool
25−
26− networks:
27− - name: lxdbr0
28− type: bridge
29− config:
30− ipv4.address: auto
31− ipv6.address: none
32−
33− profiles:
34− - name: default
35− devices:
36− eth0:
37− name: eth0
38− network: lxdbr0
39− type: nic
40− root:
41− path: /
42− pool: default
43− type: disk
44− '';
45−
11+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};
12+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};
4613
4714in {
4815 name = "lxd-image-server";
4916
5017 meta = with pkgs.lib.maintainers; {
51− maintainers = [ mkg20001 ];
18+ maintainers = [ mkg20001 patryk27 ];
5219 };
5320
5421 nodes.machine = { lib, ... }: {
@@ -100,20 +67,20 @@ in {
10067 # lxd expects the pool's directory to already exist
10168 machine.succeed("mkdir /var/lxd-pool")
10269
103−
10470 machine.succeed(
105− "cat ${lxd-config} | lxd init --preseed"
71+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"
10672 )
10773
10874 machine.succeed(
109− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"
75+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"
11076 )
11177
112− loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"
78+ loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"
11379
11480 with subtest("push image to server"):
115− machine.succeed("lxc launch alpine test")
116− machine.succeed("lxc stop test")
81+ machine.succeed("lxc launch nixos test")
82+ machine.sleep(5)
83+ machine.succeed("lxc stop -f test")
11784 machine.succeed("lxc publish --public test --alias=testimg")
11885 machine.succeed("lxc image export testimg")
11986 machine.succeed("ls >&2")
nixos/tests/lxd-image.nixdeleted−89
@@ -1,89 +0,0 @@
1−# This test ensures that the nixOS lxd images builds and functions properly
2−# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software
3−
4−import ./make-test-python.nix ({ pkgs, ...} : let
5− release = import ../release.nix {
6− /* configuration = {
7− environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works
8− }; */
9− };
10−
11− metadata = release.lxdMeta.${pkgs.system};
12− image = release.lxdImage.${pkgs.system};
13−
14− lxd-config = pkgs.writeText "config.yaml" ''
15− storage_pools:
16− - name: default
17− driver: dir
18− config:
19− source: /var/lxd-pool
20−
21− networks:
22− - name: lxdbr0
23− type: bridge
24− config:
25− ipv4.address: auto
26− ipv6.address: none
27−
28− profiles:
29− - name: default
30− devices:
31− eth0:
32− name: eth0
33− network: lxdbr0
34− type: nic
35− root:
36− path: /
37− pool: default
38− type: disk
39− '';
40−in {
41− name = "lxd-image";
42−
43− meta = with pkgs.lib.maintainers; {
44− maintainers = [ mkg20001 ];
45− };
46−
47− nodes.machine = { lib, ... }: {
48− virtualisation = {
49− # disk full otherwise
50− diskSize = 2048;
51−
52− lxc.lxcfs.enable = true;
53− lxd.enable = true;
54− };
55− };
56−
57− testScript = ''
58− machine.wait_for_unit("sockets.target")
59− machine.wait_for_unit("lxd.service")
60− machine.wait_for_file("/var/lib/lxd/unix.socket")
61−
62− # It takes additional second for lxd to settle
63− machine.sleep(1)
64−
65− # lxd expects the pool's directory to already exist
66− machine.succeed("mkdir /var/lxd-pool")
67−
68− machine.succeed(
69− "cat ${lxd-config} | lxd init --preseed"
70− )
71−
72− # TODO: test custom built container aswell
73−
74− with subtest("importing container works"):
75− machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")
76−
77− with subtest("launching container works"):
78− machine.succeed("lxc launch nixos machine -c security.nesting=true")
79− # make sure machine boots up properly
80− machine.sleep(5)
81−
82− with subtest("container shell works"):
83− machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")
84− machine.succeed("lxc exec machine /run/current-system/sw/bin/true")
85−
86− # with subtest("rebuilding works"):
87− # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")
88− '';
89−})
nixos/tests/lxd.nix+40−63
@@ -1,48 +1,18 @@
1−import ./make-test-python.nix ({ pkgs, ...} :
1+import ./make-test-python.nix ({ pkgs, lib, ... } :
22
33let
4− # Since we don't have access to the internet during the tests, we have to
5− # pre-fetch lxd containers beforehand.
6− #
7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,
8− # generally, sufficient for our tests.
9− alpine-meta = pkgs.fetchurl {
10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";
11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";
12− };
4+ lxd-image = import ../release.nix {
5+ configuration = {
6+ # Building documentation makes the test unnecessarily take a longer time:
7+ documentation.enable = lib.mkForce false;
138
14− alpine-rootfs = pkgs.fetchurl {
15− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";
16− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";
9+ # Our tests require `grep` & friends:
10+ environment.systemPackages = with pkgs; [ busybox ];
11+ };
1712 };
1813
19− lxd-config = pkgs.writeText "config.yaml" ''
20− storage_pools:
21− - name: default
22− driver: dir
23− config:
24− source: /var/lxd-pool
25−
26− networks:
27− - name: lxdbr0
28− type: bridge
29− config:
30− ipv4.address: auto
31− ipv6.address: none
32−
33− profiles:
34− - name: default
35− devices:
36− eth0:
37− name: eth0
38− network: lxdbr0
39− type: nic
40− root:
41− path: /
42− pool: default
43− type: disk
44− '';
45−
14+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};
15+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};
4616
4717in {
4818 name = "lxd";
@@ -53,6 +23,8 @@ in {
5323
5424 nodes.machine = { lib, ... }: {
5525 virtualisation = {
26+ diskSize = 2048;
27+
5628 # Since we're testing `limits.cpu`, we've gotta have a known number of
5729 # cores to lean on
5830 cores = 2;
@@ -77,61 +49,66 @@ in {
7749 machine.succeed("mkdir /var/lxd-pool")
7850
7951 machine.succeed(
80− "cat ${lxd-config} | lxd init --preseed"
52+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"
8153 )
8254
8355 machine.succeed(
84− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"
56+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"
8557 )
8658
87− with subtest("Containers can be launched and destroyed"):
88− machine.succeed("lxc launch alpine test")
89− machine.succeed("lxc exec test true")
90− machine.succeed("lxc delete -f test")
59+ with subtest("Container can be managed"):
60+ machine.succeed("lxc launch nixos container")
61+ machine.sleep(5)
62+ machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")
63+ machine.succeed("lxc exec container true")
64+ machine.succeed("lxc delete -f container")
9165
92− with subtest("Containers are being mounted with lxcfs inside"):
93− machine.succeed("lxc launch alpine test")
66+ with subtest("Container is mounted with lxcfs inside"):
67+ machine.succeed("lxc launch nixos container")
68+ machine.sleep(5)
9469
9570 ## ---------- ##
9671 ## limits.cpu ##
9772
98− machine.succeed("lxc config set test limits.cpu 1")
99− machine.succeed("lxc restart test")
73+ machine.succeed("lxc config set container limits.cpu 1")
74+ machine.succeed("lxc restart container")
75+ machine.sleep(5)
10076
101− # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort
102− # to the primal methods
10377 assert (
10478 "1"
105− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()
79+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()
10680 )
10781
108− machine.succeed("lxc config set test limits.cpu 2")
109− machine.succeed("lxc restart test")
82+ machine.succeed("lxc config set container limits.cpu 2")
83+ machine.succeed("lxc restart container")
84+ machine.sleep(5)
11085
11186 assert (
11287 "2"
113− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()
88+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()
11489 )
11590
11691 ## ------------- ##
11792 ## limits.memory ##
11893
119− machine.succeed("lxc config set test limits.memory 64MB")
120− machine.succeed("lxc restart test")
94+ machine.succeed("lxc config set container limits.memory 64MB")
95+ machine.succeed("lxc restart container")
96+ machine.sleep(5)
12197
12298 assert (
12399 "MemTotal: 62500 kB"
124− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()
100+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()
125101 )
126102
127− machine.succeed("lxc config set test limits.memory 128MB")
128− machine.succeed("lxc restart test")
103+ machine.succeed("lxc config set container limits.memory 128MB")
104+ machine.succeed("lxc restart container")
105+ machine.sleep(5)
129106
130107 assert (
131108 "MemTotal: 125000 kB"
132− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()
109+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()
133110 )
134111
135− machine.succeed("lxc delete -f test")
112+ machine.succeed("lxc delete -f container")
136113 '';
137114})
nixos/tests/matrix-appservice-irc.nix+3
@@ -20,6 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
2020
2121 enable_registration = true;
2222
23+ # don't use this in production, always use some form of verification
24+ enable_registration_without_verification = true;
25+
2326 listeners = [ {
2427 # The default but tls=false
2528 bind_addresses = [
nixos/tests/openssh.nix+12−6
@@ -80,17 +80,21 @@ in {
8080
8181 client.wait_for_unit("network.target")
8282 client.succeed(
83− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"
83+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",
84+ timeout=30
8485 )
8586 client.succeed(
86− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"
87+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",
88+ timeout=30
8789 )
8890
8991 client.succeed(
90− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"
92+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",
93+ timeout=30
9194 )
9295 client.succeed(
93− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"
96+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",
97+ timeout=30
9498 )
9599
96100 with subtest("configured-authkey"):
@@ -99,10 +103,12 @@ in {
99103 )
100104 client.succeed("chmod 600 privkey.snakeoil")
101105 client.succeed(
102− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"
106+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",
107+ timeout=30
103108 )
104109 client.succeed(
105− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"
110+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",
111+ timeout=30
106112 )
107113
108114 with subtest("localhost-only"):
nixos/tests/pam/pam-oath-login.nix+1−1
@@ -7,7 +7,7 @@ let
77 # how many passwords have been made. In this env, we'll always be on
88 # the 0th counter, so the password is static.
99 #
10− # Generated in nix-shell -p oathToolkit
10+ # Generated in nix-shell -p oath-toolkit
1111 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
1212 # and picking a the first 4:
1313 oathSnakeOilPassword1 = "143349";
nixos/tests/pgadmin4.nix+37−48
@@ -1,53 +1,27 @@
1−import ./make-test-python.nix ({ pkgs, lib, ... }:
1+import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:
2+
3+ /*
4+ This test suite replaces the typical pytestCheckHook function in python
5+ packages. Pgadmin4 test suite needs a running and configured postgresql
6+ server. This is why this test exists.
7+
8+ To not repeat all the python dependencies needed, this test is called directly
9+ from the pgadmin4 derivation, which also passes the currently
10+ used propagatedBuildInputs and any python overrides.
11+
12+ Unfortunately, there doesn't seem to be an easy way to otherwise include
13+ the needed packages here.
14+
15+ Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails
16+ and needs to be called as "pgadmin4.tests"
17+
18+ */
219
320 let
421 pgadmin4SrcDir = "/pgadmin";
522 pgadmin4Dir = "/var/lib/pgadmin";
623 pgadmin4LogDir = "/var/log/pgadmin";
724
8− python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [
9− selenium
10− testtools
11− testscenarios
12− flask
13− flask-babelex
14− flask-babel
15− flask-gravatar
16− flask_login
17− flask_mail
18− flask_migrate
19− flask_sqlalchemy
20− flask_wtf
21− flask-compress
22− passlib
23− pytz
24− simplejson
25− six
26− sqlparse
27− wtforms
28− flask-paranoid
29− psutil
30− psycopg2
31− python-dateutil
32− sqlalchemy
33− itsdangerous
34− flask-security-too
35− bcrypt
36− cryptography
37− sshtunnel
38− ldap3
39− gssapi
40− flask-socketio
41− eventlet
42− httpagentparser
43− user-agents
44− wheel
45− authlib
46− qrcode
47− pillow
48− pyotp
49− boto3
50− ]);
5125 in
5226 {
5327 name = "pgadmin4";
@@ -55,12 +29,27 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
5529
5630 nodes.machine = { pkgs, ... }: {
5731 imports = [ ./common/x11.nix ];
32+ # needed because pgadmin 6.8 will fail, if those dependencies get updated
33+ nixpkgs.overlays = [
34+ (self: super: {
35+ pythonPackages = pythonEnv;
36+ })
37+ ];
38+
5839 environment.systemPackages = with pkgs; [
5940 pgadmin4
6041 postgresql
61− python-with-needed-packages
6242 chromedriver
6343 chromium
44+ # include the same packages as in pgadmin minus speaklater3
45+ (python3.withPackages
46+ (ps: buildDeps ++
47+ [
48+ # test suite package requirements
49+ pythonPackages.testscenarios
50+ pythonPackages.selenium
51+ ])
52+ )
6453 ];
6554 services.postgresql = {
6655 enable = true;
@@ -121,7 +110,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
121110 with subtest("run browser test"):
122111 machine.succeed(
123112 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
124− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \
113+ && python regression/runtests.py --pkg browser --exclude \
125114 browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'
126115 )
127116
@@ -131,13 +120,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
131120 machine.succeed(
132121 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
133122 && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
134− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests'
123+ && python regression/runtests.py --pkg feature_tests'
135124 )
136125
137126 with subtest("run resql test"):
138127 machine.succeed(
139128 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
140− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql'
129+ && python regression/runtests.py --pkg resql'
141130 )
142131 '';
143132 })
nixos/tests/systemd-initrd-luks-keyfile.nix+1−1
@@ -32,7 +32,7 @@ in {
3232 };
3333 };
3434 virtualisation.bootDevice = "/dev/mapper/cryptroot";
35− boot.initrd.systemd.contents."/etc/cryptroot.key".source = keyfile;
35+ boot.initrd.secrets."/etc/cryptroot.key" = keyfile;
3636 };
3737 };
3838
nixos/tests/systemd-initrd-simple.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ lib, pkgs, ... }: {
22 name = "systemd-initrd-simple";
33
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 boot.initrd.systemd = {
66 enable = true;
77 emergencyAccess = true;
nixos/tests/systemd-shutdown.nix+8−3
@@ -1,4 +1,6 @@
1−import ./make-test-python.nix ({ pkgs, systemdStage1 ? false, ...} : {
1+import ./make-test-python.nix ({ pkgs, systemdStage1 ? false, ...} : let
2+ msg = "Shutting down NixOS";
3+in {
24 name = "systemd-shutdown";
35 meta = with pkgs.lib.maintainers; {
46 maintainers = [ das_j ];
@@ -6,7 +8,9 @@ import ./make-test-python.nix ({ pkgs, systemdStage1 ? false, ...} : {
68
79 nodes.machine = {
810 imports = [ ../modules/profiles/minimal.nix ];
9− boot.initrd.systemd.enable = systemdStage1;
11+ systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/shutdown-message".source = pkgs.writeShellScript "shutdown-message" ''
12+ echo "${msg}"
13+ '';
1014 };
1115
1216 testScript = ''
@@ -14,7 +18,8 @@ import ./make-test-python.nix ({ pkgs, systemdStage1 ? false, ...} : {
1418 # .shutdown() would wait for the machine to power off
1519 machine.succeed("systemctl poweroff")
1620 # Message printed by systemd-shutdown
17− machine.wait_for_console_text("All filesystems, swaps, loop devices, MD devices and DM devices detached.")
21+ machine.wait_for_console_text("Unmounting '/oldroot'")
22+ machine.wait_for_console_text("${msg}")
1823 # Don't try to sync filesystems
1924 machine.booted = False
2025 '';
nixos/tests/xmpp/xmpp-sendmessage.nix+1−4
@@ -51,11 +51,8 @@ class CthonTest(ClientXMPP):
5151 log.info('Message sent')
5252
5353 # Test http upload (XEP_0363)
54− def timeout_callback(arg):
55− log.error("ERROR: Cannot upload file. XEP_0363 seems broken")
56− sys.exit(1)
5754 try:
58− url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback)
55+ url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10)
5956 except:
6057 log.error("ERROR: Cannot run upload command. XEP_0363 seems broken")
6158 sys.exit(1)
pkgs/applications/audio/LibreArp/default.nixnew file+53
@@ -0,0 +1,53 @@
1+{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon
2+, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor
3+, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}:
4+
5+stdenv.mkDerivation rec {
6+ pname = "LibreArp";
7+ version = "2.2";
8+
9+ src = fetchFromGitLab {
10+ owner = "LibreArp";
11+ repo = "LibreArp";
12+ rev = version;
13+ hash = "sha256-jCUT/sflO9L57xRTqNR90RbwJ0uZ+xJVXnB3n+FhWBo=";
14+ fetchSubmodules = true;
15+ };
16+
17+ nativeBuildInputs = [ cmake pkg-config ];
18+ buildInputs = [
19+ cairo
20+ libxkbcommon
21+ xcbutilcursor
22+ xcbutilkeysyms
23+ xcbutil
24+ libXrandr
25+ libXinerama
26+ libXcursor
27+ alsa-lib
28+ libjack2
29+ lv2
30+ curl
31+ ];
32+
33+ cmakeFlags = [
34+ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
35+ "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
36+ "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
37+ ];
38+
39+ installPhase = ''
40+ mkdir -p $out/lib/vst3
41+ cd LibreArp_artefacts/Release
42+ cp -r VST3/LibreArp.vst3 $out/lib/vst3
43+ '';
44+
45+ meta = with lib; {
46+ description =
47+ "A pattern-based arpeggio generator plugin.";
48+ homepage = "https://librearp.gitlab.io/";
49+ license = licenses.gpl3Plus;
50+ platforms = [ "x86_64-linux" ];
51+ maintainers = with maintainers; [ magnetophon ];
52+ };
53+}
pkgs/applications/audio/LibreArp/lv2.nixnew file+53
@@ -0,0 +1,53 @@
1+{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon
2+, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor
3+, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}:
4+
5+stdenv.mkDerivation rec {
6+ pname = "LibreArp-lv2";
7+ version = "2.2";
8+
9+ src = fetchFromGitLab {
10+ owner = "LibreArp";
11+ repo = "LibreArp";
12+ rev = "${version}-lv2";
13+ hash = "sha256-j5SksuhC4ZXXILfOpwXNqIu5fO07a/6tiZ5qUo+p0Ug=";
14+ fetchSubmodules = true;
15+ };
16+
17+ nativeBuildInputs = [ cmake pkg-config ];
18+ buildInputs = [
19+ cairo
20+ libxkbcommon
21+ xcbutilcursor
22+ xcbutilkeysyms
23+ xcbutil
24+ libXrandr
25+ libXinerama
26+ libXcursor
27+ alsa-lib
28+ libjack2
29+ lv2
30+ curl
31+ ];
32+
33+ cmakeFlags = [
34+ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
35+ "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
36+ "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
37+ ];
38+
39+ installPhase = ''
40+ mkdir -p $out/lib/lv2
41+ cd LibreArp_artefacts/Release
42+ cp -r LV2/LibreArp.lv2 $out/lib/lv2
43+ '';
44+
45+ meta = with lib; {
46+ description =
47+ "A pattern-based arpeggio generator plugin.";
48+ homepage = "https://librearp.gitlab.io/";
49+ license = licenses.gpl3Plus;
50+ platforms = [ "x86_64-linux" ];
51+ maintainers = with maintainers; [ magnetophon ];
52+ };
53+}
pkgs/applications/audio/amberol/default.nix+3−3
@@ -18,20 +18,20 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "amberol";
21− version = "0.3.0";
21+ version = "0.4.3";
2222
2323 src = fetchFromGitLab {
2424 domain = "gitlab.gnome.org";
2525 owner = "World";
2626 repo = pname;
2727 rev = version;
28− sha256 = "sha256-+9lrSkjk7V+ZnIhmhw7lEiEywDp5adoAW+5PEAlhpSI=";
28+ sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4=";
2929 };
3030
3131 cargoDeps = rustPlatform.fetchCargoTarball {
3232 inherit src;
3333 name = "${pname}-${version}";
34− sha256 = "sha256-ZJiD6RshEjZ7h+/KYcY+ZjL5fHRb5+RKgIdgbD6LdkA=";
34+ sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4=";
3535 };
3636
3737 postPatch = ''
pkgs/applications/audio/audio-recorder/default.nix+1−1
@@ -2,7 +2,7 @@
22, pkg-config, intltool
33, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1
44, librsvg, wrapGAppsHook
5−, pulseaudioSupport ? true, libpulseaudio ? null }:
5+, pulseaudioSupport ? true, libpulseaudio }:
66
77stdenv.mkDerivation rec {
88 pname = "audio-recorder";
pkgs/applications/audio/cardinal/default.nix+2−11
@@ -23,23 +23,14 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "cardinal";
26− version = "22.02";
26+ version = "22.04";
2727
2828 src = fetchurl {
2929 url =
3030 "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz";
31− sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM=";
31+ sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE=";
3232 };
3333
34− patches = [
35− # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260
36− (fetchpatch {
37− url =
38− "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch";
39− sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs=";
40− })
41− ];
42−
4334 prePatch = ''
4435 patchShebangs ./dpf/utils/generate-ttl.sh
4536 '';
pkgs/applications/audio/carla/default.nix+2−2
@@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
1515
1616stdenv.mkDerivation rec {
1717 pname = "carla";
18− version = "2.4.2";
18+ version = "2.4.3";
1919
2020 src = fetchFromGitHub {
2121 owner = "falkTX";
2222 repo = pname;
2323 rev = "v${version}";
24− sha256 = "sha256-A0QmyphjsNU06kh2f9rXrR+GkDEI5HqXRA9J82E6qJU=";
24+ sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc=";
2525 };
2626
2727 nativeBuildInputs = [
pkgs/applications/audio/caudec/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, makeWrapper, bash, bc, findutils, flac, lame, opusTools, procps, sox }:
1+{ lib, stdenv, fetchurl, makeWrapper, bc, findutils, flac, lame, opusTools, procps, sox }:
22
33stdenv.mkDerivation rec {
44 pname = "caudec";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 patchShebangs ./install.sh
1414 '';
1515
16− nativeBuildInputs = [ bash makeWrapper ];
16+ nativeBuildInputs = [ makeWrapper ];
1717
1818 installPhase = ''
1919 ./install.sh --prefix=$out/bin
pkgs/applications/audio/cider/default.nix+3−3
@@ -2,11 +2,11 @@
22
33appimageTools.wrapType2 rec {
44 pname = "cider";
5− version = "1.3.1308";
5+ version = "1.4.1.1680";
66
77 src = fetchurl {
8− url = "https://1308-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-${version}.AppImage";
9− sha256 = "1lbyvn1c8155p039qfzx7jwad7km073phkmrzjm0w3ahdpwz3wgi";
8+ url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}-alpha.${builtins.elemAt (lib.splitVersion version) 3}.AppImage";
9+ sha256 = "sha256-hEv+vfMMH+Trwa1UF5R8EtyYeyiRVLP0BrXOK2+1q8M=";
1010 };
1111
1212 extraInstallCommands =
pkgs/applications/audio/denemo/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "denemo";
9− version = "2.5.0";
9+ version = "2.6.0";
1010
1111 src = fetchurl {
1212 url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz";
13− sha256 = "sha256-B6GbBL/o/z0emT+Iw6XvWmAsJCmIwSGCyV1DkhDyfBY=";
13+ sha256 = "sha256-S+WXDGmEf5fx+HYnXJdE5QNOfJg7EqEEX7IMI2SUtV0=";
1414 };
1515
1616 buildInputs = [
pkgs/applications/audio/faust/faust2.nix+2−2
@@ -20,13 +20,13 @@ with lib.strings;
2020
2121let
2222
23− version = "2.37.3";
23+ version = "2.40.0";
2424
2525 src = fetchFromGitHub {
2626 owner = "grame-cncm";
2727 repo = "faust";
2828 rev = version;
29− sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc=";
29+ sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A=";
3030 fetchSubmodules = true;
3131 };
3232
pkgs/applications/audio/faust/faustlive.nix+9−12
@@ -1,37 +1,34 @@
11{ lib, stdenv, fetchFromGitHub
22, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl
3−, bc, coreutils, which, libsndfile, pkg-config, libxcb
3+, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit
44}:
55
66stdenv.mkDerivation rec {
77 pname = "faustlive";
8− version = "2.5.5";
8+ version = "2.5.8";
99 src = fetchFromGitHub {
1010 owner = "grame-cncm";
1111 repo = "faustlive";
1212 rev = version;
13− sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9";
13+ sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8=";
1414 fetchSubmodules = true;
1515 };
1616
17− nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ];
17+ nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ];
1818
1919 buildInputs = [
2020 llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl
21− bc coreutils which libsndfile libxcb
21+ bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit
2222 ];
2323
2424 makeFlags = [ "PREFIX=$(out)" ];
2525
26− postPatch = "cd Build";
27−
28− installPhase = ''
29− install -d "$out/bin"
30− install -d "$out/share/applications"
31− install FaustLive/FaustLive "$out/bin"
32− install rsrc/FaustLive.desktop "$out/share/applications"
26+ postInstall = ''
27+ wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}"
3328 '';
3429
30+ postPatch = "cd Build";
31+
3532 meta = with lib; {
3633 description = "A standalone just-in-time Faust compiler";
3734 longDescription = ''
pkgs/applications/audio/fluidsynth/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "fluidsynth";
8− version = "2.2.3";
8+ version = "2.2.5";
99
1010 src = fetchFromGitHub {
1111 owner = "FluidSynth";
1212 repo = "fluidsynth";
1313 rev = "v${version}";
14− sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
14+ sha256 = "sha256-aR8TLxl6OziP+DMSNro0DB/UtvzXDeDYQ3o/iy70XD4=";
1515 };
1616
1717 nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
pkgs/applications/audio/greg/default.nix+3−3
@@ -2,15 +2,15 @@
22
33with pythonPackages; buildPythonApplication rec {
44 pname = "greg";
5− version = "0.4.7";
5+ version = "0.4.8";
66
77 disabled = !isPy3k;
88
99 src = fetchFromGitHub {
1010 owner = "manolomartinez";
1111 repo = pname;
12− rev = "v" + version;
13− sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
12+ rev = "refs/tags/v${version}";
13+ sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
1414 };
1515
1616 propagatedBuildInputs = [ setuptools feedparser ];
pkgs/applications/audio/gspeech/default.nix+2−2
@@ -20,13 +20,13 @@
2020
2121python3.pkgs.buildPythonApplication rec {
2222 pname = "gSpeech";
23− version = "0.10.1";
23+ version = "0.11.0";
2424
2525 src = fetchFromGitHub {
2626 owner = "mothsart";
2727 repo = pname;
2828 rev = version;
29− sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";
29+ sha256 = "0z11yxvgi8m2xjmmf56zla91jpmf0a4imwi9qqz6bp51pw4sk8gp";
3030 };
3131
3232 nativeBuildInputs = [
pkgs/applications/audio/guitarix/default.nix+2
@@ -108,6 +108,8 @@ stdenv.mkDerivation rec {
108108 "--install-roboto-font"
109109 ] ++ optional optimizationSupport "--optimization";
110110
111+ NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
112+
111113 meta = with lib; {
112114 description = "A virtual guitar amplifier for Linux running with JACK";
113115 longDescription = ''
pkgs/applications/audio/jamesdsp/default.nix+5
@@ -40,6 +40,11 @@ in
4040 url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch";
4141 hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E=";
4242 })
43+ # compatibility fix for PipeWire 0.3.44+, remove on version bump
44+ (fetchpatch {
45+ url = "https://github.com/Audio4Linux/JDSP4Linux/commit/e04c55735cc20fc3c3ce042c5681ec80f7df3c96.patch";
46+ hash = "sha256-o6AUtQzugykALSdkM3i3lYqRmzJX3FzmALSi0TrWuRA=";
47+ })
4348 ];
4449
4550 nativeBuildInputs = [
pkgs/applications/audio/mopidy/mopidy.nix+3−3
@@ -4,13 +4,13 @@
44
55pythonPackages.buildPythonApplication rec {
66 pname = "mopidy";
7− version = "3.2.0";
7+ version = "3.3.0";
88
99 src = fetchFromGitHub {
1010 owner = "mopidy";
1111 repo = "mopidy";
12− rev = "v${version}";
13− sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f";
12+ rev = "refs/tags/v${version}";
13+ sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw=";
1414 };
1515
1616 nativeBuildInputs = [ wrapGAppsHook ];
pkgs/applications/audio/musikcube/default.nix+5−3
@@ -6,6 +6,7 @@
66, fetchFromGitHub
77, fetchpatch
88, ffmpeg
9+, gnutls
910, lame
1011, libev
1112, libmicrohttpd
@@ -20,17 +21,17 @@
2021
2122stdenv.mkDerivation rec {
2223 pname = "musikcube";
23− version = "0.96.10";
24+ version = "0.97.0";
2425
2526 src = fetchFromGitHub {
2627 owner = "clangen";
2728 repo = pname;
2829 rev = version;
29− sha256 = "sha256-Aa52pRGq99Pt++aEVZdmVNhhQuBajgfZp39L1AfKvho=";
30+ sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg=";
3031 };
3132
3233 patches = [
33− # Fix pending upstream inclusion for ncuurses-6.3 support:
34+ # Fix pending upstream inclusion for ncurses-6.3 support:
3435 # https://github.com/clangen/musikcube/pull/474
3536 (fetchpatch {
3637 name = "ncurses-6.3.patch";
@@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
4849 boost
4950 curl
5051 ffmpeg
52+ gnutls
5153 lame
5254 libev
5355 libmicrohttpd
pkgs/applications/audio/ncspot/default.nix+3−3
@@ -7,16 +7,16 @@
77
88rustPlatform.buildRustPackage rec {
99 pname = "ncspot";
10− version = "0.9.7";
10+ version = "0.9.8";
1111
1212 src = fetchFromGitHub {
1313 owner = "hrkfdn";
1414 repo = "ncspot";
1515 rev = "v${version}";
16− sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0=";
16+ sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE=";
1717 };
1818
19− cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc=";
19+ cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M=";
2020
2121 nativeBuildInputs = [ pkg-config ];
2222
pkgs/applications/audio/noise-repellent/default.nix+11−9
@@ -1,22 +1,24 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, fftwFloat, lv2 }:
1+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, cmake, libspecbleach, lv2 }:
22
33stdenv.mkDerivation rec {
44 pname = "noise-repellent";
5− version = "0.1.5";
5+ version = "0.2.1";
66
77 src = fetchFromGitHub {
88 owner = "lucianodato";
99 repo = pname;
10− rev = version;
11− sha256 = "0hb89x9i2knzan46q4nwscf5zmnb2nwf4w13xl2c0y1mx1ls1mwl";
12− fetchSubmodules = true;
10+ rev = "v${version}";
11+ sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE=";
1312 };
1413
15− mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
14+ mesonFlags = [
15+ "--prefix=${placeholder "out"}/lib/lv2"
16+ "--buildtype=release"
17+ ];
1618
17− nativeBuildInputs = [ meson ninja pkg-config ];
19+ nativeBuildInputs = [ meson ninja pkg-config cmake ];
1820 buildInputs = [
19− fftwFloat lv2
21+ libspecbleach lv2
2022 ];
2123
2224 meta = with lib; {
@@ -24,6 +26,6 @@ stdenv.mkDerivation rec {
2426 homepage = "https://github.com/lucianodato/noise-repellent";
2527 license = licenses.gpl3;
2628 maintainers = [ maintainers.magnetophon ];
27− platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
29+ platforms = platforms.unix;
2830 };
2931}
pkgs/applications/audio/plexamp/default.nix+3−3
@@ -2,12 +2,12 @@
22
33let
44 pname = "plexamp";
5− version = "4.2.0";
5+ version = "4.2.1";
66
77 src = fetchurl {
88 url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
99 name="${pname}-${version}.AppImage";
10− sha512 = "yIdZoKTJJEpUzEqvixQ7JJBxzrtCRov31dGBDOjMiK/oA2q00Xo6XVDvAhYuIn6ocZqK+I5jHfmf4qYaRePDvg==";
10+ sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A==";
1111 };
1212
1313 appimageContents = appimageTools.extractType2 {
@@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
3333 meta = with lib; {
3434 description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
3535 homepage = "https://plexamp.com/";
36− changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/43";
36+ changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/44";
3737 license = licenses.unfree;
3838 maintainers = with maintainers; [ killercup synthetica ];
3939 platforms = [ "x86_64-linux" ];
pkgs/applications/audio/pyradio/default.nix+3−3
@@ -2,7 +2,7 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "pyradio";
5− version = "0.8.9.16";
5+ version = "0.8.9.17";
66
77 propagatedBuildInputs = with python3Packages; [
88 requests
@@ -13,8 +13,8 @@ python3Packages.buildPythonApplication rec {
1313 src = fetchFromGitHub {
1414 owner = "coderholic";
1515 repo = pname;
16− rev = version;
17− sha256 = "sha256-uerQfyGHWhLbO6UkLSMA1tdfW/8fDQkcm6hYIdwwC7I=";
16+ rev = "refs/tags/${version}";
17+ sha256 = "sha256-lfDSD1+xbA6tAKeHKciq/n6YHWS4JTOvjIqOn+FQ2yA=";
1818 };
1919
2020 checkPhase = ''
pkgs/applications/audio/spotify/default.nix+3−3
@@ -10,14 +10,14 @@ let
1010 # If an update breaks things, one of those might have valuable info:
1111 # https://aur.archlinux.org/packages/spotify/
1212 # https://community.spotify.com/t5/Desktop-Linux
13− version = "1.1.80.699.gc3dac750";
13+ version = "1.1.84.716.gc5f8b819";
1414 # To get the latest stable revision:
1515 # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
1616 # To get general information:
1717 # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
1818 # More examples of api usage:
1919 # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
20− rev = "58";
20+ rev = "60";
2121
2222 deps = [
2323 alsa-lib
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
8080 # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
8181 src = fetchurl {
8282 url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
83− sha512 = "91385a5a8de31d6e9f1945d23108447fd369c1cdc2e4d95cbb7cec5d403c3be14a1b0fabe3fb01aef809a39b033d289add1bcb307ab19c7fcb63689dbae57c53";
83+ sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71";
8484 };
8585
8686 nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
pkgs/applications/audio/viper4linux-gui/default.nixnew file+82
@@ -0,0 +1,82 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, copyDesktopItems
5+, pkg-config
6+, qtbase
7+, qtsvg
8+, qtmultimedia
9+, qmake
10+, gst_all_1
11+, libpulseaudio
12+, makeDesktopItem
13+, viper4linux
14+, wrapQtAppsHook
15+}:
16+let
17+ gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]);
18+in
19+stdenv.mkDerivation rec {
20+ pname = "viper4linux-gui";
21+ version = "unstable-2022-04-23";
22+
23+ src = fetchFromGitHub {
24+ owner = "Audio4Linux";
25+ repo = "Viper4Linux-GUI";
26+ rev = "2d0c84d7dda76c59e31c850e38120002eb779b7a";
27+ sha256 = "sha256-5YlLCF598i/sldczPEgCB+1KJDA7jqM964QDSNjgTKM=";
28+ };
29+
30+ desktopItems = [
31+ (makeDesktopItem {
32+ name = pname;
33+ exec = "viper-gui";
34+ icon = "viper";
35+ desktopName = "viper4linux";
36+ genericName = "Equalizer";
37+ comment = meta.description;
38+ categories = [ "AudioVideo" "Audio" ];
39+ startupNotify = false;
40+ })
41+ ];
42+
43+ nativeBuildInputs = [
44+ qmake
45+ pkg-config
46+ wrapQtAppsHook
47+ copyDesktopItems
48+ ];
49+
50+ buildInputs = [
51+ qtbase
52+ qtmultimedia
53+ qtsvg
54+ gst_all_1.gstreamer
55+ gst_all_1.gst-plugins-bad
56+ gst_all_1.gst-plugins-viperfx
57+ libpulseaudio
58+ viper4linux
59+ ];
60+
61+ qmakeFlags = [ "V4L_Frontend.pro" ];
62+
63+ qtWrapperArgs = [
64+ "--prefix PATH : ${lib.makeBinPath [ viper4linux gst_all_1.gstreamer ]}"
65+ "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath}"
66+ ];
67+
68+ installPhase = ''
69+ runHook preInstalli
70+ install -D V4L_Frontend $out/bin/viper-gui
71+ install -D icons/viper.png $out/share/icons/viper.png
72+ runHook postInstall
73+ '';
74+
75+ meta = with lib; {
76+ description = "Official UI for Viper4Linux2";
77+ homepage = "https://github.com/Audio4Linux/Viper4Linux-GUI";
78+ license = licenses.gpl3Plus;
79+ platforms = [ "x86_64-linux" ];
80+ maintainers = with maintainers; [ rewine ];
81+ };
82+}
pkgs/applications/audio/viper4linux/default.nixnew file+61
@@ -0,0 +1,61 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, pkg-config
5+, gst_all_1
6+, libviperfx
7+, makeWrapper
8+}:
9+let
10+ gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-viperfx gst-plugins-base gst-plugins-good ]);
11+in
12+stdenv.mkDerivation rec {
13+ pname = "viper4linux";
14+ version = "unstable-2022-03-13";
15+
16+ src = fetchFromGitHub {
17+ owner = "Audio4Linux";
18+ repo = "Viper4Linux";
19+ rev = "5da25644824f88cf0db24378d2c84770ba4f6816";
20+ sha256 = "sha256-CJNVr/1ehJzX45mxunXcRAypBBGEBdswOzAVG2H+ayg=";
21+ };
22+
23+ nativeBuildInputs = [ makeWrapper ];
24+
25+ buildInputs = [
26+ gst_all_1.gstreamer
27+ gst_all_1.gst-plugins-base
28+ gst_all_1.gst-plugins-good
29+ gst_all_1.gst-plugins-viperfx
30+ libviperfx
31+ ];
32+
33+ dontBuild = true;
34+
35+ postPatch = ''
36+ substituteInPlace viper --replace "/etc/viper4linux" "$out/etc/viper4linux"
37+ '';
38+
39+ installPhase = ''
40+ runHook preInstall
41+ install -D viper -t $out/bin
42+ mkdir -p $out/etc/viper4linux
43+ cp -r viper4linux/* $out/etc/viper4linux
44+ runHook postInstall
45+ '';
46+
47+ postFixup = ''
48+ wrapProgram "$out/bin/viper" \
49+ --prefix PATH : $out/bin:${lib.makeBinPath [ gst_all_1.gstreamer ]} \
50+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${gstPluginPath} \
51+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libviperfx ]}
52+ '';
53+
54+ meta = with lib; {
55+ description = "An Adaptive Digital Sound Processor";
56+ homepage = "https://github.com/Audio4Linux/Viper4Linux";
57+ license = licenses.gpl3Plus;
58+ platforms = [ "x86_64-linux" ];
59+ maintainers = with maintainers; [ rewine ];
60+ };
61+}
pkgs/applications/blockchains/bisq-desktop/default.nix+1−2
@@ -10,7 +10,6 @@
1010, writeScript
1111, bash
1212, tor
13−, gnutar
1413, zip
1514, xz
1615}:
@@ -42,7 +41,7 @@ stdenv.mkDerivation rec {
4241 sha256 = "09bpkmn22kal3cxg8sil02wy2f2gplsbdkp4viagn0jppma02jid";
4342 };
4443
45− nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ];
44+ nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ];
4645
4746 desktopItems = [
4847 (makeDesktopItem {
pkgs/applications/blockchains/bitcoin/default.nix+2−2
@@ -25,7 +25,7 @@
2525
2626with lib;
2727let
28− version = "22.0";
28+ version = "23.0";
2929 majorVersion = versions.major version;
3030 desktop = fetchurl {
3131 url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop";
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
4242 "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
4343 ];
44− sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b";
44+ sha256 = "26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05";
4545 };
4646
4747 nativeBuildInputs =
pkgs/applications/blockchains/btcpayserver/default.nix+2−2
@@ -3,13 +3,13 @@
33
44buildDotnetModule rec {
55 pname = "btcpayserver";
6− version = "1.4.7";
6+ version = "1.5.1";
77
88 src = fetchFromGitHub {
99 owner = pname;
1010 repo = pname;
1111 rev = "v${version}";
12− sha256 = "sha256-Qz4BNrhK+NPnKBgjXGYl4P2R878LCuMGZxLECawA12E=";
12+ sha256 = "sha256-DcxRrVUen+JxMpiLDPfknpwCe962ifaekBeBnxJ0y88=";
1313 };
1414
1515 projectFile = "BTCPayServer/BTCPayServer.csproj";
pkgs/applications/blockchains/btcpayserver/deps.nix+29−29
@@ -31,18 +31,18 @@
3131 })
3232 (fetchNuGet {
3333 pname = "BTCPayServer.Lightning.All";
34− version = "1.3.2";
35− sha256 = "0xcfba8n9zf5m1nb48ilggp03kpki4nv4kx7k7a5w1gxgm6k6j9z";
34+ version = "1.3.6";
35+ sha256 = "0jdpqy6kxg0lyh4n88wsvrcqc0kk7s7zn5lw7ivwys716m69qrdl";
3636 })
3737 (fetchNuGet {
3838 pname = "BTCPayServer.Lightning.Charge";
39− version = "1.3.1";
40− sha256 = "1xakwnb839dl0qnhqprsnfq8png31iyb0fsngljis5jc8yvb4353";
39+ version = "1.3.2";
40+ sha256 = "0v5rss6dg7297kq1frhn2pj9gd0rd8g1p5d316x5wkd4w7pmrm2w";
4141 })
4242 (fetchNuGet {
4343 pname = "BTCPayServer.Lightning.CLightning";
44− version = "1.3.1";
45− sha256 = "0a79p6i3xiq6svv08c4hhihkvqa2ac7fphi3g9i0cwh47ak0k5h2";
44+ version = "1.3.2";
45+ sha256 = "0qs5p6pm54il23j8yysw0pzvrki37y6z8cd2gdknpz2f3wg7slm9";
4646 })
4747 (fetchNuGet {
4848 pname = "BTCPayServer.Lightning.Common";
@@ -51,23 +51,23 @@
5151 })
5252 (fetchNuGet {
5353 pname = "BTCPayServer.Lightning.Common";
54− version = "1.3.1";
55− sha256 = "165p1246fn628hlwdrx7sanlxa6qqpn480rq1asn5r1602w21844";
54+ version = "1.3.2";
55+ sha256 = "119zplkc7iy9wc95iz1qnyi42fr99ar4hp8a11p708a22w941yi0";
5656 })
5757 (fetchNuGet {
5858 pname = "BTCPayServer.Lightning.Eclair";
59− version = "1.3.1";
60− sha256 = "1vlwm5mw8wffp00xhkx19yavk59b5x540sg81vis3q7hjvvgca5c";
59+ version = "1.3.2";
60+ sha256 = "08gw1gqng1khxzvvhlwsg6lw1w56ylilg738wi6cbcwy7vl7f6bb";
6161 })
6262 (fetchNuGet {
6363 pname = "BTCPayServer.Lightning.LNBank";
64− version = "1.3.1";
65− sha256 = "0qga34vi4fzfr0g4qk0ad8xkqdig2ishmdj9i32s5yrrjrkx7c8d";
64+ version = "1.3.4";
65+ sha256 = "1vyz63pi5j31y8pz0b4hp9c4j249rszzfcymk3z3b2clwq32s4i4";
6666 })
6767 (fetchNuGet {
6868 pname = "BTCPayServer.Lightning.LND";
69− version = "1.3.1";
70− sha256 = "1b70jlyzy9xjvfywzi6i3l3sd4mkknxpni9akdi0phsfqysmy0wl";
69+ version = "1.3.3";
70+ sha256 = "137azpxxmp2q69bp07ky1jsgnfy9lf0dg5ba8l654flvvrgxaq6y";
7171 })
7272 (fetchNuGet {
7373 pname = "BuildBundlerMinifier";
@@ -89,6 +89,11 @@
8989 version = "15.0.5";
9090 sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma";
9191 })
92+ (fetchNuGet {
93+ pname = "Dapper";
94+ version = "2.0.123";
95+ sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91";
96+ })
9297 (fetchNuGet {
9398 pname = "DigitalRuby.ExchangeSharp";
9499 version = "0.6.3";
@@ -374,11 +379,6 @@
374379 version = "3.1.6";
375380 sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5";
376381 })
377− (fetchNuGet {
378− pname = "Microsoft.EntityFrameworkCore.Abstractions";
379− version = "6.0.0";
380− sha256 = "1aw13qjkpglc1mm3cv7s73s8fschy8lzdnigsp346b7mycpg7v92";
381− })
382382 (fetchNuGet {
383383 pname = "Microsoft.EntityFrameworkCore.Abstractions";
384384 version = "6.0.1";
@@ -831,8 +831,8 @@
831831 })
832832 (fetchNuGet {
833833 pname = "NBitcoin";
834− version = "6.0.15";
835− sha256 = "038dcl2k88w4cijws3pdnjflgy4lmqx70z0l7yqz355kmxjz8ain";
834+ version = "6.0.18";
835+ sha256 = "1dr669h68cx6yfzr3n97yzzwbgnsv5g2008diyxngdjm55nh3q9s";
836836 })
837837 (fetchNuGet {
838838 pname = "NBitcoin";
@@ -856,8 +856,8 @@
856856 })
857857 (fetchNuGet {
858858 pname = "NBXplorer.Client";
859− version = "4.1.3";
860− sha256 = "1nh4jj7yg81825hr7cc99qlnfmdm6jibap81qqi8a968b61z4251";
859+ version = "4.2.0";
860+ sha256 = "1adbn5cbr42cjfvijaf1lffhcrcn0ws1arfi7mrg3kjshbzfgims";
861861 })
862862 (fetchNuGet {
863863 pname = "NETStandard.Library";
@@ -931,13 +931,13 @@
931931 })
932932 (fetchNuGet {
933933 pname = "Npgsql.EntityFrameworkCore.PostgreSQL";
934− version = "6.0.1";
935− sha256 = "108sc62dqdb6ym2ck651kamcv6qf93cmaqzygfblmiglwzi6frnx";
934+ version = "6.0.3";
935+ sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np";
936936 })
937937 (fetchNuGet {
938938 pname = "Npgsql";
939− version = "6.0.1";
940− sha256 = "150paiwqxp6zsy5v7vl2a9h3ikzfv3pd04whxifmamq0h1ghw0ld";
939+ version = "6.0.3";
940+ sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
941941 })
942942 (fetchNuGet {
943943 pname = "NSec.Cryptography";
@@ -1086,8 +1086,8 @@
10861086 })
10871087 (fetchNuGet {
10881088 pname = "Selenium.WebDriver.ChromeDriver";
1089− version = "98.0.4758.10200";
1090− sha256 = "10mc50gm78zbxrwvxlygzmj2a29liiacv8haax0534c26vj9dwkl";
1089+ version = "100.0.4896.6000";
1090+ sha256 = "1pfdvxjy4xiw1j7787lf07w9nr0dmj589vf6p4aqmk2cfz8j35c6";
10911091 })
10921092 (fetchNuGet {
10931093 pname = "Selenium.WebDriver";
pkgs/applications/blockchains/clightning/default.nix+2−2
@@ -21,11 +21,11 @@ let
2121in
2222stdenv.mkDerivation rec {
2323 pname = "clightning";
24− version = "0.10.2";
24+ version = "0.11.0.1";
2525
2626 src = fetchurl {
2727 url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
28− sha256 = "3c9dcb686217b2efe0e988e90b95777c4591e3335e259e01a94af87e0bf01809";
28+ sha256 = "e2ad6eead19a0cd8869e291c27d318cf553bb015339c1f0e8d8b30e7bc0910d8";
2929 };
3030
3131 # when building on darwin we need dawin.cctools to provide the correct libtool
pkgs/applications/blockchains/electrs/default.nix+3−3
@@ -12,16 +12,16 @@ let
1212in
1313rustPlatform.buildRustPackage rec {
1414 pname = "electrs";
15− version = "0.9.6";
15+ version = "0.9.7";
1616
1717 src = fetchFromGitHub {
1818 owner = "romanz";
1919 repo = pname;
2020 rev = "v${version}";
21− hash = "sha256-BI7hxlpg2sggD1ag73n+tRre+Ja2ZFhDPzy1DV8aEHw=";
21+ hash = "sha256-hdXc64gj7QtCnTq3f5mpQDEKLM6qaDBLkQE07xxNaDE=";
2222 };
2323
24− cargoHash = "sha256-Oy2mOulSB2a9LaT47G+BzjidcjPjHeaoesQ7g6M8M1Q=";
24+ cargoHash = "sha256-xMATO+H3bGkM/tLRimmLGYtrOAX8hzkw5Hb0c6iVAXY=";
2525
2626 # needed for librocksdb-sys
2727 nativeBuildInputs = [ llvmPackages.clang ];
pkgs/applications/blockchains/lnd/default.nix+2−2
@@ -6,13 +6,13 @@
66
77buildGoModule rec {
88 pname = "lnd";
9− version = "0.14.2-beta";
9+ version = "0.14.3-beta";
1010
1111 src = fetchFromGitHub {
1212 owner = "lightningnetwork";
1313 repo = "lnd";
1414 rev = "v${version}";
15− sha256 = "sha256-JOKitxxWcTlGlxYR1XpySZlI2fT9jgBrOxNUwT/sqdQ=";
15+ sha256 = "sha256-ZTvGFmjhQBIWqMGatMAlX59uVyl1oUKo7L5jiz571Gc";
1616 };
1717
1818 vendorSha256 = "sha256-shDmJcEyobY7Ih1MHMEY2GQnzAffsH/y4J1bme/bT7I=";
pkgs/applications/blockchains/monero-cli/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "monero-cli";
12− version = "0.17.3.0";
12+ version = "0.17.3.2";
1313
1414 src = fetchFromGitHub {
1515 owner = "monero-project";
1616 repo = "monero";
1717 rev = "v${version}";
18− sha256 = "1spsf7m3x4psp9s7mivr6x4886jnbq4i8ll2dl8bv5bsdhcd3pjm";
18+ sha256 = "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy";
1919 fetchSubmodules = true;
2020 };
2121
pkgs/applications/blockchains/monero-gui/default.nix+2−2
@@ -14,13 +14,13 @@
1414
1515stdenv.mkDerivation rec {
1616 pname = "monero-gui";
17− version = "0.17.3.1";
17+ version = "0.17.3.2";
1818
1919 src = fetchFromGitHub {
2020 owner = "monero-project";
2121 repo = "monero-gui";
2222 rev = "v${version}";
23− sha256 = "sha256-RrchaqFmL4W9F8DhZfvxm7mHMkx/OX8K9e8uNFXWubo=";
23+ sha256 = "10gincmgc0qpsgm94m1fqfy9j8jn9g1gjk12lcqnf77kvcnz37hq";
2424 };
2525
2626 nativeBuildInputs = [
pkgs/applications/blockchains/namecoin/default.nix+5−6
@@ -1,15 +1,14 @@
11{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump
22, withGui }:
33
4−with lib;
54stdenv.mkDerivation rec {
6− pname = "namecoin" + optionalString (!withGui) "d";
7− version = "nc22.0";
5+ pname = "namecoin" + lib.optionalString (!withGui) "d";
6+ version = "22.0";
87
98 src = fetchFromGitHub {
109 owner = "namecoin";
1110 repo = "namecoin-core";
12− rev = version;
11+ rev = "nc${version}";
1312 sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY=";
1413 };
1514
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
2625 db4
2726 miniupnpc
2827 eject
29− ] ++ optionals withGui [
28+ ] ++ lib.optionals withGui [
3029 qt4
3130 protobuf
3231 qrencode
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
3837 "--with-boost-libdir=${boost.out}/lib"
3938 ];
4039
41− meta = {
40+ meta = with lib; {
4241 description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
4342 homepage = "https://namecoin.org";
4443 license = licenses.mit;
pkgs/applications/blockchains/nbxplorer/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildDotnetModule rec {
44 pname = "nbxplorer";
5− version = "2.2.20";
5+ version = "2.3.20";
66
77 src = fetchFromGitHub {
88 owner = "dgarage";
99 repo = "NBXplorer";
1010 rev = "v${version}";
11− sha256 = "sha256-C3REnfecNwf3dtk6aLYAEsedHRlIrQZAokXtf6KI8U0=";
11+ sha256 = "sha256-cAko5s1bFSI7HOcXg/tZtdMMe0S9zkRBeZ6bispxgwc=";
1212 };
1313
1414 projectFile = "NBXplorer/NBXplorer.csproj";
pkgs/applications/blockchains/nbxplorer/deps.nix+15
@@ -1,4 +1,9 @@
11{ fetchNuGet }: [
2+ (fetchNuGet {
3+ pname = "Dapper";
4+ version = "2.0.123";
5+ sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91";
6+ })
27 (fetchNuGet {
38 pname = "DBTrie";
49 version = "1.0.39";
@@ -249,6 +254,11 @@
249254 version = "1.0.0.18";
250255 sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b";
251256 })
257+ (fetchNuGet {
258+ pname = "Npgsql";
259+ version = "6.0.3";
260+ sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q";
261+ })
252262 (fetchNuGet {
253263 pname = "NuGet.Frameworks";
254264 version = "5.0.0";
@@ -754,6 +764,11 @@
754764 version = "4.5.0";
755765 sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43";
756766 })
767+ (fetchNuGet {
768+ pname = "System.Runtime.CompilerServices.Unsafe";
769+ version = "6.0.0";
770+ sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc";
771+ })
757772 (fetchNuGet {
758773 pname = "System.Runtime.Extensions";
759774 version = "4.1.0";
pkgs/applications/editors/android-studio/common.nix+2
@@ -52,6 +52,7 @@
5252, xkeyboard_config
5353, zlib
5454, makeDesktopItem
55+, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper
5556}:
5657
5758let
@@ -80,6 +81,7 @@ let
8081 --set-default JAVA_HOME "$out/jre" \
8182 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
8283 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
84+ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \
8385 --set FONTCONFIG_FILE ${fontsConf} \
8486 --prefix PATH : "${lib.makeBinPath [
8587
pkgs/applications/editors/android-studio/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
1+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }:
22
33let
44 mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -7,6 +7,7 @@ let
77 };
88 inherit (gnome2) GConf gnome_vfs;
99 inherit buildFHSUserEnv;
10+ inherit tiling_wm;
1011 };
1112 stableVersion = {
1213 version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"
pkgs/applications/editors/cudatext/default.nix+2−2
@@ -38,13 +38,13 @@ let
3838in
3939stdenv.mkDerivation rec {
4040 pname = "cudatext";
41− version = "1.162.5";
41+ version = "1.163.0";
4242
4343 src = fetchFromGitHub {
4444 owner = "Alexey-T";
4545 repo = "CudaText";
4646 rev = version;
47− sha256 = "sha256-CQ0TPZH9A37WK+gm7jgCxL5eF+1SxHlsJTTzMVRkHIs=";
47+ sha256 = "sha256-4jGLyAE202GAjaypubKGW1edyKqOti/yTwstC/R94iE=";
4848 };
4949
5050 postPatch = ''
pkgs/applications/editors/cudatext/deps.json+2−2
@@ -16,8 +16,8 @@
1616 },
1717 "ATSynEdit": {
1818 "owner": "Alexey-T",
19− "rev": "2022.04.21",
20− "sha256": "sha256-rPbQ3LNBXNHi9dgQKSaaCsuAY/VIzgq9tqlRXRl2IqU="
19+ "rev": "2022.04.26",
20+ "sha256": "sha256-aItWkjnFqxeyEywELEBkuvMH1zfI4jJFL10CexSktxU="
2121 },
2222 "ATSynEdit_Cmp": {
2323 "owner": "Alexey-T",
pkgs/applications/editors/emacs/28.nix+1−1
@@ -1,5 +1,5 @@
11import ./generic.nix (rec {
22 version = "28.1";
3− sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";
3+ sha256 = "sha256-D33wnlxhx0LyG9WZaQDj2II3tG0HcJdZTC4dSA3lrgY=";
44 patches = _: [ ];
55})
pkgs/applications/editors/emacs/generic.nix+5−3
@@ -13,6 +13,7 @@
1313, sigtool, jansson, harfbuzz, sqlite, nixosTests
1414, dontRecurseIntoAttrs, emacsPackagesFor
1515, libgccjit, targetPlatform, makeWrapper # native-comp params
16+, fetchFromSavannah
1617, systemd ? null
1718, withX ? !stdenv.isDarwin
1819, withNS ? stdenv.isDarwin
@@ -23,7 +24,7 @@
2324, withSQLite3 ? false
2425, withCsrc ? true
2526, withWebP ? false
26−, srcRepo ? false, autoreconfHook ? null, texinfo ? null
27+, srcRepo ? true, autoreconfHook ? null, texinfo ? null
2728, siteStart ? ./site-start.el
2829, nativeComp ? false
2930, withAthena ? false
@@ -59,8 +60,9 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
5960
6061 patches = patches fetchpatch;
6162
62− src = fetchurl {
63− url = "mirror://gnu/emacs/${name}.tar.xz";
63+ src = fetchFromSavannah {
64+ repo = "emacs";
65+ rev = version;
6466 inherit sha256;
6567 };
6668
pkgs/applications/editors/helix/default.nix+3
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec {
1717 nativeBuildInputs = [ makeWrapper ];
1818
1919 postInstall = ''
20+ # not needed at runtime
21+ rm -r runtime/grammars/sources
22+
2023 mkdir -p $out/lib
2124 cp -r runtime $out/lib
2225 '';
pkgs/applications/editors/jetbrains/default.nix+20−17
@@ -1,6 +1,6 @@
11{ lib, stdenv, callPackage, fetchurl
2−, jdk, cmake, zlib, python3
3−, dotnet-sdk_5
2+, jdk, cmake, gdb, zlib, python3
3+, dotnet-sdk_6
44, maven
55, autoPatchelfHook
66, libdbusmenu
@@ -53,6 +53,9 @@ let
5353 # bundled cmake does not find libc
5454 rm -rf bin/cmake/linux
5555 ln -s ${cmake} bin/cmake/linux
56+ # bundled gdb does not find libcrypto 10
57+ rm -rf bin/gdb/linux
58+ ln -s ${gdb} bin/gdb/linux
5659
5760 autoPatchelf $PWD/bin
5861
@@ -124,7 +127,7 @@ let
124127 with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
125128 as IntelliJ.
126129 '';
127− maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ];
130+ maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot AnatolyPopov ];
128131 platforms = ideaPlatforms;
129132 };
130133 });
@@ -207,7 +210,7 @@ let
207210 postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
208211 rm -rf lib/ReSharperHost/linux-x64/dotnet
209212 mkdir -p lib/ReSharperHost/linux-x64/dotnet/
210− ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
213+ ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
211214 '');
212215 });
213216
@@ -260,7 +263,7 @@ in
260263 sha256 = products.clion.sha256;
261264 };
262265 wmClass = "jetbrains-clion";
263− update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
266+ update-channel = products.clion.update-channel;
264267 };
265268
266269 datagrip = buildDataGrip rec {
@@ -273,7 +276,7 @@ in
273276 sha256 = products.datagrip.sha256;
274277 };
275278 wmClass = "jetbrains-datagrip";
276− update-channel = "DataGrip RELEASE";
279+ update-channel = products.datagrip.update-channel;
277280 };
278281
279282 goland = buildGoland rec {
@@ -286,7 +289,7 @@ in
286289 sha256 = products.goland.sha256;
287290 };
288291 wmClass = "jetbrains-goland";
289− update-channel = "GoLand RELEASE";
292+ update-channel = products.goland.update-channel;
290293 };
291294
292295 idea-community = buildIdea rec {
@@ -300,7 +303,7 @@ in
300303 sha256 = products.idea-community.sha256;
301304 };
302305 wmClass = "jetbrains-idea-ce";
303− update-channel = "IntelliJ IDEA RELEASE";
306+ update-channel = products.idea-community.update-channel;
304307 };
305308
306309 idea-ultimate = buildIdea rec {
@@ -314,12 +317,12 @@ in
314317 sha256 = products.idea-ultimate.sha256;
315318 };
316319 wmClass = "jetbrains-idea";
317− update-channel = "IntelliJ IDEA RELEASE";
320+ update-channel = products.idea-ultimate.update-channel;
318321 };
319322
320323 mps = buildMps rec {
321324 pname = "mps";
322− product = "MPS ${products.mps.version-major-minor}";
325+ product = "MPS ${products.mps.version}";
323326 version = products.mps.version;
324327 description = "Create your own domain-specific language";
325328 license = lib.licenses.asl20;
@@ -328,7 +331,7 @@ in
328331 sha256 = products.mps.sha256;
329332 };
330333 wmClass = "jetbrains-mps";
331− update-channel = "MPS RELEASE";
334+ update-channel = products.mps.update-channel;
332335 };
333336
334337 phpstorm = buildPhpStorm rec {
@@ -341,7 +344,7 @@ in
341344 sha256 = products.phpstorm.sha256;
342345 };
343346 wmClass = "jetbrains-phpstorm";
344− update-channel = "PhpStorm RELEASE";
347+ update-channel = products.phpstorm.update-channel;
345348 };
346349
347350 pycharm-community = buildPycharm rec {
@@ -355,7 +358,7 @@ in
355358 sha256 = products.pycharm-community.sha256;
356359 };
357360 wmClass = "jetbrains-pycharm-ce";
358− update-channel = "PyCharm RELEASE";
361+ update-channel = products.pycharm-community.update-channel;
359362 };
360363
361364 pycharm-professional = buildPycharm rec {
@@ -369,7 +372,7 @@ in
369372 sha256 = products.pycharm-professional.sha256;
370373 };
371374 wmClass = "jetbrains-pycharm";
372− update-channel = "PyCharm RELEASE";
375+ update-channel = products.pycharm-professional.update-channel;
373376 };
374377
375378 rider = buildRider rec {
@@ -382,7 +385,7 @@ in
382385 sha256 = products.rider.sha256;
383386 };
384387 wmClass = "jetbrains-rider";
385− update-channel = "Rider RELEASE";
388+ update-channel = products.rider.update-channel;
386389 };
387390
388391 ruby-mine = buildRubyMine rec {
@@ -395,7 +398,7 @@ in
395398 sha256 = products.ruby-mine.sha256;
396399 };
397400 wmClass = "jetbrains-rubymine";
398− update-channel = "RubyMine RELEASE";
401+ update-channel = products.ruby-mine.update-channel;
399402 };
400403
401404 webstorm = buildWebStorm rec {
@@ -408,7 +411,7 @@ in
408411 sha256 = products.webstorm.sha256;
409412 };
410413 wmClass = "jetbrains-webstorm";
411− update-channel = "WebStorm RELEASE";
414+ update-channel = products.webstorm.update-channel;
412415 };
413416
414417}
pkgs/applications/editors/jetbrains/update.py+17−14
@@ -1,6 +1,5 @@
11#! /usr/bin/env nix-shell
22#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict
3−import hashlib
43import json
54import pathlib
65import logging
@@ -33,7 +32,8 @@ def download_channels():
3332
3433
3534def build_version(build):
36− return version.parse(build["@version"])
35+ build_number = build["@fullNumber"] if "@fullNumber" in build else build["@number"]
36+ return version.parse(build_number)
3737
3838
3939def latest_build(channel):
@@ -43,11 +43,10 @@ def latest_build(channel):
4343
4444
4545def download_sha256(url):
46+ url = f"{url}.sha256"
4647 download_response = requests.get(url)
4748 download_response.raise_for_status()
48− h = hashlib.sha256()
49− h.update(download_response.content)
50− return h.hexdigest()
49+ return download_response.content.decode('UTF-8').split(' ')[0]
5150
5251
5352channels = download_channels()
@@ -63,18 +62,22 @@ def update_product(name, product):
6362 else:
6463 try:
6564 build = latest_build(channel)
66− version = build["@version"]
67− parsed_version = build_version(build)
68− version_major_minor = f"{parsed_version.major}.{parsed_version.minor}"
69− download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor)
65+ new_version = build["@version"]
66+ new_build_number = build["@fullNumber"]
67+ if "EAP" not in channel["@name"]:
68+ version_or_build_number = new_version
69+ else:
70+ version_or_build_number = new_build_number
71+ version_number = new_version.split(' ')[0]
72+ download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number)
7073 product["url"] = download_url
71− product["version-major-minor"] = version_major_minor
72− if "sha256" not in product or product.get("version") != version:
73− logging.info("Found a newer version %s.", version)
74− product["version"] = version
74+ if "sha256" not in product or product.get("build_number") != new_build_number:
75+ logging.info("Found a newer version %s with build number %s.", new_version, new_build_number)
76+ product["version"] = new_version
77+ product["build_number"] = new_build_number
7578 product["sha256"] = download_sha256(download_url)
7679 else:
77− logging.info("Already at the latest version %s.", version)
80+ logging.info("Already at the latest version %s with build number %s.", new_version, new_build_number)
7881 except Exception as e:
7982 logging.exception("Update failed:", exc_info=e)
8083 logging.warning("Skipping %s due to the above error.", name)
pkgs/applications/editors/jetbrains/versions.json+108−108
@@ -3,26 +3,26 @@
33 "clion": {
44 "update-channel": "CLion RELEASE",
55 "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
6− "version": "2021.3.3",
7− "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d",
8− "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz",
9− "version-major-minor": "2021.3"
6+ "version": "2022.1",
7+ "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b",
8+ "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz",
9+ "version-major-minor": "2022.1"
1010 },
1111 "datagrip": {
1212 "update-channel": "DataGrip RELEASE",
1313 "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
14− "version": "2021.3.4",
15− "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325",
16− "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz",
17− "version-major-minor": "2021.3"
14+ "version": "2022.1.1",
15+ "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67",
16+ "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz",
17+ "version-major-minor": "2022.1.1"
1818 },
1919 "goland": {
2020 "update-channel": "GoLand RELEASE",
2121 "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
22− "version": "2021.3.3",
23− "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3",
24− "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz",
25− "version-major-minor": "2021.3"
22+ "version": "2022.1",
23+ "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947",
24+ "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz",
25+ "version-major-minor": "2022.1"
2626 },
2727 "idea-community": {
2828 "update-channel": "IntelliJ IDEA RELEASE",
@@ -51,76 +51,76 @@
5151 "phpstorm": {
5252 "update-channel": "PhpStorm RELEASE",
5353 "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
54− "version": "2021.3.2",
55− "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2",
56− "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz",
57− "version-major-minor": "2021.3"
54+ "version": "2022.1",
55+ "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395",
56+ "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz",
57+ "version-major-minor": "2022.1"
5858 },
5959 "pycharm-community": {
6060 "update-channel": "PyCharm RELEASE",
6161 "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
62− "version": "2021.3.2",
63− "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8",
64− "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz",
65− "version-major-minor": "2021.3"
62+ "version": "2022.1",
63+ "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb",
64+ "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz",
65+ "version-major-minor": "2022.1"
6666 },
6767 "pycharm-professional": {
6868 "update-channel": "PyCharm RELEASE",
6969 "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
70− "version": "2021.3.2",
71− "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67",
72− "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz",
73− "version-major-minor": "2021.3"
70+ "version": "2022.1",
71+ "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605",
72+ "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz",
73+ "version-major-minor": "2022.1"
7474 },
7575 "rider": {
7676 "update-channel": "Rider RELEASE",
7777 "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
78− "version": "2021.3.3",
79− "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f",
80− "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz",
81− "version-major-minor": "2021.3"
78+ "version": "2022.1",
79+ "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673",
80+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz",
81+ "version-major-minor": "2022.1"
8282 },
8383 "ruby-mine": {
8484 "update-channel": "RubyMine RELEASE",
8585 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
86− "version": "2021.3.2",
87− "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2",
88− "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz",
89− "version-major-minor": "2021.3"
86+ "version": "2022.1",
87+ "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401",
88+ "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz",
89+ "version-major-minor": "2022.1"
9090 },
9191 "webstorm": {
9292 "update-channel": "WebStorm RELEASE",
9393 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
94− "version": "2021.3.2",
95− "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060",
96− "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz",
97− "version-major-minor": "2021.3"
94+ "version": "2022.1",
95+ "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c",
96+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz",
97+ "version-major-minor": "2022.1"
9898 }
9999 },
100100 "x86_64-darwin": {
101101 "clion": {
102102 "update-channel": "CLion RELEASE",
103103 "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
104− "version": "2021.3.3",
105− "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d",
106− "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg",
107− "version-major-minor": "2021.3"
104+ "version": "2022.1",
105+ "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52",
106+ "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg",
107+ "version-major-minor": "2022.1"
108108 },
109109 "datagrip": {
110110 "update-channel": "DataGrip RELEASE",
111111 "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
112− "version": "2021.3.4",
113− "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52",
114− "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg",
115− "version-major-minor": "2021.3"
112+ "version": "2022.1.1",
113+ "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e",
114+ "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg",
115+ "version-major-minor": "2022.1.1"
116116 },
117117 "goland": {
118118 "update-channel": "GoLand RELEASE",
119119 "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
120− "version": "2021.3.3",
121− "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9",
122− "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg",
123− "version-major-minor": "2021.3"
120+ "version": "2022.1",
121+ "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b",
122+ "url": "https://download.jetbrains.com/go/goland-2022.1.dmg",
123+ "version-major-minor": "2022.1"
124124 },
125125 "idea-community": {
126126 "update-channel": "IntelliJ IDEA RELEASE",
@@ -149,76 +149,76 @@
149149 "phpstorm": {
150150 "update-channel": "PhpStorm RELEASE",
151151 "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
152− "version": "2021.3.2",
153− "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14",
154− "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg",
155− "version-major-minor": "2021.3"
152+ "version": "2022.1",
153+ "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8",
154+ "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg",
155+ "version-major-minor": "2022.1"
156156 },
157157 "pycharm-community": {
158158 "update-channel": "PyCharm RELEASE",
159159 "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
160− "version": "2021.3.2",
161− "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909",
162− "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg",
163− "version-major-minor": "2021.3"
160+ "version": "2022.1",
161+ "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec",
162+ "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg",
163+ "version-major-minor": "2022.1"
164164 },
165165 "pycharm-professional": {
166166 "update-channel": "PyCharm RELEASE",
167167 "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
168− "version": "2021.3.2",
169− "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775",
170− "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg",
171− "version-major-minor": "2021.3"
168+ "version": "2022.1",
169+ "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56",
170+ "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg",
171+ "version-major-minor": "2022.1"
172172 },
173173 "rider": {
174174 "update-channel": "Rider RELEASE",
175175 "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
176− "version": "2021.3.3",
177− "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094",
178− "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg",
179− "version-major-minor": "2021.3"
176+ "version": "2022.1",
177+ "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e",
178+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg",
179+ "version-major-minor": "2022.1"
180180 },
181181 "ruby-mine": {
182182 "update-channel": "RubyMine RELEASE",
183183 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
184− "version": "2021.3.2",
185− "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96",
186− "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg",
187− "version-major-minor": "2021.3"
184+ "version": "2022.1",
185+ "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff",
186+ "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg",
187+ "version-major-minor": "2022.1"
188188 },
189189 "webstorm": {
190190 "update-channel": "WebStorm RELEASE",
191191 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
192− "version": "2021.3.2",
193− "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36",
194− "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg",
195− "version-major-minor": "2021.3"
192+ "version": "2022.1",
193+ "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08",
194+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg",
195+ "version-major-minor": "2022.1"
196196 }
197197 },
198198 "aarch64-darwin": {
199199 "clion": {
200200 "update-channel": "CLion RELEASE",
201201 "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
202− "version": "2021.3.3",
203− "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2",
204− "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg",
205− "version-major-minor": "2021.3"
202+ "version": "2022.1",
203+ "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c",
204+ "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg",
205+ "version-major-minor": "2022.1"
206206 },
207207 "datagrip": {
208208 "update-channel": "DataGrip RELEASE",
209209 "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
210− "version": "2021.3.4",
211− "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a",
212− "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg",
213− "version-major-minor": "2021.3"
210+ "version": "2022.1.1",
211+ "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f",
212+ "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg",
213+ "version-major-minor": "2022.1.1"
214214 },
215215 "goland": {
216216 "update-channel": "GoLand RELEASE",
217217 "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
218− "version": "2021.3.3",
219− "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db",
220− "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg",
221− "version-major-minor": "2021.3"
218+ "version": "2022.1",
219+ "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3",
220+ "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg",
221+ "version-major-minor": "2022.1"
222222 },
223223 "idea-community": {
224224 "update-channel": "IntelliJ IDEA RELEASE",
@@ -247,50 +247,50 @@
247247 "phpstorm": {
248248 "update-channel": "PhpStorm RELEASE",
249249 "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
250− "version": "2021.3.2",
251− "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314",
252− "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg",
253− "version-major-minor": "2021.3"
250+ "version": "2022.1",
251+ "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21",
252+ "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg",
253+ "version-major-minor": "2022.1"
254254 },
255255 "pycharm-community": {
256256 "update-channel": "PyCharm RELEASE",
257257 "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
258− "version": "2021.3.2",
259− "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a",
260− "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg",
261− "version-major-minor": "2021.3"
258+ "version": "2022.1",
259+ "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7",
260+ "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg",
261+ "version-major-minor": "2022.1"
262262 },
263263 "pycharm-professional": {
264264 "update-channel": "PyCharm RELEASE",
265265 "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
266− "version": "2021.3.2",
267− "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db",
268− "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg",
269− "version-major-minor": "2021.3"
266+ "version": "2022.1",
267+ "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f",
268+ "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg",
269+ "version-major-minor": "2022.1"
270270 },
271271 "rider": {
272272 "update-channel": "Rider RELEASE",
273273 "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
274− "version": "2021.3.3",
275− "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37",
276− "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg",
277− "version-major-minor": "2021.3"
274+ "version": "2022.1",
275+ "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3",
276+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg",
277+ "version-major-minor": "2022.1"
278278 },
279279 "ruby-mine": {
280280 "update-channel": "RubyMine RELEASE",
281281 "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
282− "version": "2021.3.2",
283− "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e",
284− "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg",
285− "version-major-minor": "2021.3"
282+ "version": "2022.1",
283+ "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed",
284+ "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg",
285+ "version-major-minor": "2022.1"
286286 },
287287 "webstorm": {
288288 "update-channel": "WebStorm RELEASE",
289289 "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
290− "version": "2021.3.2",
291− "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408",
292− "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg",
293− "version-major-minor": "2021.3"
290+ "version": "2022.1",
291+ "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177",
292+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg",
293+ "version-major-minor": "2022.1"
294294 }
295295 }
296296}
pkgs/applications/editors/lifeograph/default.nix+5−5
@@ -1,21 +1,21 @@
11{ stdenv, lib, fetchgit, pkg-config, meson, ninja
2−, enchant, gtkmm3, libchamplain, libgcrypt }:
2+, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:
33
44stdenv.mkDerivation rec {
55 pname = "lifeograph";
6− version = "2.0.2";
6+ version = "2.0.3";
77
88 src = fetchgit {
99 url = "https://git.launchpad.net/lifeograph";
10− # Specific commit hash related to version
11− rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6";
12− sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq";
10+ rev = "v${version}";
11+ sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM=";
1312 };
1413
1514 nativeBuildInputs = [
1615 meson
1716 ninja
1817 pkg-config
18+ shared-mime-info # for update-mime-database
1919 ];
2020
2121 buildInputs = [
pkgs/applications/editors/okteta/default.nix+2
@@ -26,6 +26,8 @@ mkDerivation rec {
2626 kcrash
2727 ];
2828
29+ outputs = [ "out" "dev" ];
30+
2931 meta = with lib; {
3032 license = licenses.gpl2;
3133 description = "A hex editor";
pkgs/applications/editors/oni2/common.nix−1
@@ -95,7 +95,6 @@ in stdenv.mkDerivation (rec {
9595 clang
9696 makeWrapper
9797 nodePackages.esy
98− bash
9998 perl
10099 which
101100 nasm
pkgs/applications/editors/texmaker/default.nix+2−2
@@ -2,11 +2,11 @@
22
33mkDerivation rec {
44 pname = "texmaker";
5− version = "5.1.2";
5+ version = "5.1.3";
66
77 src = fetchurl {
88 url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2";
9− sha256 = "sha256-UmiW8sGuVhEw7seq6BW53Nqejut3K2VB0NyUzpGnEEQ=";
9+ sha256 = "0qczc2r01vhap11xmqizwbq21ggn4yjrxim8iqjxaq9w1rg2x9dz";
1010 };
1111
1212 buildInputs = [ qtbase qtscript poppler zlib qtwebengine ];
pkgs/applications/editors/texstudio/default.nix+2−2
@@ -3,13 +3,13 @@
33
44mkDerivation rec {
55 pname = "texstudio";
6− version = "4.2.2";
6+ version = "4.2.3";
77
88 src = fetchFromGitHub {
99 owner = "${pname}-org";
1010 repo = pname;
1111 rev = version;
12− sha256 = "sha256-MZz8DQT1f6RU+euEED1bbg2MsaqC6+W3RoMk2qfIjr4=";
12+ sha256 = "19z9dx8258qbjyzgskkg0xdn88mvx191y1sz4nk15yxsdyf2z3p8";
1313 };
1414
1515 nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ];
pkgs/applications/editors/vim/plugins/build-vim-plugin.nix+2
@@ -1,6 +1,7 @@
11{ lib, stdenv
22, rtpPath
33, vim
4+, vimCommandCheckHook
45, vimGenDocHook
56}:
67
@@ -30,6 +31,7 @@ rec {
3031 forceShare= [ "man" "info" ];
3132
3233 nativeBuildInputs = attrs.nativeBuildInputs or []
34+ ++ [ vimCommandCheckHook ]
3335 ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook;
3436 inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
3537
pkgs/applications/editors/vim/plugins/default.nix+7−2
@@ -3,7 +3,8 @@
33
44let
55
6− inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook;
6+ inherit (vimUtils.override {inherit vim;})
7+ buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;
78
89 inherit (lib) extends;
910
@@ -12,7 +13,10 @@ let
1213 toVimPlugin = drv:
1314 drv.overrideAttrs(oldAttrs: {
1415
15− nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ vimGenDocHook ];
16+ nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [
17+ vimGenDocHook
18+ vimCommandCheckHook
19+ ];
1620 passthru = (oldAttrs.passthru or {}) // {
1721 vimPlugin = true;
1822 };
@@ -21,6 +25,7 @@ let
2125
2226 plugins = callPackage ./generated.nix {
2327 inherit buildVimPluginFrom2Nix;
28+ inherit (vimUtils) buildNeovimPluginFrom2Nix;
2429 };
2530
2631 # TL;DR
pkgs/applications/editors/vim/plugins/generated.nix+441−440
@@ -1,5 +1,5 @@
11# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!
2−{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
2+{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
33
44final: prev:
55{
@@ -53,12 +53,12 @@ final: prev:
5353
5454 Coqtail = buildVimPluginFrom2Nix {
5555 pname = "Coqtail";
56− version = "2022-04-15";
56+ version = "2022-04-21";
5757 src = fetchFromGitHub {
5858 owner = "whonore";
5959 repo = "Coqtail";
60− rev = "93fca5d307007c05722050ffa8b4e508ca6f3b81";
61− sha256 = "022wv0lpz50ihvnkc38rmds0dl4g4b71yig9dc8nn8sicyv0312w";
60+ rev = "0b8f2408f96481a373f336b4405af03008e39a4e";
61+ sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki";
6262 };
6363 meta.homepage = "https://github.com/whonore/Coqtail/";
6464 };
@@ -77,12 +77,12 @@ final: prev:
7777
7878 FTerm-nvim = buildVimPluginFrom2Nix {
7979 pname = "FTerm.nvim";
80− version = "2022-04-17";
80+ version = "2022-04-21";
8181 src = fetchFromGitHub {
8282 owner = "numToStr";
8383 repo = "FTerm.nvim";
84− rev = "c2a4c4bbd00da68d864683cd09a5d3a2b80de11d";
85− sha256 = "01xscq18slsib2liqp7mbd4wil6l61m2ipihg2i6a14s9bcd1b0y";
84+ rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a";
85+ sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y";
8686 };
8787 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";
8888 };
@@ -149,12 +149,12 @@ final: prev:
149149
150150 LeaderF = buildVimPluginFrom2Nix {
151151 pname = "LeaderF";
152− version = "2022-04-19";
152+ version = "2022-04-26";
153153 src = fetchFromGitHub {
154154 owner = "Yggdroot";
155155 repo = "LeaderF";
156− rev = "ecd38845d65ffbe4b080cc3c2c1c7f0bfe835bb3";
157− sha256 = "0cjx9v0fafm2npknr85wb37934ysdggnmiwr9cwbd5risp9ircwh";
156+ rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d";
157+ sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn";
158158 };
159159 meta.homepage = "https://github.com/Yggdroot/LeaderF/";
160160 };
@@ -173,12 +173,12 @@ final: prev:
173173
174174 Navigator-nvim = buildVimPluginFrom2Nix {
175175 pname = "Navigator.nvim";
176− version = "2022-04-11";
176+ version = "2022-04-29";
177177 src = fetchFromGitHub {
178178 owner = "numToStr";
179179 repo = "Navigator.nvim";
180− rev = "52225923679ec866651bb0c2e0691374131ec939";
181− sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv";
180+ rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2";
181+ sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc";
182182 };
183183 meta.homepage = "https://github.com/numToStr/Navigator.nvim/";
184184 };
@@ -269,12 +269,12 @@ final: prev:
269269
270270 SchemaStore-nvim = buildVimPluginFrom2Nix {
271271 pname = "SchemaStore.nvim";
272− version = "2022-04-19";
272+ version = "2022-05-02";
273273 src = fetchFromGitHub {
274274 owner = "b0o";
275275 repo = "SchemaStore.nvim";
276− rev = "4112585513210a3a55e587344649a4bfb8709bdc";
277− sha256 = "1sjm13vq8608xwfhc9hyfn1n4bwpgivnpw04331giwmf4j3kp422";
276+ rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a";
277+ sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk";
278278 };
279279 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
280280 };
@@ -305,12 +305,12 @@ final: prev:
305305
306306 SimpylFold = buildVimPluginFrom2Nix {
307307 pname = "SimpylFold";
308− version = "2021-11-04";
308+ version = "2022-05-02";
309309 src = fetchFromGitHub {
310310 owner = "tmhedberg";
311311 repo = "SimpylFold";
312− rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";
313− sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";
312+ rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd";
313+ sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25";
314314 };
315315 meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
316316 };
@@ -329,12 +329,12 @@ final: prev:
329329
330330 SpaceVim = buildVimPluginFrom2Nix {
331331 pname = "SpaceVim";
332− version = "2022-04-19";
332+ version = "2022-05-02";
333333 src = fetchFromGitHub {
334334 owner = "SpaceVim";
335335 repo = "SpaceVim";
336− rev = "a1b65988e72a091334cedfe7ed1d067819f4e1eb";
337− sha256 = "096q33lrgn4i8ic6y66snb312ly3rdxm8a15mykawn1n533d04nq";
336+ rev = "97b010245f42bda351fd050a3c6ccf7806b9b007";
337+ sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f";
338338 };
339339 meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
340340 };
@@ -486,12 +486,12 @@ final: prev:
486486
487487 aerial-nvim = buildVimPluginFrom2Nix {
488488 pname = "aerial.nvim";
489− version = "2022-04-19";
489+ version = "2022-05-02";
490490 src = fetchFromGitHub {
491491 owner = "stevearc";
492492 repo = "aerial.nvim";
493− rev = "6d5246a3f0d2861eaad4121eb467bc5e6537690d";
494− sha256 = "0by8s35hhvk38l79y5nm88cvwy53vx21ps1wg9niway5xrp0khcs";
493+ rev = "8d2ef96e44768250a652826c6586005f40eeac7f";
494+ sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx";
495495 };
496496 meta.homepage = "https://github.com/stevearc/aerial.nvim/";
497497 };
@@ -522,12 +522,12 @@ final: prev:
522522
523523 ale = buildVimPluginFrom2Nix {
524524 pname = "ale";
525− version = "2022-04-06";
525+ version = "2022-05-02";
526526 src = fetchFromGitHub {
527527 owner = "dense-analysis";
528528 repo = "ale";
529− rev = "607f33a1b0f662d9809d54363e8e81a4965862ce";
530− sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx";
529+ rev = "56399106fcf9d80d476307576bc307e67f0167e2";
530+ sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv";
531531 };
532532 meta.homepage = "https://github.com/dense-analysis/ale/";
533533 };
@@ -546,12 +546,12 @@ final: prev:
546546
547547 aniseed = buildVimPluginFrom2Nix {
548548 pname = "aniseed";
549− version = "2022-04-09";
549+ version = "2022-04-27";
550550 src = fetchFromGitHub {
551551 owner = "Olical";
552552 repo = "aniseed";
553− rev = "c55d4879935f07dbf46e86389246449d7af272b1";
554− sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s";
553+ rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c";
554+ sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q";
555555 };
556556 meta.homepage = "https://github.com/Olical/aniseed/";
557557 };
@@ -654,12 +654,12 @@ final: prev:
654654
655655 asynctasks-vim = buildVimPluginFrom2Nix {
656656 pname = "asynctasks.vim";
657− version = "2022-04-06";
657+ version = "2022-05-01";
658658 src = fetchFromGitHub {
659659 owner = "skywind3000";
660660 repo = "asynctasks.vim";
661− rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5";
662− sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd";
661+ rev = "9cdb34314d5066b40627c83829b9d04943c9c66d";
662+ sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw";
663663 };
664664 meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";
665665 };
@@ -714,12 +714,12 @@ final: prev:
714714
715715 auto-session = buildVimPluginFrom2Nix {
716716 pname = "auto-session";
717− version = "2022-04-12";
717+ version = "2022-04-21";
718718 src = fetchFromGitHub {
719719 owner = "rmagatti";
720720 repo = "auto-session";
721− rev = "e840b844abcc19ad6e406b193a2a5ce285238458";
722− sha256 = "0yx662qipzdmg28x0h454y95jrp952p51pl9h1dxjnwyswn8xrnm";
721+ rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a";
722+ sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw";
723723 };
724724 meta.homepage = "https://github.com/rmagatti/auto-session/";
725725 };
@@ -894,12 +894,12 @@ final: prev:
894894
895895 bufferline-nvim = buildVimPluginFrom2Nix {
896896 pname = "bufferline.nvim";
897− version = "2022-04-20";
897+ version = "2022-05-02";
898898 src = fetchFromGitHub {
899899 owner = "akinsho";
900900 repo = "bufferline.nvim";
901− rev = "f02e19bd29a27944e6bcc1e7a492fe07534b6630";
902− sha256 = "10gwj4kd7kngcrfgm4jja08ss5hza7s1bzs11fjk08y489mhracp";
901+ rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc";
902+ sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh";
903903 };
904904 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
905905 };
@@ -1050,24 +1050,24 @@ final: prev:
10501050
10511051 cmp-calc = buildVimPluginFrom2Nix {
10521052 pname = "cmp-calc";
1053− version = "2022-04-12";
1053+ version = "2022-04-25";
10541054 src = fetchFromGitHub {
10551055 owner = "hrsh7th";
10561056 repo = "cmp-calc";
1057− rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f";
1058− sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch";
1057+ rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312";
1058+ sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg";
10591059 };
10601060 meta.homepage = "https://github.com/hrsh7th/cmp-calc/";
10611061 };
10621062
10631063 cmp-cmdline = buildVimPluginFrom2Nix {
10641064 pname = "cmp-cmdline";
1065− version = "2022-02-13";
1065+ version = "2022-05-02";
10661066 src = fetchFromGitHub {
10671067 owner = "hrsh7th";
10681068 repo = "cmp-cmdline";
1069− rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0";
1070− sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh";
1069+ rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252";
1070+ sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68";
10711071 };
10721072 meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";
10731073 };
@@ -1110,12 +1110,12 @@ final: prev:
11101110
11111111 cmp-nvim-lsp = buildVimPluginFrom2Nix {
11121112 pname = "cmp-nvim-lsp";
1113− version = "2022-01-15";
1113+ version = "2022-05-01";
11141114 src = fetchFromGitHub {
11151115 owner = "hrsh7th";
11161116 repo = "cmp-nvim-lsp";
1117− rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba";
1118− sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca";
1117+ rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d";
1118+ sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc";
11191119 };
11201120 meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";
11211121 };
@@ -1146,12 +1146,12 @@ final: prev:
11461146
11471147 cmp-nvim-ultisnips = buildVimPluginFrom2Nix {
11481148 pname = "cmp-nvim-ultisnips";
1149− version = "2022-04-15";
1149+ version = "2022-04-22";
11501150 src = fetchFromGitHub {
11511151 owner = "quangnguyen30192";
11521152 repo = "cmp-nvim-ultisnips";
1153− rev = "c6ace8ca97ca7db5cca319759efd93fbf6cc0bce";
1154− sha256 = "0jys7fl9r6n7khacypkg643lk2aadsnniyrm7nar0k08swdwhl48";
1153+ rev = "21f02b62deb409ce69928a23406076bd0043ddbc";
1154+ sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv";
11551155 };
11561156 meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";
11571157 };
@@ -1170,12 +1170,12 @@ final: prev:
11701170
11711171 cmp-pandoc-references = buildVimPluginFrom2Nix {
11721172 pname = "cmp-pandoc-references";
1173− version = "2022-02-16";
1173+ version = "2022-04-20";
11741174 src = fetchFromGitHub {
11751175 owner = "jc-doyle";
11761176 repo = "cmp-pandoc-references";
1177− rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54";
1178− sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs";
1177+ rev = "2c808dff631a783ddd2c554c4c6033907589baf6";
1178+ sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";
11791179 };
11801180 meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";
11811181 };
@@ -1230,12 +1230,12 @@ final: prev:
12301230
12311231 cmp-treesitter = buildVimPluginFrom2Nix {
12321232 pname = "cmp-treesitter";
1233− version = "2021-12-02";
1233+ version = "2022-04-25";
12341234 src = fetchFromGitHub {
12351235 owner = "ray-x";
12361236 repo = "cmp-treesitter";
1237− rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb";
1238− sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa";
1237+ rev = "c5187c31abd081ecef8b41e5eb476b7340442310";
1238+ sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5";
12391239 };
12401240 meta.homepage = "https://github.com/ray-x/cmp-treesitter/";
12411241 };
@@ -1266,12 +1266,12 @@ final: prev:
12661266
12671267 cmp_luasnip = buildVimPluginFrom2Nix {
12681268 pname = "cmp_luasnip";
1269− version = "2022-04-01";
1269+ version = "2022-05-01";
12701270 src = fetchFromGitHub {
12711271 owner = "saadparwaiz1";
12721272 repo = "cmp_luasnip";
1273− rev = "b10829736542e7cc9291e60bab134df1273165c9";
1274− sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l";
1273+ rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36";
1274+ sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj";
12751275 };
12761276 meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
12771277 };
@@ -1314,12 +1314,12 @@ final: prev:
13141314
13151315 coc-lua = buildVimPluginFrom2Nix {
13161316 pname = "coc-lua";
1317− version = "2022-04-20";
1317+ version = "2022-04-26";
13181318 src = fetchFromGitHub {
13191319 owner = "josa42";
13201320 repo = "coc-lua";
1321− rev = "0df59c8c81acfb7b0abadd49222a769ddf0730ec";
1322− sha256 = "0ij2q9q96dv3rms6qdjsqvgyl0fk3w1h67fhjq7kcagci78cka9k";
1321+ rev = "3601c8ddde380349764fc0bc016b915703c9ad86";
1322+ sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx";
13231323 };
13241324 meta.homepage = "https://github.com/josa42/coc-lua/";
13251325 };
@@ -1374,24 +1374,24 @@ final: prev:
13741374
13751375 coc-nvim = buildVimPluginFrom2Nix {
13761376 pname = "coc.nvim";
1377− version = "2022-04-19";
1377+ version = "2022-05-01";
13781378 src = fetchFromGitHub {
13791379 owner = "neoclide";
13801380 repo = "coc.nvim";
1381− rev = "6f81e3034bf04f2d8d65b82b3ac15d93b737cf0b";
1382− sha256 = "0hx8g0xlh0n6yqpv58s8vb2k0gdh1h13d05l1m3wn3gpvid17xi3";
1381+ rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02";
1382+ sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6";
13831383 };
13841384 meta.homepage = "https://github.com/neoclide/coc.nvim/";
13851385 };
13861386
13871387 codi-vim = buildVimPluginFrom2Nix {
13881388 pname = "codi.vim";
1389− version = "2022-04-16";
1389+ version = "2022-04-30";
13901390 src = fetchFromGitHub {
13911391 owner = "metakirby5";
13921392 repo = "codi.vim";
1393− rev = "d9a93193dbb23516eebb19ef5ba01b43287ea35d";
1394− sha256 = "0yk3jfp8r432s0kan0g6ml0yyz731yygv0zzpx75l9lfagdv0xpy";
1393+ rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0";
1394+ sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd";
13951395 };
13961396 meta.homepage = "https://github.com/metakirby5/codi.vim/";
13971397 };
@@ -1435,12 +1435,12 @@ final: prev:
14351435
14361436 comment-nvim = buildVimPluginFrom2Nix {
14371437 pname = "comment.nvim";
1438− version = "2022-04-19";
1438+ version = "2022-04-27";
14391439 src = fetchFromGitHub {
14401440 owner = "numtostr";
14411441 repo = "comment.nvim";
1442− rev = "ef3e6bfa41073a73c298ae90d2796f8ceda71c6a";
1443− sha256 = "1ki607wsam22h01gwq8a4vw3jq1yj2zmfp2laglh5cy5dgarm4vv";
1442+ rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a";
1443+ sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h";
14441444 };
14451445 meta.homepage = "https://github.com/numtostr/comment.nvim/";
14461446 };
@@ -1579,12 +1579,12 @@ final: prev:
15791579
15801580 conjure = buildVimPluginFrom2Nix {
15811581 pname = "conjure";
1582− version = "2022-04-09";
1582+ version = "2022-04-29";
15831583 src = fetchFromGitHub {
15841584 owner = "Olical";
15851585 repo = "conjure";
1586− rev = "422cadf51dd44306713f3f7965e40ec606290c49";
1587− sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh";
1586+ rev = "842c81892648de759e639ad2d395757b98be06d5";
1587+ sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8";
15881588 };
15891589 meta.homepage = "https://github.com/Olical/conjure/";
15901590 };
@@ -1627,12 +1627,12 @@ final: prev:
16271627
16281628 coq_nvim = buildVimPluginFrom2Nix {
16291629 pname = "coq_nvim";
1630− version = "2022-04-20";
1630+ version = "2022-05-02";
16311631 src = fetchFromGitHub {
16321632 owner = "ms-jpq";
16331633 repo = "coq_nvim";
1634− rev = "0502a7f14ab73b80353d076842d58730a0239a16";
1635− sha256 = "1s46iafdwxr20qw08si0lwbh81x9ffh2wvd4rxcyvhlxc7h686rp";
1634+ rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3";
1635+ sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf";
16361636 };
16371637 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
16381638 };
@@ -1663,12 +1663,12 @@ final: prev:
16631663
16641664 crates-nvim = buildVimPluginFrom2Nix {
16651665 pname = "crates.nvim";
1666− version = "2022-04-19";
1666+ version = "2022-05-02";
16671667 src = fetchFromGitHub {
16681668 owner = "saecki";
16691669 repo = "crates.nvim";
1670− rev = "fc46bf69f0b2293f25581123b46023226d102cc1";
1671− sha256 = "079hraq9cjxjpqrli4y2nk9xwpvkhxmrbrhxq9by1wb1q1a39da3";
1670+ rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383";
1671+ sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q";
16721672 };
16731673 meta.homepage = "https://github.com/saecki/crates.nvim/";
16741674 };
@@ -1795,12 +1795,12 @@ final: prev:
17951795
17961796 defx-nvim = buildVimPluginFrom2Nix {
17971797 pname = "defx.nvim";
1798− version = "2022-04-14";
1798+ version = "2022-04-21";
17991799 src = fetchFromGitHub {
18001800 owner = "Shougo";
18011801 repo = "defx.nvim";
1802− rev = "b636df644005bb4805cba70b238df73b302640eb";
1803− sha256 = "1aha5vashdiz59iy8l8kbkyvwngw5m7n131k7ar82gxi0zqsj6q8";
1802+ rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2";
1803+ sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j";
18041804 };
18051805 meta.homepage = "https://github.com/Shougo/defx.nvim/";
18061806 };
@@ -1855,12 +1855,12 @@ final: prev:
18551855
18561856 deol-nvim = buildVimPluginFrom2Nix {
18571857 pname = "deol.nvim";
1858− version = "2022-03-16";
1858+ version = "2022-04-29";
18591859 src = fetchFromGitHub {
18601860 owner = "Shougo";
18611861 repo = "deol.nvim";
1862− rev = "4ecffa4502a65f90397c2194ae308dac49194a65";
1863− sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9";
1862+ rev = "0bdb926d328765144dd788c062161c565dc38732";
1863+ sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x";
18641864 };
18651865 meta.homepage = "https://github.com/Shougo/deol.nvim/";
18661866 };
@@ -2169,12 +2169,12 @@ final: prev:
21692169
21702170 dressing-nvim = buildVimPluginFrom2Nix {
21712171 pname = "dressing.nvim";
2172− version = "2022-03-31";
2172+ version = "2022-05-01";
21732173 src = fetchFromGitHub {
21742174 owner = "stevearc";
21752175 repo = "dressing.nvim";
2176− rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217";
2177− sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy";
2176+ rev = "a476efd3f372d6b5b0df431cac36911fb84c515e";
2177+ sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy";
21782178 };
21792179 meta.homepage = "https://github.com/stevearc/dressing.nvim/";
21802180 };
@@ -2193,12 +2193,12 @@ final: prev:
21932193
21942194 edge = buildVimPluginFrom2Nix {
21952195 pname = "edge";
2196− version = "2022-04-14";
2196+ version = "2022-04-27";
21972197 src = fetchFromGitHub {
21982198 owner = "sainnhe";
21992199 repo = "edge";
2200− rev = "957a0f4d17f253ac23f9c870eb92d7ad2ea4b7e0";
2201− sha256 = "15m6b5svvcfsmiq87vhn77q5z7zg22vpnh9qbcv0y6cd04s69n2d";
2200+ rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674";
2201+ sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4";
22022202 };
22032203 meta.homepage = "https://github.com/sainnhe/edge/";
22042204 };
@@ -2279,12 +2279,12 @@ final: prev:
22792279
22802280 everforest = buildVimPluginFrom2Nix {
22812281 pname = "everforest";
2282− version = "2022-04-14";
2282+ version = "2022-04-27";
22832283 src = fetchFromGitHub {
22842284 owner = "sainnhe";
22852285 repo = "everforest";
2286− rev = "64f486a4856bfbfd6604c700c938b34cf551561b";
2287− sha256 = "18yxab99d9cy45ir2dfqr8wi0s56qyrzglgcslp97wnjiq79673d";
2286+ rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32";
2287+ sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah";
22882288 };
22892289 meta.homepage = "https://github.com/sainnhe/everforest/";
22902290 };
@@ -2460,12 +2460,12 @@ final: prev:
24602460
24612461 formatter-nvim = buildVimPluginFrom2Nix {
24622462 pname = "formatter.nvim";
2463− version = "2022-03-29";
2463+ version = "2022-04-26";
24642464 src = fetchFromGitHub {
24652465 owner = "mhartington";
24662466 repo = "formatter.nvim";
2467− rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31";
2468− sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n";
2467+ rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9";
2468+ sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp";
24692469 };
24702470 meta.homepage = "https://github.com/mhartington/formatter.nvim/";
24712471 };
@@ -2484,12 +2484,12 @@ final: prev:
24842484
24852485 friendly-snippets = buildVimPluginFrom2Nix {
24862486 pname = "friendly-snippets";
2487− version = "2022-04-17";
2487+ version = "2022-04-25";
24882488 src = fetchFromGitHub {
24892489 owner = "rafamadriz";
24902490 repo = "friendly-snippets";
2491− rev = "804c3f55ec4ec46f7257451b3cd731df991b9212";
2492− sha256 = "0sznw2q70zac924yf0z0ic3frmmjmryjh4af46fw2zrbrq4kk9vq";
2491+ rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938";
2492+ sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w";
24932493 };
24942494 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
24952495 };
@@ -2604,12 +2604,12 @@ final: prev:
26042604
26052605 gentoo-syntax = buildVimPluginFrom2Nix {
26062606 pname = "gentoo-syntax";
2607− version = "2022-02-23";
2607+ version = "2022-05-02";
26082608 src = fetchFromGitHub {
26092609 owner = "gentoo";
26102610 repo = "gentoo-syntax";
2611− rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";
2612− sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";
2611+ rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1";
2612+ sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h";
26132613 };
26142614 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";
26152615 };
@@ -2652,24 +2652,24 @@ final: prev:
26522652
26532653 git-blame-nvim = buildVimPluginFrom2Nix {
26542654 pname = "git-blame.nvim";
2655− version = "2022-03-03";
2655+ version = "2022-04-29";
26562656 src = fetchFromGitHub {
26572657 owner = "f-person";
26582658 repo = "git-blame.nvim";
2659− rev = "e60bfbc314476777a5ce200e533699691a5cdfa5";
2660− sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k";
2659+ rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541";
2660+ sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl";
26612661 };
26622662 meta.homepage = "https://github.com/f-person/git-blame.nvim/";
26632663 };
26642664
26652665 git-messenger-vim = buildVimPluginFrom2Nix {
26662666 pname = "git-messenger.vim";
2667− version = "2021-11-13";
2667+ version = "2022-05-02";
26682668 src = fetchFromGitHub {
26692669 owner = "rhysd";
26702670 repo = "git-messenger.vim";
2671− rev = "2e67899355f3f631aad6845925e4c2c13546444d";
2672− sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp";
2671+ rev = "6c0b55fb38d0e0633127823aab89b0676d13e509";
2672+ sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk";
26732673 };
26742674 meta.homepage = "https://github.com/rhysd/git-messenger.vim/";
26752675 };
@@ -2710,14 +2710,14 @@ final: prev:
27102710 meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";
27112711 };
27122712
2713− gitsigns-nvim = buildVimPluginFrom2Nix {
2713+ gitsigns-nvim = buildNeovimPluginFrom2Nix {
27142714 pname = "gitsigns.nvim";
2715− version = "2022-04-19";
2715+ version = "2022-05-02";
27162716 src = fetchFromGitHub {
27172717 owner = "lewis6991";
27182718 repo = "gitsigns.nvim";
2719− rev = "498abfa13dd749be963bc87a5b37da0d3e42a50e";
2720− sha256 = "11d2pnqgngm6546r1nr0cf1dj7qkgvdn0ld2h1jn3fm07l892sgv";
2719+ rev = "ef153188e849bd317c00448755bc4182a2bd495d";
2720+ sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp";
27212721 };
27222722 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
27232723 };
@@ -2760,12 +2760,12 @@ final: prev:
27602760
27612761 golden-ratio = buildVimPluginFrom2Nix {
27622762 pname = "golden-ratio";
2763− version = "2020-04-03";
2763+ version = "2022-04-21";
27642764 src = fetchFromGitHub {
27652765 owner = "roman";
27662766 repo = "golden-ratio";
2767− rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043";
2768− sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654";
2767+ rev = "7df80253680e4755b82955425da31d8c1f8e23b6";
2768+ sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq";
27692769 };
27702770 meta.homepage = "https://github.com/roman/golden-ratio/";
27712771 };
@@ -2844,24 +2844,24 @@ final: prev:
28442844
28452845 gruvbox-material = buildVimPluginFrom2Nix {
28462846 pname = "gruvbox-material";
2847− version = "2022-04-14";
2847+ version = "2022-04-27";
28482848 src = fetchFromGitHub {
28492849 owner = "sainnhe";
28502850 repo = "gruvbox-material";
2851− rev = "45d05b6affeec1f858a13c0d8fe511db32c85afd";
2852− sha256 = "18sf80zgdsfb2bd9dgdww9prlhkydk695gj9wd9zah24zfc5mcv7";
2851+ rev = "3d664943daf65bf99390a52c5dbc557f87fac552";
2852+ sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj";
28532853 };
28542854 meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
28552855 };
28562856
28572857 gruvbox-nvim = buildVimPluginFrom2Nix {
28582858 pname = "gruvbox.nvim";
2859− version = "2022-04-18";
2859+ version = "2022-04-26";
28602860 src = fetchFromGitHub {
28612861 owner = "ellisonleao";
28622862 repo = "gruvbox.nvim";
2863− rev = "028302225e19eb203ebb6876b689cc0ce2631169";
2864− sha256 = "0npsh72z3xb9p1jdhz1g9jpx20c2d52mkkg4ix07bmy40ynkbsxs";
2863+ rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123";
2864+ sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8";
28652865 };
28662866 meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
28672867 };
@@ -2976,24 +2976,24 @@ final: prev:
29762976
29772977 hop-nvim = buildVimPluginFrom2Nix {
29782978 pname = "hop.nvim";
2979− version = "2022-03-22";
2979+ version = "2022-04-25";
29802980 src = fetchFromGitHub {
29812981 owner = "phaazon";
29822982 repo = "hop.nvim";
2983− rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3";
2984− sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2";
2983+ rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578";
2984+ sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v";
29852985 };
29862986 meta.homepage = "https://github.com/phaazon/hop.nvim/";
29872987 };
29882988
29892989 hotpot-nvim = buildVimPluginFrom2Nix {
29902990 pname = "hotpot.nvim";
2991− version = "2022-04-10";
2991+ version = "2022-04-24";
29922992 src = fetchFromGitHub {
29932993 owner = "rktjmp";
29942994 repo = "hotpot.nvim";
2995− rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e";
2996− sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf";
2995+ rev = "f481b30f1d93df6016092623199ddc8bfe1624d0";
2996+ sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj";
29972997 };
29982998 meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
29992999 };
@@ -3012,12 +3012,12 @@ final: prev:
30123012
30133013 iceberg-vim = buildVimPluginFrom2Nix {
30143014 pname = "iceberg.vim";
3015− version = "2021-12-28";
3015+ version = "2022-04-26";
30163016 src = fetchFromGitHub {
30173017 owner = "cocopon";
30183018 repo = "iceberg.vim";
3019− rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c";
3020− sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa";
3019+ rev = "5ac9da61e8626d1218498a35e515f36387efe454";
3020+ sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq";
30213021 };
30223022 meta.homepage = "https://github.com/cocopon/iceberg.vim/";
30233023 };
@@ -3277,12 +3277,12 @@ final: prev:
32773277
32783278 kanagawa-nvim = buildVimPluginFrom2Nix {
32793279 pname = "kanagawa.nvim";
3280− version = "2022-04-14";
3280+ version = "2022-04-21";
32813281 src = fetchFromGitHub {
32823282 owner = "rebelot";
32833283 repo = "kanagawa.nvim";
3284− rev = "acf0f5d61236b416c804d649cd76db8390de9ae6";
3285− sha256 = "03xmcph28q1y8n0ykga5m6biw9flpnx02sy7j2w3f1q2shknnwf3";
3284+ rev = "0ad738e7cc43514d35388c1caca13990d688aa5c";
3285+ sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca";
32863286 };
32873287 meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
32883288 };
@@ -3361,12 +3361,12 @@ final: prev:
33613361
33623362 lean-nvim = buildVimPluginFrom2Nix {
33633363 pname = "lean.nvim";
3364− version = "2022-04-19";
3364+ version = "2022-05-02";
33653365 src = fetchFromGitHub {
33663366 owner = "Julian";
33673367 repo = "lean.nvim";
3368− rev = "354630520ed3fe73c69796fb2e566a7c2125cd04";
3369− sha256 = "1gwgbgg0dc0fwcdz6qs6mgvg0ybxgld3wm2wprq89abpacfz29dz";
3368+ rev = "902eb7f75d664bccd251c38d7921570b05b47cdc";
3369+ sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3";
33703370 };
33713371 meta.homepage = "https://github.com/Julian/lean.nvim/";
33723372 };
@@ -3469,12 +3469,12 @@ final: prev:
34693469
34703470 lightline-bufferline = buildVimPluginFrom2Nix {
34713471 pname = "lightline-bufferline";
3472− version = "2022-03-27";
3472+ version = "2022-04-28";
34733473 src = fetchFromGitHub {
34743474 owner = "mengelbrecht";
34753475 repo = "lightline-bufferline";
3476− rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff";
3477− sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq";
3476+ rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab";
3477+ sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj";
34783478 };
34793479 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";
34803480 };
@@ -3613,12 +3613,12 @@ final: prev:
36133613
36143614 litee-nvim = buildVimPluginFrom2Nix {
36153615 pname = "litee.nvim";
3616− version = "2022-02-28";
3616+ version = "2022-04-25";
36173617 src = fetchFromGitHub {
36183618 owner = "ldelossa";
36193619 repo = "litee.nvim";
3620− rev = "c9fd775aebf702c81e2077693336584a0027d496";
3621− sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd";
3620+ rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff";
3621+ sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y";
36223622 };
36233623 meta.homepage = "https://github.com/ldelossa/litee.nvim/";
36243624 };
@@ -3684,12 +3684,12 @@ final: prev:
36843684
36853685 lsp_signature-nvim = buildVimPluginFrom2Nix {
36863686 pname = "lsp_signature.nvim";
3687− version = "2022-04-16";
3687+ version = "2022-05-01";
36883688 src = fetchFromGitHub {
36893689 owner = "ray-x";
36903690 repo = "lsp_signature.nvim";
3691− rev = "a351509512687293fd659ba4ee7e34412c3a8f70";
3692− sha256 = "00xzd8b13krysdw21zm9ms902cxm04xl1wd2l7rb04431s2v9vc0";
3691+ rev = "6d160406f948a810c40304224a1255c8bba5a415";
3692+ sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3";
36933693 };
36943694 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
36953695 };
@@ -3699,11 +3699,11 @@ final: prev:
36993699 version = "2022-04-18";
37003700 src = fetchFromGitHub {
37013701 owner = "onsails";
3702− repo = "lspkind-nvim";
3702+ repo = "lspkind.nvim";
37033703 rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7";
37043704 sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk";
37053705 };
3706− meta.homepage = "https://github.com/onsails/lspkind-nvim/";
3706+ meta.homepage = "https://github.com/onsails/lspkind.nvim/";
37073707 };
37083708
37093709 lspsaga-nvim = buildVimPluginFrom2Nix {
@@ -3744,24 +3744,24 @@ final: prev:
37443744
37453745 lualine-nvim = buildVimPluginFrom2Nix {
37463746 pname = "lualine.nvim";
3747− version = "2022-04-17";
3747+ version = "2022-05-02";
37483748 src = fetchFromGitHub {
37493749 owner = "nvim-lualine";
37503750 repo = "lualine.nvim";
3751− rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d";
3752− sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k";
3751+ rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31";
3752+ sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d";
37533753 };
37543754 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
37553755 };
37563756
37573757 luasnip = buildVimPluginFrom2Nix {
37583758 pname = "luasnip";
3759− version = "2022-04-15";
3759+ version = "2022-05-01";
37603760 src = fetchFromGitHub {
37613761 owner = "l3mon4d3";
37623762 repo = "luasnip";
3763− rev = "6b67cb12747225a6412d8263bb97d6d2b8d9366a";
3764− sha256 = "08a1kk8z3mcq65dh0hi44188dxkqjfg3yilr8viamyni1kwy7gf3";
3763+ rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e";
3764+ sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r";
37653765 };
37663766 meta.homepage = "https://github.com/l3mon4d3/luasnip/";
37673767 };
@@ -3864,12 +3864,12 @@ final: prev:
38643864
38653865 mini-nvim = buildVimPluginFrom2Nix {
38663866 pname = "mini.nvim";
3867− version = "2022-04-20";
3867+ version = "2022-05-01";
38683868 src = fetchFromGitHub {
38693869 owner = "echasnovski";
38703870 repo = "mini.nvim";
3871− rev = "8134370549e73a5a72d24ffc7ea6a881cf4502ad";
3872− sha256 = "0llkj31jkqnm3igs2f7cw8wxbc9877jk1mc2shnh1ii2dh0kmz68";
3871+ rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88";
3872+ sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7";
38733873 };
38743874 meta.homepage = "https://github.com/echasnovski/mini.nvim/";
38753875 };
@@ -3912,12 +3912,12 @@ final: prev:
39123912
39133913 mkdx = buildVimPluginFrom2Nix {
39143914 pname = "mkdx";
3915− version = "2022-04-08";
3915+ version = "2022-04-29";
39163916 src = fetchFromGitHub {
39173917 owner = "SidOfc";
39183918 repo = "mkdx";
3919− rev = "a4645528e2ddedfb6350c142660c3e0468057f1c";
3920− sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd";
3919+ rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7";
3920+ sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql";
39213921 };
39223922 meta.homepage = "https://github.com/SidOfc/mkdx/";
39233923 };
@@ -4176,12 +4176,12 @@ final: prev:
41764176
41774177 neco-vim = buildVimPluginFrom2Nix {
41784178 pname = "neco-vim";
4179− version = "2022-02-02";
4179+ version = "2022-04-21";
41804180 src = fetchFromGitHub {
41814181 owner = "Shougo";
41824182 repo = "neco-vim";
4183− rev = "4b537fa01c28f2f7cf249722530561d2e477b49f";
4184− sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv";
4183+ rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692";
4184+ sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k";
41854185 };
41864186 meta.homepage = "https://github.com/Shougo/neco-vim/";
41874187 };
@@ -4212,12 +4212,12 @@ final: prev:
42124212
42134213 neoformat = buildVimPluginFrom2Nix {
42144214 pname = "neoformat";
4215− version = "2022-04-14";
4215+ version = "2022-05-01";
42164216 src = fetchFromGitHub {
42174217 owner = "sbdchd";
42184218 repo = "neoformat";
4219− rev = "06920fa90ec7db3f81c6f842ebaf008c39e088cf";
4220− sha256 = "1f5j7aisnpvykgj7p64cbvfww05fsv47pi04ckkh0gkc49g5sjmg";
4219+ rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a";
4220+ sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816";
42214221 };
42224222 meta.homepage = "https://github.com/sbdchd/neoformat/";
42234223 };
@@ -4284,12 +4284,12 @@ final: prev:
42844284
42854285 neorg = buildVimPluginFrom2Nix {
42864286 pname = "neorg";
4287− version = "2022-04-18";
4287+ version = "2022-05-01";
42884288 src = fetchFromGitHub {
42894289 owner = "nvim-neorg";
42904290 repo = "neorg";
4291− rev = "4a3ca2c0cb46a5320c124565fd4d9830435aa29f";
4292− sha256 = "15jwzz2ldxg6ql1lzn626dcfxgndqzgpamakqk0yicbidhmdird0";
4291+ rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8";
4292+ sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1";
42934293 };
42944294 meta.homepage = "https://github.com/nvim-neorg/neorg/";
42954295 };
@@ -4332,24 +4332,24 @@ final: prev:
43324332
43334333 neoterm = buildVimPluginFrom2Nix {
43344334 pname = "neoterm";
4335− version = "2022-01-20";
4335+ version = "2022-04-26";
43364336 src = fetchFromGitHub {
43374337 owner = "kassio";
43384338 repo = "neoterm";
4339− rev = "533d311a2a9187294ea52acab32d8565d6517059";
4340− sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6";
4339+ rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9";
4340+ sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq";
43414341 };
43424342 meta.homepage = "https://github.com/kassio/neoterm/";
43434343 };
43444344
43454345 neovim-ayu = buildVimPluginFrom2Nix {
43464346 pname = "neovim-ayu";
4347− version = "2022-04-19";
4347+ version = "2022-05-01";
43484348 src = fetchFromGitHub {
43494349 owner = "Shatur";
43504350 repo = "neovim-ayu";
4351− rev = "dde7e6f02fbcb5860b24f616c9a07b5f9e52a361";
4352− sha256 = "0800qwxlj84f8ygvniwwyrcjyfwsx7kmzq8vyz9m50zd7b20al9f";
4351+ rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac";
4352+ sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2";
43534353 };
43544354 meta.homepage = "https://github.com/Shatur/neovim-ayu/";
43554355 };
@@ -4464,12 +4464,12 @@ final: prev:
44644464
44654465 nightfox-nvim = buildVimPluginFrom2Nix {
44664466 pname = "nightfox.nvim";
4467− version = "2022-04-20";
4467+ version = "2022-05-02";
44684468 src = fetchFromGitHub {
44694469 owner = "EdenEast";
44704470 repo = "nightfox.nvim";
4471− rev = "5d2581a71510c319d128a8b02a21181abc611202";
4472− sha256 = "118lda4cgxkbf13khyg2i36i7fcrlfz29l0wfjhg90ci3w8qvajs";
4471+ rev = "25b3f3e46c87c51e4d8075d2e11f481628716363";
4472+ sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx";
44734473 };
44744474 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
44754475 };
@@ -4572,12 +4572,12 @@ final: prev:
45724572
45734573 null-ls-nvim = buildVimPluginFrom2Nix {
45744574 pname = "null-ls.nvim";
4575− version = "2022-04-16";
4575+ version = "2022-05-01";
45764576 src = fetchFromGitHub {
45774577 owner = "jose-elias-alvarez";
45784578 repo = "null-ls.nvim";
4579− rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f";
4580− sha256 = "1mifn1b83ypvaplmma1zx080vmm5nv40263lsva3z6byqyq3kfl1";
4579+ rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9";
4580+ sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c";
45814581 };
45824582 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
45834583 };
@@ -4620,36 +4620,36 @@ final: prev:
46204620
46214621 nvim-autopairs = buildVimPluginFrom2Nix {
46224622 pname = "nvim-autopairs";
4623− version = "2022-04-13";
4623+ version = "2022-04-28";
46244624 src = fetchFromGitHub {
46254625 owner = "windwp";
46264626 repo = "nvim-autopairs";
4627− rev = "38d486a1c47ae2722a78cf569008de0a64f4b153";
4628− sha256 = "0qka37c8ikcqvbjq0n0kxgm8l30jy3aixs5i00a25wcwxj40kzxv";
4627+ rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb";
4628+ sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y";
46294629 };
46304630 meta.homepage = "https://github.com/windwp/nvim-autopairs/";
46314631 };
46324632
46334633 nvim-base16 = buildVimPluginFrom2Nix {
46344634 pname = "nvim-base16";
4635− version = "2022-03-28";
4635+ version = "2022-04-25";
46364636 src = fetchFromGitHub {
46374637 owner = "RRethy";
46384638 repo = "nvim-base16";
4639− rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776";
4640− sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z";
4639+ rev = "70fe3102158b2765d5bba46f398bd4213997936f";
4640+ sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57";
46414641 };
46424642 meta.homepage = "https://github.com/RRethy/nvim-base16/";
46434643 };
46444644
46454645 nvim-bqf = buildVimPluginFrom2Nix {
46464646 pname = "nvim-bqf";
4647− version = "2022-04-18";
4647+ version = "2022-04-30";
46484648 src = fetchFromGitHub {
46494649 owner = "kevinhwang91";
46504650 repo = "nvim-bqf";
4651− rev = "3dbd349cf75cb23c7d1575b235ee57ecbe665d9d";
4652− sha256 = "12nlfz0imx6i6w8jc4pw5czyfzr8m2mhlmql10i5hdncqi9ggaar";
4651+ rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70";
4652+ sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk";
46534653 };
46544654 meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
46554655 };
@@ -4680,12 +4680,12 @@ final: prev:
46804680
46814681 nvim-cmp = buildVimPluginFrom2Nix {
46824682 pname = "nvim-cmp";
4683− version = "2022-04-20";
4683+ version = "2022-05-02";
46844684 src = fetchFromGitHub {
46854685 owner = "hrsh7th";
46864686 repo = "nvim-cmp";
4687− rev = "f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9";
4688− sha256 = "11f53yic8j3iqd4yb0gy2d54vscqqll4lcqqcj1rp195vdd476ak";
4687+ rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4";
4688+ sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq";
46894689 };
46904690 meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
46914691 };
@@ -4776,24 +4776,24 @@ final: prev:
47764776
47774777 nvim-dap-ui = buildVimPluginFrom2Nix {
47784778 pname = "nvim-dap-ui";
4779− version = "2022-04-17";
4779+ version = "2022-04-29";
47804780 src = fetchFromGitHub {
47814781 owner = "rcarriga";
47824782 repo = "nvim-dap-ui";
4783− rev = "f136bb253f6811984369a20924251bcbfe00a5cd";
4784− sha256 = "00nxdgsxa3yc0ifsmbs8d1s428p37x3ax3rlxacs983f5xlgmizq";
4783+ rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2";
4784+ sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm";
47854785 };
47864786 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
47874787 };
47884788
47894789 nvim-dap-virtual-text = buildVimPluginFrom2Nix {
47904790 pname = "nvim-dap-virtual-text";
4791− version = "2022-04-19";
4791+ version = "2022-04-30";
47924792 src = fetchFromGitHub {
47934793 owner = "theHamsta";
47944794 repo = "nvim-dap-virtual-text";
4795− rev = "1c3560ecfe8a865118efe7092308abe9e8b0ae68";
4796− sha256 = "1piz5qxymc2igqdscc3cvvympxrgmxd1ybsnqy13l7ycmknkp9hd";
4795+ rev = "9b731b9748d243b60e61eecbe2d114c39554486e";
4796+ sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9";
47974797 };
47984798 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
47994799 };
@@ -4836,36 +4836,36 @@ final: prev:
48364836
48374837 nvim-gdb = buildVimPluginFrom2Nix {
48384838 pname = "nvim-gdb";
4839− version = "2021-12-09";
4839+ version = "2022-05-02";
48404840 src = fetchFromGitHub {
48414841 owner = "sakhnik";
48424842 repo = "nvim-gdb";
4843− rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608";
4844− sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i";
4843+ rev = "d064ee481b2aec86133ebcd514c835a28776f9c5";
4844+ sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi";
48454845 };
48464846 meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
48474847 };
48484848
48494849 nvim-gps = buildVimPluginFrom2Nix {
48504850 pname = "nvim-gps";
4851− version = "2022-04-19";
4851+ version = "2022-04-30";
48524852 src = fetchFromGitHub {
48534853 owner = "smiteshp";
48544854 repo = "nvim-gps";
4855− rev = "944ea6e7244a839452ab721515141ea9208c0536";
4856− sha256 = "0i3mjk9n9czpadzpwp2wx1640h5sl51cjgnggrm8rg9qxj5108g7";
4855+ rev = "9552418fcbb9587025f4bd38364259b3888f582b";
4856+ sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4";
48574857 };
48584858 meta.homepage = "https://github.com/smiteshp/nvim-gps/";
48594859 };
48604860
48614861 nvim-highlite = buildVimPluginFrom2Nix {
48624862 pname = "nvim-highlite";
4863− version = "2022-04-18";
4863+ version = "2022-04-29";
48644864 src = fetchFromGitHub {
48654865 owner = "Iron-E";
48664866 repo = "nvim-highlite";
4867− rev = "e46cb5695b8457403488ad44b5379421c0c5dc17";
4868− sha256 = "0343pk8wylms0lnrpa0a5x2ig97an2ps64fgjpa8n85ng1z49z97";
4867+ rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665";
4868+ sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9";
48694869 };
48704870 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
48714871 };
@@ -4896,12 +4896,12 @@ final: prev:
48964896
48974897 nvim-jdtls = buildVimPluginFrom2Nix {
48984898 pname = "nvim-jdtls";
4899− version = "2022-04-14";
4899+ version = "2022-04-29";
49004900 src = fetchFromGitHub {
49014901 owner = "mfussenegger";
49024902 repo = "nvim-jdtls";
4903− rev = "ffb08466d51f717775d85e7e334ac83156c0ca98";
4904− sha256 = "1rlnidcn8zww6lvqx1syw2331i2gn67765cip2pz5rh8mbv4l67x";
4903+ rev = "9010412f7de118168d2fe4ba97b578d0d76cc500";
4904+ sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67";
49054905 };
49064906 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
49074907 };
@@ -4920,12 +4920,12 @@ final: prev:
49204920
49214921 nvim-lightbulb = buildVimPluginFrom2Nix {
49224922 pname = "nvim-lightbulb";
4923− version = "2022-02-24";
4923+ version = "2022-05-02";
49244924 src = fetchFromGitHub {
49254925 owner = "kosayoda";
49264926 repo = "nvim-lightbulb";
4927− rev = "29ca81408119ba809d1f922edc941868af97ee86";
4928− sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";
4927+ rev = "407f05c71f757f09f775229d5709a3592f1a6910";
4928+ sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9";
49294929 };
49304930 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
49314931 };
@@ -4944,12 +4944,12 @@ final: prev:
49444944
49454945 nvim-lint = buildVimPluginFrom2Nix {
49464946 pname = "nvim-lint";
4947− version = "2022-04-18";
4947+ version = "2022-05-02";
49484948 src = fetchFromGitHub {
49494949 owner = "mfussenegger";
49504950 repo = "nvim-lint";
4951− rev = "e5416bdb27a0e61cd213850646534a18bb2ba61d";
4952− sha256 = "1qrjpx99pb67yccvmb66ahcaa7wk9z6s9zvaxm5fpbm1xasci1mz";
4951+ rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba";
4952+ sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d";
49534953 };
49544954 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
49554955 };
@@ -4968,12 +4968,12 @@ final: prev:
49684968
49694969 nvim-lspconfig = buildVimPluginFrom2Nix {
49704970 pname = "nvim-lspconfig";
4971− version = "2022-04-17";
4971+ version = "2022-04-28";
49724972 src = fetchFromGitHub {
49734973 owner = "neovim";
49744974 repo = "nvim-lspconfig";
4975− rev = "ad9903c66bac88f344890acb6532f63f1cd4dac3";
4976− sha256 = "10fg52g53yk0d10rm96kw907wdkgqw762ib6530zrnw7p8fbm2ms";
4975+ rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd";
4976+ sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn";
49774977 };
49784978 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
49794979 };
@@ -4992,24 +4992,24 @@ final: prev:
49924992
49934993 nvim-metals = buildVimPluginFrom2Nix {
49944994 pname = "nvim-metals";
4995− version = "2022-04-16";
4995+ version = "2022-04-27";
49964996 src = fetchFromGitHub {
49974997 owner = "scalameta";
49984998 repo = "nvim-metals";
4999− rev = "bc6f2ba6d6b2c5ffd65b41f3df74761a90e538da";
5000− sha256 = "0fk41l2jmlhrylc9xbh4h9a35j106r0lr7rd0i2lp0acqai629qg";
4999+ rev = "6bc7681b489b04feff394f832984d14510e97e47";
5000+ sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx";
50015001 };
50025002 meta.homepage = "https://github.com/scalameta/nvim-metals/";
50035003 };
50045004
50055005 nvim-neoclip-lua = buildVimPluginFrom2Nix {
50065006 pname = "nvim-neoclip.lua";
5007− version = "2022-04-06";
5007+ version = "2022-04-29";
50085008 src = fetchFromGitHub {
50095009 owner = "AckslD";
50105010 repo = "nvim-neoclip.lua";
5011− rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e";
5012− sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46";
5011+ rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11";
5012+ sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4";
50135013 };
50145014 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
50155015 };
@@ -5028,12 +5028,12 @@ final: prev:
50285028
50295029 nvim-notify = buildVimPluginFrom2Nix {
50305030 pname = "nvim-notify";
5031− version = "2022-04-17";
5031+ version = "2022-05-01";
50325032 src = fetchFromGitHub {
50335033 owner = "rcarriga";
50345034 repo = "nvim-notify";
5035− rev = "2c8f744de34c72a5a1fabcc66da11aa017ffab88";
5036− sha256 = "1yc98fv30fvkjb7d8acjqvl8kai1hz0mslp04n1d2069q0n6k08n";
5035+ rev = "ebe78bea13b60640816658ae798a199bd5118eb1";
5036+ sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp";
50375037 };
50385038 meta.homepage = "https://github.com/rcarriga/nvim-notify/";
50395039 };
@@ -5100,24 +5100,24 @@ final: prev:
51005100
51015101 nvim-tree-lua = buildVimPluginFrom2Nix {
51025102 pname = "nvim-tree.lua";
5103− version = "2022-04-18";
5103+ version = "2022-05-01";
51045104 src = fetchFromGitHub {
51055105 owner = "kyazdani42";
51065106 repo = "nvim-tree.lua";
5107− rev = "0f0f858348aacc94f98ba32880760c5a5440b825";
5108− sha256 = "1ciir7h9s0g9i62b49swa8c8cgjqg4lz6zapkj5a8gqxqa10qh23";
5107+ rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3";
5108+ sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr";
51095109 };
51105110 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
51115111 };
51125112
51135113 nvim-treesitter = buildVimPluginFrom2Nix {
51145114 pname = "nvim-treesitter";
5115− version = "2022-04-19";
5115+ version = "2022-05-01";
51165116 src = fetchFromGitHub {
51175117 owner = "nvim-treesitter";
51185118 repo = "nvim-treesitter";
5119− rev = "62fa8f77c43ed3a4ac2bbdfa4327f6b4a835bbea";
5120− sha256 = "0cq0zbs9a52wx84ivpna4qw67dlz7i9nw6mln8948qadnzk1960r";
5119+ rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b";
5120+ sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r";
51215121 };
51225122 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
51235123 };
@@ -5160,24 +5160,24 @@ final: prev:
51605160
51615161 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
51625162 pname = "nvim-treesitter-textobjects";
5163− version = "2022-04-15";
5163+ version = "2022-04-21";
51645164 src = fetchFromGitHub {
51655165 owner = "nvim-treesitter";
51665166 repo = "nvim-treesitter-textobjects";
5167− rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d";
5168− sha256 = "09bpgd0fqpcwifs2wna1lqyrfn4rmp2gfan4635lwjp4sixj52vc";
5167+ rev = "094e8ad3cc839e825f8dcc91352837653e365a8f";
5168+ sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz";
51695169 };
51705170 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
51715171 };
51725172
51735173 nvim-ts-autotag = buildVimPluginFrom2Nix {
51745174 pname = "nvim-ts-autotag";
5175− version = "2022-03-04";
5175+ version = "2022-04-22";
51765176 src = fetchFromGitHub {
51775177 owner = "windwp";
51785178 repo = "nvim-ts-autotag";
5179− rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2";
5180− sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1";
5179+ rev = "044a05c4c51051326900a53ba98fddacd15fea22";
5180+ sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2";
51815181 };
51825182 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
51835183 };
@@ -5196,24 +5196,24 @@ final: prev:
51965196
51975197 nvim-ts-rainbow = buildVimPluginFrom2Nix {
51985198 pname = "nvim-ts-rainbow";
5199− version = "2022-04-17";
5199+ version = "2022-04-24";
52005200 src = fetchFromGitHub {
52015201 owner = "p00f";
52025202 repo = "nvim-ts-rainbow";
5203− rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0";
5204− sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3";
5203+ rev = "a7767e2a1761078abb97f6516e45c56147e0952e";
5204+ sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";
52055205 };
52065206 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
52075207 };
52085208
52095209 nvim-web-devicons = buildVimPluginFrom2Nix {
52105210 pname = "nvim-web-devicons";
5211− version = "2022-03-22";
5211+ version = "2022-05-01";
52125212 src = fetchFromGitHub {
52135213 owner = "kyazdani42";
52145214 repo = "nvim-web-devicons";
5215− rev = "09e62319974d7d7ec7e53b974724f7942470ef78";
5216− sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq";
5215+ rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f";
5216+ sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5";
52175217 };
52185218 meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
52195219 };
@@ -5256,12 +5256,12 @@ final: prev:
52565256
52575257 nvimdev-nvim = buildVimPluginFrom2Nix {
52585258 pname = "nvimdev.nvim";
5259− version = "2022-04-11";
5259+ version = "2022-04-24";
52605260 src = fetchFromGitHub {
52615261 owner = "neovim";
52625262 repo = "nvimdev.nvim";
5263− rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7";
5264− sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz";
5263+ rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9";
5264+ sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4";
52655265 };
52665266 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
52675267 };
@@ -5292,12 +5292,12 @@ final: prev:
52925292
52935293 octo-nvim = buildVimPluginFrom2Nix {
52945294 pname = "octo.nvim";
5295− version = "2022-04-14";
5295+ version = "2022-04-26";
52965296 src = fetchFromGitHub {
52975297 owner = "pwntester";
52985298 repo = "octo.nvim";
5299− rev = "0beb4de71062435ad934caba5728f7f01ae8b969";
5300− sha256 = "01k7jl34x8wikq6ff456650wgf5f5z9z6a3ypr10a3pl8p7wfyzr";
5299+ rev = "622ab9feaa735dc0999e567183ce357f3dff080f";
5300+ sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg";
53015301 };
53025302 meta.homepage = "https://github.com/pwntester/octo.nvim/";
53035303 };
@@ -5316,12 +5316,12 @@ final: prev:
53165316
53175317 onedark-nvim = buildVimPluginFrom2Nix {
53185318 pname = "onedark.nvim";
5319− version = "2022-03-23";
5319+ version = "2022-04-25";
53205320 src = fetchFromGitHub {
53215321 owner = "navarasu";
53225322 repo = "onedark.nvim";
5323− rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6";
5324− sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6";
5323+ rev = "08cde8acf181b3278dafb9c8284726104a11cc0f";
5324+ sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4";
53255325 };
53265326 meta.homepage = "https://github.com/navarasu/onedark.nvim/";
53275327 };
@@ -5340,12 +5340,12 @@ final: prev:
53405340
53415341 onedarkpro-nvim = buildVimPluginFrom2Nix {
53425342 pname = "onedarkpro.nvim";
5343− version = "2022-04-12";
5343+ version = "2022-04-26";
53445344 src = fetchFromGitHub {
53455345 owner = "olimorris";
53465346 repo = "onedarkpro.nvim";
5347− rev = "653b5d729cb2c14c564cf5ab2145e2e24354a2ba";
5348− sha256 = "1xw49fliqalz18nj0pa81xsx1d9zwphdzcai503m1bn2m2nclp6h";
5347+ rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7";
5348+ sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433";
53495349 };
53505350 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
53515351 };
@@ -5388,12 +5388,12 @@ final: prev:
53885388
53895389 orgmode = buildVimPluginFrom2Nix {
53905390 pname = "orgmode";
5391− version = "2022-04-20";
5391+ version = "2022-05-02";
53925392 src = fetchFromGitHub {
53935393 owner = "nvim-orgmode";
53945394 repo = "orgmode";
5395− rev = "8cd85f7afabef643db6b5d3dc01942870e71533d";
5396− sha256 = "16rkvz8x6rvapyq7grch77j0wd5pnhjwv932v72ai6gy940d56l2";
5395+ rev = "1a52ca239c726d62104fad012472c28a00cdcc22";
5396+ sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz";
53975397 };
53985398 meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
53995399 };
@@ -5436,12 +5436,12 @@ final: prev:
54365436
54375437 papercolor-theme = buildVimPluginFrom2Nix {
54385438 pname = "papercolor-theme";
5439− version = "2022-03-24";
5439+ version = "2022-04-30";
54405440 src = fetchFromGitHub {
54415441 owner = "NLKNguyen";
54425442 repo = "papercolor-theme";
5443− rev = "afde171829b1416125bf07a81fc28e4490aa91b2";
5444− sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d";
5443+ rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c";
5444+ sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c";
54455445 };
54465446 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";
54475447 };
@@ -5520,17 +5520,17 @@ final: prev:
55205520
55215521 playground = buildVimPluginFrom2Nix {
55225522 pname = "playground";
5523− version = "2022-04-08";
5523+ version = "2022-05-01";
55245524 src = fetchFromGitHub {
55255525 owner = "nvim-treesitter";
55265526 repo = "playground";
5527− rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00";
5528− sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns";
5527+ rev = "71b00a3c665298e5155ad64a9020135808d4e3e8";
5528+ sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8";
55295529 };
55305530 meta.homepage = "https://github.com/nvim-treesitter/playground/";
55315531 };
55325532
5533− plenary-nvim = buildVimPluginFrom2Nix {
5533+ plenary-nvim = buildNeovimPluginFrom2Nix {
55345534 pname = "plenary.nvim";
55355535 version = "2022-04-17";
55365536 src = fetchFromGitHub {
@@ -5617,12 +5617,12 @@ final: prev:
56175617
56185618 project-nvim = buildVimPluginFrom2Nix {
56195619 pname = "project.nvim";
5620− version = "2022-01-19";
5620+ version = "2022-04-25";
56215621 src = fetchFromGitHub {
56225622 owner = "ahmedkhalf";
56235623 repo = "project.nvim";
5624− rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988";
5625− sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6";
5624+ rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77";
5625+ sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w";
56265626 };
56275627 meta.homepage = "https://github.com/ahmedkhalf/project.nvim/";
56285628 };
@@ -5810,12 +5810,12 @@ final: prev:
58105810
58115811 refactoring-nvim = buildVimPluginFrom2Nix {
58125812 pname = "refactoring.nvim";
5813− version = "2022-04-11";
5813+ version = "2022-04-27";
58145814 src = fetchFromGitHub {
58155815 owner = "theprimeagen";
58165816 repo = "refactoring.nvim";
5817− rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb";
5818− sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w";
5817+ rev = "fef309f654906d931f2c714a77f5182fe70ada7d";
5818+ sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3";
58195819 };
58205820 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
58215821 };
@@ -5846,12 +5846,12 @@ final: prev:
58465846
58475847 rest-nvim = buildVimPluginFrom2Nix {
58485848 pname = "rest.nvim";
5849− version = "2022-01-26";
5849+ version = "2022-05-01";
58505850 src = fetchFromGitHub {
58515851 owner = "NTBBloodbath";
58525852 repo = "rest.nvim";
5853− rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3";
5854− sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8";
5853+ rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef";
5854+ sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0";
58555855 };
58565856 meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";
58575857 };
@@ -5930,12 +5930,12 @@ final: prev:
59305930
59315931 rust-tools-nvim = buildVimPluginFrom2Nix {
59325932 pname = "rust-tools.nvim";
5933− version = "2022-03-26";
5933+ version = "2022-05-01";
59345934 src = fetchFromGitHub {
59355935 owner = "simrat39";
59365936 repo = "rust-tools.nvim";
5937− rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44";
5938− sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h";
5937+ rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac";
5938+ sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42";
59395939 };
59405940 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
59415941 };
@@ -6147,12 +6147,12 @@ final: prev:
61476147
61486148 sonokai = buildVimPluginFrom2Nix {
61496149 pname = "sonokai";
6150− version = "2022-04-14";
6150+ version = "2022-04-27";
61516151 src = fetchFromGitHub {
61526152 owner = "sainnhe";
61536153 repo = "sonokai";
6154− rev = "4f29ac457ac759286bce3bb1a34f9517c91306c9";
6155− sha256 = "1yzyk78nb0xj5f2fnfvhrpgahg3mgx82bpw7nimvf0rd29dbpfqj";
6154+ rev = "9ad83caa675cb5160760bf85dcb951946c994572";
6155+ sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh";
61566156 };
61576157 meta.homepage = "https://github.com/sainnhe/sonokai/";
61586158 };
@@ -6243,12 +6243,12 @@ final: prev:
62436243
62446244 splitjoin-vim = buildVimPluginFrom2Nix {
62456245 pname = "splitjoin.vim";
6246− version = "2022-04-03";
6246+ version = "2022-05-02";
62476247 src = fetchFromGitHub {
62486248 owner = "AndrewRadev";
62496249 repo = "splitjoin.vim";
6250− rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6";
6251− sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc";
6250+ rev = "64f68a641084d18903769ec138b8fab45477bd92";
6251+ sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8";
62526252 fetchSubmodules = true;
62536253 };
62546254 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -6401,12 +6401,12 @@ final: prev:
64016401
64026402 symbols-outline-nvim = buildVimPluginFrom2Nix {
64036403 pname = "symbols-outline.nvim";
6404− version = "2022-03-05";
6404+ version = "2022-05-01";
64056405 src = fetchFromGitHub {
64066406 owner = "simrat39";
64076407 repo = "symbols-outline.nvim";
6408− rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2";
6409− sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd";
6408+ rev = "15ae99c27360ab42e931be127d130611375307d5";
6409+ sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi";
64106410 };
64116411 meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
64126412 };
@@ -6510,12 +6510,12 @@ final: prev:
65106510
65116511 tagbar = buildVimPluginFrom2Nix {
65126512 pname = "tagbar";
6513− version = "2022-04-07";
6513+ version = "2022-05-02";
65146514 src = fetchFromGitHub {
65156515 owner = "preservim";
65166516 repo = "tagbar";
6517− rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2";
6518− sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m";
6517+ rev = "a577ee4d650476243d91698f2d1228819c5fa0a5";
6518+ sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85";
65196519 };
65206520 meta.homepage = "https://github.com/preservim/tagbar/";
65216521 };
@@ -6558,12 +6558,12 @@ final: prev:
65586558
65596559 tcomment_vim = buildVimPluginFrom2Nix {
65606560 pname = "tcomment_vim";
6561− version = "2022-01-24";
6561+ version = "2022-04-24";
65626562 src = fetchFromGitHub {
65636563 owner = "tomtom";
65646564 repo = "tcomment_vim";
6565− rev = "3729ae43318faca94b0a1e878f9c6717b171d55e";
6566− sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9";
6565+ rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad";
6566+ sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn";
65676567 };
65686568 meta.homepage = "https://github.com/tomtom/tcomment_vim/";
65696569 };
@@ -6642,12 +6642,12 @@ final: prev:
66426642
66436643 telescope-fzf-native-nvim = buildVimPluginFrom2Nix {
66446644 pname = "telescope-fzf-native.nvim";
6645− version = "2022-02-19";
6645+ version = "2022-04-30";
66466646 src = fetchFromGitHub {
66476647 owner = "nvim-telescope";
66486648 repo = "telescope-fzf-native.nvim";
6649− rev = "8ec164b541327202e5e74f99bcc5fe5845720e18";
6650− sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1";
6649+ rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f";
6650+ sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8";
66516651 };
66526652 meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
66536653 };
@@ -6679,12 +6679,12 @@ final: prev:
66796679
66806680 telescope-github-nvim = buildVimPluginFrom2Nix {
66816681 pname = "telescope-github.nvim";
6682− version = "2022-04-06";
6682+ version = "2022-04-22";
66836683 src = fetchFromGitHub {
66846684 owner = "nvim-telescope";
66856685 repo = "telescope-github.nvim";
6686− rev = "c66aee748d572961af0e6ad5130b994343f922a7";
6687− sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz";
6686+ rev = "ee95c509901c3357679e9f2f9eaac3561c811736";
6687+ sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2";
66886688 };
66896689 meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";
66906690 };
@@ -6703,12 +6703,12 @@ final: prev:
67036703
67046704 telescope-project-nvim = buildVimPluginFrom2Nix {
67056705 pname = "telescope-project.nvim";
6706− version = "2022-01-23";
6706+ version = "2022-04-28";
67076707 src = fetchFromGitHub {
67086708 owner = "nvim-telescope";
67096709 repo = "telescope-project.nvim";
6710− rev = "d317c3cef6917d650d9a638c627b54d3e1173031";
6711− sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7";
6710+ rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae";
6711+ sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7";
67126712 };
67136713 meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
67146714 };
@@ -6727,12 +6727,12 @@ final: prev:
67276727
67286728 telescope-ui-select-nvim = buildVimPluginFrom2Nix {
67296729 pname = "telescope-ui-select.nvim";
6730− version = "2022-03-20";
6730+ version = "2022-04-30";
67316731 src = fetchFromGitHub {
67326732 owner = "nvim-telescope";
67336733 repo = "telescope-ui-select.nvim";
6734− rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939";
6735− sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb";
6734+ rev = "62ea5e58c7bbe191297b983a9e7e89420f581369";
6735+ sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw";
67366736 };
67376737 meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";
67386738 };
@@ -6787,12 +6787,12 @@ final: prev:
67876787
67886788 telescope-nvim = buildVimPluginFrom2Nix {
67896789 pname = "telescope.nvim";
6790− version = "2022-04-18";
6790+ version = "2022-05-02";
67916791 src = fetchFromGitHub {
67926792 owner = "nvim-telescope";
67936793 repo = "telescope.nvim";
6794− rev = "6e7ed1b9638f09661fcb3a6db68f3ad77c8036be";
6795− sha256 = "11p5byic4qb9cgaffnrwa4s0qdzvxl6313phz5qdll78hwjw2fmy";
6794+ rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe";
6795+ sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn";
67966796 };
67976797 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
67986798 };
@@ -6968,12 +6968,12 @@ final: prev:
69686968
69696969 toggleterm-nvim = buildVimPluginFrom2Nix {
69706970 pname = "toggleterm.nvim";
6971− version = "2022-04-18";
6971+ version = "2022-04-25";
69726972 src = fetchFromGitHub {
69736973 owner = "akinsho";
69746974 repo = "toggleterm.nvim";
6975− rev = "dca8f4d9516270cb41c147ed692f3ee420c5e515";
6976− sha256 = "0ajypqnx9kglqh5h3vwyy9ccmazq8gjgb84hjrabr9hgvcnyj5hq";
6975+ rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6";
6976+ sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131";
69776977 };
69786978 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
69796979 };
@@ -7088,12 +7088,12 @@ final: prev:
70887088
70897089 ultisnips = buildVimPluginFrom2Nix {
70907090 pname = "ultisnips";
7091− version = "2022-04-19";
7091+ version = "2022-04-23";
70927092 src = fetchFromGitHub {
70937093 owner = "SirVer";
70947094 repo = "ultisnips";
7095− rev = "e1ae43e44fb6b53144a5a8703a3d6cf10492a4a0";
7096− sha256 = "1rzhv8dma9ijf6g9z5drbi45bngzh4ccr3h4i0b8x3w4ab97p17q";
7095+ rev = "f5ccf0977c611ffd774ca180774959301baaffad";
7096+ sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb";
70977097 };
70987098 meta.homepage = "https://github.com/SirVer/ultisnips/";
70997099 };
@@ -7136,12 +7136,12 @@ final: prev:
71367136
71377137 urlview-nvim = buildVimPluginFrom2Nix {
71387138 pname = "urlview.nvim";
7139− version = "2022-04-20";
7139+ version = "2022-04-25";
71407140 src = fetchFromGitHub {
71417141 owner = "axieax";
71427142 repo = "urlview.nvim";
7143− rev = "fcd59fc3a49e75993c3828c49df18bf3da51f45d";
7144− sha256 = "16y3hicljn9y60jzvq7xmhhp7r3y0v5v4f1i16hj65rly96wziq7";
7143+ rev = "3b637651d5f0de185a0ceac783582692e204b053";
7144+ sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4";
71457145 };
71467146 meta.homepage = "https://github.com/axieax/urlview.nvim/";
71477147 };
@@ -7184,12 +7184,12 @@ final: prev:
71847184
71857185 venn-nvim = buildVimPluginFrom2Nix {
71867186 pname = "venn.nvim";
7187− version = "2021-10-19";
7187+ version = "2022-04-27";
71887188 src = fetchFromGitHub {
71897189 owner = "jbyuki";
71907190 repo = "venn.nvim";
7191− rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f";
7192− sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06";
7191+ rev = "71856b548e3206e33bad10acea294ca8b44327ee";
7192+ sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc";
71937193 };
71947194 meta.homepage = "https://github.com/jbyuki/venn.nvim/";
71957195 };
@@ -7688,12 +7688,12 @@ final: prev:
76887688
76897689 vim-autoformat = buildVimPluginFrom2Nix {
76907690 pname = "vim-autoformat";
7691− version = "2021-11-07";
7691+ version = "2022-04-21";
76927692 src = fetchFromGitHub {
76937693 owner = "vim-autoformat";
76947694 repo = "vim-autoformat";
7695− rev = "bb11f30377985e45e2eecef570856d42dbabb8b0";
7696− sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087";
7695+ rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9";
7696+ sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p";
76977697 };
76987698 meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
76997699 };
@@ -7880,12 +7880,12 @@ final: prev:
78807880
78817881 vim-ccls = buildVimPluginFrom2Nix {
78827882 pname = "vim-ccls";
7883− version = "2022-01-29";
7883+ version = "2022-04-23";
78847884 src = fetchFromGitHub {
78857885 owner = "m-pilia";
78867886 repo = "vim-ccls";
7887− rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886";
7888− sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k";
7887+ rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424";
7888+ sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08";
78897889 };
78907890 meta.homepage = "https://github.com/m-pilia/vim-ccls/";
78917891 };
@@ -7916,12 +7916,12 @@ final: prev:
79167916
79177917 vim-clap = buildVimPluginFrom2Nix {
79187918 pname = "vim-clap";
7919− version = "2022-04-08";
7919+ version = "2022-04-27";
79207920 src = fetchFromGitHub {
79217921 owner = "liuchengxu";
79227922 repo = "vim-clap";
7923− rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44";
7924− sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65";
7923+ rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15";
7924+ sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5";
79257925 };
79267926 meta.homepage = "https://github.com/liuchengxu/vim-clap/";
79277927 };
@@ -8204,12 +8204,12 @@ final: prev:
82048204
82058205 vim-dadbod-ui = buildVimPluginFrom2Nix {
82068206 pname = "vim-dadbod-ui";
8207− version = "2022-03-06";
8207+ version = "2022-05-02";
82088208 src = fetchFromGitHub {
82098209 owner = "kristijanhusak";
82108210 repo = "vim-dadbod-ui";
8211− rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37";
8212− sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q";
8211+ rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7";
8212+ sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw";
82138213 };
82148214 meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
82158215 };
@@ -8276,12 +8276,12 @@ final: prev:
82768276
82778277 vim-dirvish = buildVimPluginFrom2Nix {
82788278 pname = "vim-dirvish";
8279− version = "2022-03-27";
8279+ version = "2022-04-26";
82808280 src = fetchFromGitHub {
82818281 owner = "justinmk";
82828282 repo = "vim-dirvish";
8283− rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3";
8284− sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq";
8283+ rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00";
8284+ sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y";
82858285 };
82868286 meta.homepage = "https://github.com/justinmk/vim-dirvish/";
82878287 };
@@ -8492,24 +8492,24 @@ final: prev:
84928492
84938493 vim-erlang-tags = buildVimPluginFrom2Nix {
84948494 pname = "vim-erlang-tags";
8495− version = "2021-02-19";
8495+ version = "2022-04-02";
84968496 src = fetchFromGitHub {
84978497 owner = "vim-erlang";
84988498 repo = "vim-erlang-tags";
8499− rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611";
8500− sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0";
8499+ rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139";
8500+ sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw";
85018501 };
85028502 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";
85038503 };
85048504
85058505 vim-eunuch = buildVimPluginFrom2Nix {
85068506 pname = "vim-eunuch";
8507− version = "2022-04-19";
8507+ version = "2022-05-01";
85088508 src = fetchFromGitHub {
85098509 owner = "tpope";
85108510 repo = "vim-eunuch";
8511− rev = "c1ee64a9775b4adff8d4e052b158f380682bc249";
8512− sha256 = "17m1632a4nwilg0d29gx7gsng8f1w82q049iynm4gy1aqczlwgxh";
8511+ rev = "73b5e3fccfb5295e38546318c0d3139874c25efb";
8512+ sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2";
85138513 };
85148514 meta.homepage = "https://github.com/tpope/vim-eunuch/";
85158515 };
@@ -8588,12 +8588,12 @@ final: prev:
85888588
85898589 vim-flagship = buildVimPluginFrom2Nix {
85908590 pname = "vim-flagship";
8591− version = "2021-12-07";
8591+ version = "2022-04-21";
85928592 src = fetchFromGitHub {
85938593 owner = "tpope";
85948594 repo = "vim-flagship";
8595− rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087";
8596− sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp";
8595+ rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b";
8596+ sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06";
85978597 };
85988598 meta.homepage = "https://github.com/tpope/vim-flagship/";
85998599 };
@@ -8696,12 +8696,12 @@ final: prev:
86968696
86978697 vim-fugitive = buildVimPluginFrom2Nix {
86988698 pname = "vim-fugitive";
8699− version = "2022-04-14";
8699+ version = "2022-04-26";
87008700 src = fetchFromGitHub {
87018701 owner = "tpope";
87028702 repo = "vim-fugitive";
8703− rev = "4b0f2b604562e9681ae3b80c2665f168ac637cea";
8704− sha256 = "0amph3kjqq0hl74akpp5czjw2gk6mh6l2zz113mrb95nri0bz73q";
8703+ rev = "b7287bd5421da62986d9abf9131509b2c9f918e4";
8704+ sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz";
87058705 };
87068706 meta.homepage = "https://github.com/tpope/vim-fugitive/";
87078707 };
@@ -8792,12 +8792,12 @@ final: prev:
87928792
87938793 vim-gitgutter = buildVimPluginFrom2Nix {
87948794 pname = "vim-gitgutter";
8795− version = "2022-04-15";
8795+ version = "2022-04-25";
87968796 src = fetchFromGitHub {
87978797 owner = "airblade";
87988798 repo = "vim-gitgutter";
8799− rev = "d5bae104031bb1633cb5c5178dc7d4ac422b422a";
8800− sha256 = "1k6bn3wm9chaqhkaw382169ia5ycbbnw00hwyaabx7fbzc8zf7zw";
8799+ rev = "988a6dbad9a9777cd94aab18ba7821a41068685b";
8800+ sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi";
88018801 };
88028802 meta.homepage = "https://github.com/airblade/vim-gitgutter/";
88038803 };
@@ -8840,12 +8840,12 @@ final: prev:
88408840
88418841 vim-go = buildVimPluginFrom2Nix {
88428842 pname = "vim-go";
8843− version = "2022-04-15";
8843+ version = "2022-04-23";
88448844 src = fetchFromGitHub {
88458845 owner = "fatih";
88468846 repo = "vim-go";
8847− rev = "687eb72bb6e84012ef2b0b2474175e46243e43b0";
8848− sha256 = "0llf81fh166xvdvy0vj93a964hp2clb3lqdy2sp3fhzldzyv0bab";
8847+ rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308";
8848+ sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7";
88498849 };
88508850 meta.homepage = "https://github.com/fatih/vim-go/";
88518851 };
@@ -9538,24 +9538,24 @@ final: prev:
95389538
95399539 vim-lsc = buildVimPluginFrom2Nix {
95409540 pname = "vim-lsc";
9541− version = "2021-04-28";
9541+ version = "2022-04-30";
95429542 src = fetchFromGitHub {
95439543 owner = "natebosch";
95449544 repo = "vim-lsc";
9545− rev = "4b0fc48037c628f14209f30616a19287d9e54823";
9546− sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv";
9545+ rev = "39ec72353c2170db2caf797072800c513647e9c5";
9546+ sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx";
95479547 };
95489548 meta.homepage = "https://github.com/natebosch/vim-lsc/";
95499549 };
95509550
95519551 vim-lsp = buildVimPluginFrom2Nix {
95529552 pname = "vim-lsp";
9553− version = "2022-04-17";
9553+ version = "2022-04-21";
95549554 src = fetchFromGitHub {
95559555 owner = "prabirshrestha";
95569556 repo = "vim-lsp";
9557− rev = "8df4aa40191717b34f5da8d3c8e90dc0f1f62e0b";
9558− sha256 = "0nx63rn86cjprwbvqpzarxxn1id6jndvww9n10ssdf5cfkw697b7";
9557+ rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d";
9558+ sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy";
95599559 };
95609560 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
95619561 };
@@ -9586,12 +9586,12 @@ final: prev:
95869586
95879587 vim-maktaba = buildVimPluginFrom2Nix {
95889588 pname = "vim-maktaba";
9589− version = "2021-08-09";
9589+ version = "2022-04-22";
95909590 src = fetchFromGitHub {
95919591 owner = "google";
95929592 repo = "vim-maktaba";
9593− rev = "f5127b339a9d776f220cc0393783c55def9d8ce0";
9594− sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg";
9593+ rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb";
9594+ sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8";
95959595 };
95969596 meta.homepage = "https://github.com/google/vim-maktaba/";
95979597 };
@@ -9610,24 +9610,24 @@ final: prev:
96109610
96119611 vim-markbar = buildVimPluginFrom2Nix {
96129612 pname = "vim-markbar";
9613− version = "2020-08-31";
9613+ version = "2022-04-27";
96149614 src = fetchFromGitHub {
96159615 owner = "Yilin-Yang";
96169616 repo = "vim-markbar";
9617− rev = "df13c3abe88c01a716b1099de953dcfa1679e663";
9618− sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9";
9617+ rev = "b9b87339bca7572ffc506165069242b6c06c210b";
9618+ sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59";
96199619 };
96209620 meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";
96219621 };
96229622
96239623 vim-markdown = buildVimPluginFrom2Nix {
96249624 pname = "vim-markdown";
9625− version = "2022-04-13";
9625+ version = "2022-04-26";
96269626 src = fetchFromGitHub {
96279627 owner = "preservim";
96289628 repo = "vim-markdown";
9629− rev = "c031a3e65c50d6aa0bfc81f8be9d248f9644426d";
9630− sha256 = "0l8ginadb4jxnrggd1lvia8kan397x02jf3v6sgkcyxawwpgfl0x";
9629+ rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3";
9630+ sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf";
96319631 };
96329632 meta.homepage = "https://github.com/preservim/vim-markdown/";
96339633 };
@@ -9659,12 +9659,12 @@ final: prev:
96599659
96609660 vim-matchup = buildVimPluginFrom2Nix {
96619661 pname = "vim-matchup";
9662− version = "2022-04-19";
9662+ version = "2022-04-20";
96639663 src = fetchFromGitHub {
96649664 owner = "andymass";
96659665 repo = "vim-matchup";
9666− rev = "bb04f9fa64b96bd3d6c4c146c6f9c55a69587fac";
9667− sha256 = "1wrgxsdv3q2px0q7w6jf5dnj2abr0vf1pfq5f53zq784h08m07hq";
9666+ rev = "1cb069f2a526682b3ce69610cf7c05511295ad37";
9667+ sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1";
96689668 };
96699669 meta.homepage = "https://github.com/andymass/vim-matchup/";
96709670 };
@@ -9863,12 +9863,12 @@ final: prev:
98639863
98649864 vim-nix = buildVimPluginFrom2Nix {
98659865 pname = "vim-nix";
9866− version = "2021-05-28";
9866+ version = "2022-04-25";
98679867 src = fetchFromGitHub {
98689868 owner = "LnL7";
98699869 repo = "vim-nix";
9870− rev = "63b47b39c8d481ebca3092822ca8972e08df769b";
9871− sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361";
9870+ rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee";
9871+ sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av";
98729872 };
98739873 meta.homepage = "https://github.com/LnL7/vim-nix/";
98749874 };
@@ -10211,12 +10211,12 @@ final: prev:
1021110211
1021210212 vim-plug = buildVimPluginFrom2Nix {
1021310213 pname = "vim-plug";
10214− version = "2022-04-04";
10214+ version = "2022-04-21";
1021510215 src = fetchFromGitHub {
1021610216 owner = "junegunn";
1021710217 repo = "vim-plug";
10218− rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe";
10219− sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv";
10218+ rev = "be55ec46b5ab031805487a9c3e895db57f53010b";
10219+ sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh";
1022010220 };
1022110221 meta.homepage = "https://github.com/junegunn/vim-plug/";
1022210222 };
@@ -10235,12 +10235,12 @@ final: prev:
1023510235
1023610236 vim-polyglot = buildVimPluginFrom2Nix {
1023710237 pname = "vim-polyglot";
10238− version = "2022-04-18";
10238+ version = "2022-04-30";
1023910239 src = fetchFromGitHub {
1024010240 owner = "sheerun";
1024110241 repo = "vim-polyglot";
10242− rev = "db7bb8ba22f5798bf3abe9f786bc6e6d002725f8";
10243− sha256 = "1fjy26ncql66fn7jdmggkndad1ib9csblvyq42sq9qcdci0lb9jx";
10242+ rev = "38282d58387cff48ac203f6912c05e4c8686141b";
10243+ sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569";
1024410244 };
1024510245 meta.homepage = "https://github.com/sheerun/vim-polyglot/";
1024610246 };
@@ -10307,12 +10307,12 @@ final: prev:
1030710307
1030810308 vim-projectionist = buildVimPluginFrom2Nix {
1030910309 pname = "vim-projectionist";
10310− version = "2022-04-19";
10310+ version = "2022-04-27";
1031110311 src = fetchFromGitHub {
1031210312 owner = "tpope";
1031310313 repo = "vim-projectionist";
10314− rev = "8fb9440ad4cea6ffea8efc3efa4d8d64e7fb9785";
10315− sha256 = "0nlsi05r2gvmwzzrrcifvx1rq09d16mnfa3gl2qif5dgmrj7qzni";
10314+ rev = "df1e28dba36e69288173fdcdce122d98538ae782";
10315+ sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq";
1031610316 };
1031710317 meta.homepage = "https://github.com/tpope/vim-projectionist/";
1031810318 };
@@ -10475,12 +10475,12 @@ final: prev:
1047510475
1047610476 vim-rails = buildVimPluginFrom2Nix {
1047710477 pname = "vim-rails";
10478− version = "2022-04-16";
10478+ version = "2022-04-27";
1047910479 src = fetchFromGitHub {
1048010480 owner = "tpope";
1048110481 repo = "vim-rails";
10482− rev = "d38f1bf8575b920042153689492721b80252ae41";
10483− sha256 = "18c3maypsl265f3a03602mnq4lky5w786i9iaphv5x5rlnfwj8wa";
10482+ rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed";
10483+ sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l";
1048410484 };
1048510485 meta.homepage = "https://github.com/tpope/vim-rails/";
1048610486 };
@@ -10547,12 +10547,12 @@ final: prev:
1054710547
1054810548 vim-ruby = buildVimPluginFrom2Nix {
1054910549 pname = "vim-ruby";
10550− version = "2022-03-22";
10550+ version = "2022-04-27";
1055110551 src = fetchFromGitHub {
1055210552 owner = "vim-ruby";
1055310553 repo = "vim-ruby";
10554− rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1";
10555− sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz";
10554+ rev = "811d8060f390837c49e8625e29c69672cdc56ec3";
10555+ sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva";
1055610556 };
1055710557 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
1055810558 };
@@ -10631,12 +10631,12 @@ final: prev:
1063110631
1063210632 vim-search-pulse = buildVimPluginFrom2Nix {
1063310633 pname = "vim-search-pulse";
10634− version = "2017-01-05";
10634+ version = "2022-04-26";
1063510635 src = fetchFromGitHub {
1063610636 owner = "inside";
1063710637 repo = "vim-search-pulse";
10638− rev = "9f8f473e3813bd76ecb66e8d6182d96bda39b6df";
10639− sha256 = "1xr90a8wvjfkgw1yrh0zcvpvp9ma6z0wqkl8v8pabf20vckgy2q0";
10638+ rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445";
10639+ sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx";
1064010640 };
1064110641 meta.homepage = "https://github.com/inside/vim-search-pulse/";
1064210642 };
@@ -10739,12 +10739,12 @@ final: prev:
1073910739
1074010740 vim-sleuth = buildVimPluginFrom2Nix {
1074110741 pname = "vim-sleuth";
10742− version = "2022-04-14";
10742+ version = "2022-04-28";
1074310743 src = fetchFromGitHub {
1074410744 owner = "tpope";
1074510745 repo = "vim-sleuth";
10746− rev = "e116c2cc2555b09aee9b18eba405b925c8b7eaf9";
10747− sha256 = "02ljdb3p7fp0h3nf6rxv5kgsxqdvgkwrwgb01x4xn100spkv6y6i";
10746+ rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8";
10747+ sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs";
1074810748 };
1074910749 meta.homepage = "https://github.com/tpope/vim-sleuth/";
1075010750 };
@@ -10835,12 +10835,12 @@ final: prev:
1083510835
1083610836 vim-snippets = buildVimPluginFrom2Nix {
1083710837 pname = "vim-snippets";
10838− version = "2022-04-20";
10838+ version = "2022-04-30";
1083910839 src = fetchFromGitHub {
1084010840 owner = "honza";
1084110841 repo = "vim-snippets";
10842− rev = "0decc32aad4564452c2f8a5cbfe387195f1a8bba";
10843− sha256 = "1ycmls9xpkfzkrws2aby88zmsv1489d659sllrgmbmh04g0pq8vy";
10842+ rev = "45c8e00d0bae9056713097ea655d76d463b66f10";
10843+ sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd";
1084410844 };
1084510845 meta.homepage = "https://github.com/honza/vim-snippets/";
1084610846 };
@@ -10979,12 +10979,12 @@ final: prev:
1097910979
1098010980 vim-surround = buildVimPluginFrom2Nix {
1098110981 pname = "vim-surround";
10982− version = "2022-04-10";
10982+ version = "2022-04-22";
1098310983 src = fetchFromGitHub {
1098410984 owner = "tpope";
1098510985 repo = "vim-surround";
10986− rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7";
10987− sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i";
10986+ rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea";
10987+ sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la";
1098810988 };
1098910989 meta.homepage = "https://github.com/tpope/vim-surround/";
1099010990 };
@@ -11340,12 +11340,12 @@ final: prev:
1134011340
1134111341 vim-unimpaired = buildVimPluginFrom2Nix {
1134211342 pname = "vim-unimpaired";
11343− version = "2022-04-10";
11343+ version = "2022-04-29";
1134411344 src = fetchFromGitHub {
1134511345 owner = "tpope";
1134611346 repo = "vim-unimpaired";
11347− rev = "80ab990c7ff7251f43262aae4b60ff6eff2ef3a4";
11348− sha256 = "0qmxzk0vcglyrvx2hpxm6qgr6mcc1xnf6srw77ga9g0aazjr2hxc";
11347+ rev = "98427183e2b35acee15c7628b1cd587b98025719";
11348+ sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk";
1134911349 };
1135011350 meta.homepage = "https://github.com/tpope/vim-unimpaired/";
1135111351 };
@@ -11424,12 +11424,12 @@ final: prev:
1142411424
1142511425 vim-vsnip = buildVimPluginFrom2Nix {
1142611426 pname = "vim-vsnip";
11427− version = "2022-02-26";
11427+ version = "2022-04-22";
1142811428 src = fetchFromGitHub {
1142911429 owner = "hrsh7th";
1143011430 repo = "vim-vsnip";
11431− rev = "70a1131d64d75150ece513b983b0f42939bcb03c";
11432− sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2";
11431+ rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9";
11432+ sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai";
1143311433 };
1143411434 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
1143511435 };
@@ -11460,12 +11460,12 @@ final: prev:
1146011460
1146111461 vim-wakatime = buildVimPluginFrom2Nix {
1146211462 pname = "vim-wakatime";
11463− version = "2022-04-13";
11463+ version = "2022-04-29";
1146411464 src = fetchFromGitHub {
1146511465 owner = "wakatime";
1146611466 repo = "vim-wakatime";
11467− rev = "9cf2f1910d5cd7f25657176fe60b1745a310f1b3";
11468− sha256 = "0jxkfiq5553ad7zabxlgwzwwsgwznkn0rahfmr79r1dvvqm9m1a6";
11467+ rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996";
11468+ sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj";
1146911469 };
1147011470 meta.homepage = "https://github.com/wakatime/vim-wakatime/";
1147111471 };
@@ -11520,12 +11520,12 @@ final: prev:
1152011520
1152111521 vim-wordmotion = buildVimPluginFrom2Nix {
1152211522 pname = "vim-wordmotion";
11523− version = "2021-12-28";
11523+ version = "2022-04-23";
1152411524 src = fetchFromGitHub {
1152511525 owner = "chaoren";
1152611526 repo = "vim-wordmotion";
11527− rev = "0d810cc943a858a570a482055188b5e69c4c8724";
11528− sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl";
11527+ rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c";
11528+ sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz";
1152911529 };
1153011530 meta.homepage = "https://github.com/chaoren/vim-wordmotion/";
1153111531 };
@@ -11748,12 +11748,12 @@ final: prev:
1174811748
1174911749 vimspector = buildVimPluginFrom2Nix {
1175011750 pname = "vimspector";
11751− version = "2022-04-13";
11751+ version = "2022-05-01";
1175211752 src = fetchFromGitHub {
1175311753 owner = "puremourning";
1175411754 repo = "vimspector";
11755− rev = "ebeebc121423a5ab9a31c996f9881880b658c644";
11756− sha256 = "0npcra2k49rz9ij4kc6dyb8dpmfi6kivpp89ggmpnd0989vn9i56";
11755+ rev = "960f0444d21ebb20303e1796e4b478df042c3bd3";
11756+ sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi";
1175711757 fetchSubmodules = true;
1175811758 };
1175911759 meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -11761,12 +11761,12 @@ final: prev:
1176111761
1176211762 vimtex = buildVimPluginFrom2Nix {
1176311763 pname = "vimtex";
11764− version = "2022-04-10";
11764+ version = "2022-05-02";
1176511765 src = fetchFromGitHub {
1176611766 owner = "lervag";
1176711767 repo = "vimtex";
11768− rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48";
11769− sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn";
11768+ rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898";
11769+ sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c";
1177011770 };
1177111771 meta.homepage = "https://github.com/lervag/vimtex/";
1177211772 };
@@ -11869,12 +11869,12 @@ final: prev:
1186911869
1187011870 wilder-nvim = buildVimPluginFrom2Nix {
1187111871 pname = "wilder.nvim";
11872− version = "2022-04-17";
11872+ version = "2022-04-23";
1187311873 src = fetchFromGitHub {
1187411874 owner = "gelguy";
1187511875 repo = "wilder.nvim";
11876− rev = "a9ea0c69b37850752d5f8431b7be6bf8f1a0254c";
11877− sha256 = "0vd01sjj4q26a653wv9icfyd7g34rnl4whbnl3ic6pvb9cvj72wk";
11876+ rev = "777b163e394ba658ef288292efb533b25610ef9d";
11877+ sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh";
1187811878 };
1187911879 meta.homepage = "https://github.com/gelguy/wilder.nvim/";
1188011880 };
@@ -12038,12 +12038,12 @@ final: prev:
1203812038
1203912039 zig-vim = buildVimPluginFrom2Nix {
1204012040 pname = "zig.vim";
12041− version = "2022-03-15";
12041+ version = "2022-05-01";
1204212042 src = fetchFromGitHub {
1204312043 owner = "ziglang";
1204412044 repo = "zig.vim";
12045− rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac";
12046− sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4";
12045+ rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3";
12046+ sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7";
1204712047 };
1204812048 meta.homepage = "https://github.com/ziglang/zig.vim/";
1204912049 };
@@ -12086,12 +12086,12 @@ final: prev:
1208612086
1208712087 chad = buildVimPluginFrom2Nix {
1208812088 pname = "chad";
12089− version = "2022-04-20";
12089+ version = "2022-05-02";
1209012090 src = fetchFromGitHub {
1209112091 owner = "ms-jpq";
1209212092 repo = "chadtree";
12093− rev = "d9a84322624d14c1e249e9a8a4573c9d205a9bc9";
12094− sha256 = "16lha28fmi463snf71w0nz6ll0yiiiz7xrh2v7irkgx214q1gh6z";
12093+ rev = "820c1913a77a12d080e3436e60a491327664589b";
12094+ sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza";
1209512095 };
1209612096 meta.homepage = "https://github.com/ms-jpq/chadtree/";
1209712097 };
@@ -12122,12 +12122,12 @@ final: prev:
1212212122
1212312123 gruvbox-community = buildVimPluginFrom2Nix {
1212412124 pname = "gruvbox-community";
12125− version = "2022-03-06";
12125+ version = "2022-04-29";
1212612126 src = fetchFromGitHub {
1212712127 owner = "gruvbox-community";
1212812128 repo = "gruvbox";
12129− rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";
12130− sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";
12129+ rev = "34ad436b234c5095d46bb065c5b32780618df83f";
12130+ sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8";
1213112131 };
1213212132 meta.homepage = "https://github.com/gruvbox-community/gruvbox/";
1213312133 };
@@ -12158,12 +12158,12 @@ final: prev:
1215812158
1215912159 rose-pine = buildVimPluginFrom2Nix {
1216012160 pname = "rose-pine";
12161− version = "2022-04-19";
12161+ version = "2022-04-25";
1216212162 src = fetchFromGitHub {
1216312163 owner = "rose-pine";
1216412164 repo = "neovim";
12165− rev = "758568b92e0a17c3618f71d43cce96a3a5436985";
12166− sha256 = "0zxyyjp1527681rrw25f8vzx1d6djqac04zcay02hxi2rcnjpan5";
12165+ rev = "da67a549cf5d67e15618cc3001f1e07724a1597f";
12166+ sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2";
1216712167 };
1216812168 meta.homepage = "https://github.com/rose-pine/neovim/";
1216912169 };
@@ -12180,4 +12180,5 @@ final: prev:
1218012180 meta.homepage = "https://github.com/jhradilek/vim-snippets/";
1218112181 };
1218212182
12183+
1218312184}
pkgs/applications/editors/vim/plugins/overrides.nix+2−5
@@ -450,11 +450,8 @@ self: super: {
450450 --replace "code-minimap" "${code-minimap}/bin/code-minimap"
451451 '';
452452
453− doCheck = true;
454− checkPhase = ''
455− ${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit!
456− '';
457−
453+ doInstallCheck = true;
454+ vimCommandCheck = "MinimapToggle";
458455 });
459456
460457 ncm2 = super.ncm2.overrideAttrs (old: {
pkgs/applications/editors/vim/plugins/update.py+47−16
@@ -26,19 +26,24 @@ from typing import List, Tuple
2626from pathlib import Path
2727
2828log = logging.getLogger()
29−log.addHandler(logging.StreamHandler())
29+
30+sh = logging.StreamHandler()
31+formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s')
32+sh.setFormatter(formatter)
33+log.addHandler(sh)
3034
3135# Import plugin update library from maintainers/scripts/pluginupdate.py
3236ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
3337# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree
3438sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))
3539import pluginupdate
40+from pluginupdate import run_nix_expr, PluginDesc
3641
3742GET_PLUGINS = f"""(with import <localpkgs> {{}};
3843let
39− inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix;
44+ inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
4045 generated = callPackage {ROOT}/generated.nix {{
41− inherit buildVimPluginFrom2Nix;
46+ inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;
4247 }};
4348 hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
4449 getChecksum = name: value:
@@ -50,43 +55,69 @@ let
5055 checksums = lib.mapAttrs getChecksum generated;
5156in lib.filterAttrs (n: v: v != null) checksums)"""
5257
58+GET_PLUGINS_LUA = """
59+with import <localpkgs> {};
60+lib.attrNames lua51Packages"""
61+
5362HEADER = (
5463 "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"
5564)
5665
66+def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:
67+ '''
68+ Whether it's a neovim-only plugin
69+ We can check if it's available in lua packages
70+ '''
71+ global luaPlugins
72+ if plug.normalized_name in luaPlugins:
73+ log.debug("%s is a neovim plugin", plug)
74+ return True
75+ return False
76+
5777
5878class VimEditor(pluginupdate.Editor):
59− def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):
79+ def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str):
6080 sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())
6181
6282 with open(outfile, "w+") as f:
6383 f.write(HEADER)
6484 f.write(textwrap.dedent("""
65− { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
85+ { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:
6686
6787 final: prev:
68− {"""
88+ {
89+ """
6990 ))
7091 for pdesc, plugin in sorted_plugins:
92+ content = self.plugin2nix(pdesc, plugin)
93+ f.write(content)
94+ f.write("\n}\n")
95+ print(f"updated {outfile}")
96+
97+ def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str:
7198
72− repo = pdesc.repo
73− src_nix = repo.as_nix(plugin)
74− f.write(
75− f"""
76− {plugin.normalized_name} = buildVimPluginFrom2Nix {{
99+ repo = pdesc.repo
100+ isNeovim = isNeovimPlugin(plugin)
101+
102+ content = f" {plugin.normalized_name} = "
103+ src_nix = repo.as_nix(plugin)
104+ content += """{buildFn} {{
77105 pname = "{plugin.name}";
78106 version = "{plugin.version}";
79107 src = {src_nix};
80108 meta.homepage = "{repo.uri}";
81109 }};
82−"""
83− )
84− f.write("\n}\n")
85− print(f"updated {outfile}")
86−
87110
111+""".format(
112+ buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)
113+ print(content)
114+ return content
88115
89116def main():
117+
118+ global luaPlugins
119+ luaPlugins = run_nix_expr(GET_PLUGINS_LUA)
120+
90121 editor = VimEditor("vim", ROOT, GET_PLUGINS)
91122 parser = editor.create_parser()
92123 args = parser.parse_args()
pkgs/applications/editors/vim/plugins/vim-command-check-hook.shnew file+25
@@ -0,0 +1,25 @@
1+# Setup hook for checking whether a vim command exists
2+echo "Sourcing vim-command-check-hook.sh"
3+
4+vimCommandCheckHook () {
5+ echo "Executing vimCommandCheckHook"
6+
7+ if [ -n "$vimCommandCheck" ]; then
8+ echo "Check whether the following modules can be imported: $vimCommandCheck"
9+
10+ # editorconfig-checker-disable
11+ export HOME="$TMPDIR"
12+ @vimBinary@ -es -n -u NONE -i NONE --clean -V1 --cmd "set rtp+=$out" \
13+ --cmd "runtime! plugin/*.vim" <<-EOF
14+ if exists(":$vimCommandCheck") == 2
15+ cquit 0
16+ else
17+ cquit 1
18+ fi
19+ EOF
20+ fi
21+}
22+
23+echo "Using vimCommandCheckHook"
24+preDistPhases+=" vimCommandCheckHook"
25+
pkgs/applications/editors/vim/plugins/vim-utils.nix+18−2
@@ -521,8 +521,24 @@ rec {
521521 };
522522 } ./vim-gen-doc-hook.sh) {};
523523
524− inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath vim vimGenDocHook; })
525− buildVimPlugin buildVimPluginFrom2Nix;
524+ vimCommandCheckHook = callPackage ({ neovim-unwrapped }:
525+ makeSetupHook {
526+ name = "vim-command-check-hook";
527+ deps = [ neovim-unwrapped ];
528+ substitutions = {
529+ vimBinary = "${neovim-unwrapped}/bin/nvim";
530+ inherit rtpPath;
531+ };
532+ } ./vim-command-check-hook.sh) {};
533+
534+ inherit (import ./build-vim-plugin.nix {
535+ inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;
536+ }) buildVimPlugin buildVimPluginFrom2Nix;
537+
538+
539+ # TODO placeholder to ease working on automatic plugin detection
540+ # this should be a luarocks "flat" install with appropriate vim hooks
541+ buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix;
526542
527543 # used to figure out which python dependencies etc. neovim needs
528544 requiredPlugins = {
pkgs/applications/editors/vscode/extensions/default.nix+12
@@ -67,6 +67,18 @@ let
6767 };
6868 };
6969
70+ adpyke.codesnap = buildVscodeMarketplaceExtension {
71+ mktplcRef = {
72+ name = "codesnap";
73+ publisher = "adpyke";
74+ version = "1.3.4";
75+ sha256 = "sha256-dR6qODSTK377OJpmUqG9R85l1sf9fvJJACjrYhSRWgQ=";
76+ };
77+ meta = {
78+ license = lib.licenses.mit;
79+ };
80+ };
81+
7082 alefragnani.project-manager = buildVscodeMarketplaceExtension {
7183 mktplcRef = {
7284 name = "project-manager";
pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix−1
@@ -43,7 +43,6 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens
4343 };
4444}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {
4545 nativeBuildInputs = nativeBuildInputs ++ [
46− bash
4746 jq
4847 autoPatchelfHook
4948 makeWrapper
pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix+2−2
@@ -37,8 +37,8 @@ buildVscodeMarketplaceExtension {
3737 mktplcRef = {
3838 name = "remote-ssh";
3939 publisher = "ms-vscode-remote";
40− version = "0.66.1";
41− sha256 = "sha256-+v4UnGRG5xOc8k0IzvHUBHa128fhgd3jcmEuciiMQmI=";
40+ version = "0.78.0";
41+ sha256 = "sha256-vd+9d86Z8429QpQVCZm8gtiJDcMpD++aiFVwvCrPg5w=";
4242 };
4343
4444 postPatch = ''
pkgs/applications/editors/vscode/update-vscodium.sh+16−12
@@ -14,23 +14,27 @@ if [ ! -f "$ROOT/vscodium.nix" ]; then
1414 exit 1
1515fi
1616
17+update_vscodium () {
18+ VSCODIUM_VER=$1
19+ ARCH=$2
20+ ARCH_LONG=$3
21+ ARCHIVE_FMT=$4
22+ VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}"
23+ VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL})
24+ sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix"
25+}
26+
1727# VSCodium
1828
1929VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}')
2030sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix"
2131
22−VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz"
23−VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL})
24−sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix"
32+update_vscodium $VSCODIUM_VER linux-x64 x86_64-linux tar.gz
33+
34+update_vscodium $VSCODIUM_VER darwin-x64 x86_64-darwin zip
2535
26−VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip"
27−VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL})
28−sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix"
36+update_vscodium $VSCODIUM_VER linux-arm64 aarch64-linux tar.gz
2937
30−VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz"
31−VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL})
32−sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix"
38+update_vscodium $VSCODIUM_VER darwin-arm64 aarch64-darwin zip
3339
34−VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz"
35−VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL})
36−sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix"
40+update_vscodium $VSCODIUM_VER linux-armhf armv7l-linux tar.gz
pkgs/applications/editors/vscode/vscodium.nix+5−8
@@ -7,24 +7,21 @@ let
77 x86_64-linux = "linux-x64";
88 x86_64-darwin = "darwin-x64";
99 aarch64-linux = "linux-arm64";
10+ aarch64-darwin = "darwin-arm64";
1011 armv7l-linux = "linux-armhf";
1112 }.${system};
1213
13− archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
14+ archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
1415
1516 sha256 = {
1617 x86_64-linux = "1i76ix318y6b2dcfnisg13bp5d7nzvcx7zcpl94mkrn974db30pn";
1718 x86_64-darwin = "1qk1vykl838vwsffyjpazx7x9ajwxczpgz5vhch16iikfz2vh1vk";
1819 aarch64-linux = "13jifiqn2v17d6vwacq6aib1lzyp2021kjdswkp7wpx6ck5lkm21";
20+ aarch64-darwin = "1jgmvw52hp2zfvk6z51yni4vn7wfq63gsih42mzadg5a1b2fr9rx";
1921 armv7l-linux = "1zhriscsmfcsagsp2ds0fn316fybs5f2f2r3w5q29jwczgcnlam4";
2022 }.${system};
2123
22− sourceRoot = {
23− x86_64-linux = ".";
24− x86_64-darwin = "";
25− aarch64-linux = ".";
26− armv7l-linux = ".";
27− }.${system};
24+ sourceRoot = if stdenv.isDarwin then "" else ".";
2825in
2926 callPackage ./generic.nix rec {
3027 inherit sourceRoot;
@@ -63,6 +60,6 @@ in
6360 downloadPage = "https://github.com/VSCodium/vscodium/releases";
6461 license = licenses.mit;
6562 maintainers = with maintainers; [ synthetica turion bobby285271 ];
66− platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ];
63+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ];
6764 };
6865 }
pkgs/applications/editors/xedit/default.nix+2−2
@@ -12,14 +12,14 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "xedit";
15− version = "1.2.2";
15+ version = "1.2.3";
1616
1717 src = fetchFromGitLab {
1818 domain = "gitlab.freedesktop.org";
1919 owner = "xorg/app";
2020 repo = "xedit";
2121 rev = "${pname}-${version}";
22− sha256 = "0b5ic13aasv6zh20v2k7zyxsqbnsxfq5rs3w8nwzl1gklmgrjxa3";
22+ sha256 = "sha256-WF+4avzRRL0+OA3KxzK7JwmArkPu9fEl+728R6ouXmg=";
2323 };
2424
2525 nativeBuildInputs = [ autoreconfHook pkg-config utilmacros ];
pkgs/applications/emulators/mame/default.nix+2−2
@@ -45,13 +45,13 @@ let
4545in
4646stdenv.mkDerivation rec {
4747 pname = "mame";
48− version = "0.242";
48+ version = "0.243";
4949
5050 src = fetchFromGitHub {
5151 owner = "mamedev";
5252 repo = "mame";
5353 rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}";
54− sha256 = "sha256-06iKM9cpjXuNvChQTPjhb9oQptC4KTZEoxzZk8+x3/k=";
54+ sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk=";
5555 };
5656
5757 hardeningDisable = [ "fortify" ];
pkgs/applications/emulators/ripes/default.nixnew file+50
@@ -0,0 +1,50 @@
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, pkg-config
5+, qtbase
6+, qtsvg
7+, qtcharts
8+, wrapQtAppsHook
9+, cmake
10+, python3
11+}:
12+
13+mkDerivation rec {
14+ pname = "ripes";
15+ version = "2.2.4";
16+
17+ src = fetchFromGitHub {
18+ owner = "mortbopet";
19+ repo = "Ripes";
20+ rev = "v${version}";
21+ fetchSubmodules = true;
22+ sha256 = "sha256-Aal2A4xypzaY7Oa+boIrXk7ITNKnh5OZIP7DkJjcGu4=";
23+ };
24+
25+ nativeBuildInputs = [
26+ cmake
27+ pkg-config
28+ python3
29+ wrapQtAppsHook
30+ ];
31+
32+ buildInputs = [
33+ qtbase
34+ qtsvg
35+ qtcharts
36+ ];
37+
38+ installPhase = ''
39+ install -D Ripes $out/bin/Ripes
40+ cp -r ${src}/appdir/usr/share $out/share
41+ '';
42+
43+ meta = with lib; {
44+ description = "A graphical processor simulator and assembly editor for the RISC-V ISA";
45+ homepage = "https://github.com/mortbopet/Ripes";
46+ license = licenses.mit;
47+ platforms = platforms.linux;
48+ maintainers = with maintainers; [ rewine ];
49+ };
50+}
pkgs/applications/finance/irpf/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212stdenvNoCC.mkDerivation rec {
1313 pname = "irpf";
14− version = "2022-1.3";
14+ version = "2022-1.4";
1515
1616 src = let
1717 year = lib.head (lib.splitVersion version);
1818 in fetchzip {
1919 url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
20− sha256 = "sha256-nAmcVPSnMIWuq2zj1xq/657RmzaSmdtxlI9cp9v5P0A=";
20+ sha256 = "sha256-AKBcBkoPDBknUOyndf9hNigzDHjjgi2v0n1Rs+//j/8=";
2121 };
2222
2323 nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];
pkgs/applications/gis/grass/default.nix+10−36
@@ -1,25 +1,25 @@
11{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
2−, cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas
2+, cairo, readline, ffmpeg, makeWrapper, wxGTK31, wxmac, netcdf, blas
33, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid
44, zstd, pdal, wrapGAppsHook
55}:
66
77stdenv.mkDerivation rec {
88 pname = "grass";
9− version = "7.8.6";
9+ version = "8.0.1";
1010
1111 src = with lib; fetchFromGitHub {
1212 owner = "OSGeo";
1313 repo = "grass";
1414 rev = version;
15− sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM=";
15+ sha256 = "sha256-rcOT21HRJDR+DEYsZn6BjOOhy28DWapz9PN7cRAdWGc=";
1616 };
1717
1818 nativeBuildInputs = [ pkg-config ];
1919 buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite
2020 readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas
2121 libLAS proj-datumgrid zstd wrapGAppsHook ]
22− ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ]
22+ ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK31 ]
2323 ++ lib.optional stdenv.isDarwin wxmac
2424 ++ (with python3Packages; [ python python-dateutil numpy ]
2525 ++ lib.optional stdenv.isDarwin wxPython_4_0
@@ -68,41 +68,15 @@ stdenv.mkDerivation rec {
6868 /* Ensures that the python script run at build time are actually executable;
6969 * otherwise, patchShebangs ignores them. */
7070 postConfigure = ''
71− chmod +x scripts/d.out.file/d.out.file.py \
72− scripts/d.to.rast/d.to.rast.py \
73− scripts/d.what.rast/d.what.rast.py \
74− scripts/d.what.vect/d.what.vect.py \
75− scripts/g.extension/g.extension.py \
76− scripts/g.extension.all/g.extension.all.py \
77− scripts/r.drain/r.drain.py \
78− scripts/r.pack/r.pack.py \
79− scripts/r.import/r.import.py \
80− scripts/r.tileset/r.tileset.py \
81− scripts/r.unpack/r.unpack.py \
82− scripts/v.clip/v.clip.py \
83− scripts/v.rast.stats/v.rast.stats.py \
84− scripts/v.to.lines/v.to.lines.py \
85− scripts/v.what.strds/v.what.strds.py \
86− scripts/v.unpack/v.unpack.py \
87− scripts/wxpyimgview/*.py \
88− gui/wxpython/animation/g.gui.animation.py \
89− gui/wxpython/datacatalog/g.gui.datacatalog.py \
90− gui/wxpython/rlisetup/g.gui.rlisetup.py \
91− gui/wxpython/vdigit/g.gui.vdigit.py \
92− temporal/t.rast.accumulate/t.rast.accumulate.py \
93− temporal/t.rast.accdetect/t.rast.accdetect.py \
94− temporal/t.rast.algebra/t.rast.algebra.py \
95− temporal/t.rast3d.algebra/t.rast3d.algebra.py \
96− temporal/t.vect.algebra/t.vect.algebra.py \
97− temporal/t.downgrade/t.downgrade.py \
98− temporal/t.select/t.select.py
99− for d in gui lib scripts temporal tools; do
100− patchShebangs $d
71+ for f in $(find . -name '*.py'); do
72+ chmod +x $f
10173 done
74+
75+ patchShebangs */
10276 '';
10377
10478 postInstall = ''
105− wrapProgram $out/bin/grass78 \
79+ wrapProgram $out/bin/grass \
10680 --set PYTHONPATH $PYTHONPATH \
10781 --set GRASS_PYTHON ${python3Packages.python.interpreter} \
10882 --suffix LD_LIBRARY_PATH ':' '${gdal}/lib'
@@ -117,6 +91,6 @@ stdenv.mkDerivation rec {
11791 description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
11892 license = lib.licenses.gpl2Plus;
11993 platforms = lib.platforms.all;
120− maintainers = with lib.maintainers; [mpickering];
94+ maintainers = with lib.maintainers; [ mpickering willcohen ];
12195 };
12296}
pkgs/applications/gis/qgis/unwrapped-ltr.nix+2−2
@@ -69,14 +69,14 @@ let
6969 six
7070 ];
7171in mkDerivation rec {
72− version = "3.22.5";
72+ version = "3.22.6";
7373 pname = "qgis-ltr-unwrapped";
7474
7575 src = fetchFromGitHub {
7676 owner = "qgis";
7777 repo = "QGIS";
7878 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
79− sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o=";
79+ sha256 = "sha256-ACNEIU+kYmOa+/1nbFPTSDgyvviXqKP9kvL6aRykueY=";
8080 };
8181
8282 passthru = {
pkgs/applications/gis/qgis/unwrapped.nix+2−2
@@ -69,14 +69,14 @@ let
6969 six
7070 ];
7171in mkDerivation rec {
72− version = "3.24.1";
72+ version = "3.24.2";
7373 pname = "qgis-unwrapped";
7474
7575 src = fetchFromGitHub {
7676 owner = "qgis";
7777 repo = "QGIS";
7878 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
79− sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg=";
79+ sha256 = "sha256-skoepsX9xREqN5SoA4eUN7LKa6KGvixPd5k0KKXzKJo=";
8080 };
8181
8282 passthru = {
pkgs/applications/graphics/ImageMagick/7.0.nix+2−2
@@ -45,13 +45,13 @@ in
4545
4646stdenv.mkDerivation rec {
4747 pname = "imagemagick";
48− version = "7.1.0-31";
48+ version = "7.1.0-32";
4949
5050 src = fetchFromGitHub {
5151 owner = "ImageMagick";
5252 repo = "ImageMagick";
5353 rev = version;
54− hash = "sha256-Pf+x3TnmvKTCDL3dGLyAr6JUl5E3BRi/XW/dkuCr2YA=";
54+ hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ=";
5555 };
5656
5757 outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
pkgs/applications/graphics/cloudcompare/default.nix+2
@@ -1,4 +1,5 @@
11{ lib
2+, stdenv
23, mkDerivation
34, fetchFromGitHub
45, fetchpatch
@@ -114,5 +115,6 @@ mkDerivation rec {
114115 license = licenses.gpl2Plus;
115116 maintainers = with maintainers; [ nh2 ];
116117 platforms = with platforms; linux; # only tested here; might work on others
118+ broken = stdenv.isLinux; # plugins/core/IO/qPDALIO/CMakeFiles/QPDAL_IO_PLUGIN.dir/src/LASFilter.cpp.o] Error 1
117119 };
118120}
pkgs/applications/graphics/digikam/default.nix+14−3
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
1+{ mkDerivation, lib, fetchurl, fetchpatch, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
22
33# For `digitaglinktree`
44, perl, sqlite
@@ -43,6 +43,7 @@
4343, pcre
4444, threadweaver
4545, x265
46+, jasper
4647
4748# For panorama and focus stacking
4849, enblend-enfuse
@@ -55,13 +56,21 @@
5556
5657mkDerivation rec {
5758 pname = "digikam";
58− version = "7.4.0";
59+ version = "7.6.0";
5960
6061 src = fetchurl {
6162 url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
62− sha256 = "sha256-0Iq2bacyu0SbwQEG7BHdne+ls1Yt7TdBsEHbuqcVUEo=";
63+ sha256 = "sha256-2OHucyHT/DE5FvUVdW4wKaxBh9xFO2kzhI1N5TFLZkE=";
6364 };
6465
66+ patches = [
67+ (fetchpatch {
68+ name = "akonadi-22.04.patch";
69+ url = "https://github.com/archlinux/svntogit-packages/raw/1b3c76a4482055524120f598325d90545ff9c020/trunk/akonadi-22.04.patch";
70+ sha256 = "sha256-ittgkl2t/nAD0ci2fNYoAd4E2M6Gg0vqqjxqZugBuko=";
71+ })
72+ ];
73+
6574 nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
6675
6776 buildInputs = [
@@ -86,6 +95,7 @@ mkDerivation rec {
8695 opencv
8796 pcre
8897 x265
98+ jasper
8999
90100 qtbase
91101 qtxmlpatterns
@@ -115,6 +125,7 @@ mkDerivation rec {
115125 "-DENABLE_MEDIAPLAYER=1"
116126 "-DENABLE_QWEBENGINE=on"
117127 "-DENABLE_APPSTYLES=on"
128+ "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>`
118129 ];
119130
120131 dontWrapGApps = true;
pkgs/applications/graphics/geeqie/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool
22, gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida
3−, wrapGAppsHook, fetchpatch, bash, doxygen
3+, wrapGAppsHook, fetchpatch, doxygen
44, nix-update-script
55}:
66
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs =
3434 [ pkg-config autoconf automake gettext intltool
35− wrapGAppsHook bash doxygen
35+ wrapGAppsHook doxygen
3636 ];
3737
3838 buildInputs = [
pkgs/applications/graphics/graphicsmagick/default.nix+2−2
@@ -7,11 +7,11 @@
77
88stdenv.mkDerivation rec {
99 pname = "graphicsmagick";
10− version = "1.3.37";
10+ version = "1.3.38";
1111
1212 src = fetchurl {
1313 url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
14− sha256 = "sha256-kNwi8ae9JA5MkGWpQJYr8T2kPJm8w2yxEcw8Gg10d9Q=";
14+ sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
1515 };
1616
1717 patches = [
pkgs/applications/graphics/ovito/default.nix+2−2
@@ -21,13 +21,13 @@
2121
2222mkDerivation rec {
2323 pname = "ovito";
24− version = "3.6.0";
24+ version = "3.7.1";
2525
2626 src = fetchFromGitLab {
2727 owner = "stuko";
2828 repo = "ovito";
2929 rev = "v${version}";
30− sha256 = "sha256-yQ8gSe/QM1RRNxk4bDJ+K5QX0eYjZ+iG3QOHj01tJhY=";
30+ sha256 = "sha256-6b/yqfrpeZ6i6DoPe3lcftvuzwvK7rfZhgyHc9GtyBs=";
3131 };
3232
3333 nativeBuildInputs = [
pkgs/applications/graphics/sane/backends/brscan4/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
1+{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }:
22let
33 myPatchElf = file: with lib; ''
44 patchelf --set-interpreter \
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 tar xfvz data.tar.gz
2929 '';
3030
31− nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
31+ nativeBuildInputs = [ makeWrapper patchelf udevRules ];
3232 buildInputs = [ libusb-compat-0_1 ];
3333 dontBuild = true;
3434
pkgs/applications/graphics/sane/backends/brscan5/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb1, avahi-compat, glib, libredirect, nixosTests }:
1+{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
22let
33 myPatchElf = file: with lib; ''
44 patchelf --set-interpreter \
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 tar xfv data.tar.xz
2828 '';
2929
30− nativeBuildInputs = [ makeWrapper patchelf coreutils ];
30+ nativeBuildInputs = [ makeWrapper patchelf ];
3131 buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ];
3232 dontBuild = true;
3333
pkgs/applications/graphics/tesseract/default.nix+6
@@ -3,6 +3,7 @@
33let
44 base3 = callPackage ./tesseract3.nix {};
55 base4 = callPackage ./tesseract4.nix {};
6+ base5 = callPackage ./tesseract5.nix {};
67 languages = callPackage ./languages.nix {};
78in
89{
@@ -15,4 +16,9 @@ in
1516 tesseractBase = base4;
1617 languages = languages.v4;
1718 });
19+
20+ tesseract5 = lowPrio (callPackage ./wrapper.nix {
21+ tesseractBase = base5;
22+ languages = languages.v4;
23+ });
1824}
pkgs/applications/graphics/tesseract/fetch-language-hashes+2−2
@@ -25,11 +25,11 @@ else
2525 >&2 echo "Invalid tessdataRev: $tessdataRev"
2626 exit 1
2727 })
28− langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/]+?(?=\.traineddata)" | sort))
28+ langCodes=$(echo $(echo "$repoPage" | grep -ohP "(?<=/)[^/ ]+?(?=\.traineddata)" | sort -u))
2929fi
3030
3131for lang in $langCodes; do
3232 url=https://github.com/tesseract-ocr/tessdata/raw/$tessdataRev/$lang.traineddata
33− hash=$(nix-prefetch-url $url 2>/dev/null)
33+ hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url $url 2>/dev/null))
3434 echo "$lang = \"$hash\";"
3535done
pkgs/applications/graphics/tesseract/languages.nix+245−245
@@ -7,12 +7,12 @@ rec {
77 owner = "tesseract-ocr";
88 repo = "tessdata";
99 rev = tessdataRev;
10− sha256 = tessdata;
10+ hash = tessdata;
1111 };
1212
13− languageFile = lang: sha256: fetchurl {
13+ languageFile = lang: hash: fetchurl {
1414 url = "https://github.com/tesseract-ocr/tessdata/raw/${tessdataRev}/${lang}.traineddata";
15− inherit sha256;
15+ inherit hash;
1616 };
1717 in
1818 {
@@ -32,258 +32,258 @@ rec {
3232
3333 v3 = makeLanguages {
3434 tessdataRev = "3cf1e2df1fe1d1da29295c9ef0983796c7958b7d";
35− tessdata = "1v4b63v5nzcxr2y3635r19l7lj5smjmc9vfk0wmxlryxncb4vpg7";
36− all = "0yj6h9n6h0kzzcqsn3z87vsi8pa60szp0yiayb0znd0v9my0dqhn";
35+ tessdata = "sha256-591NFrPdZ9orB9PtxKqsukh6aAq5DDO8yJ19W/Ywi+w=";
36+ all = "sha256-FuIGfE0bNPvB8ip6cL8GRl0U9T7oD6sx+38CaGyCRno=";
3737
3838 # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
3939 languages = {
40− afr = "15dsnzy4i9ai26ilm73gkfj4ck039raa88i6w443c4b1fnay2akf";
41− amh = "1wbcsdq3svxga3j1alk61xs72a9fhsfsyjxhp3cwxfaqfhrzg7h4";
42− ara = "0nk495gki6jbbnwcl2ybsx4nd02d6qykcjncq0d2g8pbgapqmj91";
43− asm = "0c3wq15yphq7x74s2sn3f90k6z1cf5j7ic62z0dynidrv99bddfh";
44− aze = "0pz073hxqkx1a1cshlgg5k11lj73s52sdxa7k3020drc314lhaxw";
45− aze_cyrl = "0djbfgx28ykcjsn2p0766qrmj256g7vhc7valc3ivsva8b906lxq";
46− bel = "04zqy8vik0fcakq6apfp8wjhkkhlg0yn9kmag1lk7s8fy9ax3ws2";
47− ben = "0q7812kn5xjm47hcgdcg911lhbgqr7hbvqckfxxm8qw0yjx2cy0m";
48− bod = "0rwq7539zzfs8xs0bf1535z1cwkm0yk1ni25f5gjav7nm6qpiaan";
49− bos = "1qr04dj7lx347gxpin5nfprbggmxq2mwx8kf3pcc3vb5x3pa57g4";
50− bul = "0cyyqgi3i4y9bfzwls0lwljzgd0r8ayfqb4bbvdh4qmbni9x42ya";
51− cat = "0kgw8f5pdw9lfbn6cfp5n1s0j8pj3418yx6rsbagzcf1gr36gbr9";
52− ceb = "1g1n4np4vhar7wfwx2km5k6kldb600rrl7npfbf75229rar068f1";
53− ces = "0zxkkyhpd74i6321nv86pkjb0k7p9cp6m174rbn42nl7jz6qxib0";
54− chi_sim = "0k250xr0gk9yh22yqxd0zpxdsrqfzs164kdv5n9rxx1g996yffij";
55− chi_tra = "03nxqpd546p0gwfj6pqzbdbv5zjpdddzlpa10xn4nvmks1mmckbp";
56− chr = "1k1sg3hap0kd5aa36ysvmhp7r3fynxf0f7lzz814h6p3g250zclb";
57− cym = "0d6wbf9cmrrzf66mhcckwdfy3xh2i38r0by9nk6isw9rl7bf7j07";
58− dan = "1s1yj56rpzmif3ir3qs4iab744cgpflk7y8812z2665bh61illpr";
59− dan_frak = "1bxi53ymib5g0139vfd2pflh7nl5925vqznq3sfgaqx7gdx630vi";
60− deu = "0fna7fqk1a8ivd7q2k38vx37qm3vbn183zh4z5zfqb4pgqmb8znb";
61− deu_frak = "1y4krkvarg7jxhcq49fgybg4phbn58y9c0z2bm8mnp28jkih1cnb";
62− dzo = "1fcz0imi7zxi99762pxfcm5iz2jcbqj3s742magka4ihrxnz07xm";
63− ell = "0r0f71jy4y29bg055qvvy93wchi3lh08zz0k9c8l7466b03yvq5v";
64− eng = "0vghah8kqcv0n5fnjb88w6siz156ysrc41fckw3f2y8c3sgmqlf0";
65− enm = "10y61xv3w1ypgqz5rgb22y5hh1i4zx03cwiqw21ifqvg4xdrln46";
66− epo = "1y5lh55mbcx33cm7qlf1dcah8ffycxmlcpzjzx9r6ij14fdd4964";
67− equ = "1nqrd0a9jqqh6byy8snfhad1hisrc92dcx44wsy7v4nf40j3mx1s";
68− est = "12ll8lq1hjcsq9hh93020w78r7f1rcxcwlvrjqw8j5p3k9jg5a4g";
69− eus = "034s9mp7lw1a4yvf2cmbbj2fbqbaq6xnjqh30yn0wq0c0jck96nw";
70− fas = "0m61p4byc0kzf75cdn6g18s8hcg9r8ifs34wr85lbsb65kil4ijx";
71− fin = "1wac333k0lcd5jwprzg99b10bq8sdc96b9d6275kg9imyqjwcc7q";
72− fra = "1ax7i0nw1lwkz4sbrvn4z0lcrcai77ymdpla7qk7yij6s4xb5bw6";
73− frk = "16nmr71p93724vk1x5mq4r8vxpwnm448p6dwqv8scg8asch1cidp";
74− frm = "00yz3hz7wcralq8wbx1ap4c6b37ac6vnz5bgmxmgdx0kqzibiddn";
75− gle = "1n8z8kmn5m628rlzgz5v0iw6h46aalflq5asa1wj5rygx1y2azpa";
76− glg = "0fdniayplc3iwmlmvhblarh1gm97dp8rqhhkb8b0clwfd9cj342z";
77− grc = "04r2193qcxqyab5998xn8bf7197wiccmjm7iakij8d0c7l61dnxb";
78− guj = "0dp8mlxmf0x9wb8dg0c508sdwz03icq94z8ji8jhwgdqgv8hw1al";
79− hat = "0793mmlxbb09c8103jhdvlczz647nyn4ykkgd3gwgavncmjh72v8";
80− heb = "16za9ff1i3ya6hz75l9v3v7j4039kscxxw21g3i2w5p9zn52hyag";
81− hin = "1vnn5wpc724kgib8jbx0kpnnp4al60ivqir72gnbyh6cpnflb6bf";
82− hrv = "15rqd6xiv2bdmalb5s6rxvw0yk6w9agn9fli3bvi703q6vpj2yn3";
83− hun = "19zzwdxwi3h3vdsgr271i1m87gfpdirk6b1ljw2j8qmfilp4sw56";
84− iku = "1v1yvc1194qycjgb4ihh5hpj6472nlbp66dii183514g2dh9x0db";
85− ind = "120d4b41wvsgcd1sgy2mp78i9hvi7w03a63078dz1yds0yqdwf1p";
86− isl = "003ngk8dfv6dglkq8pmi6jsglrfkc65js5ywh3vvkg7qfqf6qsxz";
87− ita = "1lxklk3zc3x3k8yfpp6ygyv7fndgs57dfasc97rh8782ds16wkjs";
88− ita_old = "188gby1y51pa1ycyc8y17d16hs5w27yl5ch7xzni98bdjkwbkl1z";
89− jav = "1fjyjznjchls5ifbnx2b9xagisgxvgj9lsf39rr9d87sbzdbbwbp";
90− jpn = "1wmayj8wh3pfwznjhalad2qzv38mhrzw2sxl71mycvzvpdy9ag1w";
91− kan = "0hak4953whw9vd9dzl0hq076kzb19kk45kmfxk03af4k6gb206vg";
92− kat = "16k0057cvvdc6snm5svhdv3cr7cw71g74yy8215njjbsi838imi3";
93− kat_old = "02gl755d38plyvzwfjqxvjgfqkbjs9rvzx33qfhm2zvmgbwrfrfh";
94− kaz = "0hc36w7zz5waycsk220v0r83sg991gd5f5r937mvz44viql80sgm";
95− khm = "1gb2nv5qdq5fz9w9xq4fj68p46b62sd1m986ra5qbnskxqizr12s";
96− kir = "1b1ing6qqi8qqfh4xpk76rp4gxp69wdjdl5m777ayx3v02d7nhh3";
97− kor = "1rldj6f8h1nn5wpx57b0ci7p0fnivnwzgaf0d3576xls26z2wcgv";
98− kur = "1cp2pfd6g662gvxi7ywkxfbfq1lwbis888bf1gg8ynzy342mx1ic";
99− lao = "03bdaxakmxpbbr9vsnbzzfksvm6js0l5i0ijwl71piqyxqjj1gxf";
100− lat = "1q7v7drnwpna9k2l79jbdlxiv1j617rqzjc9d48h3lfrma5z97sj";
101− lav = "0fxzyvw7n67rmw2irvlghkf1bii4w47200zv26p0v3a9dwvhc7sg";
102− lit = "0f00ggjjqrl94kwwjmjqwajyfprsml0br8vhn2gvn11gaxvm52hm";
103− mal = "1i83plhin3m6sq8p92vzlyng5z59gvvqypyh7rnmvdmm9rranx8a";
104− mar = "0ay7q53yl3709crvn5l9c9jx7hw6m5d3x2crmvnvczsh83ayfdik";
105− mkd = "1q1wadcr4j1dzssyyqz43qmizc6vfqkbivr6xi2p7p4h9rl11x73";
106− mlt = "1qp4v6habak1l7xrw322wglvjjndrfp4j7bj8d4npwbzk1sh4s0h";
107− msa = "048p6mkx9zr40s9s5vbi0gnizhvqwn0g8i1hf1l8db7igbax5xyj";
108− mya = "17nyr5bd42kzvid3421n3mwckd49vzrjhjahd8rnfsmbsy1x382l";
109− nep = "154375r32sdmvcnp1ckvgbp3wxvb2xiiypb8bxbsvrabrz4wzjqc";
110− nld = "1clwbky71zkz55zd3f8r9hj8fhpnbkply80p1js4fvs7x12r715x";
111− nor = "1ynvrz6s0vmlq1xkjd8k2w6bx8770x6v29qgx83d4nl17ngjd459";
112− ori = "0dsakc8gnwhs6z5kxc2wdkbn31gkkiqk5vriw0swghychp164aac";
113− osd = "1zq0dfliavglmix7zzrqdxz1w01rm1f1x1352bqn8xf4zivdbxcw";
114− pan = "1fwdpwkydfmr6drwgkqzn89z12r2rdm02a75vvdxhxg2a9yiwmbv";
115− pol = "155z870ygzws476kp7qpzi8jcjcv3jb5px8rbzhnag1fklqr48hx";
116− por = "1814cff2rffpzlg4hyyrjzpf5ps2i95rmpa4c8ikblbvrlcv97q8";
117− pus = "1iz5nn1zfvn1l9gb1jriwx991d2hwwc7x4k1nvzjlwpzscplx25b";
118− ron = "11lr80zhvnnngvwwk01z1d3prfpbh3qbwpl1nl5fp7h09d6n3wzl";
119− rus = "1d6a8lg4bmd3np16jds1py3qpkaq4ahnhwghd5r0159y0jpxq00q";
120− san = "169f4ajgwn99yfdfrlwfvdgvv1abal7fpdp31sknvq8l7w2sak3g";
121− sin = "1411g18r6f6j6f4n0sn7ajgs4gkplb892s6ak0hi9nyyxwv3r1gm";
122− slk = "0bxfbrg1nf6px0xzkh6ihdi71fmr1rxxs99qb191k7pm16x2lpds";
123− slk_frak = "0zyqnn1y5cyx1y7wzgw743k4584ljl0rhvk2q1ni6jnjx9ciwzqy";
124− slv = "1kjn9m9hbwp0m0p2v8c3skpzr6f8x42hz8x48zl22550a7hq8n1h";
125− spa = "1npgl8ylvfm60hd4214z8a3lriy1hckhijschrbjpzmwdfcqafgj";
126− spa_old = "0w4ivkv8flyn7bjlyjcrcrdnslkvrrfs7l33mvird1jhhkyqd8sx";
127− sqi = "15wzvh6qm3yx7yf0k5j7g1imsaqxvq7r2xh6a0xgmkqbyypbbkdf";
128− srp = "05blqriv30x02c80ds3x7zhw0y21nc6lkqlv5jwgwnjgw4yfpgrm";
129− srp_latn = "0ss8s3q60aq8sd2a3sbnzvp13qqarxnjw4hij8hd9ab5gsjw0nwr";
130− swa = "1pwwhx7ldq21cv06cchws8gvwsmkwn5sjcy9z3nk3nbp9qjsf44f";
131− swe = "0l10iyn2cr7ibgk0akmpg8725mpwpydawgv3s77izsw7y6xhfr1a";
132− syr = "08bxil13wyp5h4hvbxjcys7ypgqgg46rrp653m7gyv5q94ycjgb0";
133− tam = "1g155kyba2wjfgzgy48g6yd2csinwbfjdi5r7vw0wm3dh1z39dvz";
134− tel = "0fydrcb54b6mmqazb337x4s36i2a64sb4xm7y7g3nqqmk9afsipv";
135− tgk = "0f6j37friywj7y132fv0jm6aj4sx8f0b7brspj3pbjqqpi4v5ws0";
136− tgl = "0f1r0gicif57qhyw8xaa1sqgny720q3z5cpd5srrn9i6fihaz577";
137− tha = "1y2hw55jfpidk95y8qbsiczgg2r2khabac97s1y3gl0v93a44jna";
138− tir = "1y7iryhjr83ca4yh5jjz7qlnrx4kbrp0a0p650whjvk2gnv8m98h";
139− tur = "0xqnq99b2jb4v74bj95py6wmg14dm31zp5s3l48dmcv6zdgcxg2w";
140− uig = "1sdddr15zlb33kd1d7hzi5lfd15bfhqn105d7x6snfpqp7vq4bxv";
141− ukr = "0cdwjnfnnmzz7jdn49l96vqgaimclfxcxaw09cm63f5my382r2rg";
142− urd = "10xcn1zs2lfswp5yai0ckyg7js587qhr5cf7qib3i35qjbw7nc18";
143− uzb = "1jkkd5j6vsx5jv5gwprbfwg1vwh714prm8j446wzvp74brmk949l";
144− uzb_cyrl = "1kdia38rgm2qd3ly80a412jyagxxryr09h1nz2d0iw71bmfn4855";
145− vie = "1ja18jxxaw282y4jljxpjf1gj15il61vc2ykpfy22vn88wvydxff";
146− yid = "1jddd0g8mm5v00z5kb8rbpfs7ppzgq9kzm1xlhhvv960yfdbi6fd";
40+ afr = "sha256-birhlXVhETYI4SYipFROA0xGpJtvnEqjEVGlSPy3upU=";
41+ amh = "sha256-BJ73M3RYuc7ZuLBLr52GLilxdA9mUhXkUK9vPXDTbPE=";
42+ ara = "sha256-IcmKr3rroicawMxKNj02TYBmSdfLC8q4XUuaOF9JZFo=";
43+ asm = "sha256-0LW2Utq5Resb+MKweGRxLHwzQXLDaqHJ6QfD60vAfDA=";
44+ aze = "sha256-vCtISRgsNyDAmEf1pkXR40gawizvUahZUKFP3OE44F8=";
45+ aze_cyrl = "sha256-uFMD0kJq6x0Ho2ofBvd5pghZMzbmgCuslmx6JPpzSzY=";
46+ bel = "sha256-QvPRVfIO6TNpeKrOZD14FM4JJUfXXWXwVMyBGTfy+BM=";
47+ ben = "sha256-FXgmuvSAY1R7d5PhveDJ+C1IQ0iPtcfgIVX2YqcI6GA=";
48+ bod = "sha256-Vql4san2bCVfcUVEG6YHdXIWfhkluAV0R9r9n0Y5mGc=";
49+ bos = "sha256-5J2i7uhl7cHYHW6izqvAvb638nW22Hj7O2R0emQjIOM=";
50+ bul = "sha256-ygvSU7SrYgLbXoss7LxCGbT3JeUUaMq/W8mTOOLD3jM=";
51+ cat = "sha256-Ka9nRn7Bsf/U0tl0jwIZ8iIJdLDlOmbscjTxdotD/E0=";
52+ ceb = "sha256-wSEDsspJiHLcctcemjMAZjU6zSx1is4dP1nBTa4lNrw=";
53+ ces = "sha256-YMWOzZeHWkHsyuSEai5L90yw5LwGbRvEMJGcdqGfs38=";
54+ chi_sim = "sha256-MjrnTUov9J6TLbtNYoL+Dmfd+v2gdeyFgD7NB3IHRUw=";
55+ chi_tra = "sha256-d01Wa9CzbktsB0Fd+ltrV/6yV1sfXyMdf+AaUtrF3Q4=";
56+ chr = "sha256-i7IPinjjGkgC+p8eB1y33o18LqxbezOUKm2Cq+B4Osw=";
57+ cym = "sha256-B8jj1qE5cR3NtMkvkNGIAvbhXeOTMViNcT/nypJb3DQ=";
58+ dan = "sha256-+VIag4GrGCO+CAj5M6m7jxFylopE45HjcLH+m02RPug=";
59+ dan_frak = "sha256-cYNhenunY/WcHth+vItIhdoDqbuiuZ1GAK+sWP0osa8=";
60+ deu = "sha256-y360Kn6XLOx++QT+gYJde1R8Rt9oTIFP2xGpMLE7yjo=";
61+ deu_frak = "sha256-y7IA45RIXFtRXeIDljwqdsFL3vLPJYIZ7PK8rPbMk/g=";
62+ dzo = "sha256-tR/wbc8wEjWfqoIcPSReTIofS2WuX2FOSrH/E2sEn7k=";
63+ ell = "sha256-u+DtB1jGkEMRSxP8jwCkI0LGR/J741LAW0l44mU4DmQ=";
64+ eng = "sha256-wFFcnx4MeeEGn8wFwrL2poQfteEILWldsWAzPBFU8G0=";
65+ enm = "sha256-hliaWydvYxeD4DhyNkD/JAYIixdivVw+ftcHPnYPxoM=";
66+ epo = "sha256-xCTSmiNBRpNT//JfRmtn3jkEFWvBUXwqG6OzVUuBtPg=";
67+ equ = "sha256-OvQ6JCDOkn285oR01kRiWUcYmoLOauT9MhBjmRRoGds=";
68+ est = "sha256-j6jyZJrjFok4lnlTzjrLwZ2MDgcCjARhwppJGDBFlIo=";
69+ eus = "sha256-3Jo0mQQMYA6sBwNiabvBauHlhFyrMuG2Jypwem5Nmgw=";
70+ fas = "sha256-XUZC4yxm6UULypwM7SLK6TGINArP2MbKcX8C5he5wVQ=";
71+ fin = "sha256-+DDGJfY1pjfLEaalZRJrGuEFwkrp/Xy5LI1RMMcYTPE=";
72+ fra = "sha256-hq+yOtFGRn8mPoreVv05UbHMKPjE7rw0+ZPTwC2Ip6s=";
73+ frk = "sha256-t0UWINMKPabRxryZiwiplt++USa4lh7mJuKMdMPJ1Zo=";
74+ frm = "sha256-trW44scT9PZqr2+Vb7dh6oxlGLkq9MURpiozfj4c3wM=";
75+ gle = "sha256-6n4lfOjP5yJ5UFoVTB1VyhBoeAS7/PdpRsLUYutEH9k=";
76+ glg = "sha256-X5AhWWqOUwYWWhNCnNFtJ9UXYFZ0wV1p5XEwer2Ktjk=";
77+ grc = "sha256-q9sWDD0MNCTjVPFUWRmL/KRw3EK2o5TKUh53hkcKIhM=";
78+ guj = "sha256-VAUO0X64PQ4lihJ9kjCLA3zeNAKFgdfQ4qkDVzut6DY=";
79+ hat = "sha256-aIsDZWV2q8ffaG9OT6y3h5j/Gd0NygECYgms1WmtIx0=";
80+ heb = "sha256-T3koiv3pFi7ieEHw3pmeaQAizx470XI+NMqPGJxL6ps=";
81+ hin = "sha256-bplFnb3MQL/sEydHvCMwVJFr7Z2gL4lWfJOIwy4v1u4=";
82+ hrv = "sha256-w3oh7zZ4gBP3GpG6ZJ9K3EwP+O7Z6LKoqm2JHbtpOJc=";
83+ hun = "sha256-pnBNLo2uYiQFlzQsM3Ns172DaojhiPx02wOOyHvj/6c=";
84+ iku = "sha256-q4GeYBOPhDJQiLEZcxe14hAjLywQRrKeZB6TFALbPuw=";
85+ ind = "sha256-NzjesAe6+fAbOmAYNQA/ccMU0blV+KdDY09vHsgiDYg=";
86+ isl = "sha256-v2tsHHb4vLn3gNwXLYth02X6tDSxXoQnfc1s19B8dgA=";
87+ ita = "sha256-Wk5ugm4CHQTzSUwr107Rr1l3tn/e3Os8mqMP9seks9M=";
88+ ita_old = "sha256-P9C5+JRtoRTt7weyQv0RvGhoQjvBI+aZD+qG4oNfD6E=";
89+ jav = "sha256-d/G12l/6oJZyTsNpmuTb/en4VE9LdLtcLJpCJu2XXro=";
90+ jpn = "sha256-PDyVfLv7b+ZrOLRrwX+GFY39sWiKKijt5+4OyJH0qvI=";
91+ kan = "sha256-bxsg1jOTODXA7K7OQuZMYf1pDsAQ0N9S24lDPkoiU0E=";
92+ kat = "sha256-I9aIBop6SWlLEMh7cl44nJ3Mxm5w61KtNqztzU4BYJo=";
93+ kat_old = "sha256-0GWX+Xp1f1Ghw2P0v3PSck3sntwdS8f/9vSi0Uo59Ak=";
94+ kaz = "sha256-9WmAKI6bkL/rGSkXV9oLKT09UAYbCDE184qX/w83g0E=";
95+ khm = "sha256-WoT8I+5T24WLygalGpoWZhlykZGO4J54+q7ghsu2Yr0=";
96+ kir = "sha256-A0J7mgB7dK/OObXQJhtP5vZHbjZn3k6gwxhFjM2zMaw=";
97+ kor = "sha256-+zEuvhGadnPKaMCp97nd0TpwT2RgndIvL9YGiJyRjeY=";
98+ kur = "sha256-LIZeBRn+W4/eC24hhHRcnAbsluuT+xP7fsKYZ5q74rI=";
99+ lao = "sha256-rr8gJe4exxsO5TKCWCjQ0tStp/t/Wb1TXuv2OlVXbQ0=";
100+ lat = "sha256-Up/0i6rZ0QERaYnJj/MJRoYdO21LpkPFTMpebnM7++A=";
101+ lav = "sha256-Tx8GN29JjQ2uEfsDIA7hJMYV3ISP7hwFr/kYe/j2vzs=";
102+ lit = "sha256-FYpSd1cvBLufsHCjvACtOl/npeJYVsn5JIlmLOV7ADg=";
103+ mal = "sha256-CnWrck61tl1tPtBfj/d+qfzyrKd/i3QR1qYOGyG9A8U=";
104+ mar = "sha256-Mzbn1UBQf7btrpmJPlqphsPTZWKJFrszS+AM6kfBxys=";
105+ mkd = "sha256-4/QQaE6Q3HNF7CbvuCZ227AfKx7kY++1/i1IkllTPOA=";
106+ mlt = "sha256-EGgCdZh/8WtJQ3IdSa7LzUq56eNCDJ77oWGqpaDZ5OI=";
107+ msa = "sha256-0vfS1XrxrIZocDBE9IDleMMf7QNx7aKTBiT/1Gc1FxE=";
108+ mya = "sha256-VKDRg9eramczalBJKPPfibTJeB02CDJa3H8K0lbJ3p4=";
109+ nep = "sha256-DMvPyc9L5a1XX2hdH2MXa3c+7np7snAt27VpMXI5g5Q=";
110+ nld = "sha256-vYSTRehHb0e0DBcgT+9c9kKHJEwZudF+KX/+cPxcnLI=";
111+ nor = "sha256-qZAmnz2BWtIG6g8nsU0H56C+DBcTNTl7wLRuoM3P2/o=";
112+ ori = "sha256-TCliwoXMw8c14DHvMnGc84Vh12xcsD7LNxpy+xCbSjc=";
113+ osd = "sha256-nPXVdvzEdWTxEmWEHlyoOQAefm84/396rPRtFalrAP8=";
114+ pan = "sha256-e1UefVLiddjb3uUoAWrLIovwE7Ifz8dzM7m65ie/jbs=";
115+ pol = "sha256-HSKSMZ0uPGXhXxn1W5Ycm0kmUfwXnzvNIZr/58FBv5Q=";
116+ por = "sha256-CJ+0Gc170TUjYkTdmkuKQt/i7pfZe0ge/de5LJxjJKA=";
117+ pus = "sha256-q4hOL9P/cir/tmGSfhjnULSQUucxy7BeosFu94O15cc=";
118+ ron = "sha256-9PNhTUsAnusKtYFevvCA67p8Rws/gMn5ftbaDT9AmYY=";
119+ rus = "sha256-GADcrwQ+lQByafBxaKEiWM2Lh79BN2nCtaPVRR5FyrQ=";
120+ san = "sha256-b0ylBT8U4W2nDuO26w5VS4W9X9uO0+ya8ylZ/qQiLpk=";
121+ sin = "sha256-9YU8Nu/e2xQhmMpokdCidz6in1THamCJM9I4k1F4IZA=";
122+ slk = "sha256-ul0qugn1nhlSWDgl3XsOubpwYoPRwPk76Nc4G15eri8=";
123+ slk_frak = "sha256-Hn8eWerSShNtwGJumAGVlKBC5iCHv8+PD92z4oO12H8=";
124+ slv = "sha256-MFiE4VGgFCHoR6SjDwXpyJn879SDoS0uqODyBVNNVs4=";
125+ spa = "sha256-8jmFmWu8/itXhkzLCCeDwcdMh0KfBEEaBKa6TT2i79o=";
126+ spa_old = "sha256-XaOG/YRQhpbjrmPQo13Oe1JtW2aZSU/lOtZTh/bckXA=";
127+ sqi = "sha256-rs21rvcLz/o6UAZ2kQ/eHStdY3hHlgmcP92Pig3cn5c=";
128+ srp = "sha256-Nb/rPOFPWv64LJviSQ2zQXjA4T996AYQE6CDsWPGdBU=";
129+ srp_latn = "sha256-mVvApX5lqdQgkhESLm3PCuMR7v526aFE0wgrYPDQSGs=";
130+ swa = "sha256-jhCnJU532THt+MkzqYvls2q+H9IcMmbAZkHgRk+HnN8=";
131+ swe = "sha256-KmQHu/GH6x/P0WM/rpq//NYiDnq3TgXmW/FkJqyPIFA=";
132+ syr = "sha256-YD3JPEm4bP9OHcXcnA15D7/rj/ZM9rUhgeV6PgKNfSE=";
133+ tam = "sha256-f7c0foBtVA74PrnEJt3iNmommjcPEf/+c5ILtfwsJbw=";
134+ tel = "sha256-+0btVJoVYzve8ad2sjQxSkQzNOlnjPUVrtUsUhbLzTs=";
135+ tgk = "sha256-QPOySbwYy3WHvDqvs4BDXROpTJVgOzGCP5L7mN0Z0jg=";
136+ tgl = "sha256-55SvYHQmJpuzLu2y8gcG4nj7sA5KdcQ9xKe4yOIDOTg=";
137+ tha = "sha256-ykpC1Egb0Dd80CcxtRScIov3Pot6YeRLmi1eJ0vhUPg=";
138+ tir = "sha256-EKWKtn1ibgk5KOYCBW5ek/RsKT5fygI9UWygLKHP8fg=";
139+ tur = "sha256-XLzOXvtms9oQoUOX+8OojYRXufG3JLnI2WRJsVLCFnc=";
140+ uig = "sha256-uy+C97n4OqtNP62AYDF0q4TmaIkfnhbaHGPRX0Jurek=";
141+ ukr = "sha256-L4ss0PC1uGEqS4CrzrqjrEb18DaJJmKbPP9Xa52VvDE=";
142+ urd = "sha256-KDB7+JK4jDhWxMexkiE+qGh5np8MROXL5dpRoX+wrIM=";
143+ uzb = "sha256-NJE0a17k3P25IUSimi8JB/IdHncrX/7KlqXrbWRpc8o=";
144+ uzb_cyrl = "sha256-pSBiXV3h8Aia+DbABLLPvT/lpQhEAeTpaFjUl9FQsc0=";
145+ vie = "sha256-zvXmN0fIbiG8u9MLtoOhsQT5gpO3SyqJF0hw1btEQck=";
146+ yid = "sha256-zZm4mvPApL0hpD3UPxN+/96j3V0ZrVk+ALvUih5orck=";
147+
147148 };
148149 };
149150
150151 v4 = makeLanguages {
151− tessdataRev = "4.0.0";
152− tessdata = "1chw1ya5zf8aaj2ixr9x013x7vwwwjjmx6f2ag0d6i14lypygy28";
153− all = "0dqgkp369rcvq72yhgnzj1pj8yrv7kqzc7y6sqs7nzcq7l5qazlg";
152+ tessdataRev = "4.1.0";
153+ tessdata = "sha256-70bp4prs1zUbSzQmcqd7v736cyYWv8oNNbmZXypik5I=";
154+ all = "sha256-hk+DjoVWf7RW9S+Gu9XUX8aWYYsL5dU5c6jLSKJp+MY=";
154155
155156 # Run `./fetch-language-hashes <tessdataRev>` to generate these hashes
156157 languages = {
157− afr = "1a9f8pnrspfmcq9gpjnxn2kkhjlsmh912bnpx671fjizxpmiri2y";
158− amh = "0m1vdyxjx57kmf2qra0p31k509y1cqn4pyckzw00i5n3wx11d2j0";
159− ara = "0nswl6n0s94g900j5k1gwzp7m140c0yd9a2fdb2lzhdvg1krf190";
160− asm = "025d9vrjcrwyd6cc6hrw1x8xqhicgrb9wpvhhmlw71ql04dadslf";
161− aze = "01shcs78a6xn3my8p3y42x1c9f5hzfn83w2n2nwpffbgz4y2nsgf";
162− aze_cyrl = "1sbd89i5r7rnkjh2in8j0plrxnfiill9jl8pr68iw77ghih6q1vg";
163− bel = "0dhyymsxcyzwal8474q7ag3m2akv0b92hkdz7rka5z1cxry1cn8c";
164− ben = "0a7q9414k3frn37x2qcglz722ysg2iivj6kqaaa0ik7z14ibc8v0";
165− bod = "0rh7x54nlh6ir6ldccj8hi7g8hwlp13r3fkljw8gndvhwmgfkkar";
166− bos = "1szym4n605hlx12a9vpz4jjs76jscajh22rgkqwbv4qdsl0gi3nd";
167− bre = "070f4c84iznblsw4jkwpzh9dss8nfb678160szm5r8dlv2yinrrk";
168− bul = "03bg2yw79lg8rl43y9288313jrfh0h69vl4s4cmlgbmnbx8pvxwj";
169− cat = "19xs691aj8yy2ff07c3gzm07zicd5ha0gmcjxjh9pknqf2gfy7qv";
170− ceb = "1896vn41hqc4anm6hjvrnn022i0p8pmhwsp5rv9w2cvr6738l79r";
171− ces = "0fh2g47msfr91285rnccxcmcshihm126sqy496s4vrr0vk8ix1nf";
172− chi_sim = "0qxkvbpm5l7gzsshnn72wfx473pprf5nmw8hd4i4x2qxnfddh1gw";
173− chi_sim_vert = "1f75pzvxbda82vxa2zb1z9b9f13sh81kzaw45vg5118ncsklj8w7";
174− chi_tra = "056vjws1fir1v5iv44pzykkxs5q1dbb2j8blhj47i53w1zf6g42m";
175− chi_tra_vert = "10c9cdycg1a5kwlgg60sh8yp07w2fl4whinpxfhlzrzs56allql4";
176− chr = "19qq8a6c27973djsc4xpcklis92r58x21fg4mz5azdyka5i1n46l";
177− cos = "0z9kx1hw8h5n00pcahxla808wya50wrkk8cz7x676pd93ibyrlyx";
178− cym = "13pk9cpf43xxqbz3blfz2av2yd1ma6ds6jbdiqw8anhhj7l9ch2d";
179− dan = "1jirmahxvyyswhhyzhinvcqaycz7m3ixchqrj3lgfcdi3anvabr2";
180− dan_frak = "17wcgdqxmbzn7qchnx5gsa05aj4wmhbwk43w173bl3wr6h5ylmh0";
181− deu = "194rqsg4nlycca9bg2fqf15xgcl110rxp182l7dbjfjhar4knsw9";
182− deu_frak = "12hhhp32f15c7fw2jp05mwim9ps14kmamhh6vmalvm7r2033vbm7";
183− div = "09mm9r5hxhsc4qpyg10ym9mc2kdpawx8zk0aiv1xpgd35rzpyz41";
184− dzo = "1zk7crgcazgqy5zmslp6iw4jws07nja31qdxx0rpzhn3c0bjgw1b";
185− ell = "1hhym18a9411953j47xjk47jx9ij9xi2qwlx05c93zl41528nsqg";
186− eng = "0iy07z182lwhqfa0q288ha691scpsry330aynaizn68wcmywk86s";
187− enm = "1dhr1qvil38bil43wk5ci645sbm3my2y9y7qlcbnwz2p4pflayvm";
188− epo = "1jig4db7050vww32vxsqyig3j1b0vgz9ipxbsw0jpkjia84k44n9";
189− equ = "02qwg6s1z7pynwm0p6dvpwi04ivfkr1s7qgssbla1dx7v0ih6rlg";
190− est = "1jxygahy6by7fbirbmjmd68k6560q1a3h5mvpzdx15h5fw0q58gl";
191− eus = "0cai7nm7si8680avrrls8bf9ski980rvsj560fh9y6n9rz7mh9mp";
192− fao = "1n3434jf18bzakbylzyg3jaw2ad4h376g56dsql32bgh2yvyww8a";
193− fas = "17wjkfka9725rz32clgqgk9msmbz4axs59vz30jmhhxyrkliafqb";
194− fil = "0p713k8g27df9z384ns111xqxii5kq20m8brflsmd3yckw1mibhz";
195− fin = "1wc3y9nnm7rb2c2c5fkj7cv7jb27jlkb2bh0g8kaz57h6imfmb2g";
196− fra = "04qrfvi6irlaahh1pgn5azyfhbhavm12yyybza8603alf8firh7a";
197− frk = "05cqmxxxjqdl5hjyzi6dpmixnjpd6f3jr6741yapdmnxvkzxkiyp";
198− frm = "0a86yy6hd0lvlbzvnzjmyapzc0rn7mnkdadqycd65bw1b714cvy2";
199− fry = "0i84r8g9hlkr9nlhypl4lq6ncrhbcpskqkdcijgk88c2fdknh57h";
200− gla = "17idyhb505waz9dnb8dsk54faw7y0xvvb12yw71k0skq3i90akar";
201− gle = "1q87h5zzcva54pg364d3hl6q9hdlydlyj1qmq8n5k7hqk11msxmk";
202− glg = "01xssz1rhpy3a0sm4i43nba61wc2srz6wv327vdw1kg8ijm0s0g4";
203− grc = "00x0s3smx4wg5h12y2b9al0j2jk1y3f0yy2x6f2qf7ps831drgyl";
204− guj = "028v4fgn0zi2044vk6j2rlqklc9i0kj22s52vhifmx1g02kz9154";
205− hat = "1bca516pr2cnyjlwycc7pr6gfmdjb8565hp06pw9nwpr20ry0hss";
206− heb = "1qfkffjh29b21frs0mv6llsrchixl5kjkpj1if7fq816g9mym9kx";
207− hin = "1rkfam5c6qil2590lfffzndhq3bncdgf4ij0cyjcglgyljgx0xnc";
208− hrv = "0da7b6mk0rwc9zlbqkycwjpddp3qpy07l643i00ia5a1zq35fmgp";
209− hun = "0w2s4mn9p74zqzmp9hh2017zgsh5v43k4lid4pv29f4b0y5gj9xi";
210− hye = "0ifzm875wlbjh4vkpmj1n6f14m8i174413l6pc6i44y4p5fpgxrf";
211− iku = "19arnv82xbxhbcy8pf9fv1sl5zc5707mk34nh7w46dlz86qkidmn";
212− ind = "1d421hizwni4m6sr4f3nqqpr1g744hzn0krk130m7x8mhzgamba5";
213− isl = "1hjjw8k2r9qa990ziq5wxr36kyf16mnmrqfmq5vbcjprka9h08pq";
214− ita = "1qyrvlf7pjxzyb29sc7aq3gq61bww14sijka44scxggfw7134l3r";
215− ita_old = "1pf8461jbj0vpyry0b54crmkf2bk9mh4klxvmj09jvf0aq2vm9s6";
216− jav = "18vvbyimj0y462amjmwvqa6h9n8l122j9v0w3hfp63hlxpfprm0m";
217− jpn = "16hma9w32vdh41ihymp894jza72b0d235hwriv18r78j5n86nhbg";
218− jpn_vert = "0yca09l9sbpfjgb2slnpb9q7qd7vz3a1wb6bkln30d3nl0d9r1rn";
219− kan = "0lcmx37rjfxkbhhbrld1ndmkwkm9w9b3pzxhas0cv5dqsx2f84jd";
220− kat = "1b164bgwa7bbvw4177h8fxfh0fbh4bycfl9pkaa184dpjpaiqpia";
221− kat_old = "1mgff7sh93hdp3wh0ckikdggrdgf0syp75s39pickpbkp9ic41ai";
222− kaz = "0h37y0kb5lwsp5zpl7bvxg3ryqldl5hxfnardliwgyqgnag951vi";
223− khm = "0m7x1fynr18sid2kjjw8xa9ika0a0fc6a6hvc7ihizi47893hdfb";
224− kir = "09kxwqpqf6kxjii07qlqsiii83zk12rszp88xnzzjp8rjsnk78s3";
225− kor = "0nsr43fwrp9876ia1fc0zcviv2n8hw16n0wfh158vhygwglvy84m";
226− kor_vert = "1wmvdznmikk9fq7wdffvn22scxmcl26vjh26jhicqwxpc7kg4bh8";
227− kur = "0gbsf3ny3n5mgb30v54bz3crgnimdpg19jn633pbpzryzg3xhd25";
228− kur_ara = "1sbj0cczhi9q119fbzpi0m6zr9kjp3k76bv9w8szkv1wc5y4fng6";
229− lao = "1gvxlg8bw3a4c9izg3c2a2yl7q6rsy7z9y64axdw9a04pz2ndbl5";
230− lat = "0b7an3q3xrf9c55bhiqqh7l45ga88l0kwvkp1akmlr98piach3vr";
231− lav = "0fqsmy47cygamddxyjfrdgkfa9bvmrvf4csvppnkdvfzy6iiv0c2";
232− lit = "0wjgbkwc3bf5khdqali7ylnhhs4xvpx19m3zx2y9s27v2wjbb6kv";
233− ltz = "02zdxbniiqfl87fzsiaaqgldqfsv15z5hja1xhxnqpl0nds7shfc";
234− mal = "0a41ifz8i6lj2ywxjkwvymxzxahkz2cjv4apbrawdj1h42bn7frd";
235− mar = "00swhlh9bckvmlxanfmlw5j4n9qqhggl84bsq0827bmijsqwnl44";
236− mkd = "1bqfiwxlzfpz4fs4z5ci2wbv01qhrcayk1inmk3dxq7dsywx1ajg";
237− mlt = "1rmmga2aw88hr7q7cfr5cvhnsgnf1mi069d5k7z66zp4vzbl4zyz";
238− mon = "1jksvcavn9plsmjdmhg40mwq5rlvrd1b9gvghdjg7zkf6qqqynlh";
239− mri = "0jlfawx20s5clsnk82ndy3v2zidh4cfh4acrh8nindk21xmiwh5i";
240− msa = "0m7zs8anaa3l4z5f3xvbhs4syp41dp4all2yfpi1plyr0hy784an";
241− mya = "0hljm5haadlr4k5rhw4mvhkygcnrr709rvl7amz7av3nskmi8mb1";
242− nep = "1dhy0m2h6xfgwibf92iwxsn926dmrhfvkg9rafkdaqcr4pq6w563";
243− nld = "0bspf5bv1s7qzm6k4aqbpq91zvk4kxxhx5zv08w91xfsa1zpdxmi";
244− nor = "08majhc9m0fjvac50yq52ia2af9kscclimwkv403klnj4kgf8ndq";
245− oci = "1mzrw9gsdjrd1xj3zv7l5gzgjq5jrygxf8cfkz20d9lls0wj1xdv";
246− ori = "1sh42mjzb1hv6l6lljp3wifjmz7wrv818f9f16m8qjikwqxm0s78";
247− osd = "03mvfk1q1xp1klpf4bwna903rnp51bkqr3gl5hvxybvrc3l2m7z1";
248− pan = "0165kr94p6x5yxzs4p8sfppvg9cywp65ps0xaym5rqz9iashz32h";
249− pol = "0g0b71ms6ddgykmkna4mlavgzgmh9vj6s62fi8l4ja93nfpr37hp";
250− por = "132jbhzmcsq8skanm15bw2niyx9xpbrqr411wn7w9r5i3cvnlv01";
251− pus = "0iiglnkn478al11avigsav625pn7ifscycnxpj6fg8835vjww3xr";
252− que = "01vkmfi9idjwskv5pllmrxpil0v5h7f7rzv5viclxrzkmbvrz9b5";
253− ron = "0ag6vs0cn3sryavs1mfrallgdgi4h28114g7m61rhlhq0z484g0m";
254− rus = "1hippm3w5d73sh50r136x0xff2p6x128ry2x4fywf6xdpv1f46v8";
255− san = "1qlpqkr5c5wqcf1bvlipy72advqnvd4wm61vghmrj2sda8mx87sx";
256− sin = "097d2s4ma0zsq0ab5qs1ylgl9l5phw91fnpsvb7vjmz2mw3ic964";
257− slk = "0c97pp5iffhdzyma605x8q3rx1qq9pq2h6cai1kppaj92rz3ji9k";
258− slk_frak = "16ivsam1g18zlpw6pgidvzwb7h8rvw1s10nigs6yfwir8hjxsgki";
259− slv = "0644jlm55p0dg4zchgrashmbv36zb4x649ckmf2jkbss8bzx7wsf";
260− snd = "1i2mfi4414l3v9nznjy7959y2jcr8ymvf6w8zpyrw6nad4d1aak7";
261− spa = "15kwvr7cpcnlxm1ja1yyc022dmsd04gmk7h1p0df12aicsscn3qb";
262− spa_old = "1jq80c4mi3rmwnfhb3mbaaq0ci101mgbibkji9ala4l5dkcwjra3";
263− sqi = "19cvvixhz9906p4c9i2grpr386rbp5alp4fp14xm9nd81bmq4701";
264− srp = "1jd25n13h6vxsa3gzbj6q6mdh02rjl4qrd1bffr5psp33asqvw0l";
265− srp_latn = "1k7577mn3z0bm5ma9d8l14sn5wpvw50hq1nxwbc36yn3a5b3mhiz";
266− sun = "0lvlaw3jfvr7b5v09669kq8mm19jdsk9g5h09jsa2gr6fvsq11pa";
267− swa = "0qy9qc5pa1dzzqrh1z40gk845z1r4d2smywnzydknbb3n240lhz0";
268− swe = "1y56r7bgzw0pqkdylbah07r1f0v03sblkggiql8x5200rhaxvqi4";
269− syr = "1vfj5fsiv170jghryrxwyz0i9mdsaki1kglxrklkb2caal9kwy38";
270− tam = "0rhhdbnp0a2hpg00vpc0xyxcl2w36i1kn63mrvwx1f9q7m3y1fmf";
271− tat = "0a74rp8pyp4yivv2xcy2m8xgwch8scr3wmk1fzniwzf43fsrqp76";
272− tel = "0gcq8hxhxvilyh7x7kiikq07hllqysc8sfyr88gvpj4xi092h2bx";
273− tgk = "1458gk0k6gk49n8lr6fj7l7cwkhxn0lrhybzq10zl1ly7yzjhf67";
274− tgl = "12yscwckdy3l21mvsrj1021gxw2isjrg369r08rsf7lh96wn4wkn";
275− tha = "01f0j7gsc5slxaaql1gqbhk4wlwaxc29dlmfxwjzikxc46gjl0w8";
276− tir = "1q6w48b1jchv55713pq20inzjjdymh32fw8wxfaj1qi7bjqfb9fk";
277− ton = "06g60ga8rys8jaimqrvd4svh40qs1nz4bszdnf2hdv05ibryibdq";
278− tur = "0g9g1wvibp61qbriy8ys948yfkl88xk9g8f93bnq8w8dx029b6s8";
279− uig = "09sajx21lw3a3ph62dyqr10pjaq2mij10sdhkhvvjiydk34dn548";
280− ukr = "14q8ls8gkrg7c9pc6qzm6yf5ady3i3303vs1hz4d2idcl6yry334";
281− urd = "15vszhqraxqdcng1069p6i4xq3ck3904q207nkbap6dfpcpjig40";
282− uzb = "03hyw0vavmjirqs4wkd5r85g91w2avsyl14z624fhm3gc66pqg7n";
283− uzb_cyrl = "1433lrrp2lfgb1k0a4sc20b35b2jcl8f1z92vm2936y7w04xpaq7";
284− vie = "02k40d3wji74d1jgvkr3zrn9gpzlmp0lqhrrdmc48r2sgvnrnk8n";
285− yid = "0xnbvi04xv1qapqg72wa3bjwbw51pkdnyncjpjp37vn6dzh04l0z";
286− yor = "07w3aci52ng6i6nyp97q5zb2dqlj08w6im90y1h691qah1x44zlv";
158+ afr = "sha256-XsQc6+0/SheO6dcuERKsmko4p7DdyvsSZtVdne1FLqk=";
159+ amh = "sha256-QIoWQufDlggA/5P5SyxmwSdQZhgXqIyFq/OULrtvO1Q=";
160+ ara = "sha256-IAWXZ3i7wU/Fak6o1DxggIR67ucvzCIBSI8kDayhXFs=";
161+ asm = "sha256-juqmGgEUh8NphXBfnlZ+LELcUQ88Q8OYaZ5nJvNOrQg=";
162+ aze = "sha256-7mkrPPlvOXe5FVbwgaz7sLjEQhfEj4t8HbYbhY5mUAc=";
163+ aze_cyrl = "sha256-bwdsYITvHB6RyRdRmSiN0dme6QUS2SignDafXGJCbek=";
164+ bel = "sha256-DFkWfO4s/KJmPr9NKNICeypRx1MHk0MQVfx71nX1HjY=";
165+ ben = "sha256-YCO2Ign/zAiUUngauWMUT3shzqePYdHPsNmNSQJJ+Cg=";
166+ bod = "sha256-Wc3pXuVwN/sQl3S6kUe4lEP0ToRIMtaoydFAaknpB2Y=";
167+ bos = "sha256-zY74ANUNk704ni8LAaViWpqjpST/7qRE6BQWYCyp/us=";
168+ bre = "sha256-M2cbvdi0oVzq18AEdMxyFmndEvyXT0m4psv+SBAjDhw=";
169+ bul = "sha256-kvd9UV+2rkcrI5rQnQwE0GU5wkBIJD8IzejRdLgXbw0=";
170+ cat = "sha256-Gx/vnnDYzpug7JLVBxQsjcV/QP1vsAOcE94jqUIyuqc=";
171+ ceb = "sha256-OR2KxjF5M8HTzuVqDutFF0QhgLV5S2iqVYRhGIjdJqE=";
172+ ces = "sha256-zoYe0dwg5020ScRjbUSoMELNKuuM2VyQCCk7XQ95Ajo=";
173+ chi_sim = "sha256-/AXYmrMdi04iaRDxaovL945DuuPiWAu1/u/QUu/as2M=";
174+ chi_sim_vert = "sha256-hyNJp2YWhVDeLoSrPwOCegSXVvphfaH6Fki11fe/5bg=";
175+ chi_tra = "sha256-VZBn3A98lHiIhHQhKdZqARfd5/T/ErJj2SFHFzSX2xQ=";
176+ chi_tra_vert = "sha256-hGJKlSn650+h69dGyAl1gh9wPYIamPcon0WFx3xjiYE=";
177+ chr = "sha256-1BAbYlHTt6/Kr+S5IDoqWSQd6WS3E6ZlGycdwYxCGKc=";
178+ cos = "sha256-3dPsVxypXXNMP5+hOTMHRXmOAFK0Q8UuALZAxGHoM30=";
179+ cym = "sha256-TUCW6JEQWoU4jm1Jo5tRNTQvthLf0TX+wr0P4i5L844=";
180+ dan = "sha256-Ii+1rRqxMffokBlD1uOo5zOvMNs2wu8h5Nr73aGqOco=";
181+ dan_frak = "sha256-AFbqCzSZD7rGCXyQyResnEhVgNKvdAsZPvav2nF7jJ8=";
182+ deu = "sha256-iWs7SVZQOrnaoQKF2zMIgbLXS3DYibeSYsxTS57GmaQ=";
183+ deu_frak = "sha256-p649BhD51E1V3QbCquokQd9UI68FXCm4O6wEJ8aFEIo=";
184+ div = "sha256-gXx/fy6jvdvDjgrMjzpXt03BaqoehOcvJkzDDktOtSY=";
185+ dzo = "sha256-K/AnF2DDwn8z6L3hMJS0B2guCY/mUl1/8fh9xV5mZ/4=";
186+ ell = "sha256-D2uLRAmE/pFYAZ1yLGJPMqYuD5myHyJHSSGQpFCoHsI=";
187+ eng = "sha256-2qDJfWUcGfujsl6BMXzWl+mQjIIICQyUw5BTgcI/wEc=";
188+ enm = "sha256-dXtF3SVXfG4Xo/j45IWvoy5diImsTD4IjQsNGjcOGbY=";
189+ epo = "sha256-yRIyCVJRzisB16vfmP7bYAU5XvRY9y0G5xsUcFYjL8o=";
190+ equ = "sha256-j2YDI9int6Do0vrho0OebkcCIr+7mQsqt/6eH7R5HAs=";
191+ est = "sha256-9KGCAXcFltDbv7sWOFTAwBQzkWlV1pXjcscv46F6vss=";
192+ eus = "sha256-tyZYz8/JGp+gA6ZIvTNAKU6d3EKa5rwVQAZFfao9UTE=";
193+ fao = "sha256-CnHutxfwLTEo1s2UZ86ApCnBlRzPf+rXVH+h4CQZZNg=";
194+ fas = "sha256-CzsV6cy+Q1glGH+norsif1Vd03z4USbGz0WcpKabkp8=";
195+ fil = "sha256-H65YA5/Mj1Y1dXmhCgSeJcaOewhBW4LGT64d8dAc4Vw=";
196+ fin = "sha256-T6zqajTwlK8megAusSaVRyx5NjtyusIEEyufam3yg/E=";
197+ fra = "sha256-6sAcHXJUDWCQ+st7L0LdCi7o/FfFvhsgVIrmaOJ2GRM=";
198+ frk = "sha256-18fZ/9zd1naVD+SYLIcz7UrbY73NxO8lLLRh2XuvmBU=";
199+ frm = "sha256-wm9GwlmBr2Ia87ipNm09NgP2r/JVfrv/opuCBo33Bik=";
200+ fry = "sha256-8BRoZ3OCITSfjKxNPPVlC2ZmDaaEXg+pTXlSmB7KBEU=";
201+ gla = "sha256-WU0FUhx4ajDD4V6EtXcH/nDlSJm6oWVb+ooXUBb0LZ4=";
202+ gle = "sha256-s3ZdQ5gYnlkswhUH6WnztMGEDYWjETPeJUVt9n+BB+E=";
203+ glg = "sha256-5AENqozozcDbPmJsbn7WgvFg1LKDRFI1UMNfmMPXugc=";
204+ grc = "sha256-1L/cwkD6HoeFM114D9zwYUohAVVpCS8CLI+TXvXQoAM=";
205+ guj = "sha256-pIT0pwAv9Ooi3KJoIeQEMTE6Mc1CmrkJASJ+YJ8jGwk=";
206+ hat = "sha256-WkPgMxD5cpv4NeDCYgpaslX3TL6HMc+p9JaJfE0oiq0=";
207+ heb = "sha256-fabqa3omIOyOi0HeKWehPUKWNaVmV6CzC2IlAaVz0+E=";
208+ hin = "sha256-zHbQn6T+0cekZ0BG4l5jdg0Mm/3OOQpSETRiw0pVbuY=";
209+ hrv = "sha256-91VXBv5BFRUBiIMYeoC/eNzWruTMT7zoT4xnMKtZRzU=";
210+ hun = "sha256-sSf5igeLuCT2JS1SMgfZBer3TwACwnTrx5+cm2wlWnA=";
211+ hye = "sha256-Lvd3XbnEExINu4aOQMgJEVUSnLFB1js3gXJRXg6q30U=";
212+ iku = "sha256-trY4sUGfNkP4gZaMWQ84hf1CddguuYs8W7CvLtC2WaU=";
213+ ind = "sha256-Ra2q3ocV9VPBCDNPYD8k5LyQL8Z2OJK1qSRa/iMMgrQ=";
214+ isl = "sha256-+CIAk5r5SrZ2wdXhXG01wflpRu684PhBSgqnLCbiUsI=";
215+ ita = "sha256-T3R2xhExK+uPjhgoiNoI6mQtmCSuRALMYjX2GrFAZAY=";
216+ ita_old = "sha256-Rqe6BVbAbZmArLvTSWBNcwk3a2akLOCzvxvIJYMhyN0=";
217+ jav = "sha256-FdR83e0UDnMdHBzsJIUIFNkEjcKbV1mVMMQDWaNfe6M=";
218+ jpn = "sha256-b0FrkC0SnYzCjpnDMkQDSxz1JUnoVg9jILBtMXhSFZo=";
219+ jpn_vert = "sha256-NoecGqB2NDAsncssHtT4+zR8cFrXUi3Wk+4unWgCink=";
220+ kan = "sha256-TRLkRNe4lc2AVrD/O1biqU4+a7Oh0bwgXLM7mc/olVE=";
221+ kat = "sha256-Kl4c1ZW3ERSUmjdRx/wicDkAXXcInhMI32sdxd8iJqw=";
222+ kat_old = "sha256-UQXCYrpz3cniTUOXc70G7rX8XptxMgD5uA2OBPVx7tU=";
223+ kaz = "sha256-cYeSnrIP+8cjbVlZ12GhjWKfx+t7HXp/uZrTsibwZ0A=";
224+ khm = "sha256-yzU4Ejok/gjjYRsaZZgDCqgZk+qISzlFixqFbL0L/VQ=";
225+ kir = "sha256-Q6MzrZYZXfm/7Qjdr7MI8w8UY9SY4gNilH0ahy/mfSY=";
226+ kmr = "sha256-5llHfGE87Pk14mkvc+a4cqb8TQXx/uVSCDhF+BkDcuk=";
227+ kor = "sha256-lSC/6ePPw41KgI4DawKHyIodN/uAuaCiOSjdzN0gWVs=";
228+ kor_vert = "sha256-CC7y5mG3c8wilEZAuY2grHamhbDbucYPdmnOWO1vu/I=";
229+ lao = "sha256-ha5mxb8EqMRbV8T49I/X2eBDvVCCjfdjYkQNvtCjfb8=";
230+ lat = "sha256-eQ/IVLwoZVqnCnduPgFFSL1C6IEYR7hKYcnlPvCw6iw=";
231+ lav = "sha256-goEdo/Hf7TbtvVsz4naueyXl5mvZSd9bq+p5doivGjs=";
232+ lit = "sha256-e5q1JBf7CJ286H/UFPrdnWgILfUnUoUbnMWtwfhcT3I=";
233+ ltz = "sha256-zEF9dLOAXmw77EFJWH4JWzvc6MNKRf3dQdThGO3q7Qs=";
234+ mal = "sha256-LbtjlyAwyMZVXleRLZn4E6r+e/WbT9m5F5KaiL6LgSg=";
235+ mar = "sha256-hFDLsZaxriMQwHoRRN+DGCdLZOG0Oqs6rXuylSCFXAM=";
236+ mkd = "sha256-T6rQudft4N7GrDaG6RXLEAewFxeRlU+0I/+6TzuPDq8=";
237+ mlt = "sha256-339C19/kfmP+maUlA2INzj5t4WYlO3bwyRAhroR6teY=";
238+ mon = "sha256-kFqPMTZu/vNkg2+/tELLm+aCeQXkwdpk1fQmuxXbeso=";
239+ mri = "sha256-sUAeaw9iNhstgpkpAh0jsMUv9vDNCjStpqxoIDpXjko=";
240+ msa = "sha256-VhF0PATZ0xvidV5QqshtgVyviYZr9+HKJ3QoZRXS/1Q=";
241+ mya = "sha256-YVUU69R2bHV+VYfunMDJ2bLnJ9yVcJjLJJk2pWCpkkI=";
242+ nep = "sha256-wxRu8CWZYdWmUzm9uR3MtRmRrO48iuRW5M91A0UFHrY=";
243+ nld = "sha256-sfZ2f1Da9ZA4AvuXDnufZO4fEr4LKzJN/fjosFdxVy8=";
244+ nor = "sha256-uFnk3iTS0jkA2ZPXSBnTMzklVBQFe1CY2tKBmhiUqiI=";
245+ oci = "sha256-u/UgOdCUpgbEn44h15/PsmD5/iv07D9kDy3Lpl/i+dc=";
246+ ori = "sha256-6GhQO+YzSoyqCS45FNDO/PwqXeTjSkoNNRuG9WUVBOo=";
247+ osd = "sha256-4Z8q6GB5L983LPSNjOcK5do8QFKWL+IuneH2gMN0uw4=";
248+ pan = "sha256-UIwPtYrp41yqVx3oW8zlnqW373UaXaJ/96WbS1KexQQ=";
249+ pol = "sha256-F56Rr7MjKUkoik4YbeROsL7/tqKVKDvr9K81o2s4Czw=";
250+ por = "sha256-AWxqNxux5MSP5SGQjPO6PXUfreCrhGrV1AhrVj9cUow=";
251+ pus = "sha256-uQ/O5S4DoeeMvN0yz7SLx94izFb6xa1CoAodYqelL0Y=";
252+ que = "sha256-ZaWf96rz505Z3GX/fNyBZQMab8+V0lv21Fy2mKKrcwc=";
253+ ron = "sha256-FTyCyAcYUpiDqeeREJCAJL72KFXZ1aC38lkPy4De5ik=";
254+ rus = "sha256-aBviwr6tG8e9I134jETo5grnOuhmhAwK1OO0wke9N8I=";
255+ san = "sha256-XR/UK1JNC5krfDuYyknbFu+mxPE30r2CY5gXVvLEl+I=";
256+ sin = "sha256-xCQWB6/iV7nP2vpaFxKHt9BEH/VB47IUwPoDVYkW7SQ=";
257+ slk = "sha256-M0U5fhZJqntniIoZKPBNGIeeB0a9AKOq/w06F8u9JzE=";
258+ slk_frak = "sha256-cT7dJUQ5cueNftGCoAPfGcGz+N8tvmv4pR+FF6rSO5o=";
259+ slv = "sha256-TvPT/0JarymFq5MlYjpZ34y9KtQqP8g+eQ3cUiqVhBg=";
260+ snd = "sha256-ZyoVGmnKGp79/Ygbt6tHmUnhU0nHS/tt2oOSQEh0VcQ=";
261+ spa = "sha256-Cw/LtGZRieAauAGeWR8BTdcmBGDeByVD7dSyy07efJY=";
262+ spa_old = "sha256-Q2XJ2WyFEkVVinKuuF4NIEQGsFKrjgWd5TWPWAkDCMs=";
263+ sqi = "sha256-ARyC6wqo2VQ7CdeRS1W5Kxs08s1PxMTINSClD3vcm6U=";
264+ srp = "sha256-FPCNtRrj6luycyu0jAmVWQDYqsFGrv+G0n0bOIItosk=";
265+ srp_latn = "sha256-P8I6VlHDejPY4t0GDEHh+/JiNQkUtaRqqQv8Yes55cw=";
266+ sun = "sha256-6oaA9XYmP6G0TACWl6ZuMoVaEZ7JmAR2WSdvJwdXdFM=";
267+ swa = "sha256-4EMKiLBjLTub/5b7qkUjOfxC0HyA/AAz/r8FdQvDyWM=";
268+ swe = "sha256-JOLdFcwAiNIRxfG9SZceYAMX8gFQLerbxBfw/9bJpvg=";
269+ syr = "sha256-aHg+E1WKiTXpzJ2+GeJUutUUwfe8Z5/hk+CEHbUr0u0=";
270+ tam = "sha256-rrrgRz04udD5znUYO0M0gwvKuu+A3Q3Au1AocO1qEGY=";
271+ tat = "sha256-5lyctRvEfR7td2FWPjLTCDL+OqrCsy72jp5cf9HN5Cg=";
272+ tel = "sha256-fQkoEoidyLsfQtk7jZj2mFJ4AJ4xztMP9DTuDjtEmD0=";
273+ tgk = "sha256-xzgovz+eBvpBwH95mCmwHU7ODj3SmUyRTWQ+M8F8qJA=";
274+ tgl = "sha256-dnJiuUmQHqczAjmZ8bLUUfD+ggBBZr1rEHT4Nhln2os=";
275+ tha = "sha256-iAMqnyGsz/gl767SlgTrilNOJlz4BYqV6lQXpt+RwAU=";
276+ tir = "sha256-06XlsFwn4iCV6xxxJwasvkn5bQQC3xFOKRsyGRYi3OA=";
277+ ton = "sha256-uK3o84oF7AaFs+3rRb4NGgMCtyZtZ1yjkkj7jNQD5hk=";
278+ tur = "sha256-SJuVBOgNcYTtGsmhl2ZHiE7nEUnaIx/zwsHcFTcPLz0=";
279+ uig = "sha256-iBTbyJjNR7k3nLBpEGSsAit5QcjYN2HgHWpwGkSXSic=";
280+ ukr = "sha256-ZAyfvaGsRdHIh0HvAcaIwzdVnDf1Y8NuYufl+ZCmCJM=";
281+ urd = "sha256-gLwoL7uumavWtAcITEAakw3cSTQ3GRCeZQ13lTH8epc=";
282+ uzb = "sha256-9jx8jWFvVOiIMJ8E6vVWgof0CsqlTU40zlHWrTbgHg4=";
283+ uzb_cyrl = "sha256-B6vbCeDHm5FE3SL94BBlUqwyFhBMEwVmWM9RcXOmY5A=";
284+ vie = "sha256-Fk2b7X5aZERYbTlDTMGt9N+XbP4jz/1kaOREyUcDZAo=";
285+ yid = "sha256-H1AC4G/G7jOuvJJZb9u8ofDF5RqKi/PwVTjsTkDcy3Y=";
286+ yor = "sha256-m35CeoAKh2Rg8CDVaDgCkuIm1i/4pOutieZZUSJTgx8=";
287287 };
288288 };
289289}
pkgs/applications/graphics/tesseract/tesseract3.nix+14−3
@@ -9,13 +9,24 @@ stdenv.mkDerivation rec {
99 owner = "tesseract-ocr";
1010 repo = "tesseract";
1111 rev = version;
12− sha256 = "11wrpcfl118wxsv2c3w2scznwb48c4547qml42s2bpdz079g8y30";
12+ hash = "sha256-YHj00gG/3SW0ILTiQwphiCxuP9OCDya27hyFQB27mYc=";
1313 };
1414
1515 enableParallelBuilding = true;
1616
17− nativeBuildInputs = [ pkg-config autoreconfHook ];
18− buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
17+ nativeBuildInputs = [
18+ pkg-config
19+ autoreconfHook
20+ ];
21+
22+ buildInputs = [
23+ leptonica
24+ libpng
25+ libtiff
26+ icu
27+ pango
28+ opencl-headers
29+ ];
1930
2031 LIBLEPT_HEADERSDIR = "${leptonica}/include";
2132
pkgs/applications/graphics/tesseract/tesseract4.nix+15−3
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 owner = "tesseract-ocr";
1010 repo = "tesseract";
1111 rev = version;
12− sha256 = "1ca27zbjpx35nxh9fha410z3jskwyj06i5hqiqdc08s2d7kdivwn";
12+ hash = "sha256-lu/Y5mlCI8AajhiWaID0fGo5PghEQZdgt2X0K9c/QrE=";
1313 };
1414
1515 patches = [
@@ -26,8 +26,20 @@ stdenv.mkDerivation rec {
2626
2727 enableParallelBuilding = true;
2828
29− nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ];
30− buildInputs = [ leptonica libpng libtiff icu pango opencl-headers ];
29+ nativeBuildInputs = [
30+ pkg-config
31+ autoreconfHook
32+ autoconf-archive
33+ ];
34+
35+ buildInputs = [
36+ leptonica
37+ libpng
38+ libtiff
39+ icu
40+ pango
41+ opencl-headers
42+ ];
3143
3244 meta = {
3345 description = "OCR engine";
pkgs/applications/graphics/tesseract/tesseract5.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, pkg-config
2+, leptonica, libpng, libtiff, icu, pango, opencl-headers, fetchpatch }:
3+
4+stdenv.mkDerivation rec {
5+ pname = "tesseract";
6+ version = "5.1.0";
7+
8+ src = fetchFromGitHub {
9+ owner = "tesseract-ocr";
10+ repo = "tesseract";
11+ rev = version;
12+ sha256 = "sha256-B1x3wxr9Sn2rsG8AHncPTEErhDo7YtpDRxfW9ZOPWoU=";
13+ };
14+
15+ enableParallelBuilding = true;
16+
17+ nativeBuildInputs = [
18+ pkg-config
19+ autoreconfHook
20+ autoconf-archive
21+ ];
22+
23+ buildInputs = [
24+ leptonica
25+ libpng
26+ libtiff
27+ icu
28+ pango
29+ opencl-headers
30+ ];
31+
32+ meta = {
33+ description = "OCR engine";
34+ homepage = "https://github.com/tesseract-ocr/tesseract";
35+ license = lib.licenses.asl20;
36+ maintainers = with lib.maintainers; [ anselmschueler ];
37+ platforms = with lib.platforms; linux ++ darwin;
38+ };
39+}
pkgs/applications/graphics/tesseract/wrapper.nix+29−3
@@ -1,4 +1,5 @@
11{ lib, makeWrapper, tesseractBase, languages
2+, runCommand, imagemagick
23
34# A list of languages like [ "eng" "spa" … ] or `null` for all available languages
45, enableLanguages ? null
@@ -12,8 +13,6 @@
1213}:
1314
1415let
15− passthru = { inherit tesseractBase languages tessdata; };
16−
1716 tesseractWithData = tesseractBase.overrideAttrs (_: {
1817 inherit tesseractBase tessdata;
1918
@@ -47,9 +46,36 @@ let
4746 exit 1
4847 fi
4948 '';
49+
5050 });
5151
52− tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru;
52+ passthru = { inherit tesseractBase languages tessdata; };
53+
54+ # Only run test when all languages are available
55+ test = lib.optionalAttrs (enableLanguages == null) {
56+ tests.default = runCommand "tesseract-test-ocr" {
57+ buildInputs = [
58+ tesseractWithData
59+ imagemagick
60+ ];
61+ } ''
62+ text="hello nix"
63+
64+ convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 \
65+ -fill black -annotate +5+20 "$text" /tmp/test-img.png 2>/dev/null
66+ ocrResult=$(tesseract /tmp/test-img.png - | tr -d "\f")
67+
68+ if [[ $ocrResult != $text ]]; then
69+ echo "OCR test failed"
70+ echo "expected: '$text'"
71+ echo "actual: '$ocrResult'"
72+ exit 1
73+ fi
74+ touch $out
75+ '';
76+ };
77+
78+ tesseract = (if enableLanguages == [] then tesseractBase else tesseractWithData) // passthru // test;
5379in
5480 if enableLanguagesHash == null then
5581 tesseract
pkgs/applications/kde/default.nix+4−1
@@ -86,6 +86,7 @@ let
8686 dragon = callPackage ./dragon.nix {};
8787 elisa = callPackage ./elisa.nix {};
8888 eventviews = callPackage ./eventviews.nix {};
89+ falkon = callPackage ./falkon.nix {};
8990 ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
9091 filelight = callPackage ./filelight.nix {};
9192 granatier = callPackage ./granatier.nix {};
@@ -97,7 +98,7 @@ let
9798 kaccounts-providers = callPackage ./kaccounts-providers.nix {};
9899 kaddressbook = callPackage ./kaddressbook.nix {};
99100 kalarm = callPackage ./kalarm.nix {};
100− kalarmcal = callPackage ./kalarmcal.nix {};
101+ kalendar = callPackage ./kalendar.nix {};
101102 kalzium = callPackage ./kalzium.nix {};
102103 kamoso = callPackage ./kamoso.nix {};
103104 kapman = callPackage ./kapman.nix {};
@@ -153,6 +154,7 @@ let
153154 kmime = callPackage ./kmime.nix {};
154155 kmines = callPackage ./kmines.nix {};
155156 kmix = callPackage ./kmix.nix {};
157+ kmousetool = callPackage ./kmousetool.nix {};
156158 kmplot = callPackage ./kmplot.nix {};
157159 knavalbattle = callPackage ./knavalbattle.nix {};
158160 knetwalk = callPackage ./knetwalk.nix {};
@@ -219,6 +221,7 @@ let
219221 print-manager = callPackage ./print-manager.nix {};
220222 rocs = callPackage ./rocs.nix {};
221223 skanlite = callPackage ./skanlite.nix {};
224+ skanpage = callPackage ./skanpage.nix {};
222225 spectacle = callPackage ./spectacle.nix {};
223226 yakuake = callPackage ./yakuake.nix {};
224227 zanshin = callPackage ./zanshin.nix {};
pkgs/applications/networking/browsers/falkon/default.nix → pkgs/applications/kde/falkon.nixrenamed+4−13
@@ -1,21 +1,13 @@
11{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch
2−, cmake, extra-cmake-modules, pkg-config, qmake
2+, cmake, extra-cmake-modules, pkg-config
33, libpthreadstubs, libxcb, libXdmcp
44, qtsvg, qttools, qtwebengine, qtx11extras
55, qtwayland, wrapQtAppsHook
6−, kwallet
6+, kwallet, kpurpose, karchive, kio
77}:
88
99mkDerivation rec {
1010 pname = "falkon";
11− version = "3.2.0";
12−
13− src = fetchFromGitHub {
14− owner = "KDE";
15− repo = "falkon";
16− rev = "v${version}";
17− sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE=";
18− };
1911
2012 preConfigure = ''
2113 export NONBLOCK_JS_DIALOGS=true
@@ -27,21 +19,20 @@ mkDerivation rec {
2719 buildInputs = [
2820 libpthreadstubs libxcb libXdmcp
2921 qtsvg qttools qtwebengine qtx11extras
30− kwallet
22+ kwallet kpurpose karchive kio
3123 ] ++ lib.optionals stdenv.isLinux [ qtwayland ];
3224
3325 nativeBuildInputs = [
3426 cmake
3527 extra-cmake-modules
3628 pkg-config
37− qmake
3829 qttools
3930 wrapQtAppsHook
4031 ];
4132
4233 meta = with lib; {
4334 description = "QtWebEngine based cross-platform web browser";
44− homepage = "https://community.kde.org/Incubator/Projects/Falkon";
35+ homepage = "https://www.falkon.org";
4536 license = licenses.gpl3;
4637 maintainers = with maintainers; [ peterhoeg ];
4738 platforms = platforms.unix;
pkgs/applications/kde/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.3/src -A '*.tar.xz' )
1+WGET_ARGS=( https://download.kde.org/stable/release-service/22.04.0/src -A '*.tar.xz' )
pkgs/applications/kde/kaddressbook.nix+4
@@ -21,4 +21,8 @@ mkDerivation {
2121 kdbusaddons ki18n kontactinterface kparts kpimtextedit
2222 kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
2323 ];
24+ postInstall = ''
25+ # added as an include directory by cmake files and fails to compile if it's missing
26+ mkdir -p "$out/include/KF5"
27+ '';
2428}
pkgs/applications/kde/kalarm.nix+2−2
@@ -7,7 +7,7 @@
77 kio, knotifications, knotifyconfig, kservice, kwidgetsaddons,
88 kwindowsystem, kxmlgui, phonon,
99
10− kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
10+ kimap, akonadi, akonadi-contacts, akonadi-mime, kcalendarcore, kcalutils,
1111 kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
1212 pimcommon, kpimtextedit, messagelib,
1313
@@ -31,7 +31,7 @@ mkDerivation {
3131 kio knotifications knotifyconfig kservice kwidgetsaddons kwindowsystem
3232 kxmlgui phonon
3333
34− kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore
34+ kimap akonadi akonadi-contacts akonadi-mime kcalendarcore
3535 kcalutils kholidays kidentitymanagement libkdepim mailcommon kmailtransport
3636 kmime pimcommon kpimtextedit messagelib
3737
pkgs/applications/kde/kalarmcal.nixdeleted−19
@@ -1,19 +0,0 @@
1−{
2− mkDerivation, lib, kdepimTeam,
3− extra-cmake-modules, kdoctools,
4− akonadi, kcalendarcore, kholidays, kidentitymanagement,
5− kpimtextedit, kcalutils
6−}:
7−
8−mkDerivation {
9− pname = "kalarmcal";
10− meta = {
11− license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
12− maintainers = kdepimTeam;
13− };
14− nativeBuildInputs = [ extra-cmake-modules kdoctools ];
15− propagatedBuildInputs = [
16− akonadi kcalendarcore kholidays kidentitymanagement kpimtextedit kcalutils
17− ];
18− outputs = [ "out" "dev" ];
19−}
pkgs/applications/office/kalendar/default.nix → pkgs/applications/kde/kalendar.nixrenamed+1−10
@@ -39,15 +39,6 @@
3939
4040mkDerivation rec {
4141 pname = "kalendar";
42− version = "1.0.0";
43−
44− src = fetchFromGitLab {
45− domain = "invent.kde.org";
46− owner = "pim";
47− repo = pname;
48− rev = "v${version}";
49− sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM=";
50− };
5142
5243 nativeBuildInputs = [
5344 cmake
@@ -95,7 +86,7 @@ mkDerivation rec {
9586
9687 meta = with lib; {
9788 description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
98− homepage = "https://invent.kde.org/pim/kalendar/";
89+ homepage = "https://apps.kde.org/kalendar/";
9990 license = licenses.gpl3Plus;
10091 maintainers = with maintainers; [ chuangzhu ];
10192 platforms = platforms.linux;
pkgs/applications/kde/kdegraphics-thumbnailers.nix+2−2
@@ -1,6 +1,6 @@
11{
22 mkDerivation, lib, fetchpatch,
3− extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw
3+ extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket
44}:
55
66mkDerivation {
@@ -10,5 +10,5 @@ mkDerivation {
1010 maintainers = [ lib.maintainers.ttuegel ];
1111 };
1212 nativeBuildInputs = [ extra-cmake-modules ];
13− buildInputs = [ karchive kio libkexiv2 libkdcraw ];
13+ buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ];
1414}
pkgs/applications/kde/kdepim-addons.nix+2−2
@@ -5,7 +5,7 @@
55 incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
66 kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
77 libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
8− kitinerary, kontactinterface
8+ kitinerary, kontactinterface, kaddressbook, discount
99}:
1010
1111mkDerivation {
@@ -20,6 +20,6 @@ mkDerivation {
2020 incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
2121 kholidays ki18n kmime ktexteditor ktnef libgravatar
2222 libksieve mailcommon mailimporter messagelib poppler prison kpkpass
23− kitinerary kontactinterface
23+ kitinerary kontactinterface kaddressbook discount
2424 ];
2525}
pkgs/applications/kde/kdepim-runtime/default.nix+2−2
@@ -3,7 +3,7 @@
33 extra-cmake-modules, kdoctools,
44 shared-mime-info,
55 akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
6− kalarmcal, kcalutils, kcontacts, kdav, kidentitymanagement,
6+ kholidays, kcalutils, kcontacts, kdav, kidentitymanagement,
77 kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
88 pimcommon, libkgapi, libsecret,
99 qca-qt5, qtkeychain, qtnetworkauth, qtspeech, qtwebengine, qtxmlpatterns,
@@ -18,7 +18,7 @@ mkDerivation {
1818 nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
1919 buildInputs = [
2020 akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
21− kalarmcal kcalutils kcontacts kdav kidentitymanagement kimap
21+ kholidays kcalutils kcontacts kdav kidentitymanagement kimap
2222 kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
2323 pimcommon libkgapi libsecret
2424 qca-qt5 qtkeychain qtnetworkauth qtspeech qtxmlpatterns
pkgs/applications/kde/kmousetool.nixnew file+35
@@ -0,0 +1,35 @@
1+{ mkDerivation
2+, lib
3+, extra-cmake-modules
4+, kdoctools
5+, ki18n
6+, kiconthemes
7+, knotifications
8+, kxmlgui
9+, kwindowsystem
10+, phonon
11+, libXtst
12+, libXt
13+}:
14+
15+mkDerivation {
16+ pname = "kmousetool";
17+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
18+ buildInputs = [
19+ ki18n
20+ kiconthemes
21+ knotifications
22+ kxmlgui
23+ kwindowsystem
24+ phonon
25+ libXtst
26+ libXt
27+ ];
28+ meta = {
29+ homepage = "https://github.com/KDE/kmousetool";
30+ description = "Program that clicks the mouse for you";
31+ license = with lib.licenses; [ gpl2 fdl12 ];
32+ maintainers = [ lib.maintainers.jayesh-bhoot ];
33+ };
34+}
35+
pkgs/applications/kde/picmi.nix+1−11
@@ -1,4 +1,4 @@
1−{ mkDerivation, lib, fetchpatch
1+{ mkDerivation, lib
22, libkdegames, extra-cmake-modules
33, kdeclarative, knewstuff
44}:
@@ -16,16 +16,6 @@ mkDerivation {
1616 platforms = platforms.linux;
1717 };
1818
19− patches = [
20− # fix compile error due to usage of deprecated things
21− # probably can be removed with the next kde bump
22− (fetchpatch {
23− url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch";
24− revert = true;
25− sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg=";
26− })
27− ];
28−
2919 nativeBuildInputs = [
3020 extra-cmake-modules
3121 ];
pkgs/applications/kde/pimcommon.nix+2−2
@@ -16,11 +16,11 @@ mkDerivation {
1616 nativeBuildInputs = [ extra-cmake-modules kdoctools ];
1717 buildInputs = [
1818 akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
19− kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
19+ kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
2020 kpurpose kwallet kwindowsystem libkdepim qtwebengine
2121 ];
2222 propagatedBuildInputs = [
23− akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
23+ akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
2424 ];
2525 outputs = [ "out" "dev" ];
2626}
pkgs/applications/graphics/skanpage/default.nix → pkgs/applications/kde/skanpage.nixrenamed+2−6
@@ -6,16 +6,11 @@
66, ktextwidgets
77, libksane
88, qtquickcontrols2
9+, kpurpose
910}:
1011
1112mkDerivation rec {
1213 pname = "skanpage";
13− version = "1.0.0";
14−
15− src = fetchurl {
16− url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz";
17− hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA=";
18− };
1914
2015 nativeBuildInputs = [ extra-cmake-modules ];
2116
@@ -24,6 +19,7 @@ mkDerivation rec {
2419 ktextwidgets
2520 libksane
2621 qtquickcontrols2
22+ kpurpose
2723 ];
2824
2925 meta = with lib; {
pkgs/applications/kde/srcs.nix+937−921
@@ -4,1843 +4,1859 @@
44
55{
66 akonadi = {
7− version = "21.12.3";
7+ version = "22.04.0";
88 src = fetchurl {
9− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-21.12.3.tar.xz";
10− sha256 = "026srxk7da20vfhbj7jh8aip3sylpm61czwblj3wxxps0vbxxs2g";
11− name = "akonadi-21.12.3.tar.xz";
9+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-22.04.0.tar.xz";
10+ sha256 = "1v4bpnd7335f6rf7sy7xv3pjgay28lf9cbhy6g63v1sv2vicrih7";
11+ name = "akonadi-22.04.0.tar.xz";
1212 };
1313 };
1414 akonadi-calendar = {
15− version = "21.12.3";
15+ version = "22.04.0";
1616 src = fetchurl {
17− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-21.12.3.tar.xz";
18− sha256 = "0hzy6y9pxa06k0pp5yr84i0sv15qgzjn7nrlmsylm6iy7fspqqbq";
19− name = "akonadi-calendar-21.12.3.tar.xz";
17+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-22.04.0.tar.xz";
18+ sha256 = "0pnr2bzw7kl2mj88d75alzrsrwanrc28z7jbkmi2wqbw9jz0icy1";
19+ name = "akonadi-calendar-22.04.0.tar.xz";
2020 };
2121 };
2222 akonadi-calendar-tools = {
23− version = "21.12.3";
23+ version = "22.04.0";
2424 src = fetchurl {
25− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-calendar-tools-21.12.3.tar.xz";
26− sha256 = "1idh6kf8h9158rgw3b5lld7z9mvvif00jrvpz891cziblvr19p4a";
27− name = "akonadi-calendar-tools-21.12.3.tar.xz";
25+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-calendar-tools-22.04.0.tar.xz";
26+ sha256 = "1q727irnq0gi86ynp62wlmmd9zkpywcnfrazlv2zvp1gyfnlhira";
27+ name = "akonadi-calendar-tools-22.04.0.tar.xz";
2828 };
2929 };
3030 akonadi-contacts = {
31− version = "21.12.3";
31+ version = "22.04.0";
3232 src = fetchurl {
33− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-contacts-21.12.3.tar.xz";
34− sha256 = "04ixj09s27q8pbmfrb1475bc0h84sb5ikfxzpc4i5b3whx40g9dm";
35− name = "akonadi-contacts-21.12.3.tar.xz";
33+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-contacts-22.04.0.tar.xz";
34+ sha256 = "0yl8rj4sbcd8nc2fjk2xgyp5mr6y39d2qdb3ig3aklkl5czbg2ml";
35+ name = "akonadi-contacts-22.04.0.tar.xz";
3636 };
3737 };
3838 akonadi-import-wizard = {
39− version = "21.12.3";
39+ version = "22.04.0";
4040 src = fetchurl {
41− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-import-wizard-21.12.3.tar.xz";
42− sha256 = "1fbxx53zdcqp98mzdx45ccncppnxqfhc7j9qwwxcik0ygrmg9wcj";
43− name = "akonadi-import-wizard-21.12.3.tar.xz";
41+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-import-wizard-22.04.0.tar.xz";
42+ sha256 = "025sm93dm01msjlxsp8p364nqix9cpwy0zk86774w5lq0m7q3cmr";
43+ name = "akonadi-import-wizard-22.04.0.tar.xz";
4444 };
4545 };
4646 akonadi-mime = {
47− version = "21.12.3";
47+ version = "22.04.0";
4848 src = fetchurl {
49− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-mime-21.12.3.tar.xz";
50− sha256 = "1bcrbf5z9175p206cvm5s6zq882nb32cf9akdcbnadqiibrpxkxv";
51− name = "akonadi-mime-21.12.3.tar.xz";
49+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-mime-22.04.0.tar.xz";
50+ sha256 = "0rr8zi8xczfbmy83ds7r3gv08s5cck5w3wyz3h42b96vr7wkxbri";
51+ name = "akonadi-mime-22.04.0.tar.xz";
5252 };
5353 };
5454 akonadi-notes = {
55− version = "21.12.3";
55+ version = "22.04.0";
5656 src = fetchurl {
57− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-notes-21.12.3.tar.xz";
58− sha256 = "0xkcw9izgxfzglciig2i4wiz6iflzjg0d6dp1nq6p1kwxwc899sb";
59− name = "akonadi-notes-21.12.3.tar.xz";
57+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-notes-22.04.0.tar.xz";
58+ sha256 = "0w0d7m5q5n56772yhixdfzmijlvd5l490z59mhidvcxl72iz8ka1";
59+ name = "akonadi-notes-22.04.0.tar.xz";
6060 };
6161 };
6262 akonadi-search = {
63− version = "21.12.3";
63+ version = "22.04.0";
6464 src = fetchurl {
65− url = "${mirror}/stable/release-service/21.12.3/src/akonadi-search-21.12.3.tar.xz";
66− sha256 = "1id6zzjxc9zvpz1ryj2zn1yff5ak04r1mlk9cklbj99frzf0wv6p";
67− name = "akonadi-search-21.12.3.tar.xz";
65+ url = "${mirror}/stable/release-service/22.04.0/src/akonadi-search-22.04.0.tar.xz";
66+ sha256 = "1ra4vgmxghyi6j6v5nmw579ms4xiw4wcgqcm2gdq29cax7yaw5w2";
67+ name = "akonadi-search-22.04.0.tar.xz";
6868 };
6969 };
7070 akonadiconsole = {
71− version = "21.12.3";
71+ version = "22.04.0";
7272 src = fetchurl {
73− url = "${mirror}/stable/release-service/21.12.3/src/akonadiconsole-21.12.3.tar.xz";
74− sha256 = "1chb0ars9w05pq6ij2l8qfj1ac7pmzwg2mq1i4z8syhdklyryir1";
75− name = "akonadiconsole-21.12.3.tar.xz";
73+ url = "${mirror}/stable/release-service/22.04.0/src/akonadiconsole-22.04.0.tar.xz";
74+ sha256 = "10x3dg83fvsjvv652gi4c3zn6cq0c86j1p00aajxr4ailk72f3l0";
75+ name = "akonadiconsole-22.04.0.tar.xz";
7676 };
7777 };
7878 akregator = {
79− version = "21.12.3";
79+ version = "22.04.0";
8080 src = fetchurl {
81− url = "${mirror}/stable/release-service/21.12.3/src/akregator-21.12.3.tar.xz";
82− sha256 = "1yy5c29zxpli4cddknmdvjkgii3j7pvw6lhwqfrqjc8jh83gm8f8";
83− name = "akregator-21.12.3.tar.xz";
81+ url = "${mirror}/stable/release-service/22.04.0/src/akregator-22.04.0.tar.xz";
82+ sha256 = "12caw8ms5gzkda0ac8yx1swpsb0rqa01igqnfbn5l2z42mb511zi";
83+ name = "akregator-22.04.0.tar.xz";
8484 };
8585 };
8686 analitza = {
87− version = "21.12.3";
87+ version = "22.04.0";
8888 src = fetchurl {
89− url = "${mirror}/stable/release-service/21.12.3/src/analitza-21.12.3.tar.xz";
90− sha256 = "0rgims4c80nficibg3lh764csh0kjsfnf7h303kyfd9yk59xa3in";
91− name = "analitza-21.12.3.tar.xz";
89+ url = "${mirror}/stable/release-service/22.04.0/src/analitza-22.04.0.tar.xz";
90+ sha256 = "0npi7x9x9s24jdzqjkrycxvjxnn43hbak5mjzrmifx98k1k3caqc";
91+ name = "analitza-22.04.0.tar.xz";
9292 };
9393 };
9494 ark = {
95− version = "21.12.3";
95+ version = "22.04.0";
9696 src = fetchurl {
97− url = "${mirror}/stable/release-service/21.12.3/src/ark-21.12.3.tar.xz";
98− sha256 = "1p30bgnb3aw0f2jnaksz7jfqqcz45b2x3bjrri0w5w580204a5s8";
99− name = "ark-21.12.3.tar.xz";
97+ url = "${mirror}/stable/release-service/22.04.0/src/ark-22.04.0.tar.xz";
98+ sha256 = "1pjz0y0863daf4qcn9m1sf6z68a7f8asdald8vcgw0p2c5yln1yb";
99+ name = "ark-22.04.0.tar.xz";
100100 };
101101 };
102102 artikulate = {
103− version = "21.12.3";
103+ version = "22.04.0";
104104 src = fetchurl {
105− url = "${mirror}/stable/release-service/21.12.3/src/artikulate-21.12.3.tar.xz";
106− sha256 = "0fbgmd3yfyv1pzz24874a0v7cl4yk6wlfryn8sn21smi054wqz6z";
107− name = "artikulate-21.12.3.tar.xz";
105+ url = "${mirror}/stable/release-service/22.04.0/src/artikulate-22.04.0.tar.xz";
106+ sha256 = "0ly407s60q8mi6li3n84hcpcxzdw0a55v6wnvr5ibnw6g6xxd01q";
107+ name = "artikulate-22.04.0.tar.xz";
108108 };
109109 };
110110 audiocd-kio = {
111− version = "21.12.3";
111+ version = "22.04.0";
112112 src = fetchurl {
113− url = "${mirror}/stable/release-service/21.12.3/src/audiocd-kio-21.12.3.tar.xz";
114− sha256 = "1alyn7w0v1by3fkb6xfnwj0hayjrrnmwnajnrnpvn8skbqsbzlgc";
115− name = "audiocd-kio-21.12.3.tar.xz";
113+ url = "${mirror}/stable/release-service/22.04.0/src/audiocd-kio-22.04.0.tar.xz";
114+ sha256 = "103c1168g83jj6q4azyzc45766alci52r9y43p0068s3p57v94fr";
115+ name = "audiocd-kio-22.04.0.tar.xz";
116116 };
117117 };
118118 baloo-widgets = {
119− version = "21.12.3";
119+ version = "22.04.0";
120120 src = fetchurl {
121− url = "${mirror}/stable/release-service/21.12.3/src/baloo-widgets-21.12.3.tar.xz";
122− sha256 = "0cfcfmsgbaxi53a3r0f013lskm5yll7zaxw98nlj6r8fsq2slrhv";
123− name = "baloo-widgets-21.12.3.tar.xz";
121+ url = "${mirror}/stable/release-service/22.04.0/src/baloo-widgets-22.04.0.tar.xz";
122+ sha256 = "0ngiwlnjmk2arclf2kbs97vkmz0rn34daxv3s1vvbjc19mb0g9iq";
123+ name = "baloo-widgets-22.04.0.tar.xz";
124124 };
125125 };
126126 blinken = {
127− version = "21.12.3";
127+ version = "22.04.0";
128128 src = fetchurl {
129− url = "${mirror}/stable/release-service/21.12.3/src/blinken-21.12.3.tar.xz";
130− sha256 = "1pbwb7q4p705k31kd62gira0x9qccjsn07d6h1w44wydc3lfdjnc";
131− name = "blinken-21.12.3.tar.xz";
129+ url = "${mirror}/stable/release-service/22.04.0/src/blinken-22.04.0.tar.xz";
130+ sha256 = "18bbpp6n92i6fx6dk9s9cy3v9rnw8wnaiywamaal4xg2qk4dkj63";
131+ name = "blinken-22.04.0.tar.xz";
132132 };
133133 };
134134 bomber = {
135− version = "21.12.3";
135+ version = "22.04.0";
136136 src = fetchurl {
137− url = "${mirror}/stable/release-service/21.12.3/src/bomber-21.12.3.tar.xz";
138− sha256 = "1mlxs2dbsycq7mw9g1hl2l17gl0z33mrry5r0zmz74i67nfijg8w";
139− name = "bomber-21.12.3.tar.xz";
137+ url = "${mirror}/stable/release-service/22.04.0/src/bomber-22.04.0.tar.xz";
138+ sha256 = "13rnxc4dmgspcacslgw8ikzzha7la0591nsnfwf0kjnqskh13kyz";
139+ name = "bomber-22.04.0.tar.xz";
140140 };
141141 };
142142 bovo = {
143− version = "21.12.3";
143+ version = "22.04.0";
144144 src = fetchurl {
145− url = "${mirror}/stable/release-service/21.12.3/src/bovo-21.12.3.tar.xz";
146− sha256 = "1jzvazqy5vcwkyhnbzw7sh8ngff5clclq98vbbhzd9dmnacirdbq";
147− name = "bovo-21.12.3.tar.xz";
145+ url = "${mirror}/stable/release-service/22.04.0/src/bovo-22.04.0.tar.xz";
146+ sha256 = "0lv6zzsaan3wfj7l3gdc7ksh2lbhmkkaksgs20mrh2mhwd8xz0gn";
147+ name = "bovo-22.04.0.tar.xz";
148148 };
149149 };
150150 calendarsupport = {
151− version = "21.12.3";
151+ version = "22.04.0";
152152 src = fetchurl {
153− url = "${mirror}/stable/release-service/21.12.3/src/calendarsupport-21.12.3.tar.xz";
154− sha256 = "0annni037cp1ga2lj2gkjxlkygnaxna4fs095lbaqp5zljz3g8vp";
155− name = "calendarsupport-21.12.3.tar.xz";
153+ url = "${mirror}/stable/release-service/22.04.0/src/calendarsupport-22.04.0.tar.xz";
154+ sha256 = "0hnsrmwy3422azd13v70gkfaj02gwd7h1q568qhyaipdfbwb3sjl";
155+ name = "calendarsupport-22.04.0.tar.xz";
156156 };
157157 };
158158 cantor = {
159− version = "21.12.3";
159+ version = "22.04.0";
160160 src = fetchurl {
161− url = "${mirror}/stable/release-service/21.12.3/src/cantor-21.12.3.tar.xz";
162− sha256 = "0v0xcgaz3rag044wmpiq8gs7pp6n7wcca0q1hzav7i651pgqjjks";
163− name = "cantor-21.12.3.tar.xz";
161+ url = "${mirror}/stable/release-service/22.04.0/src/cantor-22.04.0.tar.xz";
162+ sha256 = "1rs7w6vzm8kir348j63jrhld888ivdl2i7vb27yh7lrdgiydlkmp";
163+ name = "cantor-22.04.0.tar.xz";
164164 };
165165 };
166166 cervisia = {
167− version = "21.12.3";
167+ version = "22.04.0";
168168 src = fetchurl {
169− url = "${mirror}/stable/release-service/21.12.3/src/cervisia-21.12.3.tar.xz";
170− sha256 = "106x0xrscc6xvgijmqy892r1hrirjh32nj8lqhc7g7dzjaa7lhsj";
171− name = "cervisia-21.12.3.tar.xz";
169+ url = "${mirror}/stable/release-service/22.04.0/src/cervisia-22.04.0.tar.xz";
170+ sha256 = "02dgvvqag96fr2dhz50pa6g4v2mn7msviqzg8ih6sr30hv6qa9v9";
171+ name = "cervisia-22.04.0.tar.xz";
172172 };
173173 };
174174 dolphin = {
175− version = "21.12.3";
175+ version = "22.04.0";
176176 src = fetchurl {
177− url = "${mirror}/stable/release-service/21.12.3/src/dolphin-21.12.3.tar.xz";
178− sha256 = "0m5nqa8j0mcsrx9wxfcf8z39kxas51k03lschr721vm4x65j64jq";
179− name = "dolphin-21.12.3.tar.xz";
177+ url = "${mirror}/stable/release-service/22.04.0/src/dolphin-22.04.0.tar.xz";
178+ sha256 = "007ilkgmg4wzqg1m0q9k8n60qf4jmln358jy1s443b5qsg8cvijq";
179+ name = "dolphin-22.04.0.tar.xz";
180180 };
181181 };
182182 dolphin-plugins = {
183− version = "21.12.3";
183+ version = "22.04.0";
184184 src = fetchurl {
185− url = "${mirror}/stable/release-service/21.12.3/src/dolphin-plugins-21.12.3.tar.xz";
186− sha256 = "0rbz6fw98c71h10ry1xjc0pgzvphajmj18lnjm4hf7bbrizsmdb5";
187− name = "dolphin-plugins-21.12.3.tar.xz";
185+ url = "${mirror}/stable/release-service/22.04.0/src/dolphin-plugins-22.04.0.tar.xz";
186+ sha256 = "0l41h8f21rnwx5a00mkr2dfkgp0wpgf5si2ygc725ryzr00jkl8w";
187+ name = "dolphin-plugins-22.04.0.tar.xz";
188188 };
189189 };
190190 dragon = {
191− version = "21.12.3";
191+ version = "22.04.0";
192192 src = fetchurl {
193− url = "${mirror}/stable/release-service/21.12.3/src/dragon-21.12.3.tar.xz";
194− sha256 = "09iwwlbv4jmxs92dz20z9fqg1sfnqih54izz8459ibl8vydfgfp1";
195− name = "dragon-21.12.3.tar.xz";
193+ url = "${mirror}/stable/release-service/22.04.0/src/dragon-22.04.0.tar.xz";
194+ sha256 = "0haavk3igyfw9c4q3jc972q9h6ziwazpzfwjr0658n68qmqyg4lh";
195+ name = "dragon-22.04.0.tar.xz";
196196 };
197197 };
198198 elisa = {
199− version = "21.12.3";
199+ version = "22.04.0";
200200 src = fetchurl {
201− url = "${mirror}/stable/release-service/21.12.3/src/elisa-21.12.3.tar.xz";
202− sha256 = "0cg9v438fclqnv1rgx2k86mzfp5ggfcp7d5kr8xh4kjbmy17rzca";
203− name = "elisa-21.12.3.tar.xz";
201+ url = "${mirror}/stable/release-service/22.04.0/src/elisa-22.04.0.tar.xz";
202+ sha256 = "0gm3llind6v6g4biy5mn7ks6pcr5vviasg1ksgvh51af5ah7kcxq";
203+ name = "elisa-22.04.0.tar.xz";
204204 };
205205 };
206206 eventviews = {
207− version = "21.12.3";
207+ version = "22.04.0";
208208 src = fetchurl {
209− url = "${mirror}/stable/release-service/21.12.3/src/eventviews-21.12.3.tar.xz";
210− sha256 = "01x9ccwspn1dwkmcxcr8p6pazj6w31pxhx0bzlfr6bgpccicp2w2";
211− name = "eventviews-21.12.3.tar.xz";
209+ url = "${mirror}/stable/release-service/22.04.0/src/eventviews-22.04.0.tar.xz";
210+ sha256 = "1b9lk3xnjky9k04jcad1w3iynd57c3jfjzlz798qhz8pfvbkwd39";
211+ name = "eventviews-22.04.0.tar.xz";
212+ };
213+ };
214+ falkon = {
215+ version = "22.04.0";
216+ src = fetchurl {
217+ url = "${mirror}/stable/release-service/22.04.0/src/falkon-22.04.0.tar.xz";
218+ sha256 = "1vwgifx0g2ih23l0pvpfg46khyb69sa39mnvdap6hk0ayx6x4094";
219+ name = "falkon-22.04.0.tar.xz";
212220 };
213221 };
214222 ffmpegthumbs = {
215− version = "21.12.3";
223+ version = "22.04.0";
216224 src = fetchurl {
217− url = "${mirror}/stable/release-service/21.12.3/src/ffmpegthumbs-21.12.3.tar.xz";
218− sha256 = "0x2gpx30azkz61p3xj1nm7hckyrmyh0qhs29ah30z6a5xw7336ws";
219− name = "ffmpegthumbs-21.12.3.tar.xz";
225+ url = "${mirror}/stable/release-service/22.04.0/src/ffmpegthumbs-22.04.0.tar.xz";
226+ sha256 = "1gp13sn95wq487fxpj3z928ppjcc4mblpwp627s8s1d5d1pmvjmn";
227+ name = "ffmpegthumbs-22.04.0.tar.xz";
220228 };
221229 };
222230 filelight = {
223− version = "21.12.3";
231+ version = "22.04.0";
224232 src = fetchurl {
225− url = "${mirror}/stable/release-service/21.12.3/src/filelight-21.12.3.tar.xz";
226− sha256 = "1w3q0l9p5ry2crwdzcyb1d4ms2y4gp3y0a3j5drpy8clmxn0gz18";
227− name = "filelight-21.12.3.tar.xz";
233+ url = "${mirror}/stable/release-service/22.04.0/src/filelight-22.04.0.tar.xz";
234+ sha256 = "11z5wjl1f2a02vd6zvkiag65ysp8i4n6sdycam35r41jjx1sfks3";
235+ name = "filelight-22.04.0.tar.xz";
228236 };
229237 };
230238 granatier = {
231− version = "21.12.3";
239+ version = "22.04.0";
232240 src = fetchurl {
233− url = "${mirror}/stable/release-service/21.12.3/src/granatier-21.12.3.tar.xz";
234− sha256 = "16yriharl66frglmdy6750nixczh0l4c19nnr6dav15m8qfb3g6b";
235− name = "granatier-21.12.3.tar.xz";
241+ url = "${mirror}/stable/release-service/22.04.0/src/granatier-22.04.0.tar.xz";
242+ sha256 = "18bjz42bqg65k9ddyn5170fq1yngw92q1j0fr09q2bn3gxqh5654";
243+ name = "granatier-22.04.0.tar.xz";
236244 };
237245 };
238246 grantlee-editor = {
239− version = "21.12.3";
247+ version = "22.04.0";
240248 src = fetchurl {
241− url = "${mirror}/stable/release-service/21.12.3/src/grantlee-editor-21.12.3.tar.xz";
242− sha256 = "00qy1ncgwylc995g051x5l679s16wjpcj7il62ck7d0j02rah0n2";
243− name = "grantlee-editor-21.12.3.tar.xz";
249+ url = "${mirror}/stable/release-service/22.04.0/src/grantlee-editor-22.04.0.tar.xz";
250+ sha256 = "00ycnjh4dh4xqbf5nbmlqnmlzyv66shdhq2p5625x85bkdx7fvih";
251+ name = "grantlee-editor-22.04.0.tar.xz";
244252 };
245253 };
246254 grantleetheme = {
247− version = "21.12.3";
255+ version = "22.04.0";
248256 src = fetchurl {
249− url = "${mirror}/stable/release-service/21.12.3/src/grantleetheme-21.12.3.tar.xz";
250− sha256 = "1w83slbkj2y1wk78srq2k95ybs66sb4mbaa0zm7fl9pkwhqxbnb7";
251− name = "grantleetheme-21.12.3.tar.xz";
257+ url = "${mirror}/stable/release-service/22.04.0/src/grantleetheme-22.04.0.tar.xz";
258+ sha256 = "1ldx62lw20qj8k04vrm1p4sfr2bv9qxv5cp8g225iw8wwhhmzx2q";
259+ name = "grantleetheme-22.04.0.tar.xz";
252260 };
253261 };
254262 gwenview = {
255− version = "21.12.3";
263+ version = "22.04.0";
256264 src = fetchurl {
257− url = "${mirror}/stable/release-service/21.12.3/src/gwenview-21.12.3.tar.xz";
258− sha256 = "0zbsyrwlwbc9zmdxcgk02dvcb0f8izhlcbbzqw8cgr4l2c90xl98";
259− name = "gwenview-21.12.3.tar.xz";
265+ url = "${mirror}/stable/release-service/22.04.0/src/gwenview-22.04.0.tar.xz";
266+ sha256 = "01dbf8ij7wc2bxnjmd1a5ard0zv7sxqqzk36sn63hncci6b30s3k";
267+ name = "gwenview-22.04.0.tar.xz";
260268 };
261269 };
262270 incidenceeditor = {
263− version = "21.12.3";
271+ version = "22.04.0";
264272 src = fetchurl {
265− url = "${mirror}/stable/release-service/21.12.3/src/incidenceeditor-21.12.3.tar.xz";
266− sha256 = "1sbflfggpqhwhg3iw46462z3p83sjhlx6f1fvgz251m020vqq9xa";
267− name = "incidenceeditor-21.12.3.tar.xz";
273+ url = "${mirror}/stable/release-service/22.04.0/src/incidenceeditor-22.04.0.tar.xz";
274+ sha256 = "19p9jyp6ygisvzsvcbzcwly22kyhxvmw6wsjnm7jaw3iwbr6276i";
275+ name = "incidenceeditor-22.04.0.tar.xz";
268276 };
269277 };
270278 itinerary = {
271− version = "21.12.3";
279+ version = "22.04.0";
272280 src = fetchurl {
273− url = "${mirror}/stable/release-service/21.12.3/src/itinerary-21.12.3.tar.xz";
274− sha256 = "0gvkhwnxichvpwrsb6wjiv5q80v8k2yqvgpvfdapxnd7sx6qp7fp";
275− name = "itinerary-21.12.3.tar.xz";
281+ url = "${mirror}/stable/release-service/22.04.0/src/itinerary-22.04.0.tar.xz";
282+ sha256 = "0qa0rzm6anaiilmfiy714zvs6iy2h1mjjrc0f4n6qkfzmbzhls71";
283+ name = "itinerary-22.04.0.tar.xz";
276284 };
277285 };
278286 juk = {
279− version = "21.12.3";
287+ version = "22.04.0";
280288 src = fetchurl {
281− url = "${mirror}/stable/release-service/21.12.3/src/juk-21.12.3.tar.xz";
282− sha256 = "1ipzx031996h83f9w3fzbx5vf5nnskq9kf71a6aypqckk65vcqcs";
283− name = "juk-21.12.3.tar.xz";
289+ url = "${mirror}/stable/release-service/22.04.0/src/juk-22.04.0.tar.xz";
290+ sha256 = "05sj9pj032havlp68zk8x2mri3i56aw2j14pvk7xk31iipvly5yx";
291+ name = "juk-22.04.0.tar.xz";
284292 };
285293 };
286294 k3b = {
287− version = "21.12.3";
295+ version = "22.04.0";
288296 src = fetchurl {
289− url = "${mirror}/stable/release-service/21.12.3/src/k3b-21.12.3.tar.xz";
290− sha256 = "0igqb6zw76j2hl9xclcwfny2831phdg9s2msa1y87zyc3c7g9nxc";
291− name = "k3b-21.12.3.tar.xz";
297+ url = "${mirror}/stable/release-service/22.04.0/src/k3b-22.04.0.tar.xz";
298+ sha256 = "0135gck2fd4zghji2d6zk6nb8s8qa9pgf1v1ckmi8zygslgxfmjq";
299+ name = "k3b-22.04.0.tar.xz";
292300 };
293301 };
294302 kaccounts-integration = {
295− version = "21.12.3";
303+ version = "22.04.0";
296304 src = fetchurl {
297− url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-integration-21.12.3.tar.xz";
298− sha256 = "13q4d7ln98vdpb6ryk49zakx5bysdnjxifi7cma10fgk9gcqqhpb";
299− name = "kaccounts-integration-21.12.3.tar.xz";
305+ url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-integration-22.04.0.tar.xz";
306+ sha256 = "1f089p9i8wbldqy787iwir33ripkj9ac1p6wbgfr5knxqz0rfl9y";
307+ name = "kaccounts-integration-22.04.0.tar.xz";
300308 };
301309 };
302310 kaccounts-providers = {
303− version = "21.12.3";
311+ version = "22.04.0";
304312 src = fetchurl {
305− url = "${mirror}/stable/release-service/21.12.3/src/kaccounts-providers-21.12.3.tar.xz";
306− sha256 = "0kcyvpa0b872q7s4amagqcrzpl8cxlb91nwc9yg91wg56mmfv7m0";
307− name = "kaccounts-providers-21.12.3.tar.xz";
313+ url = "${mirror}/stable/release-service/22.04.0/src/kaccounts-providers-22.04.0.tar.xz";
314+ sha256 = "0d0fr8f3m1aj02mazcq8v4zy4jla4gd1f3xp06arwdr6zay5ayi9";
315+ name = "kaccounts-providers-22.04.0.tar.xz";
308316 };
309317 };
310318 kaddressbook = {
311− version = "21.12.3";
319+ version = "22.04.0";
312320 src = fetchurl {
313− url = "${mirror}/stable/release-service/21.12.3/src/kaddressbook-21.12.3.tar.xz";
314− sha256 = "1hzq0fdy99l1kqw14d582l0s56gvrw86abihib6k4az4c6g3c0md";
315− name = "kaddressbook-21.12.3.tar.xz";
321+ url = "${mirror}/stable/release-service/22.04.0/src/kaddressbook-22.04.0.tar.xz";
322+ sha256 = "0va36dsa8yy35zi4rkvwdvm5ga45nwwyyh366nhzymm4ni6fwlf0";
323+ name = "kaddressbook-22.04.0.tar.xz";
316324 };
317325 };
318326 kajongg = {
319− version = "21.12.3";
327+ version = "22.04.0";
320328 src = fetchurl {
321− url = "${mirror}/stable/release-service/21.12.3/src/kajongg-21.12.3.tar.xz";
322− sha256 = "1sffssfpzsd83ippkwpmqdx8rfh9cpd7i22nsv8asnaylylvy3zd";
323− name = "kajongg-21.12.3.tar.xz";
329+ url = "${mirror}/stable/release-service/22.04.0/src/kajongg-22.04.0.tar.xz";
330+ sha256 = "1k595k1vqd3fqw985193g7wf5pyl9d3ar4fwi79ai08xwk6rf4nm";
331+ name = "kajongg-22.04.0.tar.xz";
324332 };
325333 };
326334 kalarm = {
327− version = "21.12.3";
335+ version = "22.04.0";
328336 src = fetchurl {
329− url = "${mirror}/stable/release-service/21.12.3/src/kalarm-21.12.3.tar.xz";
330− sha256 = "1miwcxim46hiabp2rbs874np544ip4x5nl1dc62h9li9784a9k3i";
331− name = "kalarm-21.12.3.tar.xz";
337+ url = "${mirror}/stable/release-service/22.04.0/src/kalarm-22.04.0.tar.xz";
338+ sha256 = "150zj57bl528xyjs0lvdyr425q8da3l24xz1wn44w1w29i3i3m8q";
339+ name = "kalarm-22.04.0.tar.xz";
332340 };
333341 };
334− kalarmcal = {
335− version = "21.12.3";
342+ kalendar = {
343+ version = "22.04.0";
336344 src = fetchurl {
337− url = "${mirror}/stable/release-service/21.12.3/src/kalarmcal-21.12.3.tar.xz";
338− sha256 = "160pmr702b68hys9l02azvrv6pagy1r2whw0zp3jlf6863p9fkqr";
339− name = "kalarmcal-21.12.3.tar.xz";
345+ url = "${mirror}/stable/release-service/22.04.0/src/kalendar-22.04.0.tar.xz";
346+ sha256 = "0bma75va1nkyinmkjhm3bknrp880ngklz0c21rsgykmbb8sa0zvz";
347+ name = "kalendar-22.04.0.tar.xz";
340348 };
341349 };
342350 kalgebra = {
343− version = "21.12.3";
351+ version = "22.04.0";
344352 src = fetchurl {
345− url = "${mirror}/stable/release-service/21.12.3/src/kalgebra-21.12.3.tar.xz";
346− sha256 = "0870kdqha0nk2cm8hq8d9l2fqfw6hn0rx2qc9f9w8l4014rcn127";
347− name = "kalgebra-21.12.3.tar.xz";
353+ url = "${mirror}/stable/release-service/22.04.0/src/kalgebra-22.04.0.tar.xz";
354+ sha256 = "17mfjv3xbn02f9jzhpw2xd1rp6rvjqzksa3cqlwjjd06k3l1q414";
355+ name = "kalgebra-22.04.0.tar.xz";
348356 };
349357 };
350358 kalzium = {
351− version = "21.12.3";
359+ version = "22.04.0";
352360 src = fetchurl {
353− url = "${mirror}/stable/release-service/21.12.3/src/kalzium-21.12.3.tar.xz";
354− sha256 = "1qha1dh638ms785j1b73j19pj8y3c7v1n4jd1m93026a292m8jll";
355− name = "kalzium-21.12.3.tar.xz";
361+ url = "${mirror}/stable/release-service/22.04.0/src/kalzium-22.04.0.tar.xz";
362+ sha256 = "07glndlclws8kq3jkfsh4a12zh7ly2w4m2ws77mc4a8zsjc33hdv";
363+ name = "kalzium-22.04.0.tar.xz";
356364 };
357365 };
358366 kamera = {
359− version = "21.12.3";
367+ version = "22.04.0";
360368 src = fetchurl {
361− url = "${mirror}/stable/release-service/21.12.3/src/kamera-21.12.3.tar.xz";
362− sha256 = "1xwxmlnra9qdhvf1hhy04v72ar02pqxkg0l16a53809ilyss2wrm";
363− name = "kamera-21.12.3.tar.xz";
369+ url = "${mirror}/stable/release-service/22.04.0/src/kamera-22.04.0.tar.xz";
370+ sha256 = "06xfls262p8x7p8j04y6c59ssjcbq4f2aqiw381k5pyam81hhrah";
371+ name = "kamera-22.04.0.tar.xz";
364372 };
365373 };
366374 kamoso = {
367− version = "21.12.3";
375+ version = "22.04.0";
368376 src = fetchurl {
369− url = "${mirror}/stable/release-service/21.12.3/src/kamoso-21.12.3.tar.xz";
370− sha256 = "1q98f6ni4p19pk0svbfw4mbfwnc9i5p9csms2aj76mp2dn78xpib";
371− name = "kamoso-21.12.3.tar.xz";
377+ url = "${mirror}/stable/release-service/22.04.0/src/kamoso-22.04.0.tar.xz";
378+ sha256 = "01ghfjrl97x4kn9g7wlgwi9wmplwqgayxqma8ywhbaf2wafqbsgs";
379+ name = "kamoso-22.04.0.tar.xz";
372380 };
373381 };
374382 kanagram = {
375− version = "21.12.3";
383+ version = "22.04.0";
376384 src = fetchurl {
377− url = "${mirror}/stable/release-service/21.12.3/src/kanagram-21.12.3.tar.xz";
378− sha256 = "131flw9pjvin4w1m36qkwgzna3llvxp1vq0ynzwfnvhs49i3g5gc";
379− name = "kanagram-21.12.3.tar.xz";
385+ url = "${mirror}/stable/release-service/22.04.0/src/kanagram-22.04.0.tar.xz";
386+ sha256 = "0laa9vnrh7k8f2800gz64zxr8hx0qrgypg8jh3iccmg8v53b38lz";
387+ name = "kanagram-22.04.0.tar.xz";
380388 };
381389 };
382390 kapman = {
383− version = "21.12.3";
391+ version = "22.04.0";
384392 src = fetchurl {
385− url = "${mirror}/stable/release-service/21.12.3/src/kapman-21.12.3.tar.xz";
386− sha256 = "1974z7g3ylvf48xh3xhf3gr7iphgmj83ir9hss1a2ba0hpgg463k";
387− name = "kapman-21.12.3.tar.xz";
393+ url = "${mirror}/stable/release-service/22.04.0/src/kapman-22.04.0.tar.xz";
394+ sha256 = "0a5k1jdh9qrm5bdx3z1f97sa92i781d1myp7pjc7s0hvjxprz5wy";
395+ name = "kapman-22.04.0.tar.xz";
388396 };
389397 };
390398 kapptemplate = {
391− version = "21.12.3";
399+ version = "22.04.0";
392400 src = fetchurl {
393− url = "${mirror}/stable/release-service/21.12.3/src/kapptemplate-21.12.3.tar.xz";
394− sha256 = "16jgybcq3ixqwi7wli11ns7w4zdlj8rgw4chzsjcqxn6c0sqy8zq";
395− name = "kapptemplate-21.12.3.tar.xz";
401+ url = "${mirror}/stable/release-service/22.04.0/src/kapptemplate-22.04.0.tar.xz";
402+ sha256 = "0qbaa1ndqq7fk2azbj2rwlakg8amg572ji86vijf2f0fd26jbv2p";
403+ name = "kapptemplate-22.04.0.tar.xz";
396404 };
397405 };
398406 kate = {
399− version = "21.12.3";
407+ version = "22.04.0";
400408 src = fetchurl {
401− url = "${mirror}/stable/release-service/21.12.3/src/kate-21.12.3.tar.xz";
402− sha256 = "1pp0k00kvih0xkkv1q1gha4na2bwqc7dhyyrla7c2vvln8gi99dg";
403− name = "kate-21.12.3.tar.xz";
409+ url = "${mirror}/stable/release-service/22.04.0/src/kate-22.04.0.tar.xz";
410+ sha256 = "1jy87zliqh9j4r0xy5gd3q1zklphmyvbzdp6brqlda0kf4isv46a";
411+ name = "kate-22.04.0.tar.xz";
404412 };
405413 };
406414 katomic = {
407− version = "21.12.3";
415+ version = "22.04.0";
408416 src = fetchurl {
409− url = "${mirror}/stable/release-service/21.12.3/src/katomic-21.12.3.tar.xz";
410− sha256 = "1y4mnvkd6ajk0m0j2xph5zbw3a14clm2sswc4y8c9r4ipk3hqsgh";
411− name = "katomic-21.12.3.tar.xz";
417+ url = "${mirror}/stable/release-service/22.04.0/src/katomic-22.04.0.tar.xz";
418+ sha256 = "02s4v4clylf2wq7ifpb786m11vmvfrfj6wr6rszn77h116ckfs3j";
419+ name = "katomic-22.04.0.tar.xz";
412420 };
413421 };
414422 kbackup = {
415− version = "21.12.3";
423+ version = "22.04.0";
416424 src = fetchurl {
417− url = "${mirror}/stable/release-service/21.12.3/src/kbackup-21.12.3.tar.xz";
418− sha256 = "0r1cqkfzpdqpwv5pds8l0p7lxlwpv0mr7rjys1icsp8gl4hbpv60";
419− name = "kbackup-21.12.3.tar.xz";
425+ url = "${mirror}/stable/release-service/22.04.0/src/kbackup-22.04.0.tar.xz";
426+ sha256 = "122g4bn2cs4vyj30lf0nd603sibjdycwkiz5b9lh42kcnkjghs8l";
427+ name = "kbackup-22.04.0.tar.xz";
420428 };
421429 };
422430 kblackbox = {
423− version = "21.12.3";
431+ version = "22.04.0";
424432 src = fetchurl {
425− url = "${mirror}/stable/release-service/21.12.3/src/kblackbox-21.12.3.tar.xz";
426− sha256 = "10j8rnpr3gjaqspx4mxqj9cncqj6v2jn5rkldr46bv7yxgjb5rw3";
427− name = "kblackbox-21.12.3.tar.xz";
433+ url = "${mirror}/stable/release-service/22.04.0/src/kblackbox-22.04.0.tar.xz";
434+ sha256 = "08gjg0abp1c58m7b6xb99ynz8fkl537bcmz4iryyd3v7ibswdr91";
435+ name = "kblackbox-22.04.0.tar.xz";
428436 };
429437 };
430438 kblocks = {
431− version = "21.12.3";
439+ version = "22.04.0";
432440 src = fetchurl {
433− url = "${mirror}/stable/release-service/21.12.3/src/kblocks-21.12.3.tar.xz";
434− sha256 = "1n3jc96ws8078gk1il61dc96p3pzvj3z9brnwi274pk4cif63bli";
435− name = "kblocks-21.12.3.tar.xz";
441+ url = "${mirror}/stable/release-service/22.04.0/src/kblocks-22.04.0.tar.xz";
442+ sha256 = "18n9vy3xv1g4wafwiwnf5ghh3irrxlm1jxn19m322ajs8qk53qcg";
443+ name = "kblocks-22.04.0.tar.xz";
436444 };
437445 };
438446 kbounce = {
439− version = "21.12.3";
447+ version = "22.04.0";
440448 src = fetchurl {
441− url = "${mirror}/stable/release-service/21.12.3/src/kbounce-21.12.3.tar.xz";
442− sha256 = "1am4j11cjzlmav2zh5802kasy0kdcx78slycadnf96bmhxs8hvyv";
443− name = "kbounce-21.12.3.tar.xz";
449+ url = "${mirror}/stable/release-service/22.04.0/src/kbounce-22.04.0.tar.xz";
450+ sha256 = "0xk41pja2kxzrmrrza23xnfnxk9k4ag3xcjjp6c8hj6brzd6g9a9";
451+ name = "kbounce-22.04.0.tar.xz";
444452 };
445453 };
446454 kbreakout = {
447− version = "21.12.3";
455+ version = "22.04.0";
448456 src = fetchurl {
449− url = "${mirror}/stable/release-service/21.12.3/src/kbreakout-21.12.3.tar.xz";
450− sha256 = "0vqlxaggzvvrb439ybsvd5kr9j2jzpwk4xy3yni83y830h1mmhhc";
451− name = "kbreakout-21.12.3.tar.xz";
457+ url = "${mirror}/stable/release-service/22.04.0/src/kbreakout-22.04.0.tar.xz";
458+ sha256 = "0z8x0i5yh6hcn2b296mx05b0lm6wv4gkwk20g82ypzbwanj269pl";
459+ name = "kbreakout-22.04.0.tar.xz";
452460 };
453461 };
454462 kbruch = {
455− version = "21.12.3";
463+ version = "22.04.0";
456464 src = fetchurl {
457− url = "${mirror}/stable/release-service/21.12.3/src/kbruch-21.12.3.tar.xz";
458− sha256 = "1kcwbpa5lawkqqwn40r6d7savwvi7kkdgdxfxqxkviwnif2qkssx";
459− name = "kbruch-21.12.3.tar.xz";
465+ url = "${mirror}/stable/release-service/22.04.0/src/kbruch-22.04.0.tar.xz";
466+ sha256 = "1kpl9zk88sm4l17ndx25anlff6f1l13h4k4m39pryi5ywpsajjk9";
467+ name = "kbruch-22.04.0.tar.xz";
460468 };
461469 };
462470 kcachegrind = {
463− version = "21.12.3";
471+ version = "22.04.0";
464472 src = fetchurl {
465− url = "${mirror}/stable/release-service/21.12.3/src/kcachegrind-21.12.3.tar.xz";
466− sha256 = "1cssjywnhfbnsvly4mralpx3af2pqkmhg1jj2q3cjiqx44i3gkyx";
467− name = "kcachegrind-21.12.3.tar.xz";
473+ url = "${mirror}/stable/release-service/22.04.0/src/kcachegrind-22.04.0.tar.xz";
474+ sha256 = "03c9r0zwslsv6sb5i91bk59pzi0ia7pyssgdfr6f5b01vjjrxl5f";
475+ name = "kcachegrind-22.04.0.tar.xz";
468476 };
469477 };
470478 kcalc = {
471− version = "21.12.3";
479+ version = "22.04.0";
472480 src = fetchurl {
473− url = "${mirror}/stable/release-service/21.12.3/src/kcalc-21.12.3.tar.xz";
474− sha256 = "15yqzhrlzcix8wvgaah8wf12msylgzyqwk58f58k5agxh97ahv4q";
475− name = "kcalc-21.12.3.tar.xz";
481+ url = "${mirror}/stable/release-service/22.04.0/src/kcalc-22.04.0.tar.xz";
482+ sha256 = "1gg7wqm1vb22pa1a791sdvg1pf4l6pnzq1wsvxa8ih6dkdplcmrg";
483+ name = "kcalc-22.04.0.tar.xz";
476484 };
477485 };
478486 kcalutils = {
479− version = "21.12.3";
487+ version = "22.04.0";
480488 src = fetchurl {
481− url = "${mirror}/stable/release-service/21.12.3/src/kcalutils-21.12.3.tar.xz";
482− sha256 = "006sfkjzyid8byl2mmyn1is4nra9wjqh21ksd5g1kv948hf1jdcs";
483− name = "kcalutils-21.12.3.tar.xz";
489+ url = "${mirror}/stable/release-service/22.04.0/src/kcalutils-22.04.0.tar.xz";
490+ sha256 = "0wn9mc4myi8mj9qc3lmswqj9y3lfgfpxg0vdzxsa0ai8i3g3g0j7";
491+ name = "kcalutils-22.04.0.tar.xz";
484492 };
485493 };
486494 kcharselect = {
487− version = "21.12.3";
495+ version = "22.04.0";
488496 src = fetchurl {
489− url = "${mirror}/stable/release-service/21.12.3/src/kcharselect-21.12.3.tar.xz";
490− sha256 = "1aaiz9f9y2fmf284617pfnncgxjjjyfvdv08h900sc0bdlfmh4y7";
491− name = "kcharselect-21.12.3.tar.xz";
497+ url = "${mirror}/stable/release-service/22.04.0/src/kcharselect-22.04.0.tar.xz";
498+ sha256 = "1av1w906cy2dcdn0k7xjc1s897bgm9f8b79k97pk6x5f3rfnvy71";
499+ name = "kcharselect-22.04.0.tar.xz";
492500 };
493501 };
494502 kcolorchooser = {
495− version = "21.12.3";
503+ version = "22.04.0";
496504 src = fetchurl {
497− url = "${mirror}/stable/release-service/21.12.3/src/kcolorchooser-21.12.3.tar.xz";
498− sha256 = "0jnnbwaj9xb0ifcc95xay8yc4bx9f29wqkj3h4kffzdlwvw3vp7s";
499− name = "kcolorchooser-21.12.3.tar.xz";
505+ url = "${mirror}/stable/release-service/22.04.0/src/kcolorchooser-22.04.0.tar.xz";
506+ sha256 = "0cn5zgrsf3xji7y5ipa9zv5njyx94rg617d6l0qxjh4n94x2d4yj";
507+ name = "kcolorchooser-22.04.0.tar.xz";
500508 };
501509 };
502510 kcron = {
503− version = "21.12.3";
511+ version = "22.04.0";
504512 src = fetchurl {
505− url = "${mirror}/stable/release-service/21.12.3/src/kcron-21.12.3.tar.xz";
506− sha256 = "0ffc71inp1kyd4xh39x6vbfggz0kpipd6r6vabfn187lpnpwcmpm";
507− name = "kcron-21.12.3.tar.xz";
513+ url = "${mirror}/stable/release-service/22.04.0/src/kcron-22.04.0.tar.xz";
514+ sha256 = "0j067izv16646hjaw5swnxyf4gbg1gz5wxjcnrvscfv3hryf9b6q";
515+ name = "kcron-22.04.0.tar.xz";
508516 };
509517 };
510518 kde-dev-scripts = {
511− version = "21.12.3";
519+ version = "22.04.0";
512520 src = fetchurl {
513− url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-scripts-21.12.3.tar.xz";
514− sha256 = "04w4kk7vpfkjj2fzylmq590kk7xskw3a0id3wndw8066pfafsfg3";
515− name = "kde-dev-scripts-21.12.3.tar.xz";
521+ url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-scripts-22.04.0.tar.xz";
522+ sha256 = "0a7vsdizayl53dadcs3aiki8pl2wmibn9rjink97jl20pj8m22dx";
523+ name = "kde-dev-scripts-22.04.0.tar.xz";
516524 };
517525 };
518526 kde-dev-utils = {
519− version = "21.12.3";
527+ version = "22.04.0";
520528 src = fetchurl {
521− url = "${mirror}/stable/release-service/21.12.3/src/kde-dev-utils-21.12.3.tar.xz";
522− sha256 = "1jdqv5zdigwazh3m580rmnylr6h6a6l5g2cpxy54v9sdvh3qb1yr";
523− name = "kde-dev-utils-21.12.3.tar.xz";
529+ url = "${mirror}/stable/release-service/22.04.0/src/kde-dev-utils-22.04.0.tar.xz";
530+ sha256 = "12ci9aw82hb6z651r1jsgrkc5ywq6dcas8j12gbxllcd0033pfkp";
531+ name = "kde-dev-utils-22.04.0.tar.xz";
524532 };
525533 };
526534 kdebugsettings = {
527− version = "21.12.3";
535+ version = "22.04.0";
528536 src = fetchurl {
529− url = "${mirror}/stable/release-service/21.12.3/src/kdebugsettings-21.12.3.tar.xz";
530− sha256 = "19ng7hvqpyh3kh0pahrknh89c113mqx1kxjq4r26xbww1ypkz8zq";
531− name = "kdebugsettings-21.12.3.tar.xz";
537+ url = "${mirror}/stable/release-service/22.04.0/src/kdebugsettings-22.04.0.tar.xz";
538+ sha256 = "1jh3syvy0k611jmk615ba74zl62l5nw9fhb8y8mk6mgw23i16c21";
539+ name = "kdebugsettings-22.04.0.tar.xz";
532540 };
533541 };
534542 kdeconnect-kde = {
535− version = "21.12.3";
543+ version = "22.04.0";
536544 src = fetchurl {
537− url = "${mirror}/stable/release-service/21.12.3/src/kdeconnect-kde-21.12.3.tar.xz";
538− sha256 = "1n9km7czif19cvrsdfcjbb02i1xgpa1z4ycn20d3g8azmli4zj4g";
539− name = "kdeconnect-kde-21.12.3.tar.xz";
545+ url = "${mirror}/stable/release-service/22.04.0/src/kdeconnect-kde-22.04.0.tar.xz";
546+ sha256 = "17zza0s5lnk8rvklv4hpl877jviwv8q6y5zp7an4h12lqni3f8cv";
547+ name = "kdeconnect-kde-22.04.0.tar.xz";
540548 };
541549 };
542550 kdeedu-data = {
543− version = "21.12.3";
551+ version = "22.04.0";
544552 src = fetchurl {
545− url = "${mirror}/stable/release-service/21.12.3/src/kdeedu-data-21.12.3.tar.xz";
546− sha256 = "11mxxcca6jxz4qcmba12p6xbv845xa16b8ag529409f3276w4915";
547− name = "kdeedu-data-21.12.3.tar.xz";
553+ url = "${mirror}/stable/release-service/22.04.0/src/kdeedu-data-22.04.0.tar.xz";
554+ sha256 = "025qmwsm9h957sfa230ah2kgdsj8gs09p0nb7xpvs6wr8fhfwn1l";
555+ name = "kdeedu-data-22.04.0.tar.xz";
548556 };
549557 };
550558 kdegraphics-mobipocket = {
551− version = "21.12.3";
559+ version = "22.04.0";
552560 src = fetchurl {
553− url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-mobipocket-21.12.3.tar.xz";
554− sha256 = "091ix343p9vs4iyj8abq6mw9lbm1fx5167gykhm4g8bjk5vdri2q";
555− name = "kdegraphics-mobipocket-21.12.3.tar.xz";
561+ url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-mobipocket-22.04.0.tar.xz";
562+ sha256 = "0jinblf52nkr4jgr53szqz1l9dx9xgnwrilvzvdz2yfkyv70yr1k";
563+ name = "kdegraphics-mobipocket-22.04.0.tar.xz";
556564 };
557565 };
558566 kdegraphics-thumbnailers = {
559− version = "21.12.3";
567+ version = "22.04.0";
560568 src = fetchurl {
561− url = "${mirror}/stable/release-service/21.12.3/src/kdegraphics-thumbnailers-21.12.3.tar.xz";
562− sha256 = "0shdrl6n1724i8jrkmy8z6ayhflg93401jia87mcc1apaw9s8y83";
563− name = "kdegraphics-thumbnailers-21.12.3.tar.xz";
569+ url = "${mirror}/stable/release-service/22.04.0/src/kdegraphics-thumbnailers-22.04.0.tar.xz";
570+ sha256 = "1ywdd0dfcsssnwp5x450bhwjwjgkbhqdckk0mnf2zmw8rrspkcii";
571+ name = "kdegraphics-thumbnailers-22.04.0.tar.xz";
564572 };
565573 };
566574 kdenetwork-filesharing = {
567− version = "21.12.3";
575+ version = "22.04.0";
568576 src = fetchurl {
569− url = "${mirror}/stable/release-service/21.12.3/src/kdenetwork-filesharing-21.12.3.tar.xz";
570− sha256 = "1y6sa22j2165j3x6ql1cfm30vv9ifb94mczbqbcjzmhqsypp5pw2";
571− name = "kdenetwork-filesharing-21.12.3.tar.xz";
577+ url = "${mirror}/stable/release-service/22.04.0/src/kdenetwork-filesharing-22.04.0.tar.xz";
578+ sha256 = "1njjfvc5wlmdl3gsdv3ms4cx0z1dahnabjjn3hkls91ipd0gbgfl";
579+ name = "kdenetwork-filesharing-22.04.0.tar.xz";
572580 };
573581 };
574582 kdenlive = {
575− version = "21.12.3";
583+ version = "22.04.0";
576584 src = fetchurl {
577− url = "${mirror}/stable/release-service/21.12.3/src/kdenlive-21.12.3.tar.xz";
578− sha256 = "1hamdi2v3rx5zjmvpx1bximdppmzgsk9gbjxwgr691lkybkgx8vs";
579− name = "kdenlive-21.12.3.tar.xz";
585+ url = "${mirror}/stable/release-service/22.04.0/src/kdenlive-22.04.0.tar.xz";
586+ sha256 = "0ybd5ixjrsldsz3fr1y1phnns4lvklzcrr0mv9gg1xic38ppn536";
587+ name = "kdenlive-22.04.0.tar.xz";
580588 };
581589 };
582590 kdepim-addons = {
583− version = "21.12.3";
591+ version = "22.04.0";
584592 src = fetchurl {
585− url = "${mirror}/stable/release-service/21.12.3/src/kdepim-addons-21.12.3.tar.xz";
586− sha256 = "1pv780z29ccx05z12l2w5zdmby9d1q993jr0cyzvpapnmck9146h";
587− name = "kdepim-addons-21.12.3.tar.xz";
593+ url = "${mirror}/stable/release-service/22.04.0/src/kdepim-addons-22.04.0.tar.xz";
594+ sha256 = "0x4ja60ywrhp7qjhpb8iakhz39kxpi98iwnsfvd6drrmm1291ql1";
595+ name = "kdepim-addons-22.04.0.tar.xz";
588596 };
589597 };
590598 kdepim-runtime = {
591− version = "21.12.3";
599+ version = "22.04.0";
592600 src = fetchurl {
593− url = "${mirror}/stable/release-service/21.12.3/src/kdepim-runtime-21.12.3.tar.xz";
594− sha256 = "1ahrnnc9vn0556s4nrsjgc9vbf5rb6yby7fn33p3jjnpgja0mc7m";
595− name = "kdepim-runtime-21.12.3.tar.xz";
601+ url = "${mirror}/stable/release-service/22.04.0/src/kdepim-runtime-22.04.0.tar.xz";
602+ sha256 = "1ra39060yr8nplr855sjgwfp874vi8g76k6iyi1wh9fsxvsrnbj2";
603+ name = "kdepim-runtime-22.04.0.tar.xz";
596604 };
597605 };
598606 kdesdk-kioslaves = {
599− version = "21.12.3";
607+ version = "22.04.0";
600608 src = fetchurl {
601− url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-kioslaves-21.12.3.tar.xz";
602− sha256 = "1nhsvx5pznm3adf0scrcqqb2ibl52a241ki2gbwvxk2qpwwwx6jd";
603− name = "kdesdk-kioslaves-21.12.3.tar.xz";
609+ url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-kioslaves-22.04.0.tar.xz";
610+ sha256 = "1055gdimlaxklf93670134sf3js220wg4iv074bx3022dbvirws5";
611+ name = "kdesdk-kioslaves-22.04.0.tar.xz";
604612 };
605613 };
606614 kdesdk-thumbnailers = {
607− version = "21.12.3";
615+ version = "22.04.0";
608616 src = fetchurl {
609− url = "${mirror}/stable/release-service/21.12.3/src/kdesdk-thumbnailers-21.12.3.tar.xz";
610− sha256 = "0337rhgil42wychi5anq2v61xq8mbcvma4gb50smapcrjfl7fkdy";
611− name = "kdesdk-thumbnailers-21.12.3.tar.xz";
617+ url = "${mirror}/stable/release-service/22.04.0/src/kdesdk-thumbnailers-22.04.0.tar.xz";
618+ sha256 = "1nk0asq2ff267jvb44v7j9lpnnzrmq21fmwh2wvbiwb4mibnwh44";
619+ name = "kdesdk-thumbnailers-22.04.0.tar.xz";
612620 };
613621 };
614622 kdev-php = {
615− version = "21.12.3";
623+ version = "22.04.0";
616624 src = fetchurl {
617− url = "${mirror}/stable/release-service/21.12.3/src/kdev-php-21.12.3.tar.xz";
618− sha256 = "0z5iqgsh7w0hw0pw2522zlh5sd88zlplrxm3vjp3yvmza65471aa";
619− name = "kdev-php-21.12.3.tar.xz";
625+ url = "${mirror}/stable/release-service/22.04.0/src/kdev-php-22.04.0.tar.xz";
626+ sha256 = "00jmyrbnzar1afalx7byb3jbjqa0w0fa8aq669j6h3j52vsnr15y";
627+ name = "kdev-php-22.04.0.tar.xz";
620628 };
621629 };
622630 kdev-python = {
623− version = "21.12.3";
631+ version = "22.04.0";
624632 src = fetchurl {
625− url = "${mirror}/stable/release-service/21.12.3/src/kdev-python-21.12.3.tar.xz";
626− sha256 = "1iyg1cfldf5mk62anw8schiw3ii0gp20qwg6ljk1r9hv583iwrq6";
627− name = "kdev-python-21.12.3.tar.xz";
633+ url = "${mirror}/stable/release-service/22.04.0/src/kdev-python-22.04.0.tar.xz";
634+ sha256 = "1p28lld358c1wyqqb50v8bh6y5k3wzbkryhyhbspr40a1ym2gr8i";
635+ name = "kdev-python-22.04.0.tar.xz";
628636 };
629637 };
630638 kdevelop = {
631− version = "21.12.3";
639+ version = "22.04.0";
632640 src = fetchurl {
633− url = "${mirror}/stable/release-service/21.12.3/src/kdevelop-21.12.3.tar.xz";
634− sha256 = "1shp8zlxr7iyysn1c8d3fp6rg6g2krj2v3zw5apalxcnal16bww6";
635− name = "kdevelop-21.12.3.tar.xz";
641+ url = "${mirror}/stable/release-service/22.04.0/src/kdevelop-22.04.0.tar.xz";
642+ sha256 = "05jamqizsbfx5bj3p5d4s4320xps8nr3lq2gv22mqiv7mcl1hymb";
643+ name = "kdevelop-22.04.0.tar.xz";
636644 };
637645 };
638646 kdf = {
639− version = "21.12.3";
647+ version = "22.04.0";
640648 src = fetchurl {
641− url = "${mirror}/stable/release-service/21.12.3/src/kdf-21.12.3.tar.xz";
642− sha256 = "179ygy4kxkapfyxqj8h5xlvp1160vd72af34vd0a4r5az7wfd1m7";
643− name = "kdf-21.12.3.tar.xz";
649+ url = "${mirror}/stable/release-service/22.04.0/src/kdf-22.04.0.tar.xz";
650+ sha256 = "1xy0pm7sggcwf5mf0n9514n7skbaz9w1kwahgd135s7cxw3wd9aw";
651+ name = "kdf-22.04.0.tar.xz";
644652 };
645653 };
646654 kdialog = {
647− version = "21.12.3";
655+ version = "22.04.0";
648656 src = fetchurl {
649− url = "${mirror}/stable/release-service/21.12.3/src/kdialog-21.12.3.tar.xz";
650− sha256 = "04d1dqc5f02s867lllx1ix0nc55xw9hrpg7jxiy3v4c8vlzg0w53";
651− name = "kdialog-21.12.3.tar.xz";
657+ url = "${mirror}/stable/release-service/22.04.0/src/kdialog-22.04.0.tar.xz";
658+ sha256 = "1285jdcv2bbnq3292qx08i5bashvjj2vdx325nlfi1vbaydlfixc";
659+ name = "kdialog-22.04.0.tar.xz";
652660 };
653661 };
654662 kdiamond = {
655− version = "21.12.3";
663+ version = "22.04.0";
656664 src = fetchurl {
657− url = "${mirror}/stable/release-service/21.12.3/src/kdiamond-21.12.3.tar.xz";
658− sha256 = "1d3c4pckddnri9i19g2pi2ygpqakllrgy6azgvnh5hn20kgsw7d9";
659− name = "kdiamond-21.12.3.tar.xz";
665+ url = "${mirror}/stable/release-service/22.04.0/src/kdiamond-22.04.0.tar.xz";
666+ sha256 = "1qvjrklq2vdbq26k531ddwgjjfgnj77qc9c84c7x4bjyv3j2jhry";
667+ name = "kdiamond-22.04.0.tar.xz";
660668 };
661669 };
662670 keditbookmarks = {
663− version = "21.12.3";
671+ version = "22.04.0";
664672 src = fetchurl {
665− url = "${mirror}/stable/release-service/21.12.3/src/keditbookmarks-21.12.3.tar.xz";
666− sha256 = "0wfb7j1lhhdfw2x03p692mglmy9i9qys8mn4f3gxlb5imrd2hmnk";
667− name = "keditbookmarks-21.12.3.tar.xz";
673+ url = "${mirror}/stable/release-service/22.04.0/src/keditbookmarks-22.04.0.tar.xz";
674+ sha256 = "09vkp0ingzf8naa7d5hvsj7nxab5z4ci1nh12jn9ri6f1bvapnnn";
675+ name = "keditbookmarks-22.04.0.tar.xz";
668676 };
669677 };
670678 kfind = {
671− version = "21.12.3";
679+ version = "22.04.0";
672680 src = fetchurl {
673− url = "${mirror}/stable/release-service/21.12.3/src/kfind-21.12.3.tar.xz";
674− sha256 = "1v1yxsbmzv4q5m5rbvl9n095d9fq0b1zphnl6vrzff5r8i53pzx0";
675− name = "kfind-21.12.3.tar.xz";
681+ url = "${mirror}/stable/release-service/22.04.0/src/kfind-22.04.0.tar.xz";
682+ sha256 = "0db9iclzq89ykb9lw90wycb1057qrys02sv6z71kzyv4pv8clcsi";
683+ name = "kfind-22.04.0.tar.xz";
676684 };
677685 };
678686 kfloppy = {
679− version = "21.12.3";
687+ version = "22.04.0";
680688 src = fetchurl {
681− url = "${mirror}/stable/release-service/21.12.3/src/kfloppy-21.12.3.tar.xz";
682− sha256 = "1phkigxd6bkwlcjrsfhlhn44ra9imfq0flcvp4vmza6c9ylsx6m8";
683− name = "kfloppy-21.12.3.tar.xz";
689+ url = "${mirror}/stable/release-service/22.04.0/src/kfloppy-22.04.0.tar.xz";
690+ sha256 = "07vixy0fdvvvjwchci77a32lz2bam02smnyvl5jx446gxra3kbxd";
691+ name = "kfloppy-22.04.0.tar.xz";
684692 };
685693 };
686694 kfourinline = {
687− version = "21.12.3";
695+ version = "22.04.0";
688696 src = fetchurl {
689− url = "${mirror}/stable/release-service/21.12.3/src/kfourinline-21.12.3.tar.xz";
690− sha256 = "0rb5jcmmf19bidwywj56dn0wfrnrfi5kc75c20d7mxnlgygfdnkg";
691− name = "kfourinline-21.12.3.tar.xz";
697+ url = "${mirror}/stable/release-service/22.04.0/src/kfourinline-22.04.0.tar.xz";
698+ sha256 = "1kvpilvsfb4zz59jmz8qk688xf9j4v8xijahxnsfrx3a216nd5wx";
699+ name = "kfourinline-22.04.0.tar.xz";
692700 };
693701 };
694702 kgeography = {
695− version = "21.12.3";
703+ version = "22.04.0";
696704 src = fetchurl {
697− url = "${mirror}/stable/release-service/21.12.3/src/kgeography-21.12.3.tar.xz";
698− sha256 = "1s1xyfffqkhmf4n74a4ksjz62rdiyl1fk1v57s9gnr6qw71wqql0";
699− name = "kgeography-21.12.3.tar.xz";
705+ url = "${mirror}/stable/release-service/22.04.0/src/kgeography-22.04.0.tar.xz";
706+ sha256 = "1f75av03iw1glsxar6ipbch2xvb9if59r3h85ndkpd7f8azdmam5";
707+ name = "kgeography-22.04.0.tar.xz";
700708 };
701709 };
702710 kget = {
703− version = "21.12.3";
711+ version = "22.04.0";
704712 src = fetchurl {
705− url = "${mirror}/stable/release-service/21.12.3/src/kget-21.12.3.tar.xz";
706− sha256 = "1w249gvzz47ac7n1mnxxf20d9l7jmbh18m5dijy55ck61s4zcq4l";
707− name = "kget-21.12.3.tar.xz";
713+ url = "${mirror}/stable/release-service/22.04.0/src/kget-22.04.0.tar.xz";
714+ sha256 = "01s73qb2658hryq639yiqjl696z6k4c6m7vmm0x9iglacl0qihdd";
715+ name = "kget-22.04.0.tar.xz";
708716 };
709717 };
710718 kgoldrunner = {
711− version = "21.12.3";
719+ version = "22.04.0";
712720 src = fetchurl {
713− url = "${mirror}/stable/release-service/21.12.3/src/kgoldrunner-21.12.3.tar.xz";
714− sha256 = "0gzz58407zjmk311kyyj5l2c1ciczcq9i8ckpwbd341dvwaww27q";
715− name = "kgoldrunner-21.12.3.tar.xz";
721+ url = "${mirror}/stable/release-service/22.04.0/src/kgoldrunner-22.04.0.tar.xz";
722+ sha256 = "1d6z2fslxpjdnixh372p78zk1apavnn9pvhdhnz9isq1yyvbwabx";
723+ name = "kgoldrunner-22.04.0.tar.xz";
716724 };
717725 };
718726 kgpg = {
719− version = "21.12.3";
727+ version = "22.04.0";
720728 src = fetchurl {
721− url = "${mirror}/stable/release-service/21.12.3/src/kgpg-21.12.3.tar.xz";
722− sha256 = "1mzq3g4xwg459k0mp9xvg8bhilizadbh4gck1764wq69bxlcyav3";
723− name = "kgpg-21.12.3.tar.xz";
729+ url = "${mirror}/stable/release-service/22.04.0/src/kgpg-22.04.0.tar.xz";
730+ sha256 = "0g78r1lya4vv09yiq9jmhcy4d3824n70ps71x1z6dvrpf6fnri49";
731+ name = "kgpg-22.04.0.tar.xz";
724732 };
725733 };
726734 khangman = {
727− version = "21.12.3";
735+ version = "22.04.0";
728736 src = fetchurl {
729− url = "${mirror}/stable/release-service/21.12.3/src/khangman-21.12.3.tar.xz";
730− sha256 = "000vn11pp4hwfh2689rmnwrrssrmrhx5569k02h4ynswkiykvbv6";
731− name = "khangman-21.12.3.tar.xz";
737+ url = "${mirror}/stable/release-service/22.04.0/src/khangman-22.04.0.tar.xz";
738+ sha256 = "0dl4rdifgxbxcxslnjcgl8ni3fw30zkp90mzdrp4hbg1rql8pav9";
739+ name = "khangman-22.04.0.tar.xz";
732740 };
733741 };
734742 khelpcenter = {
735− version = "21.12.3";
743+ version = "22.04.0";
736744 src = fetchurl {
737− url = "${mirror}/stable/release-service/21.12.3/src/khelpcenter-21.12.3.tar.xz";
738− sha256 = "1fj1c57bqs009rx9db4ifvfmhhl4b35r5sfly3wvbfr4dapjqfqr";
739− name = "khelpcenter-21.12.3.tar.xz";
745+ url = "${mirror}/stable/release-service/22.04.0/src/khelpcenter-22.04.0.tar.xz";
746+ sha256 = "1nfa9q688l151196mbfdn5i7k2x2a5sz1kn07j8flxhwpkcbyrgm";
747+ name = "khelpcenter-22.04.0.tar.xz";
740748 };
741749 };
742750 kidentitymanagement = {
743− version = "21.12.3";
751+ version = "22.04.0";
744752 src = fetchurl {
745− url = "${mirror}/stable/release-service/21.12.3/src/kidentitymanagement-21.12.3.tar.xz";
746− sha256 = "18xwvlmqhih5jmig2mj3a6mc5awlxdv8f81da6cgm123imhrirk4";
747− name = "kidentitymanagement-21.12.3.tar.xz";
753+ url = "${mirror}/stable/release-service/22.04.0/src/kidentitymanagement-22.04.0.tar.xz";
754+ sha256 = "1xw5q12la5p34lg8pwndx4pnr1cf5pv36611209v2qcfwjfk5570";
755+ name = "kidentitymanagement-22.04.0.tar.xz";
748756 };
749757 };
750758 kig = {
751− version = "21.12.3";
759+ version = "22.04.0";
752760 src = fetchurl {
753− url = "${mirror}/stable/release-service/21.12.3/src/kig-21.12.3.tar.xz";
754− sha256 = "0rl0z1djsf9ha0q94v0cnj5qm4ij6yjsil2s57r3v666h64yradn";
755− name = "kig-21.12.3.tar.xz";
761+ url = "${mirror}/stable/release-service/22.04.0/src/kig-22.04.0.tar.xz";
762+ sha256 = "0rbrvkflm0199vz4zpqs08dqzsrqw7r8xzgr034s9g7hwf0f5nbd";
763+ name = "kig-22.04.0.tar.xz";
756764 };
757765 };
758766 kigo = {
759− version = "21.12.3";
767+ version = "22.04.0";
760768 src = fetchurl {
761− url = "${mirror}/stable/release-service/21.12.3/src/kigo-21.12.3.tar.xz";
762− sha256 = "14pp73b9mbf0ny75b90vs7z9l61m7zp8cll7hl4bplqh1kig1szf";
763− name = "kigo-21.12.3.tar.xz";
769+ url = "${mirror}/stable/release-service/22.04.0/src/kigo-22.04.0.tar.xz";
770+ sha256 = "0whiza2xqzi33ppaz1d72aicg53f1zmwg47drg1s42sx5rj7jmpg";
771+ name = "kigo-22.04.0.tar.xz";
764772 };
765773 };
766774 killbots = {
767− version = "21.12.3";
775+ version = "22.04.0";
768776 src = fetchurl {
769− url = "${mirror}/stable/release-service/21.12.3/src/killbots-21.12.3.tar.xz";
770− sha256 = "1ncr55xq04vrx6bss1ahk86c3l9ckhv4zjbc6gq4krhjw0lkdfiv";
771− name = "killbots-21.12.3.tar.xz";
777+ url = "${mirror}/stable/release-service/22.04.0/src/killbots-22.04.0.tar.xz";
778+ sha256 = "0aaip213gc6ngan122r2rm7mc794mlir3qx1krhsg6gh8i1qvj91";
779+ name = "killbots-22.04.0.tar.xz";
772780 };
773781 };
774782 kimagemapeditor = {
775− version = "21.12.3";
783+ version = "22.04.0";
776784 src = fetchurl {
777− url = "${mirror}/stable/release-service/21.12.3/src/kimagemapeditor-21.12.3.tar.xz";
778− sha256 = "0qdmyrlf0jp3737p7x31wk428676xv77lx0mgyd9h2hdl0ipnbvr";
779− name = "kimagemapeditor-21.12.3.tar.xz";
785+ url = "${mirror}/stable/release-service/22.04.0/src/kimagemapeditor-22.04.0.tar.xz";
786+ sha256 = "0yh7sb5pk31q1pksb74yg94mrf752baj767gq0kgmp6ymmw83i6x";
787+ name = "kimagemapeditor-22.04.0.tar.xz";
780788 };
781789 };
782790 kimap = {
783− version = "21.12.3";
791+ version = "22.04.0";
784792 src = fetchurl {
785− url = "${mirror}/stable/release-service/21.12.3/src/kimap-21.12.3.tar.xz";
786− sha256 = "11jd9zkvflfh3gqs36fhj8mla3k44xf7zdb0z4nl9sk5nhhgm5px";
787− name = "kimap-21.12.3.tar.xz";
793+ url = "${mirror}/stable/release-service/22.04.0/src/kimap-22.04.0.tar.xz";
794+ sha256 = "12n0fjqh9mpwdii3gkvfvg33b6lzdrl2n3v94j29hq4nk8k1y8gf";
795+ name = "kimap-22.04.0.tar.xz";
788796 };
789797 };
790798 kio-extras = {
791− version = "21.12.3";
799+ version = "22.04.0";
792800 src = fetchurl {
793− url = "${mirror}/stable/release-service/21.12.3/src/kio-extras-21.12.3.tar.xz";
794− sha256 = "11zpnjdri7z4sz6zx26d9iv52aj4vf5lr9c114gg4pvz2l4h4h5i";
795− name = "kio-extras-21.12.3.tar.xz";
801+ url = "${mirror}/stable/release-service/22.04.0/src/kio-extras-22.04.0.tar.xz";
802+ sha256 = "1ikjhimw12c9kvq15zjwxvmrd4mfx66dxl9scfvkh6pvw8l9hy76";
803+ name = "kio-extras-22.04.0.tar.xz";
796804 };
797805 };
798806 kio-gdrive = {
799− version = "21.12.3";
807+ version = "22.04.0";
800808 src = fetchurl {
801− url = "${mirror}/stable/release-service/21.12.3/src/kio-gdrive-21.12.3.tar.xz";
802− sha256 = "0bm3c7g6q7z2ydnha2x5c456x9wlgachi9453mlrd2zcsc7c5h87";
803− name = "kio-gdrive-21.12.3.tar.xz";
809+ url = "${mirror}/stable/release-service/22.04.0/src/kio-gdrive-22.04.0.tar.xz";
810+ sha256 = "1v445kclcdnb6ajjrjmkqzvr5f84n7qx79cxikrd21zphym0p4cz";
811+ name = "kio-gdrive-22.04.0.tar.xz";
804812 };
805813 };
806814 kipi-plugins = {
807− version = "21.12.3";
815+ version = "22.04.0";
808816 src = fetchurl {
809− url = "${mirror}/stable/release-service/21.12.3/src/kipi-plugins-21.12.3.tar.xz";
810− sha256 = "1h6107d2a6jcyjsd191cg2ykgwm580j7wr0blg328ff6wwk1aizy";
811− name = "kipi-plugins-21.12.3.tar.xz";
817+ url = "${mirror}/stable/release-service/22.04.0/src/kipi-plugins-22.04.0.tar.xz";
818+ sha256 = "0cxn6h5vglip14ydap0wnnwm5y33x9lha4r05kwyjlvi754dx4qs";
819+ name = "kipi-plugins-22.04.0.tar.xz";
812820 };
813821 };
814822 kirigami-gallery = {
815− version = "21.12.3";
823+ version = "22.04.0";
816824 src = fetchurl {
817− url = "${mirror}/stable/release-service/21.12.3/src/kirigami-gallery-21.12.3.tar.xz";
818− sha256 = "0pjd9bq965v9x433p8rbhd7w3fj0808qd7x4c11ziyhy4cg9gwml";
819− name = "kirigami-gallery-21.12.3.tar.xz";
825+ url = "${mirror}/stable/release-service/22.04.0/src/kirigami-gallery-22.04.0.tar.xz";
826+ sha256 = "1ggg4ak997ax03zaspx09z0jxh0lf10sm5hh262p1v96xnlc7kz3";
827+ name = "kirigami-gallery-22.04.0.tar.xz";
820828 };
821829 };
822830 kiriki = {
823− version = "21.12.3";
831+ version = "22.04.0";
824832 src = fetchurl {
825− url = "${mirror}/stable/release-service/21.12.3/src/kiriki-21.12.3.tar.xz";
826− sha256 = "0qbm0zjjqnbcdm39zi8h240nblpa1pa7g1ls9mghzbqrdrh7n3a0";
827− name = "kiriki-21.12.3.tar.xz";
833+ url = "${mirror}/stable/release-service/22.04.0/src/kiriki-22.04.0.tar.xz";
834+ sha256 = "041xiw7s7r94115wvlnzk1443af9gb06scsvbqj92hdc9a2p6318";
835+ name = "kiriki-22.04.0.tar.xz";
828836 };
829837 };
830838 kiten = {
831− version = "21.12.3";
839+ version = "22.04.0";
832840 src = fetchurl {
833− url = "${mirror}/stable/release-service/21.12.3/src/kiten-21.12.3.tar.xz";
834− sha256 = "0z0haqxxkh7m2510b5qfwbx8s45vcahbk503jp1x0bwz03mrwflw";
835− name = "kiten-21.12.3.tar.xz";
841+ url = "${mirror}/stable/release-service/22.04.0/src/kiten-22.04.0.tar.xz";
842+ sha256 = "0n19a4ch2rgzq7s2f6dnhgbcqdi22xqd8vhy5hnbw4mw4xa9f6xm";
843+ name = "kiten-22.04.0.tar.xz";
836844 };
837845 };
838846 kitinerary = {
839− version = "21.12.3";
847+ version = "22.04.0";
840848 src = fetchurl {
841− url = "${mirror}/stable/release-service/21.12.3/src/kitinerary-21.12.3.tar.xz";
842− sha256 = "0kccrjiyib2zljr6rnc89y29jgi8cnhwfh1yq8psyzmca2n8lpxi";
843− name = "kitinerary-21.12.3.tar.xz";
849+ url = "${mirror}/stable/release-service/22.04.0/src/kitinerary-22.04.0.tar.xz";
850+ sha256 = "1q2dwdycajab3w7w4898s3s2jcy541qgsandfzi7yapplw238gm7";
851+ name = "kitinerary-22.04.0.tar.xz";
844852 };
845853 };
846854 kjumpingcube = {
847− version = "21.12.3";
855+ version = "22.04.0";
848856 src = fetchurl {
849− url = "${mirror}/stable/release-service/21.12.3/src/kjumpingcube-21.12.3.tar.xz";
850− sha256 = "1wlk6my6pawmdv3zgcpnyyzpjwz0wii0h8i1z0gxhbpg9nc8iy1r";
851− name = "kjumpingcube-21.12.3.tar.xz";
857+ url = "${mirror}/stable/release-service/22.04.0/src/kjumpingcube-22.04.0.tar.xz";
858+ sha256 = "1q8wnyympajijzsnddrf21pzwshbvkj4r5diydgavd23zgspfkp3";
859+ name = "kjumpingcube-22.04.0.tar.xz";
852860 };
853861 };
854862 kldap = {
855− version = "21.12.3";
863+ version = "22.04.0";
856864 src = fetchurl {
857− url = "${mirror}/stable/release-service/21.12.3/src/kldap-21.12.3.tar.xz";
858− sha256 = "13llsfhx9lfvhf90a3vmpkyh02fjg5sp4fmrwrqyx9hjrbmy1g0a";
859− name = "kldap-21.12.3.tar.xz";
865+ url = "${mirror}/stable/release-service/22.04.0/src/kldap-22.04.0.tar.xz";
866+ sha256 = "1z6kmkryc9sz3g0hf0dh7plmv59w03rzxyrnacrc94bjkbf56y1i";
867+ name = "kldap-22.04.0.tar.xz";
860868 };
861869 };
862870 kleopatra = {
863− version = "21.12.3";
871+ version = "22.04.0";
864872 src = fetchurl {
865− url = "${mirror}/stable/release-service/21.12.3/src/kleopatra-21.12.3.tar.xz";
866− sha256 = "10f61m0qrs0qipn94jd32gibyj8pcvprs8j7gmac0mym0b3djjls";
867− name = "kleopatra-21.12.3.tar.xz";
873+ url = "${mirror}/stable/release-service/22.04.0/src/kleopatra-22.04.0.tar.xz";
874+ sha256 = "0aaz3mwyyr2i8lbkrfz9hbz8358bqhf2zzxla1i9p177cfrdv60i";
875+ name = "kleopatra-22.04.0.tar.xz";
868876 };
869877 };
870878 klettres = {
871− version = "21.12.3";
879+ version = "22.04.0";
872880 src = fetchurl {
873− url = "${mirror}/stable/release-service/21.12.3/src/klettres-21.12.3.tar.xz";
874− sha256 = "0l4zgfqd6l2bk67s2a0zldbcy8v7nwbv7yahvnyw4jf4jyv9q9rv";
875− name = "klettres-21.12.3.tar.xz";
881+ url = "${mirror}/stable/release-service/22.04.0/src/klettres-22.04.0.tar.xz";
882+ sha256 = "1ih7q2rd6ajky719dikyfhy03dyw4x4bm9032l8vd51rv9zcjbp3";
883+ name = "klettres-22.04.0.tar.xz";
876884 };
877885 };
878886 klickety = {
879− version = "21.12.3";
887+ version = "22.04.0";
880888 src = fetchurl {
881− url = "${mirror}/stable/release-service/21.12.3/src/klickety-21.12.3.tar.xz";
882− sha256 = "03liv3fax764ngfkwp3ga96irn8qb509b08ljnhz5aw5v9yrssnk";
883− name = "klickety-21.12.3.tar.xz";
889+ url = "${mirror}/stable/release-service/22.04.0/src/klickety-22.04.0.tar.xz";
890+ sha256 = "1fl76vj1qrlp8giy6ing3qnm76i4scx0q5sn7dflwix5cjvsjyss";
891+ name = "klickety-22.04.0.tar.xz";
884892 };
885893 };
886894 klines = {
887− version = "21.12.3";
895+ version = "22.04.0";
888896 src = fetchurl {
889− url = "${mirror}/stable/release-service/21.12.3/src/klines-21.12.3.tar.xz";
890− sha256 = "1ypi64wdsw1zsj03wcxj02v27y1by113v89as8dyk9wr0pfmbpqf";
891− name = "klines-21.12.3.tar.xz";
897+ url = "${mirror}/stable/release-service/22.04.0/src/klines-22.04.0.tar.xz";
898+ sha256 = "0s7vqsg5lh7znxij0fygawww8fhga3rn0dv5k147jbvrzhfn01yn";
899+ name = "klines-22.04.0.tar.xz";
892900 };
893901 };
894902 kmag = {
895− version = "21.12.3";
903+ version = "22.04.0";
896904 src = fetchurl {
897− url = "${mirror}/stable/release-service/21.12.3/src/kmag-21.12.3.tar.xz";
898− sha256 = "067x65gmip89rdgii2nwnxn7zi96cf7vfbhqzg0499pd2d69p3sl";
899− name = "kmag-21.12.3.tar.xz";
905+ url = "${mirror}/stable/release-service/22.04.0/src/kmag-22.04.0.tar.xz";
906+ sha256 = "1bwp7psf2vdl7q0s8ymji9zhmrfp6vxilwmf9cw1bhl0wjislnp6";
907+ name = "kmag-22.04.0.tar.xz";
900908 };
901909 };
902910 kmahjongg = {
903− version = "21.12.3";
911+ version = "22.04.0";
904912 src = fetchurl {
905− url = "${mirror}/stable/release-service/21.12.3/src/kmahjongg-21.12.3.tar.xz";
906− sha256 = "02yvvpwkk5gbj445zv5xhfragk8220rlx0pkxf32pj0jsv7dnz1x";
907− name = "kmahjongg-21.12.3.tar.xz";
913+ url = "${mirror}/stable/release-service/22.04.0/src/kmahjongg-22.04.0.tar.xz";
914+ sha256 = "1hs0pv8bvxbk8c4ag7kbmylddh0wqzzi953xggpi86fzinpgzmq9";
915+ name = "kmahjongg-22.04.0.tar.xz";
908916 };
909917 };
910918 kmail = {
911− version = "21.12.3";
919+ version = "22.04.0";
912920 src = fetchurl {
913− url = "${mirror}/stable/release-service/21.12.3/src/kmail-21.12.3.tar.xz";
914− sha256 = "1knh6cf72hidc6jyiw250b708b410fla0c5w83zaavmwv37ah8z0";
915− name = "kmail-21.12.3.tar.xz";
921+ url = "${mirror}/stable/release-service/22.04.0/src/kmail-22.04.0.tar.xz";
922+ sha256 = "1rp65m1y4rynzxc0497d4kbppqj9gz5r1kd769msq01v72if7xvr";
923+ name = "kmail-22.04.0.tar.xz";
916924 };
917925 };
918926 kmail-account-wizard = {
919− version = "21.12.3";
927+ version = "22.04.0";
920928 src = fetchurl {
921− url = "${mirror}/stable/release-service/21.12.3/src/kmail-account-wizard-21.12.3.tar.xz";
922− sha256 = "0ar2rm6viissfipbak07fxivrgqgsdfilsprsqmvab44inw2g4pg";
923− name = "kmail-account-wizard-21.12.3.tar.xz";
929+ url = "${mirror}/stable/release-service/22.04.0/src/kmail-account-wizard-22.04.0.tar.xz";
930+ sha256 = "0pvbq8x16m08v3fdmd7gjnsh5p7c77fgz1f0d11hkbnpza9x72d7";
931+ name = "kmail-account-wizard-22.04.0.tar.xz";
924932 };
925933 };
926934 kmailtransport = {
927− version = "21.12.3";
935+ version = "22.04.0";
928936 src = fetchurl {
929− url = "${mirror}/stable/release-service/21.12.3/src/kmailtransport-21.12.3.tar.xz";
930− sha256 = "0l3pgs781a6is937i0bkz9ykr40l36rwlrirsr4g8wh0gkc3ifi6";
931− name = "kmailtransport-21.12.3.tar.xz";
937+ url = "${mirror}/stable/release-service/22.04.0/src/kmailtransport-22.04.0.tar.xz";
938+ sha256 = "1bglr299xn5z65zl49kp6ahcf229aga5fwn6ij2bv3cm9xa4f6iv";
939+ name = "kmailtransport-22.04.0.tar.xz";
932940 };
933941 };
934942 kmbox = {
935− version = "21.12.3";
943+ version = "22.04.0";
936944 src = fetchurl {
937− url = "${mirror}/stable/release-service/21.12.3/src/kmbox-21.12.3.tar.xz";
938− sha256 = "04cl2khj3a7n81nlmxsg8kgszrl22qm6s2kvbrhz39yfzi31cwqr";
939− name = "kmbox-21.12.3.tar.xz";
945+ url = "${mirror}/stable/release-service/22.04.0/src/kmbox-22.04.0.tar.xz";
946+ sha256 = "1ysjjz8v338l8n47dxg5jskbilsybwx6vd3lmlajw5iqfwpjk6k1";
947+ name = "kmbox-22.04.0.tar.xz";
940948 };
941949 };
942950 kmime = {
943− version = "21.12.3";
951+ version = "22.04.0";
944952 src = fetchurl {
945− url = "${mirror}/stable/release-service/21.12.3/src/kmime-21.12.3.tar.xz";
946− sha256 = "03s7l4lywdvp97h4qjgq06qqcclvnhy83qsrfzv0w2wcl631nnpw";
947− name = "kmime-21.12.3.tar.xz";
953+ url = "${mirror}/stable/release-service/22.04.0/src/kmime-22.04.0.tar.xz";
954+ sha256 = "0h9dsw3jl2jpfsb19yh4v8rzjd930xbglgzasl87f0f2nawkmdik";
955+ name = "kmime-22.04.0.tar.xz";
948956 };
949957 };
950958 kmines = {
951− version = "21.12.3";
959+ version = "22.04.0";
952960 src = fetchurl {
953− url = "${mirror}/stable/release-service/21.12.3/src/kmines-21.12.3.tar.xz";
954− sha256 = "1wxy0cyz733wvnxfjhirqf41wnda4f6aqdiqmb5r1ngzzllgbglc";
955− name = "kmines-21.12.3.tar.xz";
961+ url = "${mirror}/stable/release-service/22.04.0/src/kmines-22.04.0.tar.xz";
962+ sha256 = "1dzfi9r2zrn0rn96l42g12srqgmz8gkw6glyjadzay1mkhin7zp4";
963+ name = "kmines-22.04.0.tar.xz";
956964 };
957965 };
958966 kmix = {
959− version = "21.12.3";
967+ version = "22.04.0";
960968 src = fetchurl {
961− url = "${mirror}/stable/release-service/21.12.3/src/kmix-21.12.3.tar.xz";
962− sha256 = "1zk2xljis1pv3m4vs5zr6wza6iv5y6wmh1csx3rn8ylfkrpk7h8k";
963− name = "kmix-21.12.3.tar.xz";
969+ url = "${mirror}/stable/release-service/22.04.0/src/kmix-22.04.0.tar.xz";
970+ sha256 = "0yjykslaynf6vcv33s3hwm2s03acp2k97dljmq8dwgq3nwyaah9z";
971+ name = "kmix-22.04.0.tar.xz";
964972 };
965973 };
966974 kmousetool = {
967− version = "21.12.3";
975+ version = "22.04.0";
968976 src = fetchurl {
969− url = "${mirror}/stable/release-service/21.12.3/src/kmousetool-21.12.3.tar.xz";
970− sha256 = "013qr1md3gbin7hcahnv14y9i2cg35r433s2w81fvgcakd38qvkj";
971− name = "kmousetool-21.12.3.tar.xz";
977+ url = "${mirror}/stable/release-service/22.04.0/src/kmousetool-22.04.0.tar.xz";
978+ sha256 = "0a0gcq0295x3ckdhxv77lnvv8yms04xg5pkza5612k3zr386f0b5";
979+ name = "kmousetool-22.04.0.tar.xz";
972980 };
973981 };
974982 kmouth = {
975− version = "21.12.3";
983+ version = "22.04.0";
976984 src = fetchurl {
977− url = "${mirror}/stable/release-service/21.12.3/src/kmouth-21.12.3.tar.xz";
978− sha256 = "0xvkp2pm2szbgzdsfmwrykma8npmlwmx2pb1iakbx3x1wyyjsbim";
979− name = "kmouth-21.12.3.tar.xz";
985+ url = "${mirror}/stable/release-service/22.04.0/src/kmouth-22.04.0.tar.xz";
986+ sha256 = "05v0frgl6im5yv6ah8qsrgqcrjziiycnnnqq2z859psxnysvmsiz";
987+ name = "kmouth-22.04.0.tar.xz";
980988 };
981989 };
982990 kmplot = {
983− version = "21.12.3";
991+ version = "22.04.0";
984992 src = fetchurl {
985− url = "${mirror}/stable/release-service/21.12.3/src/kmplot-21.12.3.tar.xz";
986− sha256 = "1vmrzfcdyaxgvyp9la2gvy3h5fhksmn24lsnrpvr6alj880mh8bq";
987− name = "kmplot-21.12.3.tar.xz";
993+ url = "${mirror}/stable/release-service/22.04.0/src/kmplot-22.04.0.tar.xz";
994+ sha256 = "063bxm619jkd63jv70a4g6bj2q4fcg5a7lxjkwas9qm1qhlz2vzy";
995+ name = "kmplot-22.04.0.tar.xz";
988996 };
989997 };
990998 knavalbattle = {
991− version = "21.12.3";
999+ version = "22.04.0";
9921000 src = fetchurl {
993− url = "${mirror}/stable/release-service/21.12.3/src/knavalbattle-21.12.3.tar.xz";
994− sha256 = "1mpj1783za6b7a7cjawy4v0z24dvcd34gdb25qch4gi9cx1lc28z";
995− name = "knavalbattle-21.12.3.tar.xz";
1001+ url = "${mirror}/stable/release-service/22.04.0/src/knavalbattle-22.04.0.tar.xz";
1002+ sha256 = "1hdgmjvsv7skck64w4j4sxyq7b8c7f5i2vcvkfbqxrrzf3wcq649";
1003+ name = "knavalbattle-22.04.0.tar.xz";
9961004 };
9971005 };
9981006 knetwalk = {
999− version = "21.12.3";
1007+ version = "22.04.0";
10001008 src = fetchurl {
1001− url = "${mirror}/stable/release-service/21.12.3/src/knetwalk-21.12.3.tar.xz";
1002− sha256 = "0ahms3imvkdknp1z2h6j42k9g1i20ygd2633icjv37d2cbij128m";
1003− name = "knetwalk-21.12.3.tar.xz";
1009+ url = "${mirror}/stable/release-service/22.04.0/src/knetwalk-22.04.0.tar.xz";
1010+ sha256 = "0ws9sgn3ygl4012irkjk82j7b08cbhpq7ca7sncw9il7lfxbis6l";
1011+ name = "knetwalk-22.04.0.tar.xz";
10041012 };
10051013 };
10061014 knights = {
1007− version = "21.12.3";
1015+ version = "22.04.0";
10081016 src = fetchurl {
1009− url = "${mirror}/stable/release-service/21.12.3/src/knights-21.12.3.tar.xz";
1010− sha256 = "1m2big16rdw3w347m5vi0qhypnb2rgz6804kkxs7ln0yx658y4x4";
1011− name = "knights-21.12.3.tar.xz";
1017+ url = "${mirror}/stable/release-service/22.04.0/src/knights-22.04.0.tar.xz";
1018+ sha256 = "0dfxk811f9yjklfr01djppms86fqj3112cfh41z2zwsl4wgbyrma";
1019+ name = "knights-22.04.0.tar.xz";
10121020 };
10131021 };
10141022 knotes = {
1015− version = "21.12.3";
1023+ version = "22.04.0";
10161024 src = fetchurl {
1017− url = "${mirror}/stable/release-service/21.12.3/src/knotes-21.12.3.tar.xz";
1018− sha256 = "07pj0aqwsy1xi5mx7x0h3zmxfg0n4afgjax9a9ihc553xs6k48d7";
1019− name = "knotes-21.12.3.tar.xz";
1025+ url = "${mirror}/stable/release-service/22.04.0/src/knotes-22.04.0.tar.xz";
1026+ sha256 = "023rv1cvy2ykpv9p0862csixxn65fkhis8jjf9vmdq33j7mmflsm";
1027+ name = "knotes-22.04.0.tar.xz";
10201028 };
10211029 };
10221030 kolf = {
1023− version = "21.12.3";
1031+ version = "22.04.0";
10241032 src = fetchurl {
1025− url = "${mirror}/stable/release-service/21.12.3/src/kolf-21.12.3.tar.xz";
1026− sha256 = "00dhjy82d9964z94nn4vkkwynql3bfa6djwrgsq93f9d7grgkd7g";
1027− name = "kolf-21.12.3.tar.xz";
1033+ url = "${mirror}/stable/release-service/22.04.0/src/kolf-22.04.0.tar.xz";
1034+ sha256 = "0i3j9wbhjgxd1j58brjnbyb7862h6iz8kvb6vnnqwgzybwy09n88";
1035+ name = "kolf-22.04.0.tar.xz";
10281036 };
10291037 };
10301038 kollision = {
1031− version = "21.12.3";
1039+ version = "22.04.0";
10321040 src = fetchurl {
1033− url = "${mirror}/stable/release-service/21.12.3/src/kollision-21.12.3.tar.xz";
1034− sha256 = "0avin6s1lglfps6qlvz19i27nb0x0hgrl4q2brpq4kax7azs1nc3";
1035− name = "kollision-21.12.3.tar.xz";
1041+ url = "${mirror}/stable/release-service/22.04.0/src/kollision-22.04.0.tar.xz";
1042+ sha256 = "18vp7iqkm9pbrcl5cppwb6qngfbw75d2vjqngm5kjz124jn6hxxa";
1043+ name = "kollision-22.04.0.tar.xz";
10361044 };
10371045 };
10381046 kolourpaint = {
1039− version = "21.12.3";
1047+ version = "22.04.0";
10401048 src = fetchurl {
1041− url = "${mirror}/stable/release-service/21.12.3/src/kolourpaint-21.12.3.tar.xz";
1042− sha256 = "0kbz8jz33bk4zr7kk6mb1y42mdq6nykdfqm2cs08sxldd3nrs6fj";
1043− name = "kolourpaint-21.12.3.tar.xz";
1049+ url = "${mirror}/stable/release-service/22.04.0/src/kolourpaint-22.04.0.tar.xz";
1050+ sha256 = "0qwibnpr5zgpwdk44xl43xlr02w75j8c01z8arsiv6rdycwy9cmf";
1051+ name = "kolourpaint-22.04.0.tar.xz";
10441052 };
10451053 };
10461054 kompare = {
1047− version = "21.12.3";
1055+ version = "22.04.0";
10481056 src = fetchurl {
1049− url = "${mirror}/stable/release-service/21.12.3/src/kompare-21.12.3.tar.xz";
1050− sha256 = "097aawmziplsndj42bdjf3x3smal1fy67c2y7cik9p1qw9wgn24h";
1051− name = "kompare-21.12.3.tar.xz";
1057+ url = "${mirror}/stable/release-service/22.04.0/src/kompare-22.04.0.tar.xz";
1058+ sha256 = "1381kih1ywd5k2wslasp0ap69kmbd05nm8jy67cric1f9d4fxq72";
1059+ name = "kompare-22.04.0.tar.xz";
10521060 };
10531061 };
10541062 konqueror = {
1055− version = "21.12.3";
1063+ version = "22.04.0";
10561064 src = fetchurl {
1057− url = "${mirror}/stable/release-service/21.12.3/src/konqueror-21.12.3.tar.xz";
1058− sha256 = "0z3zq71n0lnpx5ggfg835zbmgf2ly4zsmz01yyyxn9n9d9b6d3px";
1059− name = "konqueror-21.12.3.tar.xz";
1065+ url = "${mirror}/stable/release-service/22.04.0/src/konqueror-22.04.0.tar.xz";
1066+ sha256 = "0s0cf41p2ciwmgywv5g59cnw9fzy2065grk9g058d522qqadcmfv";
1067+ name = "konqueror-22.04.0.tar.xz";
10601068 };
10611069 };
10621070 konquest = {
1063− version = "21.12.3";
1071+ version = "22.04.0";
10641072 src = fetchurl {
1065− url = "${mirror}/stable/release-service/21.12.3/src/konquest-21.12.3.tar.xz";
1066− sha256 = "0lrahq9s70rx24dw4cgpvchr4s6pcl565vh343ggg24s1rd3ly80";
1067− name = "konquest-21.12.3.tar.xz";
1073+ url = "${mirror}/stable/release-service/22.04.0/src/konquest-22.04.0.tar.xz";
1074+ sha256 = "0kpjakww8kaqf7b18v5r7xhg9z07c22959gygcq22b0dahqsgy1w";
1075+ name = "konquest-22.04.0.tar.xz";
10681076 };
10691077 };
10701078 konsole = {
1071− version = "21.12.3";
1079+ version = "22.04.0";
10721080 src = fetchurl {
1073− url = "${mirror}/stable/release-service/21.12.3/src/konsole-21.12.3.tar.xz";
1074− sha256 = "06sqm2xmairicrdcxnf7imvyvw0wyknrrym334scx2w7mfhjg5qs";
1075− name = "konsole-21.12.3.tar.xz";
1081+ url = "${mirror}/stable/release-service/22.04.0/src/konsole-22.04.0.tar.xz";
1082+ sha256 = "1wyvfwky8p5ryc101bfxfbzrbvhw6sl9yaqk057wkqvav2h6k6xz";
1083+ name = "konsole-22.04.0.tar.xz";
10761084 };
10771085 };
10781086 kontact = {
1079− version = "21.12.3";
1087+ version = "22.04.0";
10801088 src = fetchurl {
1081− url = "${mirror}/stable/release-service/21.12.3/src/kontact-21.12.3.tar.xz";
1082− sha256 = "16p17b4llral0g48l3s9yg838x6hhc4dprlcpd00b8sy58c27f90";
1083− name = "kontact-21.12.3.tar.xz";
1089+ url = "${mirror}/stable/release-service/22.04.0/src/kontact-22.04.0.tar.xz";
1090+ sha256 = "19jpwazr553bb1qw9lkp89gbxabjbalc1f31sf6j074zxjn7p29v";
1091+ name = "kontact-22.04.0.tar.xz";
10841092 };
10851093 };
10861094 kontactinterface = {
1087− version = "21.12.3";
1095+ version = "22.04.0";
10881096 src = fetchurl {
1089− url = "${mirror}/stable/release-service/21.12.3/src/kontactinterface-21.12.3.tar.xz";
1090− sha256 = "1qwx0q4bbk3d720ij37wbd54g9alw6ispjl1mq19hkk3gs5l1c78";
1091− name = "kontactinterface-21.12.3.tar.xz";
1097+ url = "${mirror}/stable/release-service/22.04.0/src/kontactinterface-22.04.0.tar.xz";
1098+ sha256 = "1v0yyb81dq98dgmlzc3ry36nhsl29sh1dj7c9y3y926dkv6s3khp";
1099+ name = "kontactinterface-22.04.0.tar.xz";
10921100 };
10931101 };
10941102 kontrast = {
1095− version = "21.12.3";
1103+ version = "22.04.0";
10961104 src = fetchurl {
1097− url = "${mirror}/stable/release-service/21.12.3/src/kontrast-21.12.3.tar.xz";
1098− sha256 = "1rp279mfq18p5kzw3788m8w6kkj8w7zfdv97rnl3n5jir4j94yxl";
1099− name = "kontrast-21.12.3.tar.xz";
1105+ url = "${mirror}/stable/release-service/22.04.0/src/kontrast-22.04.0.tar.xz";
1106+ sha256 = "1nznd3ir87r3rhmpqxdcnvivczfybqdqzabwa0f6zlryixcvqmqb";
1107+ name = "kontrast-22.04.0.tar.xz";
11001108 };
11011109 };
11021110 konversation = {
1103− version = "21.12.3";
1111+ version = "22.04.0";
11041112 src = fetchurl {
1105− url = "${mirror}/stable/release-service/21.12.3/src/konversation-21.12.3.tar.xz";
1106− sha256 = "05dxzkpadz29b5fm6pf225xqq0gaz9w50paz9341kzz4k3rnzq80";
1107− name = "konversation-21.12.3.tar.xz";
1113+ url = "${mirror}/stable/release-service/22.04.0/src/konversation-22.04.0.tar.xz";
1114+ sha256 = "12lvgxzdchcyg0jy3qcvfssdad5c6asiadkszz7brnnnxma3i77q";
1115+ name = "konversation-22.04.0.tar.xz";
11081116 };
11091117 };
11101118 kopeninghours = {
1111− version = "21.12.3";
1119+ version = "22.04.0";
11121120 src = fetchurl {
1113− url = "${mirror}/stable/release-service/21.12.3/src/kopeninghours-21.12.3.tar.xz";
1114− sha256 = "0pfkrns576ll6wc33c8i6pgzd9wf543w2isbvh393zyb1rr3bzgd";
1115− name = "kopeninghours-21.12.3.tar.xz";
1121+ url = "${mirror}/stable/release-service/22.04.0/src/kopeninghours-22.04.0.tar.xz";
1122+ sha256 = "17yxbr86dqyxpgdr35lfvfal1qf38hx8alk2p0j7l8k9yd5zgw5h";
1123+ name = "kopeninghours-22.04.0.tar.xz";
11161124 };
11171125 };
11181126 kopete = {
1119− version = "21.12.3";
1127+ version = "22.04.0";
11201128 src = fetchurl {
1121− url = "${mirror}/stable/release-service/21.12.3/src/kopete-21.12.3.tar.xz";
1122− sha256 = "1v519sw2lzlap6xci3j55k8c48755sc9p3mgvj566b6jjq64xi5k";
1123− name = "kopete-21.12.3.tar.xz";
1129+ url = "${mirror}/stable/release-service/22.04.0/src/kopete-22.04.0.tar.xz";
1130+ sha256 = "1hy9z5148c9grh56pr4865hq62x85lnn83kg9f7kx6dnbkwyq408";
1131+ name = "kopete-22.04.0.tar.xz";
11241132 };
11251133 };
11261134 korganizer = {
1127− version = "21.12.3";
1135+ version = "22.04.0";
11281136 src = fetchurl {
1129− url = "${mirror}/stable/release-service/21.12.3/src/korganizer-21.12.3.tar.xz";
1130− sha256 = "072pyzs38dv07mwi4hlfb4rh9jx40dpxac3ywy7kj6nyvbfjmh0r";
1131− name = "korganizer-21.12.3.tar.xz";
1137+ url = "${mirror}/stable/release-service/22.04.0/src/korganizer-22.04.0.tar.xz";
1138+ sha256 = "12qdp5wwii55prc7wih70r1sw7c3dnrwmczhsm3m6gsf4p2px4si";
1139+ name = "korganizer-22.04.0.tar.xz";
11321140 };
11331141 };
11341142 kosmindoormap = {
1135− version = "21.12.3";
1143+ version = "22.04.0";
11361144 src = fetchurl {
1137− url = "${mirror}/stable/release-service/21.12.3/src/kosmindoormap-21.12.3.tar.xz";
1138− sha256 = "06i616c873lkkpy2iwdjcgwnm6adjrr6rcain2rrb1j4pgzmmbvw";
1139− name = "kosmindoormap-21.12.3.tar.xz";
1145+ url = "${mirror}/stable/release-service/22.04.0/src/kosmindoormap-22.04.0.tar.xz";
1146+ sha256 = "1gxw614nydmqc8s83wi6aranw4jd24zvbjky2sdfryph0gr14zg1";
1147+ name = "kosmindoormap-22.04.0.tar.xz";
11401148 };
11411149 };
11421150 kpat = {
1143− version = "21.12.3";
1151+ version = "22.04.0";
11441152 src = fetchurl {
1145− url = "${mirror}/stable/release-service/21.12.3/src/kpat-21.12.3.tar.xz";
1146− sha256 = "1jd9457hf15d2l6njkfyj9a7lfyabcm80vz3zjb2cykm16x3sdb8";
1147− name = "kpat-21.12.3.tar.xz";
1153+ url = "${mirror}/stable/release-service/22.04.0/src/kpat-22.04.0.tar.xz";
1154+ sha256 = "0kd4cxgwg7336q27api51g2xa7d20nypm32rpm9vq3cq112jwpi7";
1155+ name = "kpat-22.04.0.tar.xz";
11481156 };
11491157 };
11501158 kpimtextedit = {
1151− version = "21.12.3";
1159+ version = "22.04.0";
11521160 src = fetchurl {
1153− url = "${mirror}/stable/release-service/21.12.3/src/kpimtextedit-21.12.3.tar.xz";
1154− sha256 = "19hrqbjcmpi81vmnggrkrv0fcc9inhz5aa5klx0141aylnzfgwsl";
1155− name = "kpimtextedit-21.12.3.tar.xz";
1161+ url = "${mirror}/stable/release-service/22.04.0/src/kpimtextedit-22.04.0.tar.xz";
1162+ sha256 = "0j01yn28j58y05v9cf6fyjal79n0rydddsga00aqkbksf80pd93p";
1163+ name = "kpimtextedit-22.04.0.tar.xz";
11561164 };
11571165 };
11581166 kpkpass = {
1159− version = "21.12.3";
1167+ version = "22.04.0";
11601168 src = fetchurl {
1161− url = "${mirror}/stable/release-service/21.12.3/src/kpkpass-21.12.3.tar.xz";
1162− sha256 = "05f88hlqxfak94jy8afiv91dgzxd9qgrkarnqi9rv1f5a3j7k3k7";
1163− name = "kpkpass-21.12.3.tar.xz";
1169+ url = "${mirror}/stable/release-service/22.04.0/src/kpkpass-22.04.0.tar.xz";
1170+ sha256 = "0fk789wgx9ks99cfd7b8w62nw7820s53mb9zv9vkzy9mma4640q3";
1171+ name = "kpkpass-22.04.0.tar.xz";
11641172 };
11651173 };
11661174 kpmcore = {
1167− version = "21.12.3";
1175+ version = "22.04.0";
11681176 src = fetchurl {
1169− url = "${mirror}/stable/release-service/21.12.3/src/kpmcore-21.12.3.tar.xz";
1170− sha256 = "19h0ag54xzv4hwh950hshjghd4fb9xkdg8rlx6lvqa0w9b8admva";
1171− name = "kpmcore-21.12.3.tar.xz";
1177+ url = "${mirror}/stable/release-service/22.04.0/src/kpmcore-22.04.0.tar.xz";
1178+ sha256 = "1fwdyr37q8bk7mwr2v7q9704q4ykwgg6ak08ss3vvlzsj981dvxh";
1179+ name = "kpmcore-22.04.0.tar.xz";
11721180 };
11731181 };
11741182 kpublictransport = {
1175− version = "21.12.3";
1183+ version = "22.04.0";
11761184 src = fetchurl {
1177− url = "${mirror}/stable/release-service/21.12.3/src/kpublictransport-21.12.3.tar.xz";
1178− sha256 = "1jcba5bq320afzfs5ly3vyyicdix8fprpr02x67v8p7mdzg58cq6";
1179− name = "kpublictransport-21.12.3.tar.xz";
1185+ url = "${mirror}/stable/release-service/22.04.0/src/kpublictransport-22.04.0.tar.xz";
1186+ sha256 = "1nc7z7czr24wbwdpgj9vv8p3kn2hdqpf88q7q2776zh64ghi1mrc";
1187+ name = "kpublictransport-22.04.0.tar.xz";
11801188 };
11811189 };
11821190 kqtquickcharts = {
1183− version = "21.12.3";
1191+ version = "22.04.0";
11841192 src = fetchurl {
1185− url = "${mirror}/stable/release-service/21.12.3/src/kqtquickcharts-21.12.3.tar.xz";
1186− sha256 = "0gl9c8zfn440202l82y4nfng0hyhivby8a4hf91rphi8f1xfxxmr";
1187− name = "kqtquickcharts-21.12.3.tar.xz";
1193+ url = "${mirror}/stable/release-service/22.04.0/src/kqtquickcharts-22.04.0.tar.xz";
1194+ sha256 = "1pn0c8wpbd88g26g65yd0pv5xzz27k5bmx7k6as7k3s41y96lpn5";
1195+ name = "kqtquickcharts-22.04.0.tar.xz";
11881196 };
11891197 };
11901198 krdc = {
1191− version = "21.12.3";
1199+ version = "22.04.0";
11921200 src = fetchurl {
1193− url = "${mirror}/stable/release-service/21.12.3/src/krdc-21.12.3.tar.xz";
1194− sha256 = "09np9clvmdll7v2p9aswnlhz4cgsnly82za7k3k9fs66h5c8q20j";
1195− name = "krdc-21.12.3.tar.xz";
1201+ url = "${mirror}/stable/release-service/22.04.0/src/krdc-22.04.0.tar.xz";
1202+ sha256 = "1rykh19g4fb7kadzg2i3kgf1s1qdm31z5hdq4yx60v009lmsa2r5";
1203+ name = "krdc-22.04.0.tar.xz";
11961204 };
11971205 };
11981206 kreversi = {
1199− version = "21.12.3";
1207+ version = "22.04.0";
12001208 src = fetchurl {
1201− url = "${mirror}/stable/release-service/21.12.3/src/kreversi-21.12.3.tar.xz";
1202− sha256 = "0lbypkh6lc5af43c2p19gs2c53icxd26abxf5rhs2c8182gr39b8";
1203− name = "kreversi-21.12.3.tar.xz";
1209+ url = "${mirror}/stable/release-service/22.04.0/src/kreversi-22.04.0.tar.xz";
1210+ sha256 = "0mzwjkgzv3f8y7wkbfy5gvww2gl6kww8wq2s1kwayv8cimvxmlzq";
1211+ name = "kreversi-22.04.0.tar.xz";
12041212 };
12051213 };
12061214 krfb = {
1207− version = "21.12.3";
1215+ version = "22.04.0";
12081216 src = fetchurl {
1209− url = "${mirror}/stable/release-service/21.12.3/src/krfb-21.12.3.tar.xz";
1210− sha256 = "1r8lvvh2z8xi0l3pizlpl12nm4fnbpgiwqmx18w8i51x4j27dv0n";
1211− name = "krfb-21.12.3.tar.xz";
1217+ url = "${mirror}/stable/release-service/22.04.0/src/krfb-22.04.0.tar.xz";
1218+ sha256 = "145wi252ah38c45p08jjwzd7f07d993mvn7nq30xc6vvs5mwgmia";
1219+ name = "krfb-22.04.0.tar.xz";
12121220 };
12131221 };
12141222 kross-interpreters = {
1215− version = "21.12.3";
1223+ version = "22.04.0";
12161224 src = fetchurl {
1217− url = "${mirror}/stable/release-service/21.12.3/src/kross-interpreters-21.12.3.tar.xz";
1218− sha256 = "0wyr3xwdkb2fiadzh5lhjli1g0mbxjw353q7k1vbi2wxg5b9042g";
1219− name = "kross-interpreters-21.12.3.tar.xz";
1225+ url = "${mirror}/stable/release-service/22.04.0/src/kross-interpreters-22.04.0.tar.xz";
1226+ sha256 = "0nff5k9372yj8aqnbgfb4ljcmdg598jkfwrcpkay9vf51krimspp";
1227+ name = "kross-interpreters-22.04.0.tar.xz";
12201228 };
12211229 };
12221230 kruler = {
1223− version = "21.12.3";
1231+ version = "22.04.0";
12241232 src = fetchurl {
1225− url = "${mirror}/stable/release-service/21.12.3/src/kruler-21.12.3.tar.xz";
1226− sha256 = "0jmb3a907jx0s80865lmd7in8ggdf30gdbgykpalzfrv7nkjamzr";
1227− name = "kruler-21.12.3.tar.xz";
1233+ url = "${mirror}/stable/release-service/22.04.0/src/kruler-22.04.0.tar.xz";
1234+ sha256 = "0ifd32x0xwrzx6whjja71qhwvzgsv956dxs05vsb4gw10sv8kwgl";
1235+ name = "kruler-22.04.0.tar.xz";
12281236 };
12291237 };
12301238 kshisen = {
1231− version = "21.12.3";
1239+ version = "22.04.0";
12321240 src = fetchurl {
1233− url = "${mirror}/stable/release-service/21.12.3/src/kshisen-21.12.3.tar.xz";
1234− sha256 = "1i11gh87gfza58rpdd44pjb423an9a44cls117ba9gznxm67cph5";
1235− name = "kshisen-21.12.3.tar.xz";
1241+ url = "${mirror}/stable/release-service/22.04.0/src/kshisen-22.04.0.tar.xz";
1242+ sha256 = "0p1bxyayl5nlik9ksssqy1sa543zv9chi6cq10sic46gwz6cxbhr";
1243+ name = "kshisen-22.04.0.tar.xz";
12361244 };
12371245 };
12381246 ksirk = {
1239− version = "21.12.3";
1247+ version = "22.04.0";
12401248 src = fetchurl {
1241− url = "${mirror}/stable/release-service/21.12.3/src/ksirk-21.12.3.tar.xz";
1242− sha256 = "1ipnkg2mgj37g5s5ihlys176kn2c11f3d57xr9zhqf8fvkvrkfm0";
1243− name = "ksirk-21.12.3.tar.xz";
1249+ url = "${mirror}/stable/release-service/22.04.0/src/ksirk-22.04.0.tar.xz";
1250+ sha256 = "1ys3k3y4gkyd7691yd7r7pr1csm05hmfvm60iwkv6g1a7imsanp7";
1251+ name = "ksirk-22.04.0.tar.xz";
12441252 };
12451253 };
12461254 ksmtp = {
1247− version = "21.12.3";
1255+ version = "22.04.0";
12481256 src = fetchurl {
1249− url = "${mirror}/stable/release-service/21.12.3/src/ksmtp-21.12.3.tar.xz";
1250− sha256 = "0kdy5gsg1sgccvdk1fpf866xl9m8v8z034jpgf6s7n2pr5r5mni2";
1251− name = "ksmtp-21.12.3.tar.xz";
1257+ url = "${mirror}/stable/release-service/22.04.0/src/ksmtp-22.04.0.tar.xz";
1258+ sha256 = "15v7bqx6y2cvj71v30zdscddv5xc1vqxq2h6r1f2c1i1ppg0x91d";
1259+ name = "ksmtp-22.04.0.tar.xz";
12521260 };
12531261 };
12541262 ksnakeduel = {
1255− version = "21.12.3";
1263+ version = "22.04.0";
12561264 src = fetchurl {
1257− url = "${mirror}/stable/release-service/21.12.3/src/ksnakeduel-21.12.3.tar.xz";
1258− sha256 = "06rill73xhhxra7kmbvwwriv9vbi91641z334ry1m4rr1qm2cdd6";
1259− name = "ksnakeduel-21.12.3.tar.xz";
1265+ url = "${mirror}/stable/release-service/22.04.0/src/ksnakeduel-22.04.0.tar.xz";
1266+ sha256 = "0d03ixx8fid3wagcajasasd1h9j87wxxix7521fmnq5qhdd77nyl";
1267+ name = "ksnakeduel-22.04.0.tar.xz";
12601268 };
12611269 };
12621270 kspaceduel = {
1263− version = "21.12.3";
1271+ version = "22.04.0";
12641272 src = fetchurl {
1265− url = "${mirror}/stable/release-service/21.12.3/src/kspaceduel-21.12.3.tar.xz";
1266− sha256 = "0dv539jlpkj8hr4cz0ncqm3scg6ja3s41p37bpqd94zicfvzxw84";
1267− name = "kspaceduel-21.12.3.tar.xz";
1273+ url = "${mirror}/stable/release-service/22.04.0/src/kspaceduel-22.04.0.tar.xz";
1274+ sha256 = "0gyblvlcrbdspdf740mp4587f04lnl8jm5qq0gl5gmfads7l90bh";
1275+ name = "kspaceduel-22.04.0.tar.xz";
12681276 };
12691277 };
12701278 ksquares = {
1271− version = "21.12.3";
1279+ version = "22.04.0";
12721280 src = fetchurl {
1273− url = "${mirror}/stable/release-service/21.12.3/src/ksquares-21.12.3.tar.xz";
1274− sha256 = "1wbrakq1wnwp558y140j9vbid3g0k332rwbilky7z11c0giiv76x";
1275− name = "ksquares-21.12.3.tar.xz";
1281+ url = "${mirror}/stable/release-service/22.04.0/src/ksquares-22.04.0.tar.xz";
1282+ sha256 = "122i3wwbvvc66i8mzmql3z4s23nmjc9k9rfbl9v0202hcalgzhv8";
1283+ name = "ksquares-22.04.0.tar.xz";
12761284 };
12771285 };
12781286 ksudoku = {
1279− version = "21.12.3";
1287+ version = "22.04.0";
12801288 src = fetchurl {
1281− url = "${mirror}/stable/release-service/21.12.3/src/ksudoku-21.12.3.tar.xz";
1282− sha256 = "1gw0ybwhvg1z8pcs72f73y52jvzvrw367g275axf2rw50iik6jwv";
1283− name = "ksudoku-21.12.3.tar.xz";
1289+ url = "${mirror}/stable/release-service/22.04.0/src/ksudoku-22.04.0.tar.xz";
1290+ sha256 = "088bkzx1n81al774h2n9nvkhsg42alc5n4fffh490lx3ys8ckdgq";
1291+ name = "ksudoku-22.04.0.tar.xz";
12841292 };
12851293 };
12861294 ksystemlog = {
1287− version = "21.12.3";
1295+ version = "22.04.0";
12881296 src = fetchurl {
1289− url = "${mirror}/stable/release-service/21.12.3/src/ksystemlog-21.12.3.tar.xz";
1290− sha256 = "0jkd0rx0xlzwsxa3s40sp5x4r19a9rg1x9klpnjfw0b326vgf2m9";
1291− name = "ksystemlog-21.12.3.tar.xz";
1297+ url = "${mirror}/stable/release-service/22.04.0/src/ksystemlog-22.04.0.tar.xz";
1298+ sha256 = "1927515lh64qk041d5qpshx4fy3k5hsnzv6c2jqdsa39fll5wli5";
1299+ name = "ksystemlog-22.04.0.tar.xz";
12921300 };
12931301 };
12941302 kteatime = {
1295− version = "21.12.3";
1303+ version = "22.04.0";
12961304 src = fetchurl {
1297− url = "${mirror}/stable/release-service/21.12.3/src/kteatime-21.12.3.tar.xz";
1298− sha256 = "0i3ps1a8y8crmxf1631q4zjfa0zglqhq1rk6id5v2xx8f10rkh54";
1299− name = "kteatime-21.12.3.tar.xz";
1305+ url = "${mirror}/stable/release-service/22.04.0/src/kteatime-22.04.0.tar.xz";
1306+ sha256 = "1xhxz2x1a35vsibgn8myqg976gqdhipsw48c961f0vfzyw9q62gk";
1307+ name = "kteatime-22.04.0.tar.xz";
13001308 };
13011309 };
13021310 ktimer = {
1303− version = "21.12.3";
1311+ version = "22.04.0";
13041312 src = fetchurl {
1305− url = "${mirror}/stable/release-service/21.12.3/src/ktimer-21.12.3.tar.xz";
1306− sha256 = "0s6zbygxnk69dciyz1iv1d6whfcv637licsd07n7fc8bsygqjl5p";
1307− name = "ktimer-21.12.3.tar.xz";
1313+ url = "${mirror}/stable/release-service/22.04.0/src/ktimer-22.04.0.tar.xz";
1314+ sha256 = "0zg5hk69wz395b8faz7s8sxl3ncr6vkybz0zd3m70cm85cxv5jwv";
1315+ name = "ktimer-22.04.0.tar.xz";
13081316 };
13091317 };
13101318 ktnef = {
1311− version = "21.12.3";
1319+ version = "22.04.0";
13121320 src = fetchurl {
1313− url = "${mirror}/stable/release-service/21.12.3/src/ktnef-21.12.3.tar.xz";
1314− sha256 = "1in991n8alkxf40p0wvkr7gdaaz8w4kdw1rsq6sbjil6cs4cr5nl";
1315− name = "ktnef-21.12.3.tar.xz";
1321+ url = "${mirror}/stable/release-service/22.04.0/src/ktnef-22.04.0.tar.xz";
1322+ sha256 = "0kk50qf8k7q9qsdqwr2fy580adw3a4a6x0q4a825smch1m35wih0";
1323+ name = "ktnef-22.04.0.tar.xz";
13161324 };
13171325 };
13181326 ktorrent = {
1319− version = "21.12.3";
1327+ version = "22.04.0";
13201328 src = fetchurl {
1321− url = "${mirror}/stable/release-service/21.12.3/src/ktorrent-21.12.3.tar.xz";
1322− sha256 = "021x6qcbk4kdh5ay5mqmf92129s42j2rhrs0q350b0wcnpad55zd";
1323− name = "ktorrent-21.12.3.tar.xz";
1329+ url = "${mirror}/stable/release-service/22.04.0/src/ktorrent-22.04.0.tar.xz";
1330+ sha256 = "1yclmg4hjvss0l2q0pzc1j9gz2nqwgj37kcvacxa38n6l5clfxb2";
1331+ name = "ktorrent-22.04.0.tar.xz";
13241332 };
13251333 };
13261334 ktouch = {
1327− version = "21.12.3";
1335+ version = "22.04.0";
13281336 src = fetchurl {
1329− url = "${mirror}/stable/release-service/21.12.3/src/ktouch-21.12.3.tar.xz";
1330− sha256 = "0wi01gr85sxs4qhvnwkkp1230wnvz7gdr74zar03rc3wzwgv22nd";
1331− name = "ktouch-21.12.3.tar.xz";
1337+ url = "${mirror}/stable/release-service/22.04.0/src/ktouch-22.04.0.tar.xz";
1338+ sha256 = "03qr1q4nhayklkwyskh3wf5c101l90b9h8lp9v11y63gpzicsxhh";
1339+ name = "ktouch-22.04.0.tar.xz";
13321340 };
13331341 };
13341342 ktp-accounts-kcm = {
1335− version = "21.12.3";
1343+ version = "22.04.0";
13361344 src = fetchurl {
1337− url = "${mirror}/stable/release-service/21.12.3/src/ktp-accounts-kcm-21.12.3.tar.xz";
1338− sha256 = "1ydsfiw67avgwswvpy85s3siggyi4w610yqz5dyl535i6my1kl5n";
1339− name = "ktp-accounts-kcm-21.12.3.tar.xz";
1345+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-accounts-kcm-22.04.0.tar.xz";
1346+ sha256 = "0crhb1p09varma77awfq0a4dx9cjyqra5h7inlv0d4bb7vm7zd43";
1347+ name = "ktp-accounts-kcm-22.04.0.tar.xz";
13401348 };
13411349 };
13421350 ktp-approver = {
1343− version = "21.12.3";
1351+ version = "22.04.0";
13441352 src = fetchurl {
1345− url = "${mirror}/stable/release-service/21.12.3/src/ktp-approver-21.12.3.tar.xz";
1346− sha256 = "0mvczpc0dy2m0dn25r2h2js3hw7s0qr8zl3syvqbyqqs51s59xnl";
1347− name = "ktp-approver-21.12.3.tar.xz";
1353+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-approver-22.04.0.tar.xz";
1354+ sha256 = "1zgii0sclcxi1dhainpcbqyadcwmks84clmchld47kq1wjm5w0xa";
1355+ name = "ktp-approver-22.04.0.tar.xz";
13481356 };
13491357 };
13501358 ktp-auth-handler = {
1351− version = "21.12.3";
1359+ version = "22.04.0";
13521360 src = fetchurl {
1353− url = "${mirror}/stable/release-service/21.12.3/src/ktp-auth-handler-21.12.3.tar.xz";
1354− sha256 = "0lgg0ify9mbsd8has8ingkq3m0g91r9gvfq85s2xf90cwc1s429c";
1355− name = "ktp-auth-handler-21.12.3.tar.xz";
1361+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-auth-handler-22.04.0.tar.xz";
1362+ sha256 = "0cf6swv24pp7s5hf5nv3c6ipk2zmr6w6ikg16wzwcyva56h8izq8";
1363+ name = "ktp-auth-handler-22.04.0.tar.xz";
13561364 };
13571365 };
13581366 ktp-call-ui = {
1359− version = "21.12.3";
1367+ version = "22.04.0";
13601368 src = fetchurl {
1361− url = "${mirror}/stable/release-service/21.12.3/src/ktp-call-ui-21.12.3.tar.xz";
1362− sha256 = "1npr8qbpxx25pm9mky9sd0qngc5wphmy5blvl6qy7nvs2rqszgam";
1363− name = "ktp-call-ui-21.12.3.tar.xz";
1369+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-call-ui-22.04.0.tar.xz";
1370+ sha256 = "0gy6sw403j129i81nhvcnvahlymvj5k8y8p37w935lzws0vr0r0p";
1371+ name = "ktp-call-ui-22.04.0.tar.xz";
13641372 };
13651373 };
13661374 ktp-common-internals = {
1367− version = "21.12.3";
1375+ version = "22.04.0";
13681376 src = fetchurl {
1369− url = "${mirror}/stable/release-service/21.12.3/src/ktp-common-internals-21.12.3.tar.xz";
1370− sha256 = "0spr2gs5d561agvipkipwcxk2zjlhzvp6swdh8rcv23qr6igqjq6";
1371− name = "ktp-common-internals-21.12.3.tar.xz";
1377+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-common-internals-22.04.0.tar.xz";
1378+ sha256 = "1fd5wvmirlaxv43c72d3z7hncf434nb8fvr4g5nxiw69i0il8mvr";
1379+ name = "ktp-common-internals-22.04.0.tar.xz";
13721380 };
13731381 };
13741382 ktp-contact-list = {
1375− version = "21.12.3";
1383+ version = "22.04.0";
13761384 src = fetchurl {
1377− url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-list-21.12.3.tar.xz";
1378− sha256 = "1qn3bmwl4kvm5ikbr0ycy2znm4c2yv4m5863d4vakr8xhhappamp";
1379− name = "ktp-contact-list-21.12.3.tar.xz";
1385+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-list-22.04.0.tar.xz";
1386+ sha256 = "1nqr6qq12rg1vf20v89q7qvp9b7karybk4662ci7qbjyj9s2xgj9";
1387+ name = "ktp-contact-list-22.04.0.tar.xz";
13801388 };
13811389 };
13821390 ktp-contact-runner = {
1383− version = "21.12.3";
1391+ version = "22.04.0";
13841392 src = fetchurl {
1385− url = "${mirror}/stable/release-service/21.12.3/src/ktp-contact-runner-21.12.3.tar.xz";
1386− sha256 = "0bwi0j733jnwiqlxv8nik1whdvk4aggfayy2bcwwpj5zdzr3mbga";
1387− name = "ktp-contact-runner-21.12.3.tar.xz";
1393+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-contact-runner-22.04.0.tar.xz";
1394+ sha256 = "1s1dkp5cybia28k07xwa7180h8m2cm8y381kkpkg4pi6izadqfn8";
1395+ name = "ktp-contact-runner-22.04.0.tar.xz";
13881396 };
13891397 };
13901398 ktp-desktop-applets = {
1391− version = "21.12.3";
1399+ version = "22.04.0";
13921400 src = fetchurl {
1393− url = "${mirror}/stable/release-service/21.12.3/src/ktp-desktop-applets-21.12.3.tar.xz";
1394− sha256 = "01h26jsdb7mkw8isxpy4sfpdn11q209xqhhpnk7xvchs8fpl5fni";
1395− name = "ktp-desktop-applets-21.12.3.tar.xz";
1401+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-desktop-applets-22.04.0.tar.xz";
1402+ sha256 = "1n5vlhlh1jasc87zdm9k8srpr7y67lzal36vdc4jbl9jlc96gm8n";
1403+ name = "ktp-desktop-applets-22.04.0.tar.xz";
13961404 };
13971405 };
13981406 ktp-filetransfer-handler = {
1399− version = "21.12.3";
1407+ version = "22.04.0";
14001408 src = fetchurl {
1401− url = "${mirror}/stable/release-service/21.12.3/src/ktp-filetransfer-handler-21.12.3.tar.xz";
1402− sha256 = "0aq5ii7b2kk0qan4qph9glapp81sgqm2zzbdknggxz7vkhj5y6lk";
1403− name = "ktp-filetransfer-handler-21.12.3.tar.xz";
1409+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-filetransfer-handler-22.04.0.tar.xz";
1410+ sha256 = "01b1xid6zbvgnyp5fm5sp7gli0hhpa3a538pn469i50d61rhhnrv";
1411+ name = "ktp-filetransfer-handler-22.04.0.tar.xz";
14041412 };
14051413 };
14061414 ktp-kded-module = {
1407− version = "21.12.3";
1415+ version = "22.04.0";
14081416 src = fetchurl {
1409− url = "${mirror}/stable/release-service/21.12.3/src/ktp-kded-module-21.12.3.tar.xz";
1410− sha256 = "0921lahpqjx094ngk68pphkv306ajgxbp6yb0hkckmlic4f2hm37";
1411− name = "ktp-kded-module-21.12.3.tar.xz";
1417+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-kded-module-22.04.0.tar.xz";
1418+ sha256 = "0m1rslk778j1kvx3f4cgiz925sd72kg4b3dhg3hjlmm95ypnf8d0";
1419+ name = "ktp-kded-module-22.04.0.tar.xz";
14121420 };
14131421 };
14141422 ktp-send-file = {
1415− version = "21.12.3";
1423+ version = "22.04.0";
14161424 src = fetchurl {
1417− url = "${mirror}/stable/release-service/21.12.3/src/ktp-send-file-21.12.3.tar.xz";
1418− sha256 = "0vvg0qz2zxckqqwfibsl88w0mpa7a0lzskwhzbvzir03x14rwjlc";
1419− name = "ktp-send-file-21.12.3.tar.xz";
1425+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-send-file-22.04.0.tar.xz";
1426+ sha256 = "1v7gzq2pivbxf4ypqg8k3ihya7cpyw3bmxda3f7a8x1n60z7pfx7";
1427+ name = "ktp-send-file-22.04.0.tar.xz";
14201428 };
14211429 };
14221430 ktp-text-ui = {
1423− version = "21.12.3";
1431+ version = "22.04.0";
14241432 src = fetchurl {
1425− url = "${mirror}/stable/release-service/21.12.3/src/ktp-text-ui-21.12.3.tar.xz";
1426− sha256 = "046611abkdn7qqh6n4v8ssdzg10q4g14rji7klypmccfng0px2xg";
1427− name = "ktp-text-ui-21.12.3.tar.xz";
1433+ url = "${mirror}/stable/release-service/22.04.0/src/ktp-text-ui-22.04.0.tar.xz";
1434+ sha256 = "1v25qqclqssdq2v9h010jib3cm5an5h7cyyrlmc4f5jx76d82rzj";
1435+ name = "ktp-text-ui-22.04.0.tar.xz";
14281436 };
14291437 };
14301438 ktuberling = {
1431− version = "21.12.3";
1439+ version = "22.04.0";
14321440 src = fetchurl {
1433− url = "${mirror}/stable/release-service/21.12.3/src/ktuberling-21.12.3.tar.xz";
1434− sha256 = "1awsn285j9nggyypkra9ladgi46w2m7m09d8364w5d0sygpzmgsg";
1435− name = "ktuberling-21.12.3.tar.xz";
1441+ url = "${mirror}/stable/release-service/22.04.0/src/ktuberling-22.04.0.tar.xz";
1442+ sha256 = "19cxpxwyzcy3vif7q5rmzzr1qa1bhql2l309psi66b4yndxs1n8q";
1443+ name = "ktuberling-22.04.0.tar.xz";
14361444 };
14371445 };
14381446 kturtle = {
1439− version = "21.12.3";
1447+ version = "22.04.0";
14401448 src = fetchurl {
1441− url = "${mirror}/stable/release-service/21.12.3/src/kturtle-21.12.3.tar.xz";
1442− sha256 = "1689skwk2dwm4mrl2mrakb1cn74nyxd6xa8ipxsip5zhjgkkvg23";
1443− name = "kturtle-21.12.3.tar.xz";
1449+ url = "${mirror}/stable/release-service/22.04.0/src/kturtle-22.04.0.tar.xz";
1450+ sha256 = "09w4wf7w5bck2ca59gsszjdyvyfwir9vwk5wwp0xciky1qwb2hpx";
1451+ name = "kturtle-22.04.0.tar.xz";
14441452 };
14451453 };
14461454 kubrick = {
1447− version = "21.12.3";
1455+ version = "22.04.0";
14481456 src = fetchurl {
1449− url = "${mirror}/stable/release-service/21.12.3/src/kubrick-21.12.3.tar.xz";
1450− sha256 = "0hx81cp1lql74c9067dw7mi78c6sp6p1a035j2nzjn9drpxal6p2";
1451− name = "kubrick-21.12.3.tar.xz";
1457+ url = "${mirror}/stable/release-service/22.04.0/src/kubrick-22.04.0.tar.xz";
1458+ sha256 = "0k624kl2cv06r04b7y1dp7zyhcqampqa10cy77df6am20v6n0za3";
1459+ name = "kubrick-22.04.0.tar.xz";
14521460 };
14531461 };
14541462 kwalletmanager = {
1455− version = "21.12.3";
1463+ version = "22.04.0";
14561464 src = fetchurl {
1457− url = "${mirror}/stable/release-service/21.12.3/src/kwalletmanager-21.12.3.tar.xz";
1458− sha256 = "01xif44iz1ik32swlrzzjycizy4hjlis1f336qc9p7affjyv2797";
1459− name = "kwalletmanager-21.12.3.tar.xz";
1465+ url = "${mirror}/stable/release-service/22.04.0/src/kwalletmanager-22.04.0.tar.xz";
1466+ sha256 = "05zc9aib2wnzn45mrcg59qkyfrwzxanddnnpv7z74ydw1ap28f6k";
1467+ name = "kwalletmanager-22.04.0.tar.xz";
14601468 };
14611469 };
14621470 kwave = {
1463− version = "21.12.3";
1471+ version = "22.04.0";
14641472 src = fetchurl {
1465− url = "${mirror}/stable/release-service/21.12.3/src/kwave-21.12.3.tar.xz";
1466− sha256 = "07xbbii5gpllbpmkxfv5kwxawd390zp0angh94xjk0yq71lvdav2";
1467− name = "kwave-21.12.3.tar.xz";
1473+ url = "${mirror}/stable/release-service/22.04.0/src/kwave-22.04.0.tar.xz";
1474+ sha256 = "17a2gzawp9pg5aqmj3433qrqrh03yj5ldivnzr7alf5qdvj7p1c6";
1475+ name = "kwave-22.04.0.tar.xz";
14681476 };
14691477 };
14701478 kwordquiz = {
1471− version = "21.12.3";
1479+ version = "22.04.0";
14721480 src = fetchurl {
1473− url = "${mirror}/stable/release-service/21.12.3/src/kwordquiz-21.12.3.tar.xz";
1474− sha256 = "1p06ki75zy4il6k9siavqddpr9j02z3lbnd14pxwk42fhfmbx057";
1475− name = "kwordquiz-21.12.3.tar.xz";
1481+ url = "${mirror}/stable/release-service/22.04.0/src/kwordquiz-22.04.0.tar.xz";
1482+ sha256 = "0pss1vz890hmv03g9gl1v6bmf73ga484qzp2j5x3mp1w3ks93s73";
1483+ name = "kwordquiz-22.04.0.tar.xz";
14761484 };
14771485 };
14781486 libgravatar = {
1479− version = "21.12.3";
1487+ version = "22.04.0";
14801488 src = fetchurl {
1481− url = "${mirror}/stable/release-service/21.12.3/src/libgravatar-21.12.3.tar.xz";
1482− sha256 = "1bihy3dfagwc7aday40myqjbn555mkzzaaq7c14ywkmhh99dhvh7";
1483− name = "libgravatar-21.12.3.tar.xz";
1489+ url = "${mirror}/stable/release-service/22.04.0/src/libgravatar-22.04.0.tar.xz";
1490+ sha256 = "0zkbs3zniahfbhzf7qghm7d478vbhm1ifvv44xl4m596rhm18ibs";
1491+ name = "libgravatar-22.04.0.tar.xz";
14841492 };
14851493 };
14861494 libkcddb = {
1487− version = "21.12.3";
1495+ version = "22.04.0";
14881496 src = fetchurl {
1489− url = "${mirror}/stable/release-service/21.12.3/src/libkcddb-21.12.3.tar.xz";
1490− sha256 = "14f1mzsfm0vyqzsyja0p8ln1105sw5dr6fssj25j0qw4rnf9yw32";
1491− name = "libkcddb-21.12.3.tar.xz";
1497+ url = "${mirror}/stable/release-service/22.04.0/src/libkcddb-22.04.0.tar.xz";
1498+ sha256 = "0x87pg6djih6sssd7zjqarnry9v9n6kbk2zirjgp8nic272irjfx";
1499+ name = "libkcddb-22.04.0.tar.xz";
14921500 };
14931501 };
14941502 libkcompactdisc = {
1495− version = "21.12.3";
1503+ version = "22.04.0";
14961504 src = fetchurl {
1497− url = "${mirror}/stable/release-service/21.12.3/src/libkcompactdisc-21.12.3.tar.xz";
1498− sha256 = "1vmaf3b41sj0sm4k9zdliy5ba4ps5z0cwabggfish152wzw34kgn";
1499− name = "libkcompactdisc-21.12.3.tar.xz";
1505+ url = "${mirror}/stable/release-service/22.04.0/src/libkcompactdisc-22.04.0.tar.xz";
1506+ sha256 = "152zq2c23cf13lmc6895pcw36plhb8is4hilf9jvcgx0jmzgs5kz";
1507+ name = "libkcompactdisc-22.04.0.tar.xz";
15001508 };
15011509 };
15021510 libkdcraw = {
1503− version = "21.12.3";
1511+ version = "22.04.0";
15041512 src = fetchurl {
1505− url = "${mirror}/stable/release-service/21.12.3/src/libkdcraw-21.12.3.tar.xz";
1506− sha256 = "1pyqsaaficwxbg6hk8xg8srq79i6xdxvghkn2rf54zj1435d9kva";
1507− name = "libkdcraw-21.12.3.tar.xz";
1513+ url = "${mirror}/stable/release-service/22.04.0/src/libkdcraw-22.04.0.tar.xz";
1514+ sha256 = "0y9yvdfhbn0fy81y6d16r1vjcfxiq8g4wy6y5gqmkvzxhydfwb7r";
1515+ name = "libkdcraw-22.04.0.tar.xz";
15081516 };
15091517 };
15101518 libkdegames = {
1511− version = "21.12.3";
1519+ version = "22.04.0";
15121520 src = fetchurl {
1513− url = "${mirror}/stable/release-service/21.12.3/src/libkdegames-21.12.3.tar.xz";
1514− sha256 = "0x5mw25c8hmnxhcxc2xm19xmgdxfbx89nrxfl6mzfrh8myr3ybsb";
1515− name = "libkdegames-21.12.3.tar.xz";
1521+ url = "${mirror}/stable/release-service/22.04.0/src/libkdegames-22.04.0.tar.xz";
1522+ sha256 = "0xif6jpdm9x0c6f4p8wy7lkyhxd1ckgw5vxn1d16v06jpw6xin2d";
1523+ name = "libkdegames-22.04.0.tar.xz";
15161524 };
15171525 };
15181526 libkdepim = {
1519− version = "21.12.3";
1527+ version = "22.04.0";
15201528 src = fetchurl {
1521− url = "${mirror}/stable/release-service/21.12.3/src/libkdepim-21.12.3.tar.xz";
1522− sha256 = "0g9jx6z5jf9yqn01xc1k038b4ljr9sil7bwvifc64s38qxl9wmww";
1523− name = "libkdepim-21.12.3.tar.xz";
1529+ url = "${mirror}/stable/release-service/22.04.0/src/libkdepim-22.04.0.tar.xz";
1530+ sha256 = "14cq8zm2ldhql91v8cc9g9v81ny0g1x06qfj2jwlqjccmphywncd";
1531+ name = "libkdepim-22.04.0.tar.xz";
15241532 };
15251533 };
15261534 libkeduvocdocument = {
1527− version = "21.12.3";
1535+ version = "22.04.0";
15281536 src = fetchurl {
1529− url = "${mirror}/stable/release-service/21.12.3/src/libkeduvocdocument-21.12.3.tar.xz";
1530− sha256 = "16kk7ij2qxy5abgv9hgk1ycbx0f2gnpc9lxqbhl5sq9vxd4nblv0";
1531− name = "libkeduvocdocument-21.12.3.tar.xz";
1537+ url = "${mirror}/stable/release-service/22.04.0/src/libkeduvocdocument-22.04.0.tar.xz";
1538+ sha256 = "0d4pxjvnnri45q8dn7r7qi9vv7kd8g35mhkc9jh80mqw5817pl5h";
1539+ name = "libkeduvocdocument-22.04.0.tar.xz";
15321540 };
15331541 };
15341542 libkexiv2 = {
1535− version = "21.12.3";
1543+ version = "22.04.0";
15361544 src = fetchurl {
1537− url = "${mirror}/stable/release-service/21.12.3/src/libkexiv2-21.12.3.tar.xz";
1538− sha256 = "0r2m6d9rw0r6rm6xqpj1i3w0hplhivy8h90zggqynfzvfyr9c529";
1539− name = "libkexiv2-21.12.3.tar.xz";
1545+ url = "${mirror}/stable/release-service/22.04.0/src/libkexiv2-22.04.0.tar.xz";
1546+ sha256 = "0h3zjldpjz2jvkwp6scpxwjmxm5l0bcs25ivrl8s3yjjggil53wx";
1547+ name = "libkexiv2-22.04.0.tar.xz";
15401548 };
15411549 };
15421550 libkgapi = {
1543− version = "21.12.3";
1551+ version = "22.04.0";
15441552 src = fetchurl {
1545− url = "${mirror}/stable/release-service/21.12.3/src/libkgapi-21.12.3.tar.xz";
1546− sha256 = "1vbk8786mk1irm94bsm97270gnd149nz7w0zqnvwz499f72d21jx";
1547− name = "libkgapi-21.12.3.tar.xz";
1553+ url = "${mirror}/stable/release-service/22.04.0/src/libkgapi-22.04.0.tar.xz";
1554+ sha256 = "0gvr1ins5sbf8q10waqgjpricvz5v5d8q0i6q4q3r0hncg7i21rw";
1555+ name = "libkgapi-22.04.0.tar.xz";
15481556 };
15491557 };
15501558 libkipi = {
1551− version = "21.12.3";
1559+ version = "22.04.0";
15521560 src = fetchurl {
1553− url = "${mirror}/stable/release-service/21.12.3/src/libkipi-21.12.3.tar.xz";
1554− sha256 = "0w2kwi6djwp8mhmpfrr16v8fgmwjmsc89rcwpfhgii1p68xia8gc";
1555− name = "libkipi-21.12.3.tar.xz";
1561+ url = "${mirror}/stable/release-service/22.04.0/src/libkipi-22.04.0.tar.xz";
1562+ sha256 = "0xcwjx5kidqbf64b2pd4vlf9vzyjwm1jbbm89pyb2myiadkngzkj";
1563+ name = "libkipi-22.04.0.tar.xz";
15561564 };
15571565 };
15581566 libkleo = {
1559− version = "21.12.3";
1567+ version = "22.04.0";
15601568 src = fetchurl {
1561− url = "${mirror}/stable/release-service/21.12.3/src/libkleo-21.12.3.tar.xz";
1562− sha256 = "19q128ldi0aspy7vc03r54vrf7wz7l1181x9pbmax8340nbnaz7l";
1563− name = "libkleo-21.12.3.tar.xz";
1569+ url = "${mirror}/stable/release-service/22.04.0/src/libkleo-22.04.0.tar.xz";
1570+ sha256 = "1vwfa38wh0di2q4999bnw8dfyn8ckph5b88z0v218gl1iwwsxgsf";
1571+ name = "libkleo-22.04.0.tar.xz";
15641572 };
15651573 };
15661574 libkmahjongg = {
1567− version = "21.12.3";
1575+ version = "22.04.0";
15681576 src = fetchurl {
1569− url = "${mirror}/stable/release-service/21.12.3/src/libkmahjongg-21.12.3.tar.xz";
1570− sha256 = "114viyqq7zlwsdnm96iyyvj8ma4p06m69hs641yv42xlbkspwbal";
1571− name = "libkmahjongg-21.12.3.tar.xz";
1577+ url = "${mirror}/stable/release-service/22.04.0/src/libkmahjongg-22.04.0.tar.xz";
1578+ sha256 = "0g50qks245zw9g9inzkk9n9bbzambi3pf5sd0m4qcd4hlkq494q3";
1579+ name = "libkmahjongg-22.04.0.tar.xz";
15721580 };
15731581 };
15741582 libkomparediff2 = {
1575− version = "21.12.3";
1583+ version = "22.04.0";
15761584 src = fetchurl {
1577− url = "${mirror}/stable/release-service/21.12.3/src/libkomparediff2-21.12.3.tar.xz";
1578− sha256 = "1j93lf9adyw581a9i8kc1pj6vadscibw49wvwfs750f0kxn5p0d2";
1579− name = "libkomparediff2-21.12.3.tar.xz";
1585+ url = "${mirror}/stable/release-service/22.04.0/src/libkomparediff2-22.04.0.tar.xz";
1586+ sha256 = "0487grz2q8g3cxmirp2mzzk87xljdnakh0lqvjqc0773siwg97ww";
1587+ name = "libkomparediff2-22.04.0.tar.xz";
15801588 };
15811589 };
15821590 libksane = {
1583− version = "21.12.3";
1591+ version = "22.04.0";
15841592 src = fetchurl {
1585− url = "${mirror}/stable/release-service/21.12.3/src/libksane-21.12.3.tar.xz";
1586− sha256 = "0ci2284ysh4q8sbhqcg5bis2v02bp5x64h8n0qik14yy24x852zg";
1587− name = "libksane-21.12.3.tar.xz";
1593+ url = "${mirror}/stable/release-service/22.04.0/src/libksane-22.04.0.tar.xz";
1594+ sha256 = "055x396jhkzqzfk54flig4cpn12hfvmsm5x5ini2vhjfdc986fkk";
1595+ name = "libksane-22.04.0.tar.xz";
15881596 };
15891597 };
15901598 libksieve = {
1591− version = "21.12.3";
1599+ version = "22.04.0";
15921600 src = fetchurl {
1593− url = "${mirror}/stable/release-service/21.12.3/src/libksieve-21.12.3.tar.xz";
1594− sha256 = "1li9cc5y6xbn4m4qa21qmsjd4xzshp67mxwh2nvr17mfs8ray7vd";
1595− name = "libksieve-21.12.3.tar.xz";
1601+ url = "${mirror}/stable/release-service/22.04.0/src/libksieve-22.04.0.tar.xz";
1602+ sha256 = "0ybmccxrsfvlsxrhbk4f1szj6y2gz520j5a7mdqwarwj2ba2fnvy";
1603+ name = "libksieve-22.04.0.tar.xz";
15961604 };
15971605 };
15981606 libktorrent = {
1599− version = "21.12.3";
1607+ version = "22.04.0";
16001608 src = fetchurl {
1601− url = "${mirror}/stable/release-service/21.12.3/src/libktorrent-21.12.3.tar.xz";
1602− sha256 = "0i976al9bsc3gbplqbxkxr03sdhxv3yzjlfkdaghga8fkihzkkl0";
1603− name = "libktorrent-21.12.3.tar.xz";
1609+ url = "${mirror}/stable/release-service/22.04.0/src/libktorrent-22.04.0.tar.xz";
1610+ sha256 = "0xgh27yi06sx4jc6bfdayc2jx4fbf66939k9amg7m728sgd3yq1h";
1611+ name = "libktorrent-22.04.0.tar.xz";
16041612 };
16051613 };
16061614 lokalize = {
1607− version = "21.12.3";
1615+ version = "22.04.0";
16081616 src = fetchurl {
1609− url = "${mirror}/stable/release-service/21.12.3/src/lokalize-21.12.3.tar.xz";
1610− sha256 = "1gzfiajy377kx0iar85z72zqxh7y9vhp1hs03zzqymazawm9lqnn";
1611− name = "lokalize-21.12.3.tar.xz";
1617+ url = "${mirror}/stable/release-service/22.04.0/src/lokalize-22.04.0.tar.xz";
1618+ sha256 = "1r6r3bkcnqaj7r398pl30plzs81bwj83lzbmch8pl25v8vksd0w0";
1619+ name = "lokalize-22.04.0.tar.xz";
16121620 };
16131621 };
16141622 lskat = {
1615− version = "21.12.3";
1623+ version = "22.04.0";
16161624 src = fetchurl {
1617− url = "${mirror}/stable/release-service/21.12.3/src/lskat-21.12.3.tar.xz";
1618− sha256 = "1cfs1lfwgxwpn2g56y7jb2c6ijd81bi8ba8ap0yyx6nhv6na072b";
1619− name = "lskat-21.12.3.tar.xz";
1625+ url = "${mirror}/stable/release-service/22.04.0/src/lskat-22.04.0.tar.xz";
1626+ sha256 = "0nr78krgf6hy3brn94g0lcwkw6bif5ivhhmmx62b4p3iqy6155c0";
1627+ name = "lskat-22.04.0.tar.xz";
16201628 };
16211629 };
16221630 mailcommon = {
1623− version = "21.12.3";
1631+ version = "22.04.0";
16241632 src = fetchurl {
1625− url = "${mirror}/stable/release-service/21.12.3/src/mailcommon-21.12.3.tar.xz";
1626− sha256 = "1zi8zkhv9g4vsylqzjm2wr9v6b20irfxhf4q467cmpqqrqpcp3af";
1627− name = "mailcommon-21.12.3.tar.xz";
1633+ url = "${mirror}/stable/release-service/22.04.0/src/mailcommon-22.04.0.tar.xz";
1634+ sha256 = "0yx2j9j3pylgliadbc1j2w4jmqb3ydciy7x9swhgf0zm8a0gj0k6";
1635+ name = "mailcommon-22.04.0.tar.xz";
16281636 };
16291637 };
16301638 mailimporter = {
1631− version = "21.12.3";
1639+ version = "22.04.0";
16321640 src = fetchurl {
1633− url = "${mirror}/stable/release-service/21.12.3/src/mailimporter-21.12.3.tar.xz";
1634− sha256 = "0lcr9zzdf16f82spr9x33jnzr23sx7xk2zvfpzdki3b5jxvapnsk";
1635− name = "mailimporter-21.12.3.tar.xz";
1641+ url = "${mirror}/stable/release-service/22.04.0/src/mailimporter-22.04.0.tar.xz";
1642+ sha256 = "07rkcnylpalhd774dsvsyv1lg5i8ya2wkn3zmgswvsnlxiymlv2s";
1643+ name = "mailimporter-22.04.0.tar.xz";
16361644 };
16371645 };
16381646 marble = {
1639− version = "21.12.3";
1647+ version = "22.04.0";
16401648 src = fetchurl {
1641− url = "${mirror}/stable/release-service/21.12.3/src/marble-21.12.3.tar.xz";
1642− sha256 = "0v6qd9cl6g8k55mjq2lswsfcxzf88w33nlm1193ps3ac0awjaaa4";
1643− name = "marble-21.12.3.tar.xz";
1649+ url = "${mirror}/stable/release-service/22.04.0/src/marble-22.04.0.tar.xz";
1650+ sha256 = "0qlrg5vy2rvvgimg1bxlyia5czygqn5gwf1nfkjdm1xk6scj2fgb";
1651+ name = "marble-22.04.0.tar.xz";
16441652 };
16451653 };
16461654 markdownpart = {
1647− version = "21.12.3";
1655+ version = "22.04.0";
16481656 src = fetchurl {
1649− url = "${mirror}/stable/release-service/21.12.3/src/markdownpart-21.12.3.tar.xz";
1650− sha256 = "1drvjrvmd2c36xj3x7kxb7lvk23cmaw8mi976pdfnxn5pdamv6wl";
1651− name = "markdownpart-21.12.3.tar.xz";
1657+ url = "${mirror}/stable/release-service/22.04.0/src/markdownpart-22.04.0.tar.xz";
1658+ sha256 = "130vm0h07phzg7rdcdijcnr8nlyif7gcf80a7pfxjirxszy3l5zw";
1659+ name = "markdownpart-22.04.0.tar.xz";
16521660 };
16531661 };
16541662 mbox-importer = {
1655− version = "21.12.3";
1663+ version = "22.04.0";
16561664 src = fetchurl {
1657− url = "${mirror}/stable/release-service/21.12.3/src/mbox-importer-21.12.3.tar.xz";
1658− sha256 = "01bh0yzv23vkicc7lj217rp8c36kyyjlxmkwylss3hakr4b3afan";
1659− name = "mbox-importer-21.12.3.tar.xz";
1665+ url = "${mirror}/stable/release-service/22.04.0/src/mbox-importer-22.04.0.tar.xz";
1666+ sha256 = "1j4l6lziyj1vb7m3m6cxlydk3k66iy2ivmrqarl040r2c2xp36wa";
1667+ name = "mbox-importer-22.04.0.tar.xz";
16601668 };
16611669 };
16621670 messagelib = {
1663− version = "21.12.3";
1671+ version = "22.04.0";
16641672 src = fetchurl {
1665− url = "${mirror}/stable/release-service/21.12.3/src/messagelib-21.12.3.tar.xz";
1666− sha256 = "0xrhnkahqirsz37lbvx505ll7bfhr25lbq89yqq81bxbzkbvamsw";
1667− name = "messagelib-21.12.3.tar.xz";
1673+ url = "${mirror}/stable/release-service/22.04.0/src/messagelib-22.04.0.tar.xz";
1674+ sha256 = "0ny9qv26a8vi0vg5990bw82jz25balk3j0419ssbgakwybgfgkkb";
1675+ name = "messagelib-22.04.0.tar.xz";
16681676 };
16691677 };
16701678 minuet = {
1671− version = "21.12.3";
1679+ version = "22.04.0";
16721680 src = fetchurl {
1673− url = "${mirror}/stable/release-service/21.12.3/src/minuet-21.12.3.tar.xz";
1674− sha256 = "0r68z3j0j2gbwzj77wvsx1idrfkagj0pjai9j7fbqa0r6q833flr";
1675− name = "minuet-21.12.3.tar.xz";
1681+ url = "${mirror}/stable/release-service/22.04.0/src/minuet-22.04.0.tar.xz";
1682+ sha256 = "1q74jkkc0yd03xar6bpg62kvwh6kfpvipqvramg91sdi5k77rr56";
1683+ name = "minuet-22.04.0.tar.xz";
16761684 };
16771685 };
16781686 okular = {
1679− version = "21.12.3";
1687+ version = "22.04.0";
16801688 src = fetchurl {
1681− url = "${mirror}/stable/release-service/21.12.3/src/okular-21.12.3.tar.xz";
1682− sha256 = "054rzdqsqkjx2sncyfcnfdvm9bp45sdw3rycmpzicnwpn5j4hcb3";
1683− name = "okular-21.12.3.tar.xz";
1689+ url = "${mirror}/stable/release-service/22.04.0/src/okular-22.04.0.tar.xz";
1690+ sha256 = "1gz3nal7m0jlcblrzy4d3fszcj03h7z2wmvyj12v459l1k0vmvj7";
1691+ name = "okular-22.04.0.tar.xz";
16841692 };
16851693 };
16861694 palapeli = {
1687− version = "21.12.3";
1695+ version = "22.04.0";
16881696 src = fetchurl {
1689− url = "${mirror}/stable/release-service/21.12.3/src/palapeli-21.12.3.tar.xz";
1690− sha256 = "076igql89sx55hfxjb79248ih4cjbkr1s1jnz46y3dk793rscm8g";
1691− name = "palapeli-21.12.3.tar.xz";
1697+ url = "${mirror}/stable/release-service/22.04.0/src/palapeli-22.04.0.tar.xz";
1698+ sha256 = "0wixgr17z0mwmb78wn126bvg512z9dbd5gm6k1x9wikhlfi91mkd";
1699+ name = "palapeli-22.04.0.tar.xz";
16921700 };
16931701 };
16941702 parley = {
1695− version = "21.12.3";
1703+ version = "22.04.0";
16961704 src = fetchurl {
1697− url = "${mirror}/stable/release-service/21.12.3/src/parley-21.12.3.tar.xz";
1698− sha256 = "10hv885l0gz5aymf72f42bhkncfarj768nb12q9fxqk4x5rviiw0";
1699− name = "parley-21.12.3.tar.xz";
1705+ url = "${mirror}/stable/release-service/22.04.0/src/parley-22.04.0.tar.xz";
1706+ sha256 = "0wkjkyddx95rai0p5q6hd47swrykk20g62c5n5hh5picr9yacr98";
1707+ name = "parley-22.04.0.tar.xz";
17001708 };
17011709 };
17021710 partitionmanager = {
1703− version = "21.12.3";
1711+ version = "22.04.0";
17041712 src = fetchurl {
1705− url = "${mirror}/stable/release-service/21.12.3/src/partitionmanager-21.12.3.tar.xz";
1706− sha256 = "0x0k3vsbngcb7kvcgqj2w025fn9xvfd2232lx51xfar5r3jb7h1p";
1707− name = "partitionmanager-21.12.3.tar.xz";
1713+ url = "${mirror}/stable/release-service/22.04.0/src/partitionmanager-22.04.0.tar.xz";
1714+ sha256 = "06lhxgwal3fjxyb2v4vvd67r6dyd5hf08hz7lnyp0b0xx7f6fa3q";
1715+ name = "partitionmanager-22.04.0.tar.xz";
17081716 };
17091717 };
17101718 picmi = {
1711− version = "21.12.3";
1719+ version = "22.04.0";
17121720 src = fetchurl {
1713− url = "${mirror}/stable/release-service/21.12.3/src/picmi-21.12.3.tar.xz";
1714− sha256 = "0gk1yq5ac55k6lxbxszxpd393fb9k6yphisb71lx2zv9gchl44n6";
1715− name = "picmi-21.12.3.tar.xz";
1721+ url = "${mirror}/stable/release-service/22.04.0/src/picmi-22.04.0.tar.xz";
1722+ sha256 = "0q2wrn323wwwfnf0w6cvw0fhv3fsxhqj3a2qdki9yzz5rb5mc2y9";
1723+ name = "picmi-22.04.0.tar.xz";
17161724 };
17171725 };
17181726 pim-data-exporter = {
1719− version = "21.12.3";
1727+ version = "22.04.0";
17201728 src = fetchurl {
1721− url = "${mirror}/stable/release-service/21.12.3/src/pim-data-exporter-21.12.3.tar.xz";
1722− sha256 = "0qcwsbb4zsjgc15fhq9pp341wwm35y9v1lq8gnpjdsvfq2pczq5q";
1723− name = "pim-data-exporter-21.12.3.tar.xz";
1729+ url = "${mirror}/stable/release-service/22.04.0/src/pim-data-exporter-22.04.0.tar.xz";
1730+ sha256 = "02h76ividjadlmfmxnc1x2bif3mmgrc4q7yjxzf2jpjqdha80xyq";
1731+ name = "pim-data-exporter-22.04.0.tar.xz";
17241732 };
17251733 };
17261734 pim-sieve-editor = {
1727− version = "21.12.3";
1735+ version = "22.04.0";
17281736 src = fetchurl {
1729− url = "${mirror}/stable/release-service/21.12.3/src/pim-sieve-editor-21.12.3.tar.xz";
1730− sha256 = "1gp4gpagv6pfiy6gyfh14z1rb16iqm1npmngw6ybjlhh6d424n90";
1731− name = "pim-sieve-editor-21.12.3.tar.xz";
1737+ url = "${mirror}/stable/release-service/22.04.0/src/pim-sieve-editor-22.04.0.tar.xz";
1738+ sha256 = "1c9w4bnh3a9w79lakqsv780zqdpl8g6wsax994p6lglzs56xs299";
1739+ name = "pim-sieve-editor-22.04.0.tar.xz";
17321740 };
17331741 };
17341742 pimcommon = {
1735− version = "21.12.3";
1743+ version = "22.04.0";
17361744 src = fetchurl {
1737− url = "${mirror}/stable/release-service/21.12.3/src/pimcommon-21.12.3.tar.xz";
1738− sha256 = "1k1d100lr277lgwyzn2ssxsx9x2yd9nfd5657r95vmdnkh2qs517";
1739− name = "pimcommon-21.12.3.tar.xz";
1745+ url = "${mirror}/stable/release-service/22.04.0/src/pimcommon-22.04.0.tar.xz";
1746+ sha256 = "0iqmyb9xx8h8ay6yzf9xbrg7c67jlsrywwlljynj7lh4n2wjg3sc";
1747+ name = "pimcommon-22.04.0.tar.xz";
17401748 };
17411749 };
17421750 poxml = {
1743− version = "21.12.3";
1751+ version = "22.04.0";
17441752 src = fetchurl {
1745− url = "${mirror}/stable/release-service/21.12.3/src/poxml-21.12.3.tar.xz";
1746− sha256 = "19hrb75fbh102fw8ajflj4777s7hq7vxv6kbwjir6wzsvdfanwdb";
1747− name = "poxml-21.12.3.tar.xz";
1753+ url = "${mirror}/stable/release-service/22.04.0/src/poxml-22.04.0.tar.xz";
1754+ sha256 = "15m55qb2wn66nxg0j7jwz0r4zg180dbm1ynnx1yj39iprra9j9k7";
1755+ name = "poxml-22.04.0.tar.xz";
17481756 };
17491757 };
17501758 print-manager = {
1751− version = "21.12.3";
1759+ version = "22.04.0";
17521760 src = fetchurl {
1753− url = "${mirror}/stable/release-service/21.12.3/src/print-manager-21.12.3.tar.xz";
1754− sha256 = "1q9vv5v9hivm583hcx8qa7xik9yv4zicrd02abcsn6hvgwmdav8b";
1755− name = "print-manager-21.12.3.tar.xz";
1761+ url = "${mirror}/stable/release-service/22.04.0/src/print-manager-22.04.0.tar.xz";
1762+ sha256 = "0fq4q57nxiingwmkj6hsgvg3gaix6rkgfskpg442vbhc70s280q9";
1763+ name = "print-manager-22.04.0.tar.xz";
17561764 };
17571765 };
17581766 rocs = {
1759− version = "21.12.3";
1767+ version = "22.04.0";
17601768 src = fetchurl {
1761− url = "${mirror}/stable/release-service/21.12.3/src/rocs-21.12.3.tar.xz";
1762− sha256 = "1fgjap71qnaydar9q155is7vwjlkpa8wi1162dsqxr5ywy464wrg";
1763− name = "rocs-21.12.3.tar.xz";
1769+ url = "${mirror}/stable/release-service/22.04.0/src/rocs-22.04.0.tar.xz";
1770+ sha256 = "1x80ln8px5fywb1zhc569nrpnpv5iyr73vxl1ckh3s337xn44pd7";
1771+ name = "rocs-22.04.0.tar.xz";
17641772 };
17651773 };
17661774 signon-kwallet-extension = {
1767− version = "21.12.3";
1775+ version = "22.04.0";
17681776 src = fetchurl {
1769− url = "${mirror}/stable/release-service/21.12.3/src/signon-kwallet-extension-21.12.3.tar.xz";
1770− sha256 = "0sv0g50bxxd442ia7wzk2lkqwr8lsjxk5wm3zsskxhql851y0ybm";
1771− name = "signon-kwallet-extension-21.12.3.tar.xz";
1777+ url = "${mirror}/stable/release-service/22.04.0/src/signon-kwallet-extension-22.04.0.tar.xz";
1778+ sha256 = "1s6jjhqkz2pv2ki87ka8y4b4gqv8wmlc332hrrlfa8cafldrpl9k";
1779+ name = "signon-kwallet-extension-22.04.0.tar.xz";
17721780 };
17731781 };
17741782 skanlite = {
1775− version = "21.12.3";
1783+ version = "22.04.0";
1784+ src = fetchurl {
1785+ url = "${mirror}/stable/release-service/22.04.0/src/skanlite-22.04.0.tar.xz";
1786+ sha256 = "155d62q26xfba7ihbj6mz5vyydl6bkcxzwa6fxn62kgnpq8axdxf";
1787+ name = "skanlite-22.04.0.tar.xz";
1788+ };
1789+ };
1790+ skanpage = {
1791+ version = "22.04.0";
17761792 src = fetchurl {
1777− url = "${mirror}/stable/release-service/21.12.3/src/skanlite-21.12.3.tar.xz";
1778− sha256 = "06dwmdjrss7cqqigg4rwsy5dya35577qwdaxj2jbvs2pkzp9rq3p";
1779− name = "skanlite-21.12.3.tar.xz";
1793+ url = "${mirror}/stable/release-service/22.04.0/src/skanpage-22.04.0.tar.xz";
1794+ sha256 = "1n72796546x9fh0bhnlc43mlcrpdqlkph605f8nb7vznkpdnb8zq";
1795+ name = "skanpage-22.04.0.tar.xz";
17801796 };
17811797 };
17821798 spectacle = {
1783− version = "21.12.3";
1799+ version = "22.04.0";
17841800 src = fetchurl {
1785− url = "${mirror}/stable/release-service/21.12.3/src/spectacle-21.12.3.tar.xz";
1786− sha256 = "155xin26lkjr0swb281afha906nqy2821lf2spmzzxa3xalzq3sv";
1787− name = "spectacle-21.12.3.tar.xz";
1801+ url = "${mirror}/stable/release-service/22.04.0/src/spectacle-22.04.0.tar.xz";
1802+ sha256 = "07dx9jg9i5s1cg0zsz9s06qipz80dv0bq2q1dfy82p6xrji30pdc";
1803+ name = "spectacle-22.04.0.tar.xz";
17881804 };
17891805 };
17901806 step = {
1791− version = "21.12.3";
1807+ version = "22.04.0";
17921808 src = fetchurl {
1793− url = "${mirror}/stable/release-service/21.12.3/src/step-21.12.3.tar.xz";
1794− sha256 = "0j3w63bxj3b4lrfb0mnchlvsr987v5zwwjw5jrgvqidrhv1rh7dc";
1795− name = "step-21.12.3.tar.xz";
1809+ url = "${mirror}/stable/release-service/22.04.0/src/step-22.04.0.tar.xz";
1810+ sha256 = "007zbkg8gg56f733wp2dbb0xskja5c6pm3n181lirqq831ai9rnb";
1811+ name = "step-22.04.0.tar.xz";
17961812 };
17971813 };
17981814 svgpart = {
1799− version = "21.12.3";
1815+ version = "22.04.0";
18001816 src = fetchurl {
1801− url = "${mirror}/stable/release-service/21.12.3/src/svgpart-21.12.3.tar.xz";
1802− sha256 = "0yg8sn1z9zfb7a6y61nw7vya516sfaydkgxh7cfwiz7sljl87z8j";
1803− name = "svgpart-21.12.3.tar.xz";
1817+ url = "${mirror}/stable/release-service/22.04.0/src/svgpart-22.04.0.tar.xz";
1818+ sha256 = "16nz12sc1zgyaa6rilqymfcw0waj0ha8xydlsbgv83v1wqlxlfwj";
1819+ name = "svgpart-22.04.0.tar.xz";
18041820 };
18051821 };
18061822 sweeper = {
1807− version = "21.12.3";
1823+ version = "22.04.0";
18081824 src = fetchurl {
1809− url = "${mirror}/stable/release-service/21.12.3/src/sweeper-21.12.3.tar.xz";
1810− sha256 = "1l4ag2nhy0da9z4nlf7fmjrim7pmwpm3m4v4y50jlpdv73f63246";
1811− name = "sweeper-21.12.3.tar.xz";
1825+ url = "${mirror}/stable/release-service/22.04.0/src/sweeper-22.04.0.tar.xz";
1826+ sha256 = "1fvjq1pcqnadpvkh5jdlb62l54x7r99zshd59jdxy6h7fji3pkbs";
1827+ name = "sweeper-22.04.0.tar.xz";
18121828 };
18131829 };
18141830 umbrello = {
1815− version = "21.12.3";
1831+ version = "22.04.0";
18161832 src = fetchurl {
1817− url = "${mirror}/stable/release-service/21.12.3/src/umbrello-21.12.3.tar.xz";
1818− sha256 = "1i94l5hnn8hl0dgdq8sj5xm2vk372zfcnch9qvf9gcvhg08gdif6";
1819− name = "umbrello-21.12.3.tar.xz";
1833+ url = "${mirror}/stable/release-service/22.04.0/src/umbrello-22.04.0.tar.xz";
1834+ sha256 = "1n3jvsrzmfzm7x9f125hsf8i80r0iiqzv80ddc7fpzdyxpd83xpl";
1835+ name = "umbrello-22.04.0.tar.xz";
18201836 };
18211837 };
18221838 yakuake = {
1823− version = "21.12.3";
1839+ version = "22.04.0";
18241840 src = fetchurl {
1825− url = "${mirror}/stable/release-service/21.12.3/src/yakuake-21.12.3.tar.xz";
1826− sha256 = "10mkr8svkjf2s023mf21cil2c5v986s5b2yp1hm0fzdgmawpwrh9";
1827− name = "yakuake-21.12.3.tar.xz";
1841+ url = "${mirror}/stable/release-service/22.04.0/src/yakuake-22.04.0.tar.xz";
1842+ sha256 = "01i0ddgz81mzqlnj6cvslzv2h1nbz238hg75izfpbajvzm46pydp";
1843+ name = "yakuake-22.04.0.tar.xz";
18281844 };
18291845 };
18301846 zanshin = {
1831− version = "21.12.3";
1847+ version = "22.04.0";
18321848 src = fetchurl {
1833− url = "${mirror}/stable/release-service/21.12.3/src/zanshin-21.12.3.tar.xz";
1834− sha256 = "1cwawpmx5hc60zkdkyh484lp3bwiipn6c3yh164gzw769vz9zr71";
1835− name = "zanshin-21.12.3.tar.xz";
1849+ url = "${mirror}/stable/release-service/22.04.0/src/zanshin-22.04.0.tar.xz";
1850+ sha256 = "1d0sn9km4xdxs28avhxpc1xpkm5bcmg8i06x97xvls4cxh3nbgm9";
1851+ name = "zanshin-22.04.0.tar.xz";
18361852 };
18371853 };
18381854 zeroconf-ioslave = {
1839− version = "21.12.3";
1855+ version = "22.04.0";
18401856 src = fetchurl {
1841− url = "${mirror}/stable/release-service/21.12.3/src/zeroconf-ioslave-21.12.3.tar.xz";
1842− sha256 = "09jmf233njbqam1swzvpzfgdplpjzdx48vjy6kcpmjvg2qlm7i2l";
1843− name = "zeroconf-ioslave-21.12.3.tar.xz";
1857+ url = "${mirror}/stable/release-service/22.04.0/src/zeroconf-ioslave-22.04.0.tar.xz";
1858+ sha256 = "0nppr0qm5aqail1y370b26ky9snz033j3ij9sykc1yq9il8kkpp4";
1859+ name = "zeroconf-ioslave-22.04.0.tar.xz";
18441860 };
18451861 };
18461862}
pkgs/applications/kde/yakuake.nix+2
@@ -23,6 +23,8 @@ mkDerivation {
2323 extra-cmake-modules kdoctools
2424 ];
2525
26+ outputs = [ "out" "dev" ];
27+
2628 meta = {
2729 homepage = "https://yakuake.kde.org";
2830 description = "Quad-style terminal emulator for KDE";
pkgs/applications/logging/sosreport/default.nixnew file+51
@@ -0,0 +1,51 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, fetchpatch
5+, gettext
6+, pexpect
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "sosreport";
11+ version = "4.3";
12+
13+ src = fetchFromGitHub {
14+ owner = "sosreport";
15+ repo = "sos";
16+ rev = version;
17+ sha256 = "sha256-fLEYRRQap7xqSyUU9MAV8cxxYKydHjn8J147VTXSf78=";
18+ };
19+
20+ patches = [
21+ (fetchpatch {
22+ # fix sos --help
23+ url = "https://github.com/sosreport/sos/commit/ac4eb48fa35c13b99ada41540831412480babf8d.patch";
24+ sha256 = "sha256-6ZRoDDZN2KkHTXOKuHTAquB/HTIUppodmx83WxxYFP0=";
25+ })
26+ ];
27+
28+ nativeBuildInputs = [
29+ gettext
30+ ];
31+
32+ propagatedBuildInputs = [
33+ pexpect
34+ ];
35+
36+ # requires avocado-framework 94.0, latest version as of writing is 96.0
37+ doCheck = false;
38+
39+ preCheck = ''
40+ export PYTHONPATH=$PWD/tests:$PYTHONPATH
41+ '';
42+
43+ pythonImportsCheck = [ "sos" ];
44+
45+ meta = with lib; {
46+ description = "Unified tool for collecting system logs and other debug information";
47+ homepage = "https://github.com/sosreport/sos";
48+ license = licenses.gpl2Only;
49+ maintainers = with maintainers; [ SuperSandro2000 ];
50+ };
51+}
pkgs/applications/misc/1password/default.nix+5−5
@@ -12,12 +12,12 @@ let
1212 if extension == "zip" then fetchzip args else fetchurl args;
1313
1414 pname = "1password-cli";
15− version = "2.0.2";
15+ version = "2.1.0";
1616 sources = rec {
17− aarch64-linux = fetch "linux_arm64" "sha256-DhKxY4Ry1IpT16UC3HbbUSKWzhGm/0R7rYrvqupg/Zo=" "zip";
18− i686-linux = fetch "linux_386" "sha256-ANoOYjG4+mci6TdF4HC9fP8e5eAckrbZITRuA1fqtCA=" "zip";
19− x86_64-linux = fetch "linux_amd64" "sha256-uPudElKu30smsupSIvGAmrF/f9TXoTzyUfSrUAvTDWw=" "zip";
20− aarch64-darwin = fetch "apple_universal" "sha256-P5qsy4kiE/DMJnJr3EUHMcb0KoUZyO2BQ5PIosPbnI8=" "pkg";
17+ aarch64-linux = fetch "linux_arm64" "sha256-DTYWqhawyAQBIxMUksZheyN8WSVPyhCghZC8orxKsBk=" "zip";
18+ i686-linux = fetch "linux_386" "sha256-JBjiKxbJnFILSOVnOUIcY3GpbOT2UOJlasTSPRyYz4I=" "zip";
19+ x86_64-linux = fetch "linux_amd64" "sha256-PfVOvUF8Rls29VzfIj1U6/VFv1H6lj2K3Dz6DWmh2fs=" "zip";
20+ aarch64-darwin = fetch "apple_universal" "sha256-Cn3/+Dvk5hW9rvxu4I9ghHSS1yWSAeQq3gx+6dvFiIk=" "pkg";
2121 x86_64-darwin = aarch64-darwin;
2222 };
2323 platforms = builtins.attrNames sources;
pkgs/applications/misc/anytype/default.nix+2−2
@@ -2,13 +2,13 @@
22
33let
44 pname = "anytype";
5− version = "0.25.0";
5+ version = "0.25.4";
66 name = "Anytype-${version}";
77 nameExecutable = pname;
88 src = fetchurl {
99 url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
1010 name = "Anytype-${version}.AppImage";
11− sha256 = "sha256-cfiSZLfaVmxsZWDwulbMHKzHCG7zMKCWwg8q/2MolVs=";
11+ sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM=";
1212 };
1313 appimageContents = appimageTools.extractType2 { inherit name src; };
1414in
pkgs/applications/misc/audio/wavesurfer/default.nixdeleted−30
@@ -1,30 +0,0 @@
1−{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
2−
3−stdenv.mkDerivation rec {
4− pname = "wavesurfer";
5− version = "1.8.5";
6−
7− src = fetchurl {
8− url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz";
9− sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
10− };
11−
12− nativeBuildInputs = [ makeWrapper ];
13− buildInputs = [ snack tcl tk ];
14−
15− installPhase = ''
16− mkdir -p $out/{bin,nix-support,share/wavesurfer/}
17− mv doc $out/share/wavesurfer
18− mv * $out/nix-support
19− ln -s $out/{nix-support,bin}/wavesurfer.tcl
20− wrapProgram "$out/nix-support/wavesurfer.tcl" \
21− --set TCLLIBPATH "${snack}/lib" \
22− --prefix PATH : "${lib.makeBinPath [ tcl tk ]}"
23− '';
24−
25− meta = {
26− description = "Tool for recording, playing, editing, viewing and labeling of audio";
27− homepage = "https://www.speech.kth.se/wavesurfer/";
28− license = lib.licenses.bsd0;
29− };
30−}
pkgs/applications/misc/authy/default.nix+30−7
@@ -1,7 +1,29 @@
1−{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups
2−, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib
3−, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper
4−, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg
1+{ alsa-lib
2+, at-spi2-atk
3+, at-spi2-core
4+, atk
5+, autoPatchelfHook
6+, cairo
7+, cups
8+, dbus
9+, electron_9
10+, expat
11+, fetchurl
12+, gdk-pixbuf
13+, glib
14+, gtk3
15+, lib
16+, libappindicator-gtk3
17+, libdbusmenu-gtk3
18+, libuuid
19+, makeWrapper
20+, nspr
21+, nss
22+, pango
23+, squashfsTools
24+, stdenv
25+, systemd
26+, xorg
527}:
628
729let
@@ -11,8 +33,9 @@ in
1133
1234stdenv.mkDerivation rec {
1335 pname = "authy";
14− version = "1.9.0";
15− rev = "7";
36+ # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version'
37+ version = "2.1.0";
38+ rev = "9";
1639
1740 buildInputs = [
1841 alsa-lib
@@ -50,7 +73,7 @@ stdenv.mkDerivation rec {
5073
5174 src = fetchurl {
5275 url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap";
53− sha256 = "10az47cc3lgsdi0ixmmna08nqf9xm7gsl1ph00wfwrxzsi05ygx3";
76+ sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU=";
5477 };
5578
5679 nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ];
pkgs/applications/misc/barrier/default.nix+12−1
@@ -1,6 +1,7 @@
11{ lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
22 openssl, wrapGAppsHook,
3− avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
3+ avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; },
4+ fetchpatch
45}:
56
67mkDerivation rec {
@@ -15,6 +16,16 @@ mkDerivation rec {
1516 fetchSubmodules = true;
1617 };
1718
19+ patches = [
20+ # This patch can be removed when a new version of barrier (greater than 2.4.0)
21+ # is released, which will contain this commit.
22+ (fetchpatch {
23+ name = "add-missing-cstddef-header.patch";
24+ url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch";
25+ sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk=";
26+ })
27+ ];
28+
1829 buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
1930 nativeBuildInputs = [ cmake wrapGAppsHook ];
2031
pkgs/applications/misc/bottles/default.nix+2−2
@@ -20,13 +20,13 @@ let
2020in
2121python3Packages.buildPythonApplication rec {
2222 pname = "bottles";
23− version = "2022.4.14-trento-1";
23+ version = "2022.5.2-trento";
2424
2525 src = fetchFromGitHub {
2626 owner = "bottlesdevs";
2727 repo = pname;
2828 rev = version;
29− sha256 = "16cb01fhxa64f8fadwpr0mawfmchig6xlbx20mz4q9yh5fnagywj";
29+ sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84=";
3030 };
3131
3232 postPatch = ''
pkgs/applications/misc/calibre/default.nix+5−1
@@ -104,7 +104,6 @@ mkDerivation rec {
104104 pillow
105105 pyqt-builder
106106 pyqt5
107− pyqtwebengine
108107 python
109108 regex
110109 sip
@@ -114,6 +113,11 @@ mkDerivation rec {
114113 pycryptodome
115114 # the following are distributed with calibre, but we use upstream instead
116115 odfpy
116+ ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqtwebengine.meta.platforms) [
117+ # much of calibre's functionality is usable without a web
118+ # browser, so we enable building on platforms which qtwebengine
119+ # does not support by simply omitting qtwebengine.
120+ pyqtwebengine
117121 ] ++ lib.optional (unrarSupport) unrardll
118122 );
119123
pkgs/applications/misc/charm/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "charm";
5− version = "0.11.0";
5+ version = "0.12.0";
66
77 src = fetchFromGitHub {
88 owner = "charmbracelet";
99 repo = "charm";
1010 rev = "v${version}";
11− sha256 = "sha256-98TUiFy4X7lMUostkgZikk6r6wzBPF0pqWthrS9nU+U=";
11+ sha256 = "sha256-XXKzK5MXJsB3LE7iE5BqnLm0hPs7WbyHR0x9aTldrj4=";
1212 };
1313
14− vendorSha256 = "sha256-enkt7BUAntbB75LR12NB0vW6z9dTPzk0bGdRrn3JHm4=";
14+ vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4=";
1515
1616 ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
1717
pkgs/applications/misc/ff2mpv/default.nixnew file+34
@@ -0,0 +1,34 @@
1+{ lib, stdenv, fetchFromGitHub, python3, mpv }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "ff2mpv";
5+ version = "4.0.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "woodruffw";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "sha256-sxUp/JlmnYW2sPDpIO2/q40cVJBVDveJvbQMT70yjP4=";
12+ };
13+
14+ buildInputs = [ python3 mpv ];
15+
16+ postPatch = ''
17+ patchShebangs .
18+ substituteInPlace ff2mpv.json \
19+ --replace '/home/william/scripts/ff2mpv' "$out/bin/ff2mpv.py"
20+ '';
21+
22+ installPhase = ''
23+ mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts
24+ cp ff2mpv.py $out/bin
25+ cp ff2mpv.json $out/lib/mozilla/native-messaging-hosts
26+ '';
27+
28+ meta = {
29+ description = "Native Messaging Host for ff2mpv firefox addon.";
30+ homepage = "https://github.com/woodruffw/ff2mpv";
31+ license = lib.licenses.mit;
32+ maintainers = with lib.maintainers; [ Enzime ];
33+ };
34+}
pkgs/applications/misc/fspy/default.nix+2−3
@@ -2,7 +2,6 @@
22let
33 pname = "fspy";
44 version = "1.0.3";
5− name = "${pname}-v${version}";
65
76 src = fetchurl {
87 url = "https://github.com/stuffmatic/fSpy/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
@@ -10,10 +9,10 @@ let
109 };
1110
1211in appimageTools.wrapType2 {
13− inherit name src;
12+ inherit pname version src;
1413
1514 extraInstallCommands = ''
16− mv $out/bin/${name} $out/bin/${pname}
15+ mv $out/bin/${pname}-v${version} $out/bin/${pname}
1716 '';
1817
1918 meta = with lib; {
pkgs/applications/misc/gallery-dl/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonApplication rec {
44 pname = "gallery_dl";
5− version = "1.21.1";
5+ version = "1.21.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "sha256-oLVrYM7F9JFDYgQL/XgJS9LeUexqcSlvmkwyAk1bpoY=";
9+ sha256 = "sha256-xn+Y8WOIH6zkExO3ZNya3ZBwh90oSjSk00xfO0c23To=";
1010 };
1111
1212 propagatedBuildInputs = [ requests yt-dlp ];
pkgs/applications/misc/gnome-secrets/default.nix+4−10
@@ -5,7 +5,6 @@
55, gettext
66, fetchFromGitLab
77, python3Packages
8−, libpwquality
98, wrapGAppsHook4
109, gtk4
1110, glib
@@ -17,7 +16,7 @@
1716
1817python3Packages.buildPythonApplication rec {
1918 pname = "gnome-secrets";
20− version = "6.1";
19+ version = "6.4";
2120 format = "other";
2221 strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
2322
@@ -26,7 +25,7 @@ python3Packages.buildPythonApplication rec {
2625 owner = "World";
2726 repo = "secrets";
2827 rev = version;
29− sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
28+ sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
3029 };
3130
3231 nativeBuildInputs = [
@@ -45,6 +44,7 @@ python3Packages.buildPythonApplication rec {
4544 glib
4645 gdk-pixbuf
4746 libadwaita
47+ python3Packages.libpwquality.dev # Use python-enabled libpwquality
4848 ];
4949
5050 propagatedBuildInputs = with python3Packages; [
@@ -52,14 +52,9 @@ python3Packages.buildPythonApplication rec {
5252 construct
5353 pykeepass
5454 pyotp
55− ] ++ [
56− libpwquality # using the python bindings
55+ libpwquality
5756 ];
5857
59− postPatch = ''
60− substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
61− '';
62−
6358 # Prevent double wrapping, let the Python wrapper use the args in preFixup.
6459 dontWrapGApps = true;
6560
@@ -76,4 +71,3 @@ python3Packages.buildPythonApplication rec {
7671 maintainers = with maintainers; [ mvnetbiz ];
7772 };
7873}
79−
pkgs/applications/misc/hello/default.nix+8−5
@@ -1,4 +1,5 @@
1−{ lib
1+{ callPackage
2+, lib
23, stdenv
34, fetchurl
45, nixos
@@ -6,12 +7,12 @@
67, hello
78}:
89
9−stdenv.mkDerivation rec {
10+stdenv.mkDerivation (finalAttrs: {
1011 pname = "hello";
1112 version = "2.12";
1213
1314 src = fetchurl {
14− url = "mirror://gnu/hello/${pname}-${version}.tar.gz";
15+ url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";
1516 sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";
1617 };
1718
@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
2728 (nixos { environment.noXlibs = true; }).pkgs.hello;
2829 };
2930
31+ passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
32+
3033 meta = with lib; {
3134 description = "A program that produces a familiar, friendly greeting";
3235 longDescription = ''
@@ -34,9 +37,9 @@ stdenv.mkDerivation rec {
3437 It is fully customizable.
3538 '';
3639 homepage = "https://www.gnu.org/software/hello/manual/";
37− changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}";
40+ changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
3841 license = licenses.gpl3Plus;
3942 maintainers = [ maintainers.eelco ];
4043 platforms = platforms.all;
4144 };
42−}
45+})
pkgs/applications/misc/hello/test.nixnew file+8
@@ -0,0 +1,8 @@
1+{ runCommand, hello }:
2+
3+runCommand "hello-test-run" {
4+ nativeBuildInputs = [ hello ];
5+} ''
6+ diff -U3 --color=auto <(hello) <(echo 'Hello, world!')
7+ touch $out
8+''
pkgs/applications/misc/hugo/default.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "hugo";
5− version = "0.96.0";
5+ version = "0.98.0";
66
77 src = fetchFromGitHub {
88 owner = "gohugoio";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-3O+ZdOloh5gILPQssztt7s/MwRgDOnpJItwLn7FXnPU=";
11+ sha256 = "sha256-oZzjnuu6C522qBs/A83jKIZ3dUrJRmKJ/C8NRX31yvw=";
1212 };
1313
14− vendorSha256 = "sha256-TgE/ToHBg2QBgtk0gPZTV/icIbQN14RpVAbL/8b+W0U=";
14+ vendorSha256 = "sha256-HM5IE/rVNWyTfjUtVOlw+69+YoWYlLtU2FOXeH2BAi8=";
1515
1616 doCheck = false;
1717
pkgs/applications/misc/joplin-desktop/default.nix+3−3
@@ -2,7 +2,7 @@
22
33let
44 pname = "joplin-desktop";
5− version = "2.7.13";
5+ version = "2.7.15";
66 name = "${pname}-${version}";
77
88 inherit (stdenv.hostPlatform) system;
@@ -16,8 +16,8 @@ let
1616 src = fetchurl {
1717 url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
1818 sha256 = {
19− x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs=";
20− x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k=";
19+ x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts=";
20+ x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA=";
2121 }.${system} or throwSystem;
2222 };
2323
pkgs/applications/misc/kiln/default.nix+3−3
@@ -2,18 +2,18 @@
22
33buildGoModule rec {
44 pname = "kiln";
5− version = "0.2.1";
5+ version = "0.3.0";
66
77 src = fetchFromSourcehut {
88 owner = "~adnano";
99 repo = pname;
1010 rev = version;
11− hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";
11+ hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";
1212 };
1313
1414 nativeBuildInputs = [ scdoc ];
1515
16− vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";
16+ vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";
1717
1818 installPhase = ''
1919 runHook preInstall
pkgs/applications/misc/libosmocore/default.nix+21−6
@@ -1,16 +1,25 @@
1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
2−, pcsclite, talloc, python2, gnutls
1+{ lib, stdenv
2+, autoreconfHook
3+, fetchFromGitHub
4+, gnutls
5+, libmnl
6+, libusb1
7+, lksctp-tools
8+, pcsclite
9+, pkg-config
10+, python3
11+, talloc
312}:
413
514stdenv.mkDerivation rec {
615 pname = "libosmocore";
7− version = "1.2.0";
16+ version = "1.6.0";
817
918 src = fetchFromGitHub {
1019 owner = "osmocom";
1120 repo = "libosmocore";
1221 rev = version;
13− sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";
22+ hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";
1423 };
1524
1625 propagatedBuildInputs = [
@@ -18,11 +27,17 @@ stdenv.mkDerivation rec {
1827 ];
1928
2029 nativeBuildInputs = [
21− autoreconfHook pkg-config
30+ autoreconfHook
31+ pkg-config
32+ python3
2233 ];
2334
2435 buildInputs = [
25− pcsclite python2 gnutls
36+ gnutls
37+ libmnl
38+ libusb1
39+ lksctp-tools
40+ pcsclite
2641 ];
2742
2843 enableParallelBuilding = true;
pkgs/applications/misc/lighthouse/default.nixdeleted−35
@@ -1,35 +0,0 @@
1−{ lib, stdenv, fetchFromGitHub, pkg-config
2−, libX11, libxcb, cairo, gtk2, pango, python27, python3
3−}:
4−
5−stdenv.mkDerivation rec {
6− pname = "lighthouse";
7− version = "unstable-2016-07-20";
8−
9− src = fetchFromGitHub {
10− owner = "emgram769";
11− repo = "lighthouse";
12− rev = "d1813ef8e2aca9f6b3609b1e0c6d1d5ee683281a";
13− sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys";
14− };
15−
16− nativeBuildInputs = [ pkg-config ];
17− buildInputs = [
18− libX11 libxcb cairo gtk2 pango python27 python3
19− ];
20−
21− makeFlags = [ "PREFIX=\${out}" ];
22−
23− preFixup = "chmod +x $out/share/lighthouse/.config/lighthouse/google.py";
24−
25− postFixup = "chmod -x $out/share/lighthouse/.config/lighthouse/google.py";
26−
27− meta = with lib; {
28− description = "A simple flexible popup dialog to run on X";
29− homepage = "https://github.com/emgram769/lighthouse";
30− license = licenses.mit;
31− maintainers = with maintainers; [ ramkromberg ];
32− platforms = platforms.linux;
33− };
34−
35−}
pkgs/applications/misc/marktext/default.nix+5−6
@@ -2,20 +2,19 @@
22
33let
44 pname = "marktext";
5− version = "v0.17.1";
6− name = "${pname}-${version}-binary";
5+ version = "0.17.1";
76
87 src = fetchurl {
9− url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage";
8+ url = "https://github.com/marktext/marktext/releases/download/v${version}/marktext-x86_64.AppImage";
109 sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7";
1110 };
1211
1312 appimageContents = appimageTools.extractType2 {
14− inherit name src;
13+ inherit pname version src;
1514 };
1615in
1716appimageTools.wrapType2 rec {
18− inherit name src;
17+ inherit pname version src;
1918
2019 profile = ''
2120 export LC_ALL=C.UTF-8
@@ -35,7 +34,7 @@ appimageTools.wrapType2 rec {
3534
3635 extraInstallCommands = ''
3736 # Strip version from binary name.
38− mv $out/bin/${name} $out/bin/${pname}
37+ mv $out/bin/${pname}-${version} $out/bin/${pname}
3938
4039 install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
4140 substituteInPlace $out/share/applications/marktext.desktop \
pkgs/applications/misc/megacmd/default.nix+2−2
@@ -23,13 +23,13 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "megacmd";
26− version = "1.5.0";
26+ version = "1.5.0c";
2727
2828 src = fetchFromGitHub {
2929 owner = "meganz";
3030 repo = "MEGAcmd";
3131 rev = "${version}_Linux";
32− sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A=";
32+ sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE=";
3333 fetchSubmodules = true;
3434 };
3535
pkgs/applications/misc/moonlight-qt/default.nix+2−2
@@ -20,13 +20,13 @@
2020
2121stdenv.mkDerivation rec {
2222 pname = "moonlight-qt";
23− version = "3.2.0";
23+ version = "4.0.0";
2424
2525 src = fetchFromGitHub {
2626 owner = "moonlight-stream";
2727 repo = pname;
2828 rev = "v${version}";
29− sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI=";
29+ sha256 = "sha256-CfOphr8QILCZg+UrImp5JO/1DTqoan5EwiQeTKR15Fo=";
3030 fetchSubmodules = true;
3131 };
3232
pkgs/applications/misc/nnn/default.nix+2−2
@@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false;
2020
2121stdenv.mkDerivation rec {
2222 pname = "nnn";
23− version = "4.4";
23+ version = "4.5";
2424
2525 src = fetchFromGitHub {
2626 owner = "jarun";
2727 repo = pname;
2828 rev = "v${version}";
29− sha256 = "sha256-g9GaCc/IWKtih0/A2AZEPImjj7ymJIdYwC5I/6GUh5c=";
29+ sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk=";
3030 };
3131
3232 configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf);
pkgs/applications/misc/obsidian/default.nix+3−3
@@ -12,20 +12,20 @@
1212let
1313 inherit (stdenv.hostPlatform) system;
1414 pname = "obsidian";
15− version = "0.14.2";
15+ version = "0.14.6";
1616 appname = "Obsidian";
1717 meta = with lib; {
1818 description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
1919 homepage = "https://obsidian.md";
2020 downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
2121 license = licenses.obsidian;
22− maintainers = with maintainers; [ conradmearns zaninime opeik ];
22+ maintainers = with maintainers; [ atila conradmearns zaninime opeik ];
2323 };
2424
2525 filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
2626 src = fetchurl {
2727 url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
28− sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3";
28+ sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc=";
2929 };
3030
3131 icon = fetchurl {
pkgs/applications/misc/octoprint/default.nix+7−245
@@ -9,251 +9,11 @@
99, packageOverrides ? self: super: { }
1010}:
1111let
12− mkOverride = attrname: version: sha256:
13− self: super: {
14− ${attrname} = super.${attrname}.overridePythonAttrs (
15− oldAttrs: {
16− inherit version;
17− src = oldAttrs.src.override {
18− inherit version sha256;
19− };
20− }
21− );
22− };
2312
2413 py = python3.override {
2514 self = py;
2615 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (
2716 [
28− # the following dependencies are non trivial to update since later versions introduce backwards incompatible
29− # changes that might affect plugins, or due to other observed problems
30− (mkOverride "click" "7.1.2" "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a")
31− (mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")
32− (mkOverride "itsdangerous" "1.1.0" "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19")
33− (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6")
34− (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a")
35− (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b")
36−
37− # black uses hash, not sha256 identifier. Newer black version requires newer click version
38− (
39− self: super: {
40− black = super.black.overridePythonAttrs (oldAttrs: rec {
41− version = "21.12b0";
42− src = oldAttrs.src.override {
43− inherit version;
44− hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM=";
45− };
46− doCheck = false;
47− });
48− }
49− )
50−
51− # tests need network
52− (
53− self: super: {
54− curio = super.curio.overridePythonAttrs (oldAttrs: rec {
55− disabledTests = [
56− "test_timeout"
57− "test_ssl_outgoing"
58− ];
59− });
60− }
61− )
62−
63− # tests need network
64− (
65− self: super: {
66− trio = super.trio.overridePythonAttrs (oldAttrs: rec {
67− disabledTests = [
68− "test_local_address_real"
69− ];
70− disabledTestPaths = [
71− "trio/tests/test_exports.py"
72− "trio/tests/test_socket.py"
73− ];
74− });
75− }
76− )
77−
78− # Requires flask<2, cannot mkOverride because tests need to be disabled
79− (
80− self: super: {
81− flask = super.flask.overridePythonAttrs (oldAttrs: rec {
82− version = "1.1.4";
83− src = oldAttrs.src.override {
84− inherit version;
85− sha256 = "15ni4xlm57a15f5hipp8w0c9zba20179bvfns2392fiq1lcbdghg";
86− };
87− doCheck = false;
88− });
89− }
90− )
91−
92− # Requires werkezug<2, cannot mkOverride because tests need to be disabled
93− (
94− self: super: {
95− werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec {
96− version = "1.0.1";
97− src = oldAttrs.src.override {
98− inherit version;
99− sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c";
100− };
101− doCheck = false;
102− });
103− }
104− )
105−
106− # Requires unidecode>=0.04.14,<0.05. Upstream changed the source naming between releases
107− (
108− self: super: {
109− unidecode = super.unidecode.overridePythonAttrs (oldAttrs: rec {
110− version = "0.04.21";
111− src = fetchFromGitHub {
112− owner = "avian2";
113− repo = "unidecode";
114− rev = "release-${version}";
115− sha256 = "0p5bkibv0xm1265dlfrz3zq3k9bbx07gl8zyq8mvvb8hi7p5lifg";
116− };
117− });
118− }
119− )
120−
121− # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name
122− (
123− self: super: {
124− websocket-client = super.websocket-client.overridePythonAttrs (
125− oldAttrs: rec {
126− version = "0.59.0";
127− src = oldAttrs.src.override {
128− inherit version;
129− sha256 = "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk";
130− };
131− propagatedBuildInputs = with self; [
132− six
133− pysocks
134− ];
135− disabledTests = [
136− "testConnect" # requires network access
137− ];
138− }
139− );
140− }
141− )
142−
143− # Octoprint needs zeroconf >=0.24 <0.25. This can't be done via mkOverride, because in zeroconf 0.32
144− # the super package was migrated to fetchFromGitHub.
145− (
146− self: super: {
147− zeroconf = super.zeroconf.overrideAttrs (oldAttrs: rec {
148− version = "0.24.5";
149− src = super.fetchPypi {
150− inherit (oldAttrs) pname;
151− inherit version;
152− sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
153− };
154− pythonImportsCheck = [
155− "zeroconf"
156− ];
157− buildInputs = with self; [
158− pytestCheckHook
159− nose
160− ];
161− pytestFlagsArray = [ "zeroconf/test.py" ];
162− });
163− }
164− )
165−
166− # Octoprint pulls in celery indirectly but has no support for the up-to-date releases
167− (
168− self: super: {
169− celery = super.celery.overrideAttrs (oldAttrs: rec {
170− version = "5.0.0";
171− src = oldAttrs.src.override {
172− inherit version;
173− hash = "sha256-MTkw/d3nA9jjcCmjBL+RQpzRGu72PFfebayp2Vjh8lU=";
174− };
175− disabledTestPaths = [
176− "t/unit/backends/test_mongodb.py"
177− ];
178− });
179− }
180− )
181−
182− # Octoprint would allow later sentry-sdk releases but not later click releases
183− (
184− self: super: {
185− sentry-sdk = super.sentry-sdk.overrideAttrs (oldAttrs: rec {
186− pname = "sentry-sdk";
187− version = "1.4.3";
188−
189− src = fetchFromGitHub {
190− owner = "getsentry";
191− repo = "sentry-python";
192− rev = version;
193− sha256 = "sha256-vdE6eqELMM69CWHaNYhF0HMCTV3tQsJlMHAA96oCy8c=";
194− };
195− disabledTests = [
196− "test_apply_simulates_delivery_info"
197− "test_auto_enabling_integrations_catches_import_error"
198− "test_leaks"
199− ];
200− disabledTestPaths = [
201− # Don't test integrations
202− "tests/integrations"
203− # test crashes on aarch64
204− "tests/test_transport.py"
205− ];
206− });
207− }
208− )
209−
210− # Octoprint fails due to a newly added test in pytest-httpbin
211− # see https://github.com/NixOS/nixpkgs/issues/159864
212− (
213− self: super: {
214− pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: rec {
215− disabledTests = [
216− "test_redirect_location_is_https_for_secure_server"
217− ];
218− });
219− }
220− )
221−
222− # All test fail on aarch64
223− (
224− self: super: {
225− azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec {
226− doCheck = stdenv.buildPlatform == "x86_64-linux";
227− });
228− }
229− )
230−
231− # needs network
232− (
233− self: super: {
234− falcon = super.falcon.overridePythonAttrs (oldAttrs: rec {
235− #pytestFlagsArray = [ "-W ignore::DeprecationWarning" ];
236− disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
237− "tests/asgi/test_asgi_servers.py"
238− ];
239− });
240− }
241− )
242−
243− # update broke some tests
244− (
245− self: super: {
246− sanic = super.sanic.overridePythonAttrs (oldAttrs: rec {
247− disabledTestPaths = oldAttrs.disabledTestPaths or [] ++ [
248− "test_cli.py"
249− "test_cookies.py"
250− # requires network
251− "test_worker.py"
252− ];
253− });
254− }
255− )
256−
25717 # Built-in dependency
25818 (
25919 self: super: {
@@ -294,14 +54,14 @@ let
29454 self: super: {
29555 octoprint-pisupport = self.buildPythonPackage rec {
29656 pname = "OctoPrint-PiSupport";
297− version = "2021.10.28";
57+ version = "2022.3.28";
29858 format = "setuptools";
29959
30060 src = fetchFromGitHub {
30161 owner = "OctoPrint";
30262 repo = "OctoPrint-PiSupport";
30363 rev = version;
304− sha256 = "01bpvv1sn3113fdpw6b90c2rj8lqay118x609yy64z9ccm93khl9";
64+ sha256 = "yzE/jz604nX/CHcW3aa7goH1ey8qZ7rLw31SMfNKJZM=";
30565 };
30666
30767 # requires octoprint itself during tests
@@ -314,13 +74,13 @@ let
31474 self: super: {
31575 octoprint = self.buildPythonPackage rec {
31676 pname = "OctoPrint";
317− version = "1.7.3";
77+ version = "1.8.0rc5";
31878
31979 src = fetchFromGitHub {
32080 owner = "OctoPrint";
32181 repo = "OctoPrint";
32282 rev = version;
323− sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg=";
83+ sha256 = "sha256-FeT45w6VXaFV4BsuOMk58nxxiu9jhCNnA2F7Uh/3sB0=";
32484 };
32585
32686 propagatedBuildInputs = with super; [
@@ -368,7 +128,7 @@ let
368128 werkzeug
369129 wrapt
370130 zeroconf
371− zipstream-new
131+ zipstream-ng
372132 ] ++ lib.optionals stdenv.isDarwin [
373133 py.pkgs.appdirs
374134 ];
@@ -406,6 +166,8 @@ let
406166 "watchdog"
407167 "wrapt"
408168 "zeroconf"
169+ "Flask-Login"
170+ "werkzeug"
409171 ];
410172 in
411173 ''
pkgs/applications/misc/opencpn/default.nix+85−16
@@ -1,31 +1,100 @@
1−{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,
2− gettext, glib, portaudio }:
1+{ stdenv, lib
2+, alsa-utils
3+, at-spi2-core
4+, cmake
5+, curl
6+, dbus
7+, epoxy
8+, fetchFromGitHub
9+, flac
10+, gtk3
11+, jasper
12+, libGLU
13+, libarchive
14+, libdatrie
15+, libelf
16+, libexif
17+, libogg
18+, libopus
19+, libselinux
20+, libsepol
21+, libsndfile
22+, libthai
23+, libunarr
24+, libusb
25+, libvorbis
26+, libxkbcommon
27+, lsb-release
28+, lz4
29+, pcre
30+, pkg-config
31+, portaudio
32+, sqlite
33+, tinyxml
34+, udev
35+, util-linux
36+, wxGTK31-gtk3
37+, xorg
38+}:
339
440stdenv.mkDerivation rec {
5− pname = "opencpn-unstable";
6− version = "2019-11-21";
41+ pname = "opencpn";
42+ version = "5.6.2";
743
844 src = fetchFromGitHub {
945 owner = "OpenCPN";
1046 repo = "OpenCPN";
11− rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";
12− sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
47+ rev = "Release_${version}";
48+ hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";
1349 };
1450
15− nativeBuildInputs = [ cmake pkg-config ];
16− buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext
17− glib portaudio ];
18−
19− cmakeFlags = [
20− "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
21− "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
51+ nativeBuildInputs = [ cmake lsb-release pkg-config ];
52+ buildInputs = [
53+ alsa-utils
54+ at-spi2-core
55+ curl
56+ dbus
57+ epoxy
58+ flac
59+ gtk3
60+ jasper
61+ libGLU
62+ libarchive
63+ libdatrie
64+ libelf
65+ libexif
66+ libogg
67+ libopus
68+ libselinux
69+ libsepol
70+ libsndfile
71+ libthai
72+ libunarr
73+ libusb
74+ libvorbis
75+ libxkbcommon
76+ lz4
77+ pcre
78+ portaudio
79+ sqlite
80+ tinyxml
81+ udev
82+ util-linux
83+ wxGTK31-gtk3
84+ xorg.libXdmcp
85+ xorg.libXtst
2286 ];
2387
24− meta = {
88+
89+ cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
90+
91+ doCheck = true;
92+
93+ meta = with lib; {
2594 description = "A concise ChartPlotter/Navigator";
26− maintainers = [ lib.maintainers.kragniz ];
95+ maintainers = with maintainers; [ kragniz lovesegfault ];
2796 platforms = [ "x86_64-linux" ];
28− license = lib.licenses.gpl2;
97+ license = licenses.gpl2;
2998 homepage = "https://opencpn.org/";
3099 };
31100}
pkgs/applications/misc/organicmaps/default.nix+7−12
@@ -20,13 +20,13 @@
2020
2121mkDerivation rec {
2222 pname = "organicmaps";
23− version = "2022.03.23-4-android";
23+ version = "2022.04.27-2";
2424
2525 src = fetchFromGitHub {
2626 owner = "organicmaps";
2727 repo = "organicmaps";
28− rev = version;
29− sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo=";
28+ rev = "${version}-android";
29+ sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0=";
3030 fetchSubmodules = true;
3131 };
3232
@@ -35,7 +35,7 @@ mkDerivation rec {
3535 echo "exit 0" > tools/unix/check_cert.sh
3636
3737 # crude fix for https://github.com/organicmaps/organicmaps/issues/1862
38− echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh
38+ echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh
3939 '';
4040
4141 nativeBuildInputs = [
@@ -64,19 +64,14 @@ mkDerivation rec {
6464 bash ./configure.sh
6565 '';
6666
67+ # Tell the program that the read-only and the read-write data locations
68+ # are different, and create the read-write one.
69+ # https://github.com/organicmaps/organicmaps/issues/2387
6770 postInstall = ''
68− install -Dm755 OMaps $out/bin/OMaps
69− # Tell the program that the read-only and the read-write data locations
70− # are different, and create the read-write one.
7171 wrapProgram $out/bin/OMaps \
7272 --add-flags "-resources_path $out/share/organicmaps/data" \
7373 --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \
7474 --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"'
75−
76− mkdir -p $out/share/organicmaps
77− cp -r ../data $out/share/organicmaps/data
78− install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png
79− install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop
8075 '';
8176
8277 meta = with lib; {
pkgs/applications/misc/osmscout-server/default.nix+3−24
@@ -1,4 +1,4 @@
1−{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config
1+{ lib, mkDerivation, fetchFromGitHub, pkg-config
22, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation
33, libosmscout, valhalla, libpostal, osrm-backend, protobuf
44, libmicrohttpd_0_9_70, sqlite, marisa, kyotocabinet, boost
@@ -14,30 +14,16 @@ let
1414in
1515mkDerivation rec {
1616 pname = "osmscout-server";
17− version = "1.17.1";
17+ version = "2.1.2";
1818
1919 src = fetchFromGitHub {
2020 owner = "rinigus";
2121 repo = "osmscout-server";
2222 rev = version;
23− sha256 = "0rpsi6nyhcz6bv0jab4vixkxhjmn84xi0q2xz15a097hn46cklx9";
23+ sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s=";
2424 fetchSubmodules = true;
2525 };
2626
27− # Two patches required to work with valhalla 3.1
28− patches = [
29− # require C++14 to match latest Valhalla
30− (fetchpatch {
31− url = "https://github.com/rinigus/osmscout-server/commit/78b41b9b4c607fe9bfd6fbd61ae31cb7c8a725cd.patch";
32− sha256 = "0gk9mdwa75awl0bj30gm8waj454d8k2yixxwh05m0p550cbv3lg0";
33− })
34− # add Valhalla 3.1 config
35− (fetchpatch {
36− url = "https://github.com/rinigus/osmscout-server/commit/584de8bd47700053960fa139a2d7f8d3d184c876.patch";
37− sha256 = "0liz72n83q93bzzyyiqjkxa6hp9zjx7v9rgsmpwf88gc4caqm2dz";
38− })
39− ];
40−
4127 nativeBuildInputs = [ qmake pkg-config qttools ];
4228 buildInputs = [
4329 kirigami2 qtquickcontrols2 qtlocation
@@ -45,13 +31,6 @@ mkDerivation rec {
4531 libpostal sqlite marisa kyotocabinet boost protobuf date
4632 ];
4733
48− # OSMScout server currently defaults to an earlier version of valhalla,
49− # but valhalla 3.1 support has been added. (See patches above)
50− # Replace the default valhalla.json with the valhalla 3.1 version
51− postPatch = ''
52− mv data/valhalla.json-3.1 data/valhalla.json
53− '';
54−
5534 qmakeFlags = [
5635 "SCOUT_FLAVOR=kirigami" # Choose to build the kirigami UI variant
5736 "CONFIG+=disable_mapnik" # Disable the optional mapnik backend
pkgs/applications/misc/phwmon/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717
1818 pythonPath = [ python2Packages.pygtk python2Packages.psutil ];
1919
20− patchPhase = ''
20+ postPatch = ''
2121 substituteInPlace install.sh --replace "/usr/local" "$out"
2222 '';
2323
pkgs/applications/misc/prusa-slicer/default.nix+2−2
@@ -4,7 +4,7 @@
44}:
55stdenv.mkDerivation rec {
66 pname = "prusa-slicer";
7− version = "2.4.1";
7+ version = "2.4.2";
88
99 nativeBuildInputs = [
1010 cmake
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
7474 src = fetchFromGitHub {
7575 owner = "prusa3d";
7676 repo = "PrusaSlicer";
77− sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA=";
77+ sha256 = "17p56f0zmiryy8k4da02in1l6yxniz286gf9yz8s1gaz5ksqj4af";
7878 rev = "version_${version}";
7979 };
8080
pkgs/applications/misc/sigal/default.nix+17−13
@@ -1,17 +1,19 @@
1−{ lib, python3Packages, ffmpeg }:
1+{ lib
2+, python3
3+, ffmpeg
4+}:
25
3−python3Packages.buildPythonApplication rec {
4− version = "2.2";
5− pname = "sigal";
6+python3.pkgs.buildPythonApplication rec {
7+ pname = "sigal";
8+ version = "2.3";
9+ format = "setuptools";
610
7− src = python3Packages.fetchPypi {
11+ src = python3.pkgs.fetchPypi {
812 inherit version pname;
9− sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo=";
13+ hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
1014 };
1115
12− disabled = !(python3Packages.pythonAtLeast "3.6");
13−
14− propagatedBuildInputs = with python3Packages; [
16+ propagatedBuildInputs = with python3.pkgs; [
1517 # install_requires
1618 jinja2
1719 markdown
@@ -29,16 +31,18 @@ python3Packages.buildPythonApplication rec {
2931
3032 checkInputs = [
3133 ffmpeg
32− ] ++ (with python3Packages; [
34+ ] ++ (with python3.pkgs; [
3335 pytestCheckHook
3436 ]);
3537
36− makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ];
38+ makeWrapperArgs = [
39+ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}"
40+ ];
3741
3842 meta = with lib; {
3943 description = "Yet another simple static gallery generator";
40− homepage = "http://sigal.saimon.org/en/latest/index.html";
41− license = licenses.mit;
44+ homepage = "http://sigal.saimon.org/";
45+ license = licenses.mit;
4246 maintainers = with maintainers; [ domenkozar matthiasbeyer ];
4347 };
4448}
pkgs/applications/misc/skytemple/default.nix+5−2
@@ -2,13 +2,13 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "skytemple";
5− version = "1.3.2";
5+ version = "1.3.10";
66
77 src = fetchFromGitHub {
88 owner = "SkyTemple";
99 repo = pname;
1010 rev = version;
11− sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";
11+ sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
1212 };
1313
1414 buildInputs = [
@@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec {
2626 packaging
2727 pycairo
2828 pygal
29+ psutil
30+ gbulb
2931 pypresence
32+ sentry-sdk
3033 setuptools
3134 skytemple-dtef
3235 skytemple-eventserver
pkgs/applications/misc/solaar/default.nix+3−2
@@ -13,19 +13,20 @@
1313# logitech-udev-rules instead of adding this to services.udev.packages on NixOS
1414python3Packages.buildPythonApplication rec {
1515 pname = "solaar";
16− version = "1.1.1";
16+ version = "1.1.3";
1717
1818 src = fetchFromGitHub {
1919 owner = "pwr-Solaar";
2020 repo = "Solaar";
2121 rev = version;
22− sha256 = "1yqxk6nfxc1xhk59qbz9m3wqkxv446g17pazvanpavriiysjzbrs";
22+ hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s=";
2323 };
2424
2525 nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ];
2626 buildInputs = [ libappindicator librsvg ];
2727
2828 propagatedBuildInputs = with python3Packages; [
29+ evdev
2930 gobject-introspection
3031 gtk3
3132 psutil
pkgs/applications/misc/sqls/default.nix+5−3
@@ -2,19 +2,21 @@
22
33buildGoModule rec {
44 pname = "sqls";
5− version = "0.2.20";
5+ version = "0.2.22";
66
77 src = fetchFromGitHub {
88 owner = "lighttiger2505";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-QYxiWxgzuD+JymlXlVmzZOtex70JC93VmWljAFQJMPQ=";
11+ sha256 = "sha256-xtvm/NVL98dRzQL1id/WwT/NdsnB7qTRVR7jfrRsabY=";
1212 };
1313
14− vendorSha256 = "sha256-fo5g6anMcKqdzLG8KCJ/T4uTOp1Z5Du4EtCHYkLgUpo=";
14+ vendorSha256 = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw=";
1515
1616 ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ];
1717
18+ doCheck = false;
19+
1820 meta = with lib; {
1921 homepage = "https://github.com/lighttiger2505/sqls";
2022 description = "SQL language server written in Go";
pkgs/applications/misc/tut/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "tut";
5− version = "0.0.42";
5+ version = "0.0.46";
66
77 src = fetchFromGitHub {
88 owner = "RasmusLindroth";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";
11+ sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w=";
1212 };
1313
1414 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";
pkgs/applications/misc/udiskie/default.nix+30−25
@@ -1,42 +1,47 @@
11{ lib
2+, asciidoc
23, fetchFromGitHub
3−, buildPythonApplication
4−, asciidoc-full
5−, docopt
6−, gettext
74, gobject-introspection
85, gtk3
9−, keyutils
6+, installShellFiles
107, libappindicator-gtk3
118, libnotify
129, librsvg
13−, nose
14−, pygobject3
15−, pyyaml
10+, python3
1611, udisks2
1712, wrapGAppsHook
1813}:
1914
20−buildPythonApplication rec {
15+python3.pkgs.buildPythonApplication rec {
2116 pname = "udiskie";
22− version = "2.4.0";
17+ version = "2.4.2";
18+
19+ format = "setuptools";
2320
2421 src = fetchFromGitHub {
2522 owner = "coldfix";
2623 repo = "udiskie";
2724 rev = "v${version}";
28− hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";
25+ hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";
2926 };
3027
31− outputs = [ "out" "man" ];
28+ patches = [
29+ ./locale-path.patch
30+ ];
31+
32+ postPatch = ''
33+ substituteInPlace udiskie/locale.py --subst-var out
34+ '';
3235
3336 nativeBuildInputs = [
34− asciidoc-full # Man page
35− gettext
37+ asciidoc # Man page
3638 gobject-introspection
39+ installShellFiles
3740 wrapGAppsHook
3841 ];
3942
43+ dontWrapGApps = true;
44+
4045 buildInputs = [
4146 gobject-introspection
4247 gtk3
@@ -46,8 +51,9 @@ buildPythonApplication rec {
4651 udisks2
4752 ];
4853
49− propagatedBuildInputs = [
54+ propagatedBuildInputs = with python3.pkgs; [
5055 docopt
56+ keyutils
5157 pygobject3
5258 pyyaml
5359 ];
@@ -57,21 +63,20 @@ buildPythonApplication rec {
5763 '';
5864
5965 postInstall = ''
60− mkdir -p $man/share/man/man8
61− cp -v doc/udiskie.8 $man/share/man/man8/
66+ installManPage doc/udiskie.8
6267 '';
6368
64− checkInputs = [
65− keyutils
66− nose
67− ];
68−
69− checkPhase = ''
70− nosetests
69+ preFixup = ''
70+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
7171 '';
7272
73+ checkInputs = with python3.pkgs; [
74+ pytestCheckHook
75+ ];
76+
7377 meta = with lib; {
7478 homepage = "https://github.com/coldfix/udiskie";
79+ changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";
7580 description = "Removable disk automounter for udisks";
7681 longDescription = ''
7782 udiskie is a udisks2 front-end that allows to manage removeable media such
@@ -88,6 +93,6 @@ buildPythonApplication rec {
8893 - password caching (requires python keyutils 0.3)
8994 '';
9095 license = licenses.mit;
91− maintainers = with maintainers; [ AndersonTorres ];
96+ maintainers = with maintainers; [ AndersonTorres dotlambda ];
9297 };
9398}
pkgs/applications/misc/udiskie/locale-path.patchnew file+17
@@ -0,0 +1,17 @@
1+diff --git a/udiskie/locale.py b/udiskie/locale.py
2+index f12bea9..450e38b 100644
3+--- a/udiskie/locale.py
4++++ b/udiskie/locale.py
5+@@ -10,10 +10,8 @@ from gettext import translation
6+ testdirs = [
7+ # manual override:
8+ os.environ.get('TEXTDOMAINDIR'),
9+- # editable installation:
10+- os.path.join(os.path.dirname(__file__), '../build/locale'),
11+- # user or virtualenv installation:
12+- os.path.join(sys.prefix, 'share/locale'),
13++ # Nix installation:
14++ os.path.join('@out@', 'share/locale'),
15+ ]
16+ testfile = 'en_US/LC_MESSAGES/udiskie.mo'
17+ localedir = next(
pkgs/applications/misc/upwork/default.nix+3−3
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "upwork";
9− version = "5.6.10.7";
9+ version = "5.6.10.13";
1010
1111 src = fetchurl {
12− url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";
13− sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";
12+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";
13+ sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/applications/misc/vit/default.nix+3−5
@@ -8,18 +8,16 @@ with python3Packages;
88
99buildPythonApplication rec {
1010 pname = "vit";
11− version = "2.1.0";
12− disabled = lib.versionOlder python.version "3.6";
11+ version = "2.2.0";
12+ disabled = lib.versionOlder python.version "3.7";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f";
16+ sha256 = "sha256-6GbIc5giuecxUqswyaAJw675R1M8BvelyyRNFcTqKW8=";
1717 };
1818
1919 propagatedBuildInputs = [
20− pytz
2120 tasklib
22− tzlocal
2321 urwid
2422 ];
2523
pkgs/applications/misc/xpdf/default.nix+2−2
@@ -12,11 +12,11 @@ assert enablePrinting -> cups != null;
1212
1313stdenv.mkDerivation rec {
1414 pname = "xpdf";
15− version = "4.03";
15+ version = "4.04";
1616
1717 src = fetchzip {
1818 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";
19− sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";
19+ hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY=";
2020 };
2121
2222 # Fix "No known features for CXX compiler", see
pkgs/applications/misc/xplr/default.nix+3−3
@@ -2,18 +2,18 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "xplr";
5− version = "0.17.3";
5+ version = "0.17.6";
66
77 src = fetchFromGitHub {
88 owner = "sayanarijit";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";
11+ sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";
1212 };
1313
1414 buildInputs = lib.optional stdenv.isDarwin libiconv;
1515
16− cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";
16+ cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";
1717
1818 meta = with lib; {
1919 description = "A hackable, minimal, fast TUI file explorer";
pkgs/applications/networking/bee/bee.nix+1−3
@@ -1,4 +1,4 @@
1−{ version ? "release", lib, fetchFromGitHub, buildGoModule, coreutils }:
1+{ version ? "release", lib, fetchFromGitHub, buildGoModule }:
22
33let
44
@@ -39,8 +39,6 @@ buildGoModule {
3939 inherit (versionSpec) rev sha256;
4040 };
4141
42− nativeBuildInputs = [ coreutils ];
43−
4442 subPackages = [ "cmd/bee" ];
4543
4644 # no symbol table, no debug info, and pass the commit for the version string
pkgs/applications/networking/browsers/brave/default.nix+71−55
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl
1+{ lib, stdenv, fetchurl, wrapGAppsHook
22, dpkg
33, alsa-lib
44, at-spi2-atk
@@ -15,7 +15,6 @@
1515, gnome
1616, gsettings-desktop-schemas
1717, gtk3
18−, libpulseaudio
1918, libuuid
2019, libdrm
2120, libX11
@@ -41,63 +40,61 @@
4140, xorg
4241, zlib
4342, xdg-utils
44−, wrapGAppsHook
43+, snappy
44+
45+# command line arguments which are always set e.g "--disable-gpu"
4546, commandLineArgs ? ""
46−}:
4747
48−let
48+# Necessary for USB audio devices.
49+, pulseSupport ? stdenv.isLinux
50+, libpulseaudio
4951
50−rpath = lib.makeLibraryPath [
51− alsa-lib
52− at-spi2-atk
53− at-spi2-core
54− atk
55− cairo
56− cups
57− dbus
58− expat
59− fontconfig
60− freetype
61− gdk-pixbuf
62− glib
63− gtk3
64− libdrm
65− libpulseaudio
66− libX11
67− libxkbcommon
68− libXScrnSaver
69− libXcomposite
70− libXcursor
71− libXdamage
72− libXext
73− libXfixes
74− libXi
75− libXrandr
76− libXrender
77− libxshmfence
78− libXtst
79− libuuid
80− mesa
81− nspr
82− nss
83− pango
84− pipewire
85− udev
86− wayland
87− xdg-utils
88− xorg.libxcb
89− zlib
90−];
52+# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)
53+, libGL
9154
55+# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)
56+, libvaSupport ? stdenv.isLinux
57+, libva
58+, enableVideoAcceleration ? libvaSupport
59+
60+# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
61+, vulkanSupport ? false
62+, addOpenGLRunpath
63+, enableVulkan ? vulkanSupport
64+}:
65+
66+let
67+ inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath
68+ optionalString strings escapeShellArg;
69+
70+ deps = [
71+ alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat
72+ fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL
73+ libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage
74+ libXext libXfixes libXi libXrandr libXrender libxshmfence
75+ libXtst libuuid mesa nspr nss pango pipewire udev wayland
76+ xdg-utils xorg.libxcb zlib snappy
77+ ]
78+ ++ optional pulseSupport libpulseaudio
79+ ++ optional libvaSupport libva;
80+
81+ rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
82+ binpath = makeBinPath deps;
83+
84+ enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ]
85+ ++ optional enableVulkan "Vulkan";
86+
87+ # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935
88+ disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder";
9289in
9390
9491stdenv.mkDerivation rec {
9592 pname = "brave";
96− version = "1.37.116";
93+ version = "1.38.109";
9794
9895 src = fetchurl {
9996 url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
100− sha256 = "HoqmzUyYas5ho9S8ZeXHj+LuNspejuQ69B6HxuKXWtw=";
97+ sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI=";
10198 };
10299
103100 dontConfigure = true;
@@ -107,7 +104,13 @@ stdenv.mkDerivation rec {
107104
108105 nativeBuildInputs = [ dpkg wrapGAppsHook ];
109106
110− buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ];
107+ buildInputs = [
108+ # needed for GSETTINGS_SCHEMAS_PATH
109+ glib gsettings-desktop-schemas gtk3
110+
111+ # needed for XDG_ICON_DIRS
112+ gnome.adwaita-icon-theme
113+ ];
111114
112115 unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
113116
@@ -128,9 +131,9 @@ stdenv.mkDerivation rec {
128131 ln -sf $BINARYWRAPPER $out/bin/brave
129132
130133 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do
131− patchelf \
132− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
133− --set-rpath "${rpath}" $exe
134+ patchelf \
135+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
136+ --set-rpath "${rpath}" $exe
134137 done
135138
136139 # Fix paths
@@ -161,8 +164,21 @@ stdenv.mkDerivation rec {
161164
162165 preFixup = ''
163166 # Add command line args to wrapGApp.
164− gappsWrapperArgs+=(--add-flags ${lib.escapeShellArg commandLineArgs})
165− gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}")
167+ gappsWrapperArgs+=(
168+ --prefix LD_LIBRARY_PATH : ${rpath}
169+ --prefix PATH : ${binpath}
170+ ${optionalString (enableFeatures != []) ''
171+ --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}"
172+ ''}
173+ ${optionalString (disableFeatures != []) ''
174+ --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"
175+ ''}
176+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
177+ ${optionalString vulkanSupport ''
178+ --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"
179+ --add-flags ${escapeShellArg commandLineArgs}
180+ ''}
181+ )
166182 '';
167183
168184 installCheckPhase = ''
@@ -175,7 +191,7 @@ stdenv.mkDerivation rec {
175191 meta = with lib; {
176192 homepage = "https://brave.com/";
177193 description = "Privacy-oriented browser for Desktop and Laptop computers";
178− changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version;
194+ changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + replaceStrings [ "." ] [ "" ] version;
179195 longDescription = ''
180196 Brave browser blocks the ads and trackers that slow you down,
181197 chew up your bandwidth, and invade your privacy. Brave lets you
pkgs/applications/networking/browsers/chromium/common.nix+11−12
@@ -7,7 +7,7 @@
77# Native build inputs:
88, ninja, pkg-config
99, python3, perl
10−, gnutar, which
10+, which
1111, llvmPackages
1212# postPatch:
1313, pkgsBuildHost
@@ -61,13 +61,6 @@ let
6161 url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT";
6262 sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l";
6363 };
64− # https://webrtc-review.googlesource.com/c/src/+/255601
65− webrtcWaylandScreenshareCoredumpFix = fetchurl {
66− # PipeWire capturer: check existence of cursor metadata
67− name = "webrtc-wayland-screenshare-coredump-fix.patch";
68− url = "https://webrtc-review.googlesource.com/changes/src~255601/revisions/2/patch?download";
69− hash = "sha256-PHGwEoYhMa+ZL2ner10FwdGUWUxsVr+HWuZOAEugYDY=";
70− };
7164
7265 # The additional attributes for creating derivations based on the chromium
7366 # source tree.
@@ -133,7 +126,7 @@ let
133126 nativeBuildInputs = [
134127 ninja pkg-config
135128 python3WithPackages perl
136− gnutar which
129+ which
137130 llvmPackages.bintools
138131 ];
139132
@@ -169,8 +162,14 @@ let
169162 ./patches/widevine-79.patch
170163 ];
171164
172− postPatch = optionalString (versionRange "100" "101") ''
173− base64 --decode ${webrtcWaylandScreenshareCoredumpFix} | patch -p1 -d third_party/webrtc
165+ postPatch = optionalString (chromiumVersionAtLeast "102") ''
166+ # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
167+ substituteInPlace BUILD.gn \
168+ --replace '"//infra/orchestrator:orchestrator_all",' ""
169+ # Disable build flags that require LLVM 15:
170+ substituteInPlace build/config/compiler/BUILD.gn \
171+ --replace '"-Xclang",' "" \
172+ --replace '"-no-opaque-pointers",' ""
174173 '' + ''
175174 # remove unused third-party
176175 for lib in ${toString gnSystemLibraries}; do
@@ -191,6 +190,7 @@ let
191190 --replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
192191 fi
193192 chmod -x third_party/webgpu-cts/src/tools/run_deno
193+ ${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"}
194194
195195 # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
196196 substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
@@ -288,7 +288,6 @@ let
288288 enable_widevine = true;
289289 # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture:
290290 rtc_use_pipewire = true;
291− } // optionalAttrs (chromiumVersionAtLeast "101") {
292291 # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
293292 chrome_pgo_phase = 0;
294293 } // optionalAttrs proprietaryCodecs {
pkgs/applications/networking/browsers/chromium/upstream-info.json+30−30
@@ -1,63 +1,63 @@
11{
22 "stable": {
3− "version": "100.0.4896.127",
4− "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427",
5− "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh",
3+ "version": "101.0.4951.41",
4+ "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
5+ "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",
66 "deps": {
77 "gn": {
8− "version": "2022-01-21",
8+ "version": "2022-03-14",
99 "url": "https://gn.googlesource.com/gn",
10− "rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
11− "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
10+ "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
11+ "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
1212 }
1313 },
1414 "chromedriver": {
15− "version": "100.0.4896.60",
16− "sha256_linux": "0q9ddwhccd0jmzi8jksxlfjavmm913c9bmb4lz1ahxplsnxd8z31",
17− "sha256_darwin": "0q0ikhf5pkbrqln91fklbbfmqi33nfcjdg5dm7zb66b4alxwwas9",
18− "sha256_darwin_aarch64": "1vf3s0gq61riqsv85pr6xj0c2afdnv1b2w4gp2bwlfq4ffkfq38y"
15+ "version": "101.0.4951.15",
16+ "sha256_linux": "1i8ay83gh1q6nd0v14qv7gjar9h4fccb50a8b6fg671pg0l6vn24",
17+ "sha256_darwin": "0ldxy1dxb99xps0h1d1264njc55q4bd000bdnaaks9kyx2djn54b",
18+ "sha256_darwin_aarch64": "14awsldpqz2y187jwbcli8v7f1r6gsybk8yx8jqg26y8iyg3lrx9"
1919 }
2020 },
2121 "beta": {
22− "version": "101.0.4951.41",
23− "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
24− "sha256bin64": "1jbj5cykxamf32c1s4gsid1wxcsdf4hng2d19q9h7b2ashkvvrbi",
22+ "version": "102.0.5005.27",
23+ "sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m",
24+ "sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx",
2525 "deps": {
2626 "gn": {
27− "version": "2022-03-14",
27+ "version": "2022-04-14",
2828 "url": "https://gn.googlesource.com/gn",
29− "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
30− "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
29+ "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
30+ "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
3131 }
3232 }
3333 },
3434 "dev": {
35− "version": "102.0.5005.12",
36− "sha256": "11n03hz3g8h7srywxrjwrdrxybdjvmdjrnigjlrwjkydprg1l7ab",
37− "sha256bin64": "0hc56a98ikkbgdw36dpz9k6r15jmjmnm7faml8z59vixxlvkrw7y",
35+ "version": "103.0.5028.0",
36+ "sha256": "06i6kgsdril5gfbjl1sh0z5hqvq64bchhb2z8w0h8cw9977bvqk6",
37+ "sha256bin64": "09hxvcv5n1kd4qnwh6pxzmrlnc8xijm7rwb1c8c57v0jjb32x9ry",
3838 "deps": {
3939 "gn": {
40− "version": "2022-04-14",
40+ "version": "2022-04-26",
4141 "url": "https://gn.googlesource.com/gn",
42− "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
43− "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
42+ "rev": "ced9fbfe6943854e65ada4ac1849d1fa4cb19348",
43+ "sha256": "14fgjsfqihmma1cr8n30n37vxkf20paa6swq2yxn1agjvfr9cdvl"
4444 }
4545 }
4646 },
4747 "ungoogled-chromium": {
48− "version": "100.0.4896.127",
49− "sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427",
50− "sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh",
48+ "version": "101.0.4951.54",
49+ "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",
50+ "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",
5151 "deps": {
5252 "gn": {
53− "version": "2022-01-21",
53+ "version": "2022-03-14",
5454 "url": "https://gn.googlesource.com/gn",
55− "rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
56− "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
55+ "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
56+ "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
5757 },
5858 "ungoogled-patches": {
59− "rev": "100.0.4896.127-1",
60− "sha256": "192kyhr0fa97csciv5kp496y9zwcsknwlrmdr4jic3rvv8ig1q9y"
59+ "rev": "101.0.4951.54-1",
60+ "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"
6161 }
6262 }
6363 }
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393
@@ -1,985 +1,985 @@
11{
2− version = "100.0b6";
2+ version = "101.0b2";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ach/firefox-100.0b6.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ach/firefox-101.0b2.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085";
7+ sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6";
88 }
9− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/af/firefox-100.0b6.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/af/firefox-101.0b2.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790";
12+ sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82";
1313 }
14− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/an/firefox-100.0b6.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/an/firefox-101.0b2.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f";
17+ sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1";
1818 }
19− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ar/firefox-100.0b6.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ar/firefox-101.0b2.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e";
22+ sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50";
2323 }
24− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ast/firefox-100.0b6.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ast/firefox-101.0b2.tar.bz2";
2525 locale = "ast";
2626 arch = "linux-x86_64";
27− sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb";
27+ sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e";
2828 }
29− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/az/firefox-100.0b6.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/az/firefox-101.0b2.tar.bz2";
3030 locale = "az";
3131 arch = "linux-x86_64";
32− sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701";
32+ sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c";
3333 }
34− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/be/firefox-100.0b6.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/be/firefox-101.0b2.tar.bz2";
3535 locale = "be";
3636 arch = "linux-x86_64";
37− sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3";
37+ sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2";
3838 }
39− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bg/firefox-100.0b6.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bg/firefox-101.0b2.tar.bz2";
4040 locale = "bg";
4141 arch = "linux-x86_64";
42− sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3";
42+ sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2";
4343 }
44− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bn/firefox-100.0b6.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bn/firefox-101.0b2.tar.bz2";
4545 locale = "bn";
4646 arch = "linux-x86_64";
47− sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b";
47+ sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb";
4848 }
49− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/br/firefox-100.0b6.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/br/firefox-101.0b2.tar.bz2";
5050 locale = "br";
5151 arch = "linux-x86_64";
52− sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130";
52+ sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267";
5353 }
54− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bs/firefox-100.0b6.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bs/firefox-101.0b2.tar.bz2";
5555 locale = "bs";
5656 arch = "linux-x86_64";
57− sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61";
57+ sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3";
5858 }
59− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca-valencia/firefox-100.0b6.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca-valencia/firefox-101.0b2.tar.bz2";
6060 locale = "ca-valencia";
6161 arch = "linux-x86_64";
62− sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a";
62+ sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99";
6363 }
64− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca/firefox-100.0b6.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca/firefox-101.0b2.tar.bz2";
6565 locale = "ca";
6666 arch = "linux-x86_64";
67− sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4";
67+ sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc";
6868 }
69− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cak/firefox-100.0b6.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cak/firefox-101.0b2.tar.bz2";
7070 locale = "cak";
7171 arch = "linux-x86_64";
72− sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a";
72+ sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014";
7373 }
74− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cs/firefox-100.0b6.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cs/firefox-101.0b2.tar.bz2";
7575 locale = "cs";
7676 arch = "linux-x86_64";
77− sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35";
77+ sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c";
7878 }
79− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cy/firefox-100.0b6.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cy/firefox-101.0b2.tar.bz2";
8080 locale = "cy";
8181 arch = "linux-x86_64";
82− sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2";
82+ sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae";
8383 }
84− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/da/firefox-100.0b6.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/da/firefox-101.0b2.tar.bz2";
8585 locale = "da";
8686 arch = "linux-x86_64";
87− sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25";
87+ sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781";
8888 }
89− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/de/firefox-100.0b6.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/de/firefox-101.0b2.tar.bz2";
9090 locale = "de";
9191 arch = "linux-x86_64";
92− sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee";
92+ sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360";
9393 }
94− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/dsb/firefox-100.0b6.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/dsb/firefox-101.0b2.tar.bz2";
9595 locale = "dsb";
9696 arch = "linux-x86_64";
97− sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a";
97+ sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc";
9898 }
99− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/el/firefox-100.0b6.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/el/firefox-101.0b2.tar.bz2";
100100 locale = "el";
101101 arch = "linux-x86_64";
102− sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac";
102+ sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa";
103103 }
104− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-CA/firefox-100.0b6.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-CA/firefox-101.0b2.tar.bz2";
105105 locale = "en-CA";
106106 arch = "linux-x86_64";
107− sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587";
107+ sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e";
108108 }
109− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-GB/firefox-100.0b6.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-GB/firefox-101.0b2.tar.bz2";
110110 locale = "en-GB";
111111 arch = "linux-x86_64";
112− sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab";
112+ sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23";
113113 }
114− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-US/firefox-100.0b6.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-US/firefox-101.0b2.tar.bz2";
115115 locale = "en-US";
116116 arch = "linux-x86_64";
117− sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e";
117+ sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0";
118118 }
119− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eo/firefox-100.0b6.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eo/firefox-101.0b2.tar.bz2";
120120 locale = "eo";
121121 arch = "linux-x86_64";
122− sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5";
122+ sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95";
123123 }
124− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-AR/firefox-100.0b6.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-AR/firefox-101.0b2.tar.bz2";
125125 locale = "es-AR";
126126 arch = "linux-x86_64";
127− sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946";
127+ sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf";
128128 }
129− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-CL/firefox-100.0b6.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-CL/firefox-101.0b2.tar.bz2";
130130 locale = "es-CL";
131131 arch = "linux-x86_64";
132− sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff";
132+ sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb";
133133 }
134− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-ES/firefox-100.0b6.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-ES/firefox-101.0b2.tar.bz2";
135135 locale = "es-ES";
136136 arch = "linux-x86_64";
137− sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5";
137+ sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4";
138138 }
139− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-MX/firefox-100.0b6.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-MX/firefox-101.0b2.tar.bz2";
140140 locale = "es-MX";
141141 arch = "linux-x86_64";
142− sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026";
142+ sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200";
143143 }
144− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/et/firefox-100.0b6.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/et/firefox-101.0b2.tar.bz2";
145145 locale = "et";
146146 arch = "linux-x86_64";
147− sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322";
147+ sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375";
148148 }
149− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eu/firefox-100.0b6.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eu/firefox-101.0b2.tar.bz2";
150150 locale = "eu";
151151 arch = "linux-x86_64";
152− sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9";
152+ sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b";
153153 }
154− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fa/firefox-100.0b6.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fa/firefox-101.0b2.tar.bz2";
155155 locale = "fa";
156156 arch = "linux-x86_64";
157− sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d";
157+ sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624";
158158 }
159− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ff/firefox-100.0b6.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ff/firefox-101.0b2.tar.bz2";
160160 locale = "ff";
161161 arch = "linux-x86_64";
162− sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234";
162+ sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80";
163163 }
164− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fi/firefox-100.0b6.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fi/firefox-101.0b2.tar.bz2";
165165 locale = "fi";
166166 arch = "linux-x86_64";
167− sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4";
167+ sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0";
168168 }
169− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fr/firefox-100.0b6.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fr/firefox-101.0b2.tar.bz2";
170170 locale = "fr";
171171 arch = "linux-x86_64";
172− sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c";
172+ sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198";
173173 }
174− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fy-NL/firefox-100.0b6.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fy-NL/firefox-101.0b2.tar.bz2";
175175 locale = "fy-NL";
176176 arch = "linux-x86_64";
177− sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d";
177+ sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584";
178178 }
179− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ga-IE/firefox-100.0b6.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ga-IE/firefox-101.0b2.tar.bz2";
180180 locale = "ga-IE";
181181 arch = "linux-x86_64";
182− sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc";
182+ sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657";
183183 }
184− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gd/firefox-100.0b6.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gd/firefox-101.0b2.tar.bz2";
185185 locale = "gd";
186186 arch = "linux-x86_64";
187− sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c";
187+ sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49";
188188 }
189− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gl/firefox-100.0b6.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gl/firefox-101.0b2.tar.bz2";
190190 locale = "gl";
191191 arch = "linux-x86_64";
192− sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2";
192+ sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e";
193193 }
194− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gn/firefox-100.0b6.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gn/firefox-101.0b2.tar.bz2";
195195 locale = "gn";
196196 arch = "linux-x86_64";
197− sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634";
197+ sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de";
198198 }
199− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gu-IN/firefox-100.0b6.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gu-IN/firefox-101.0b2.tar.bz2";
200200 locale = "gu-IN";
201201 arch = "linux-x86_64";
202− sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7";
202+ sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499";
203203 }
204− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/he/firefox-100.0b6.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/he/firefox-101.0b2.tar.bz2";
205205 locale = "he";
206206 arch = "linux-x86_64";
207− sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5";
207+ sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4";
208208 }
209− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hi-IN/firefox-100.0b6.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hi-IN/firefox-101.0b2.tar.bz2";
210210 locale = "hi-IN";
211211 arch = "linux-x86_64";
212− sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09";
212+ sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f";
213213 }
214− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hr/firefox-100.0b6.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hr/firefox-101.0b2.tar.bz2";
215215 locale = "hr";
216216 arch = "linux-x86_64";
217− sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945";
217+ sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270";
218218 }
219− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hsb/firefox-100.0b6.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hsb/firefox-101.0b2.tar.bz2";
220220 locale = "hsb";
221221 arch = "linux-x86_64";
222− sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c";
222+ sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f";
223223 }
224− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hu/firefox-100.0b6.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hu/firefox-101.0b2.tar.bz2";
225225 locale = "hu";
226226 arch = "linux-x86_64";
227− sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03";
227+ sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10";
228228 }
229− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hy-AM/firefox-100.0b6.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hy-AM/firefox-101.0b2.tar.bz2";
230230 locale = "hy-AM";
231231 arch = "linux-x86_64";
232− sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5";
232+ sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e";
233233 }
234− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ia/firefox-100.0b6.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ia/firefox-101.0b2.tar.bz2";
235235 locale = "ia";
236236 arch = "linux-x86_64";
237− sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098";
237+ sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6";
238238 }
239− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/id/firefox-100.0b6.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/id/firefox-101.0b2.tar.bz2";
240240 locale = "id";
241241 arch = "linux-x86_64";
242− sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b";
242+ sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3";
243243 }
244− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/is/firefox-100.0b6.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/is/firefox-101.0b2.tar.bz2";
245245 locale = "is";
246246 arch = "linux-x86_64";
247− sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733";
247+ sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab";
248248 }
249− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/it/firefox-100.0b6.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/it/firefox-101.0b2.tar.bz2";
250250 locale = "it";
251251 arch = "linux-x86_64";
252− sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2";
252+ sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c";
253253 }
254− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ja/firefox-100.0b6.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ja/firefox-101.0b2.tar.bz2";
255255 locale = "ja";
256256 arch = "linux-x86_64";
257− sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921";
257+ sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378";
258258 }
259− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ka/firefox-100.0b6.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ka/firefox-101.0b2.tar.bz2";
260260 locale = "ka";
261261 arch = "linux-x86_64";
262− sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9";
262+ sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c";
263263 }
264− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kab/firefox-100.0b6.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kab/firefox-101.0b2.tar.bz2";
265265 locale = "kab";
266266 arch = "linux-x86_64";
267− sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f";
267+ sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712";
268268 }
269− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kk/firefox-100.0b6.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kk/firefox-101.0b2.tar.bz2";
270270 locale = "kk";
271271 arch = "linux-x86_64";
272− sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab";
272+ sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05";
273273 }
274− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/km/firefox-100.0b6.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/km/firefox-101.0b2.tar.bz2";
275275 locale = "km";
276276 arch = "linux-x86_64";
277− sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d";
277+ sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f";
278278 }
279− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kn/firefox-100.0b6.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kn/firefox-101.0b2.tar.bz2";
280280 locale = "kn";
281281 arch = "linux-x86_64";
282− sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0";
282+ sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5";
283283 }
284− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ko/firefox-100.0b6.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ko/firefox-101.0b2.tar.bz2";
285285 locale = "ko";
286286 arch = "linux-x86_64";
287− sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630";
287+ sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094";
288288 }
289− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lij/firefox-100.0b6.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lij/firefox-101.0b2.tar.bz2";
290290 locale = "lij";
291291 arch = "linux-x86_64";
292− sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8";
292+ sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4";
293293 }
294− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lt/firefox-100.0b6.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lt/firefox-101.0b2.tar.bz2";
295295 locale = "lt";
296296 arch = "linux-x86_64";
297− sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d";
297+ sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31";
298298 }
299− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lv/firefox-100.0b6.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lv/firefox-101.0b2.tar.bz2";
300300 locale = "lv";
301301 arch = "linux-x86_64";
302− sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9";
302+ sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29";
303303 }
304− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mk/firefox-100.0b6.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mk/firefox-101.0b2.tar.bz2";
305305 locale = "mk";
306306 arch = "linux-x86_64";
307− sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d";
307+ sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b";
308308 }
309− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mr/firefox-100.0b6.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mr/firefox-101.0b2.tar.bz2";
310310 locale = "mr";
311311 arch = "linux-x86_64";
312− sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5";
312+ sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c";
313313 }
314− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ms/firefox-100.0b6.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ms/firefox-101.0b2.tar.bz2";
315315 locale = "ms";
316316 arch = "linux-x86_64";
317− sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949";
317+ sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b";
318318 }
319− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/my/firefox-100.0b6.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/my/firefox-101.0b2.tar.bz2";
320320 locale = "my";
321321 arch = "linux-x86_64";
322− sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9";
322+ sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031";
323323 }
324− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nb-NO/firefox-100.0b6.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nb-NO/firefox-101.0b2.tar.bz2";
325325 locale = "nb-NO";
326326 arch = "linux-x86_64";
327− sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284";
327+ sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2";
328328 }
329− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ne-NP/firefox-100.0b6.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ne-NP/firefox-101.0b2.tar.bz2";
330330 locale = "ne-NP";
331331 arch = "linux-x86_64";
332− sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b";
332+ sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d";
333333 }
334− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nl/firefox-100.0b6.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nl/firefox-101.0b2.tar.bz2";
335335 locale = "nl";
336336 arch = "linux-x86_64";
337− sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51";
337+ sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d";
338338 }
339− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nn-NO/firefox-100.0b6.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nn-NO/firefox-101.0b2.tar.bz2";
340340 locale = "nn-NO";
341341 arch = "linux-x86_64";
342− sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd";
342+ sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b";
343343 }
344− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/oc/firefox-100.0b6.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/oc/firefox-101.0b2.tar.bz2";
345345 locale = "oc";
346346 arch = "linux-x86_64";
347− sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7";
347+ sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513";
348348 }
349− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pa-IN/firefox-100.0b6.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pa-IN/firefox-101.0b2.tar.bz2";
350350 locale = "pa-IN";
351351 arch = "linux-x86_64";
352− sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb";
352+ sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552";
353353 }
354− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pl/firefox-100.0b6.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pl/firefox-101.0b2.tar.bz2";
355355 locale = "pl";
356356 arch = "linux-x86_64";
357− sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585";
357+ sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0";
358358 }
359− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-BR/firefox-100.0b6.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-BR/firefox-101.0b2.tar.bz2";
360360 locale = "pt-BR";
361361 arch = "linux-x86_64";
362− sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4";
362+ sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030";
363363 }
364− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-PT/firefox-100.0b6.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-PT/firefox-101.0b2.tar.bz2";
365365 locale = "pt-PT";
366366 arch = "linux-x86_64";
367− sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44";
367+ sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428";
368368 }
369− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/rm/firefox-100.0b6.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/rm/firefox-101.0b2.tar.bz2";
370370 locale = "rm";
371371 arch = "linux-x86_64";
372− sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53";
372+ sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b";
373373 }
374− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ro/firefox-100.0b6.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ro/firefox-101.0b2.tar.bz2";
375375 locale = "ro";
376376 arch = "linux-x86_64";
377− sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9";
377+ sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a";
378378 }
379− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ru/firefox-100.0b6.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ru/firefox-101.0b2.tar.bz2";
380380 locale = "ru";
381381 arch = "linux-x86_64";
382− sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281";
382+ sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f";
383383 }
384− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sco/firefox-100.0b6.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sco/firefox-101.0b2.tar.bz2";
385385 locale = "sco";
386386 arch = "linux-x86_64";
387− sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f";
387+ sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad";
388388 }
389− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/si/firefox-100.0b6.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/si/firefox-101.0b2.tar.bz2";
390390 locale = "si";
391391 arch = "linux-x86_64";
392− sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f";
392+ sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75";
393393 }
394− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sk/firefox-100.0b6.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sk/firefox-101.0b2.tar.bz2";
395395 locale = "sk";
396396 arch = "linux-x86_64";
397− sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235";
397+ sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db";
398398 }
399− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sl/firefox-100.0b6.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sl/firefox-101.0b2.tar.bz2";
400400 locale = "sl";
401401 arch = "linux-x86_64";
402− sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6";
402+ sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49";
403403 }
404− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/son/firefox-100.0b6.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/son/firefox-101.0b2.tar.bz2";
405405 locale = "son";
406406 arch = "linux-x86_64";
407− sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa";
407+ sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f";
408408 }
409− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sq/firefox-100.0b6.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sq/firefox-101.0b2.tar.bz2";
410410 locale = "sq";
411411 arch = "linux-x86_64";
412− sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6";
412+ sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f";
413413 }
414− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sr/firefox-100.0b6.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sr/firefox-101.0b2.tar.bz2";
415415 locale = "sr";
416416 arch = "linux-x86_64";
417− sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad";
417+ sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2";
418418 }
419− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sv-SE/firefox-100.0b6.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sv-SE/firefox-101.0b2.tar.bz2";
420420 locale = "sv-SE";
421421 arch = "linux-x86_64";
422− sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b";
422+ sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23";
423423 }
424− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/szl/firefox-100.0b6.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/szl/firefox-101.0b2.tar.bz2";
425425 locale = "szl";
426426 arch = "linux-x86_64";
427− sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970";
427+ sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8";
428428 }
429− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ta/firefox-100.0b6.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ta/firefox-101.0b2.tar.bz2";
430430 locale = "ta";
431431 arch = "linux-x86_64";
432− sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587";
432+ sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d";
433433 }
434− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/te/firefox-100.0b6.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/te/firefox-101.0b2.tar.bz2";
435435 locale = "te";
436436 arch = "linux-x86_64";
437− sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0";
437+ sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c";
438438 }
439− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/th/firefox-100.0b6.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/th/firefox-101.0b2.tar.bz2";
440440 locale = "th";
441441 arch = "linux-x86_64";
442− sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9";
442+ sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349";
443443 }
444− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tl/firefox-100.0b6.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tl/firefox-101.0b2.tar.bz2";
445445 locale = "tl";
446446 arch = "linux-x86_64";
447− sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07";
447+ sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408";
448448 }
449− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tr/firefox-100.0b6.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tr/firefox-101.0b2.tar.bz2";
450450 locale = "tr";
451451 arch = "linux-x86_64";
452− sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf";
452+ sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa";
453453 }
454− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/trs/firefox-100.0b6.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/trs/firefox-101.0b2.tar.bz2";
455455 locale = "trs";
456456 arch = "linux-x86_64";
457− sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa";
457+ sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597";
458458 }
459− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uk/firefox-100.0b6.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uk/firefox-101.0b2.tar.bz2";
460460 locale = "uk";
461461 arch = "linux-x86_64";
462− sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494";
462+ sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d";
463463 }
464− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ur/firefox-100.0b6.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ur/firefox-101.0b2.tar.bz2";
465465 locale = "ur";
466466 arch = "linux-x86_64";
467− sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563";
467+ sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e";
468468 }
469− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uz/firefox-100.0b6.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uz/firefox-101.0b2.tar.bz2";
470470 locale = "uz";
471471 arch = "linux-x86_64";
472− sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880";
472+ sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49";
473473 }
474− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/vi/firefox-100.0b6.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/vi/firefox-101.0b2.tar.bz2";
475475 locale = "vi";
476476 arch = "linux-x86_64";
477− sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb";
477+ sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e";
478478 }
479− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/xh/firefox-100.0b6.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/xh/firefox-101.0b2.tar.bz2";
480480 locale = "xh";
481481 arch = "linux-x86_64";
482− sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b";
482+ sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce";
483483 }
484− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-CN/firefox-100.0b6.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-CN/firefox-101.0b2.tar.bz2";
485485 locale = "zh-CN";
486486 arch = "linux-x86_64";
487− sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172";
487+ sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0";
488488 }
489− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-TW/firefox-100.0b6.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-TW/firefox-101.0b2.tar.bz2";
490490 locale = "zh-TW";
491491 arch = "linux-x86_64";
492− sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7";
492+ sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c";
493493 }
494− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ach/firefox-100.0b6.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ach/firefox-101.0b2.tar.bz2";
495495 locale = "ach";
496496 arch = "linux-i686";
497− sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab";
497+ sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c";
498498 }
499− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/af/firefox-100.0b6.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/af/firefox-101.0b2.tar.bz2";
500500 locale = "af";
501501 arch = "linux-i686";
502− sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b";
502+ sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48";
503503 }
504− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/an/firefox-100.0b6.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/an/firefox-101.0b2.tar.bz2";
505505 locale = "an";
506506 arch = "linux-i686";
507− sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97";
507+ sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d";
508508 }
509− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ar/firefox-100.0b6.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ar/firefox-101.0b2.tar.bz2";
510510 locale = "ar";
511511 arch = "linux-i686";
512− sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc";
512+ sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895";
513513 }
514− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ast/firefox-100.0b6.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ast/firefox-101.0b2.tar.bz2";
515515 locale = "ast";
516516 arch = "linux-i686";
517− sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11";
517+ sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124";
518518 }
519− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/az/firefox-100.0b6.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/az/firefox-101.0b2.tar.bz2";
520520 locale = "az";
521521 arch = "linux-i686";
522− sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d";
522+ sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e";
523523 }
524− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/be/firefox-100.0b6.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/be/firefox-101.0b2.tar.bz2";
525525 locale = "be";
526526 arch = "linux-i686";
527− sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b";
527+ sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81";
528528 }
529− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bg/firefox-100.0b6.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bg/firefox-101.0b2.tar.bz2";
530530 locale = "bg";
531531 arch = "linux-i686";
532− sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d";
532+ sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a";
533533 }
534− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bn/firefox-100.0b6.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bn/firefox-101.0b2.tar.bz2";
535535 locale = "bn";
536536 arch = "linux-i686";
537− sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d";
537+ sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce";
538538 }
539− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/br/firefox-100.0b6.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/br/firefox-101.0b2.tar.bz2";
540540 locale = "br";
541541 arch = "linux-i686";
542− sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e";
542+ sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812";
543543 }
544− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bs/firefox-100.0b6.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bs/firefox-101.0b2.tar.bz2";
545545 locale = "bs";
546546 arch = "linux-i686";
547− sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137";
547+ sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86";
548548 }
549− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca-valencia/firefox-100.0b6.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca-valencia/firefox-101.0b2.tar.bz2";
550550 locale = "ca-valencia";
551551 arch = "linux-i686";
552− sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e";
552+ sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac";
553553 }
554− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca/firefox-100.0b6.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca/firefox-101.0b2.tar.bz2";
555555 locale = "ca";
556556 arch = "linux-i686";
557− sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722";
557+ sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07";
558558 }
559− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cak/firefox-100.0b6.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cak/firefox-101.0b2.tar.bz2";
560560 locale = "cak";
561561 arch = "linux-i686";
562− sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc";
562+ sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94";
563563 }
564− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cs/firefox-100.0b6.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cs/firefox-101.0b2.tar.bz2";
565565 locale = "cs";
566566 arch = "linux-i686";
567− sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db";
567+ sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd";
568568 }
569− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cy/firefox-100.0b6.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cy/firefox-101.0b2.tar.bz2";
570570 locale = "cy";
571571 arch = "linux-i686";
572− sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964";
572+ sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad";
573573 }
574− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/da/firefox-100.0b6.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/da/firefox-101.0b2.tar.bz2";
575575 locale = "da";
576576 arch = "linux-i686";
577− sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b";
577+ sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a";
578578 }
579− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/de/firefox-100.0b6.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/de/firefox-101.0b2.tar.bz2";
580580 locale = "de";
581581 arch = "linux-i686";
582− sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d";
582+ sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649";
583583 }
584− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/dsb/firefox-100.0b6.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/dsb/firefox-101.0b2.tar.bz2";
585585 locale = "dsb";
586586 arch = "linux-i686";
587− sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae";
587+ sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7";
588588 }
589− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/el/firefox-100.0b6.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/el/firefox-101.0b2.tar.bz2";
590590 locale = "el";
591591 arch = "linux-i686";
592− sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad";
592+ sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0";
593593 }
594− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-CA/firefox-100.0b6.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-CA/firefox-101.0b2.tar.bz2";
595595 locale = "en-CA";
596596 arch = "linux-i686";
597− sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc";
597+ sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc";
598598 }
599− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-GB/firefox-100.0b6.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-GB/firefox-101.0b2.tar.bz2";
600600 locale = "en-GB";
601601 arch = "linux-i686";
602− sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a";
602+ sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01";
603603 }
604− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-US/firefox-100.0b6.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-US/firefox-101.0b2.tar.bz2";
605605 locale = "en-US";
606606 arch = "linux-i686";
607− sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20";
607+ sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e";
608608 }
609− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eo/firefox-100.0b6.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eo/firefox-101.0b2.tar.bz2";
610610 locale = "eo";
611611 arch = "linux-i686";
612− sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca";
612+ sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4";
613613 }
614− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-AR/firefox-100.0b6.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-AR/firefox-101.0b2.tar.bz2";
615615 locale = "es-AR";
616616 arch = "linux-i686";
617− sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e";
617+ sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25";
618618 }
619− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-CL/firefox-100.0b6.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-CL/firefox-101.0b2.tar.bz2";
620620 locale = "es-CL";
621621 arch = "linux-i686";
622− sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b";
622+ sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273";
623623 }
624− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-ES/firefox-100.0b6.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-ES/firefox-101.0b2.tar.bz2";
625625 locale = "es-ES";
626626 arch = "linux-i686";
627− sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10";
627+ sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f";
628628 }
629− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-MX/firefox-100.0b6.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-MX/firefox-101.0b2.tar.bz2";
630630 locale = "es-MX";
631631 arch = "linux-i686";
632− sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea";
632+ sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30";
633633 }
634− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/et/firefox-100.0b6.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/et/firefox-101.0b2.tar.bz2";
635635 locale = "et";
636636 arch = "linux-i686";
637− sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b";
637+ sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b";
638638 }
639− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eu/firefox-100.0b6.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eu/firefox-101.0b2.tar.bz2";
640640 locale = "eu";
641641 arch = "linux-i686";
642− sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69";
642+ sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be";
643643 }
644− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fa/firefox-100.0b6.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fa/firefox-101.0b2.tar.bz2";
645645 locale = "fa";
646646 arch = "linux-i686";
647− sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b";
647+ sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8";
648648 }
649− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ff/firefox-100.0b6.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ff/firefox-101.0b2.tar.bz2";
650650 locale = "ff";
651651 arch = "linux-i686";
652− sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce";
652+ sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582";
653653 }
654− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fi/firefox-100.0b6.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fi/firefox-101.0b2.tar.bz2";
655655 locale = "fi";
656656 arch = "linux-i686";
657− sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51";
657+ sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed";
658658 }
659− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fr/firefox-100.0b6.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fr/firefox-101.0b2.tar.bz2";
660660 locale = "fr";
661661 arch = "linux-i686";
662− sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3";
662+ sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771";
663663 }
664− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fy-NL/firefox-100.0b6.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fy-NL/firefox-101.0b2.tar.bz2";
665665 locale = "fy-NL";
666666 arch = "linux-i686";
667− sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6";
667+ sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28";
668668 }
669− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ga-IE/firefox-100.0b6.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ga-IE/firefox-101.0b2.tar.bz2";
670670 locale = "ga-IE";
671671 arch = "linux-i686";
672− sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e";
672+ sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1";
673673 }
674− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gd/firefox-100.0b6.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gd/firefox-101.0b2.tar.bz2";
675675 locale = "gd";
676676 arch = "linux-i686";
677− sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e";
677+ sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2";
678678 }
679− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gl/firefox-100.0b6.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gl/firefox-101.0b2.tar.bz2";
680680 locale = "gl";
681681 arch = "linux-i686";
682− sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604";
682+ sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4";
683683 }
684− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gn/firefox-100.0b6.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gn/firefox-101.0b2.tar.bz2";
685685 locale = "gn";
686686 arch = "linux-i686";
687− sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc";
687+ sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612";
688688 }
689− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gu-IN/firefox-100.0b6.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gu-IN/firefox-101.0b2.tar.bz2";
690690 locale = "gu-IN";
691691 arch = "linux-i686";
692− sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300";
692+ sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682";
693693 }
694− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/he/firefox-100.0b6.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/he/firefox-101.0b2.tar.bz2";
695695 locale = "he";
696696 arch = "linux-i686";
697− sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90";
697+ sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193";
698698 }
699− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hi-IN/firefox-100.0b6.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hi-IN/firefox-101.0b2.tar.bz2";
700700 locale = "hi-IN";
701701 arch = "linux-i686";
702− sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6";
702+ sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0";
703703 }
704− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hr/firefox-100.0b6.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hr/firefox-101.0b2.tar.bz2";
705705 locale = "hr";
706706 arch = "linux-i686";
707− sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f";
707+ sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490";
708708 }
709− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hsb/firefox-100.0b6.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hsb/firefox-101.0b2.tar.bz2";
710710 locale = "hsb";
711711 arch = "linux-i686";
712− sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1";
712+ sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8";
713713 }
714− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hu/firefox-100.0b6.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hu/firefox-101.0b2.tar.bz2";
715715 locale = "hu";
716716 arch = "linux-i686";
717− sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f";
717+ sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45";
718718 }
719− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hy-AM/firefox-100.0b6.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hy-AM/firefox-101.0b2.tar.bz2";
720720 locale = "hy-AM";
721721 arch = "linux-i686";
722− sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6";
722+ sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d";
723723 }
724− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ia/firefox-100.0b6.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ia/firefox-101.0b2.tar.bz2";
725725 locale = "ia";
726726 arch = "linux-i686";
727− sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6";
727+ sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0";
728728 }
729− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/id/firefox-100.0b6.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/id/firefox-101.0b2.tar.bz2";
730730 locale = "id";
731731 arch = "linux-i686";
732− sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690";
732+ sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2";
733733 }
734− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/is/firefox-100.0b6.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/is/firefox-101.0b2.tar.bz2";
735735 locale = "is";
736736 arch = "linux-i686";
737− sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c";
737+ sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e";
738738 }
739− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/it/firefox-100.0b6.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/it/firefox-101.0b2.tar.bz2";
740740 locale = "it";
741741 arch = "linux-i686";
742− sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80";
742+ sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8";
743743 }
744− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ja/firefox-100.0b6.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ja/firefox-101.0b2.tar.bz2";
745745 locale = "ja";
746746 arch = "linux-i686";
747− sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf";
747+ sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c";
748748 }
749− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ka/firefox-100.0b6.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ka/firefox-101.0b2.tar.bz2";
750750 locale = "ka";
751751 arch = "linux-i686";
752− sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3";
752+ sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180";
753753 }
754− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kab/firefox-100.0b6.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kab/firefox-101.0b2.tar.bz2";
755755 locale = "kab";
756756 arch = "linux-i686";
757− sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01";
757+ sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf";
758758 }
759− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kk/firefox-100.0b6.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kk/firefox-101.0b2.tar.bz2";
760760 locale = "kk";
761761 arch = "linux-i686";
762− sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d";
762+ sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60";
763763 }
764− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/km/firefox-100.0b6.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/km/firefox-101.0b2.tar.bz2";
765765 locale = "km";
766766 arch = "linux-i686";
767− sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce";
767+ sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2";
768768 }
769− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kn/firefox-100.0b6.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kn/firefox-101.0b2.tar.bz2";
770770 locale = "kn";
771771 arch = "linux-i686";
772− sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8";
772+ sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a";
773773 }
774− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ko/firefox-100.0b6.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ko/firefox-101.0b2.tar.bz2";
775775 locale = "ko";
776776 arch = "linux-i686";
777− sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039";
777+ sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f";
778778 }
779− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lij/firefox-100.0b6.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lij/firefox-101.0b2.tar.bz2";
780780 locale = "lij";
781781 arch = "linux-i686";
782− sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a";
782+ sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72";
783783 }
784− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lt/firefox-100.0b6.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lt/firefox-101.0b2.tar.bz2";
785785 locale = "lt";
786786 arch = "linux-i686";
787− sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e";
787+ sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648";
788788 }
789− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lv/firefox-100.0b6.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lv/firefox-101.0b2.tar.bz2";
790790 locale = "lv";
791791 arch = "linux-i686";
792− sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34";
792+ sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5";
793793 }
794− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mk/firefox-100.0b6.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mk/firefox-101.0b2.tar.bz2";
795795 locale = "mk";
796796 arch = "linux-i686";
797− sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c";
797+ sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640";
798798 }
799− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mr/firefox-100.0b6.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mr/firefox-101.0b2.tar.bz2";
800800 locale = "mr";
801801 arch = "linux-i686";
802− sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9";
802+ sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595";
803803 }
804− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ms/firefox-100.0b6.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ms/firefox-101.0b2.tar.bz2";
805805 locale = "ms";
806806 arch = "linux-i686";
807− sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad";
807+ sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93";
808808 }
809− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/my/firefox-100.0b6.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/my/firefox-101.0b2.tar.bz2";
810810 locale = "my";
811811 arch = "linux-i686";
812− sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe";
812+ sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c";
813813 }
814− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nb-NO/firefox-100.0b6.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nb-NO/firefox-101.0b2.tar.bz2";
815815 locale = "nb-NO";
816816 arch = "linux-i686";
817− sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24";
817+ sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353";
818818 }
819− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ne-NP/firefox-100.0b6.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ne-NP/firefox-101.0b2.tar.bz2";
820820 locale = "ne-NP";
821821 arch = "linux-i686";
822− sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61";
822+ sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f";
823823 }
824− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nl/firefox-100.0b6.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nl/firefox-101.0b2.tar.bz2";
825825 locale = "nl";
826826 arch = "linux-i686";
827− sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12";
827+ sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c";
828828 }
829− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nn-NO/firefox-100.0b6.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nn-NO/firefox-101.0b2.tar.bz2";
830830 locale = "nn-NO";
831831 arch = "linux-i686";
832− sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241";
832+ sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58";
833833 }
834− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/oc/firefox-100.0b6.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/oc/firefox-101.0b2.tar.bz2";
835835 locale = "oc";
836836 arch = "linux-i686";
837− sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd";
837+ sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680";
838838 }
839− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pa-IN/firefox-100.0b6.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pa-IN/firefox-101.0b2.tar.bz2";
840840 locale = "pa-IN";
841841 arch = "linux-i686";
842− sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f";
842+ sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a";
843843 }
844− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pl/firefox-100.0b6.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pl/firefox-101.0b2.tar.bz2";
845845 locale = "pl";
846846 arch = "linux-i686";
847− sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96";
847+ sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29";
848848 }
849− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-BR/firefox-100.0b6.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-BR/firefox-101.0b2.tar.bz2";
850850 locale = "pt-BR";
851851 arch = "linux-i686";
852− sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c";
852+ sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280";
853853 }
854− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-PT/firefox-100.0b6.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-PT/firefox-101.0b2.tar.bz2";
855855 locale = "pt-PT";
856856 arch = "linux-i686";
857− sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3";
857+ sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c";
858858 }
859− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/rm/firefox-100.0b6.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/rm/firefox-101.0b2.tar.bz2";
860860 locale = "rm";
861861 arch = "linux-i686";
862− sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d";
862+ sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c";
863863 }
864− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ro/firefox-100.0b6.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ro/firefox-101.0b2.tar.bz2";
865865 locale = "ro";
866866 arch = "linux-i686";
867− sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f";
867+ sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41";
868868 }
869− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ru/firefox-100.0b6.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ru/firefox-101.0b2.tar.bz2";
870870 locale = "ru";
871871 arch = "linux-i686";
872− sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4";
872+ sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5";
873873 }
874− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sco/firefox-100.0b6.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sco/firefox-101.0b2.tar.bz2";
875875 locale = "sco";
876876 arch = "linux-i686";
877− sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510";
877+ sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd";
878878 }
879− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/si/firefox-100.0b6.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/si/firefox-101.0b2.tar.bz2";
880880 locale = "si";
881881 arch = "linux-i686";
882− sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732";
882+ sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d";
883883 }
884− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sk/firefox-100.0b6.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sk/firefox-101.0b2.tar.bz2";
885885 locale = "sk";
886886 arch = "linux-i686";
887− sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0";
887+ sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27";
888888 }
889− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sl/firefox-100.0b6.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sl/firefox-101.0b2.tar.bz2";
890890 locale = "sl";
891891 arch = "linux-i686";
892− sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9";
892+ sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229";
893893 }
894− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/son/firefox-100.0b6.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/son/firefox-101.0b2.tar.bz2";
895895 locale = "son";
896896 arch = "linux-i686";
897− sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16";
897+ sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0";
898898 }
899− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sq/firefox-100.0b6.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sq/firefox-101.0b2.tar.bz2";
900900 locale = "sq";
901901 arch = "linux-i686";
902− sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756";
902+ sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1";
903903 }
904− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sr/firefox-100.0b6.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sr/firefox-101.0b2.tar.bz2";
905905 locale = "sr";
906906 arch = "linux-i686";
907− sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153";
907+ sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231";
908908 }
909− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sv-SE/firefox-100.0b6.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sv-SE/firefox-101.0b2.tar.bz2";
910910 locale = "sv-SE";
911911 arch = "linux-i686";
912− sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0";
912+ sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49";
913913 }
914− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/szl/firefox-100.0b6.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/szl/firefox-101.0b2.tar.bz2";
915915 locale = "szl";
916916 arch = "linux-i686";
917− sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f";
917+ sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd";
918918 }
919− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ta/firefox-100.0b6.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ta/firefox-101.0b2.tar.bz2";
920920 locale = "ta";
921921 arch = "linux-i686";
922− sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64";
922+ sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4";
923923 }
924− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/te/firefox-100.0b6.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/te/firefox-101.0b2.tar.bz2";
925925 locale = "te";
926926 arch = "linux-i686";
927− sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275";
927+ sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd";
928928 }
929− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/th/firefox-100.0b6.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/th/firefox-101.0b2.tar.bz2";
930930 locale = "th";
931931 arch = "linux-i686";
932− sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383";
932+ sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad";
933933 }
934− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tl/firefox-100.0b6.tar.bz2";
934+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tl/firefox-101.0b2.tar.bz2";
935935 locale = "tl";
936936 arch = "linux-i686";
937− sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9";
937+ sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151";
938938 }
939− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tr/firefox-100.0b6.tar.bz2";
939+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tr/firefox-101.0b2.tar.bz2";
940940 locale = "tr";
941941 arch = "linux-i686";
942− sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42";
942+ sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e";
943943 }
944− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/trs/firefox-100.0b6.tar.bz2";
944+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/trs/firefox-101.0b2.tar.bz2";
945945 locale = "trs";
946946 arch = "linux-i686";
947− sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648";
947+ sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526";
948948 }
949− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uk/firefox-100.0b6.tar.bz2";
949+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uk/firefox-101.0b2.tar.bz2";
950950 locale = "uk";
951951 arch = "linux-i686";
952− sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2";
952+ sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75";
953953 }
954− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ur/firefox-100.0b6.tar.bz2";
954+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ur/firefox-101.0b2.tar.bz2";
955955 locale = "ur";
956956 arch = "linux-i686";
957− sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca";
957+ sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837";
958958 }
959− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uz/firefox-100.0b6.tar.bz2";
959+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uz/firefox-101.0b2.tar.bz2";
960960 locale = "uz";
961961 arch = "linux-i686";
962− sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9";
962+ sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d";
963963 }
964− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/vi/firefox-100.0b6.tar.bz2";
964+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/vi/firefox-101.0b2.tar.bz2";
965965 locale = "vi";
966966 arch = "linux-i686";
967− sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061";
967+ sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4";
968968 }
969− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/xh/firefox-100.0b6.tar.bz2";
969+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/xh/firefox-101.0b2.tar.bz2";
970970 locale = "xh";
971971 arch = "linux-i686";
972− sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f";
972+ sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77";
973973 }
974− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-CN/firefox-100.0b6.tar.bz2";
974+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-CN/firefox-101.0b2.tar.bz2";
975975 locale = "zh-CN";
976976 arch = "linux-i686";
977− sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d";
977+ sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6";
978978 }
979− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-TW/firefox-100.0b6.tar.bz2";
979+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-TW/firefox-101.0b2.tar.bz2";
980980 locale = "zh-TW";
981981 arch = "linux-i686";
982− sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac";
982+ sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98";
983983 }
984984 ];
985985}
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+393−393
@@ -1,985 +1,985 @@
11{
2− version = "99.0.1";
2+ version = "100.0";
33 sources = [
4− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ach/firefox-99.0.1.tar.bz2";
4+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ach/firefox-100.0.tar.bz2";
55 locale = "ach";
66 arch = "linux-x86_64";
7− sha256 = "e2054f03b413f783f287c14fb670ee97415e89181e2ca1f9bbe05a18fb529330";
7+ sha256 = "3e85609f0b3e4eb15262cd8567d8973bed2195f6a19199d76a99ed361cc0d0cf";
88 }
9− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/af/firefox-99.0.1.tar.bz2";
9+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/af/firefox-100.0.tar.bz2";
1010 locale = "af";
1111 arch = "linux-x86_64";
12− sha256 = "102c4460ae7a8242c770bda09baee07004f84d95a885c621fbe23f2fdb585398";
12+ sha256 = "0950ef9c6c9c386df1e2d9f85312d9f3fe0dbc1668aff6710da54f8a3cdbc5de";
1313 }
14− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/an/firefox-99.0.1.tar.bz2";
14+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/an/firefox-100.0.tar.bz2";
1515 locale = "an";
1616 arch = "linux-x86_64";
17− sha256 = "0f8aeacc3a7abbb5f571aff8a6580c9779336bccb0d30005b46d336447123b10";
17+ sha256 = "af97c6a4dcc34e7edd52111c6ba9480f5ecd2765ca972cb43745ecb54ba01d7b";
1818 }
19− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ar/firefox-99.0.1.tar.bz2";
19+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ar/firefox-100.0.tar.bz2";
2020 locale = "ar";
2121 arch = "linux-x86_64";
22− sha256 = "720c5d872243631ddf67102e6a54504912b33f6e21c666d84e73a399f10a2559";
22+ sha256 = "0f9947456cee9db27baffd0476e62ce529b349213ad1a0c2196bcf6d7f0e582c";
2323 }
24− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ast/firefox-99.0.1.tar.bz2";
24+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ast/firefox-100.0.tar.bz2";
2525 locale = "ast";
2626 arch = "linux-x86_64";
27− sha256 = "194345cdce1e9c6462a80423d1b97be4c757dc69b1f5a0055ac14e2624d1d145";
27+ sha256 = "c0da6abaaecee287732a5e00520d2bacfd61a3a7ca64a5bffe37830f53cf5d20";
2828 }
29− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/az/firefox-99.0.1.tar.bz2";
29+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/az/firefox-100.0.tar.bz2";
3030 locale = "az";
3131 arch = "linux-x86_64";
32− sha256 = "9936c9d172ddd291d34679c33f28d7ec425e4835abdfb25dd0252e50ab5eca09";
32+ sha256 = "1d57a9d3038dff5a354f24e7ebc7d93d11dccc57be72644988dbbb20c734d243";
3333 }
34− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/be/firefox-99.0.1.tar.bz2";
34+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/be/firefox-100.0.tar.bz2";
3535 locale = "be";
3636 arch = "linux-x86_64";
37− sha256 = "420f519aa954b708da735605e32acf9f11bfa2195e7a9bd2ebd954a58df2db10";
37+ sha256 = "d20e556064f10c5730f094b55b4014816df7b49840d0e9934fe3167e135bd789";
3838 }
39− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bg/firefox-99.0.1.tar.bz2";
39+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bg/firefox-100.0.tar.bz2";
4040 locale = "bg";
4141 arch = "linux-x86_64";
42− sha256 = "2a7cbc2903894934024fb8ea2212e7f23a47c7db707e4c88a33656366b810dfc";
42+ sha256 = "2d26cdef7ee0d7c263599c38d5352268380125ccc3f901f48ed60134badae1c7";
4343 }
44− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bn/firefox-99.0.1.tar.bz2";
44+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bn/firefox-100.0.tar.bz2";
4545 locale = "bn";
4646 arch = "linux-x86_64";
47− sha256 = "46984d43f628ecdc1674d41f45c57177dfe24eb6dec0e5ae5e6a8efec7157791";
47+ sha256 = "61395cb64c519a14ef879b6b1f9444f727a6ac73074d0e67e3e68a89428c7651";
4848 }
49− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/br/firefox-99.0.1.tar.bz2";
49+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/br/firefox-100.0.tar.bz2";
5050 locale = "br";
5151 arch = "linux-x86_64";
52− sha256 = "1427aaca5903a1ecb3e17aa7e3351334b1a2183a1180c9a4942535b50f64c0db";
52+ sha256 = "486b59f31c0a63155d04cf0818d5c8629e846b313cd6eabcc762bb0c51adf35a";
5353 }
54− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/bs/firefox-99.0.1.tar.bz2";
54+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/bs/firefox-100.0.tar.bz2";
5555 locale = "bs";
5656 arch = "linux-x86_64";
57− sha256 = "8377ad8c27236c5336e370acf70e901f4dbb53dd25142a74dc61f98fd2beab91";
57+ sha256 = "656911e5fdd030ee191f1bcab6dc9f2a66f888a6fa726007e528716df5d6667e";
5858 }
59− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca-valencia/firefox-99.0.1.tar.bz2";
59+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca-valencia/firefox-100.0.tar.bz2";
6060 locale = "ca-valencia";
6161 arch = "linux-x86_64";
62− sha256 = "78f8dd650fb9398b1cb999db887bb5764f4b015539c3aac0eee2fdd05477bf3e";
62+ sha256 = "f31c75df5bf3639bfa4db86cc0237f7602a725b242e6330259ca4cbb61dd715d";
6363 }
64− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ca/firefox-99.0.1.tar.bz2";
64+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ca/firefox-100.0.tar.bz2";
6565 locale = "ca";
6666 arch = "linux-x86_64";
67− sha256 = "18b0acda5e75ec1412273a016d2cc36f6c65b68ebae5251ef13289cf73ef00d6";
67+ sha256 = "7f53e06ccec188fb5e85a33c7968ba90c88bf1d3a782aee179e3fef5010a33b4";
6868 }
69− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cak/firefox-99.0.1.tar.bz2";
69+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cak/firefox-100.0.tar.bz2";
7070 locale = "cak";
7171 arch = "linux-x86_64";
72− sha256 = "505c3f2c8f39aeea7ca4f8285d59fcef995e5c6c64d318d7b143e7060982d7a7";
72+ sha256 = "a1b8349ffe436cce151c5358b2e1d5a928a0ef3e623ef2c98e9f55b0ce2f405b";
7373 }
74− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cs/firefox-99.0.1.tar.bz2";
74+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cs/firefox-100.0.tar.bz2";
7575 locale = "cs";
7676 arch = "linux-x86_64";
77− sha256 = "d33f7f5adf068743a523f54fb2dec1edf7302993ef3684dd86cbab25b96c3247";
77+ sha256 = "b11f724a20c13ccec73c9058e90387a031e6a9b22e02ae4ab59357d8f191ce65";
7878 }
79− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/cy/firefox-99.0.1.tar.bz2";
79+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/cy/firefox-100.0.tar.bz2";
8080 locale = "cy";
8181 arch = "linux-x86_64";
82− sha256 = "8a0d5e3a4ad8650d4e8e77e92c24b27da1d5c0b44878e97462ec94597020e548";
82+ sha256 = "71e1faa584d6c9243ab806f694e548fec92672f44d6239828fb7f3c5363850b8";
8383 }
84− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/da/firefox-99.0.1.tar.bz2";
84+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/da/firefox-100.0.tar.bz2";
8585 locale = "da";
8686 arch = "linux-x86_64";
87− sha256 = "c9c8355c3cab4e189a4ba322f4a7e2a189617786e912930f0c17b217ff89c1c6";
87+ sha256 = "e811e13df31bf0e55904a696b69ca0fd0785c7e60f9bc79fae920cc7bb55ee39";
8888 }
89− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/de/firefox-99.0.1.tar.bz2";
89+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/de/firefox-100.0.tar.bz2";
9090 locale = "de";
9191 arch = "linux-x86_64";
92− sha256 = "83468180a67fae5a5df8810e3b7bfdc6b01faaf60dd18a0914715ac89531c7a4";
92+ sha256 = "22c6c8d312db6b64dabc7d401751ce7aecd3b5889eb8e5538433bbf5aeb55d5f";
9393 }
94− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/dsb/firefox-99.0.1.tar.bz2";
94+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/dsb/firefox-100.0.tar.bz2";
9595 locale = "dsb";
9696 arch = "linux-x86_64";
97− sha256 = "feeda2e3f021d459c98371e244d29b9e6e6fdaa6250a8a6700b34a981f3dcf13";
97+ sha256 = "76d7d9ba4483c6b727568dfbf497940dc38871cc18f5cf6823cdbd539d9f559d";
9898 }
99− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/el/firefox-99.0.1.tar.bz2";
99+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/el/firefox-100.0.tar.bz2";
100100 locale = "el";
101101 arch = "linux-x86_64";
102− sha256 = "4fc65f4b6d84a01c79165ee9e058c980659089e86da72b016cfc5efbe973e592";
102+ sha256 = "59f4fab29a3888a7b86b8f50281eff8d3c7ed512a92fbceb5ab3ebfaaa4faad6";
103103 }
104− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-CA/firefox-99.0.1.tar.bz2";
104+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-CA/firefox-100.0.tar.bz2";
105105 locale = "en-CA";
106106 arch = "linux-x86_64";
107− sha256 = "10e324101932b7290814ea2ab747657363023a88857ca90e25d54f89115ffbcf";
107+ sha256 = "1c493929d5ab703f59b2e6e6ca86004725dcda7ca23c3a2b34de425e6a969cad";
108108 }
109− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-GB/firefox-99.0.1.tar.bz2";
109+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-GB/firefox-100.0.tar.bz2";
110110 locale = "en-GB";
111111 arch = "linux-x86_64";
112− sha256 = "83ba931e4f6afd0d0c32b3bf0db55a7ff0fdfda080e906bb3ada5b4e61a4c3f1";
112+ sha256 = "2e48068db4bed6722568a35d7a2aaa84b68a8e18304744940c36437cf88b10d4";
113113 }
114− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/en-US/firefox-99.0.1.tar.bz2";
114+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/en-US/firefox-100.0.tar.bz2";
115115 locale = "en-US";
116116 arch = "linux-x86_64";
117− sha256 = "7bc57f06fc9c52e16815f1a4208c33bc5819423c68da441d001f7c2200591bcd";
117+ sha256 = "528845df1a15acf081fdc9e1e7276f0b4601acc9df3553324e02c9c6fb9b7d9d";
118118 }
119− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eo/firefox-99.0.1.tar.bz2";
119+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eo/firefox-100.0.tar.bz2";
120120 locale = "eo";
121121 arch = "linux-x86_64";
122− sha256 = "3fc945331b62f9998d2adb6a99d3390528975c97b6776f97a4c461eb124da462";
122+ sha256 = "0fa2f3f4a7cbe7e9e41d0d08ba8649efa84b727d9adb621b408cf7732312fc6f";
123123 }
124− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-AR/firefox-99.0.1.tar.bz2";
124+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-AR/firefox-100.0.tar.bz2";
125125 locale = "es-AR";
126126 arch = "linux-x86_64";
127− sha256 = "908723c7445b92b4c4e26fc999562681e4bf3ffffee0ea1db6362aed0f615c0e";
127+ sha256 = "6afb61b7e361735321934a4189063cc5f424c79022b7482b0923a0204160c2b0";
128128 }
129− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-CL/firefox-99.0.1.tar.bz2";
129+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-CL/firefox-100.0.tar.bz2";
130130 locale = "es-CL";
131131 arch = "linux-x86_64";
132− sha256 = "77363cfa3c2ce655a9f6203c495f8f54700b44e0b66d021050cea59e2b0e0a3e";
132+ sha256 = "382ba75ab94f81ecdaeeb98b41467969b103e9feb73cbbad18b69d5f39013dc0";
133133 }
134− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-ES/firefox-99.0.1.tar.bz2";
134+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-ES/firefox-100.0.tar.bz2";
135135 locale = "es-ES";
136136 arch = "linux-x86_64";
137− sha256 = "ee59faf4bd7472a14fd8e420aa7f408abccd72f31d162da0c5f9b530593722f2";
137+ sha256 = "1a09045c93cceb449e6f0dd9d644abcab2ec30bd39f5c9aab091fc49f32a2592";
138138 }
139− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/es-MX/firefox-99.0.1.tar.bz2";
139+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/es-MX/firefox-100.0.tar.bz2";
140140 locale = "es-MX";
141141 arch = "linux-x86_64";
142− sha256 = "732b1edb21462281e029de794ccdb3c20ceea0c6d5c0f1c885ef76ad57df7abf";
142+ sha256 = "68f0ef188418452de2efc73d3f94a5c1e515bd07b6907168b20b909f7739be84";
143143 }
144− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/et/firefox-99.0.1.tar.bz2";
144+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/et/firefox-100.0.tar.bz2";
145145 locale = "et";
146146 arch = "linux-x86_64";
147− sha256 = "b816c47c20a674256dc176a15dbeec830b47f8c3eecde31c615f003260e69668";
147+ sha256 = "7142bcf0d715b73f11cba9f181f3a02cfeef9e07e825dae7120df51b10697765";
148148 }
149− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/eu/firefox-99.0.1.tar.bz2";
149+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/eu/firefox-100.0.tar.bz2";
150150 locale = "eu";
151151 arch = "linux-x86_64";
152− sha256 = "4f54fa8f7718bc55b733c6986c8ffa17517afac92383dae03fb972beed876665";
152+ sha256 = "563fed2bb7c6168aa9d973d1578e59c2ed1e785ca82d796de4aecebb8d6dc404";
153153 }
154− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fa/firefox-99.0.1.tar.bz2";
154+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fa/firefox-100.0.tar.bz2";
155155 locale = "fa";
156156 arch = "linux-x86_64";
157− sha256 = "ee716492cc2cc0a11c98ea8e8bd7d142ec21c006e2f12a96707d9dad82bf92b5";
157+ sha256 = "f7ec308585ab8aa0e112057cd0af1df524e6712611b7ae93e893e681c8b117c6";
158158 }
159− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ff/firefox-99.0.1.tar.bz2";
159+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ff/firefox-100.0.tar.bz2";
160160 locale = "ff";
161161 arch = "linux-x86_64";
162− sha256 = "36d1c4b3966a807c6bc90c4f6fecbef327442398a463167535dae318f286d222";
162+ sha256 = "d678cc64bba6370a300a64dbdc52343b7eaae73953ddec584038d70dee8f09ed";
163163 }
164− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fi/firefox-99.0.1.tar.bz2";
164+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fi/firefox-100.0.tar.bz2";
165165 locale = "fi";
166166 arch = "linux-x86_64";
167− sha256 = "9855e6d25d34d6df614ef2b48b4b1e60d527fe00c0da132a0609ac6262354623";
167+ sha256 = "998746f48e543897806e8024e8e6c6cac3dd63471b3896d83ebd80279d8f026e";
168168 }
169− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fr/firefox-99.0.1.tar.bz2";
169+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fr/firefox-100.0.tar.bz2";
170170 locale = "fr";
171171 arch = "linux-x86_64";
172− sha256 = "b999d3ed98eb594335e810a4a81de86e7e3466a2c32cc6bef0bc260ae883a6d4";
172+ sha256 = "11bd3ad17ad680049dcb262ffa18a477d9d8285040e403b26a2f45a449a63139";
173173 }
174− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/fy-NL/firefox-99.0.1.tar.bz2";
174+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/fy-NL/firefox-100.0.tar.bz2";
175175 locale = "fy-NL";
176176 arch = "linux-x86_64";
177− sha256 = "be9fce28930fb80a94cc5c6343b34ff6b05538a08cee657d995d647f3d9dec7d";
177+ sha256 = "508f784775df7b89e6144d9290f98e05b17b831f43f81fde5f45cadb0355bfcf";
178178 }
179− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ga-IE/firefox-99.0.1.tar.bz2";
179+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ga-IE/firefox-100.0.tar.bz2";
180180 locale = "ga-IE";
181181 arch = "linux-x86_64";
182− sha256 = "92bbd149f59a6c2594d6fe1e2ba8e545bd7f9040ae35ec924414c59d06d0f4c7";
182+ sha256 = "3185a57d4a065ed4cc85fac6c3ee14597b25b5f3acdf9f0c9232d7b1935ad25b";
183183 }
184− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gd/firefox-99.0.1.tar.bz2";
184+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gd/firefox-100.0.tar.bz2";
185185 locale = "gd";
186186 arch = "linux-x86_64";
187− sha256 = "bb2cd80e2d1c9b08363a0025b428473334596f3e34ff321e3d6c69f723fb18f0";
187+ sha256 = "580397f6ec486a571768f9eb4b4d1b5b7e10a9e791c90907c7b0be0eccfb355a";
188188 }
189− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gl/firefox-99.0.1.tar.bz2";
189+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gl/firefox-100.0.tar.bz2";
190190 locale = "gl";
191191 arch = "linux-x86_64";
192− sha256 = "f74e552aea8622136679cfb162b2c192ccefa91705e8352830efdec3cae9a0b1";
192+ sha256 = "485a806aeaafda44d687fc41eab57a276cca691c01a67eae6baf10288e7aec67";
193193 }
194− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gn/firefox-99.0.1.tar.bz2";
194+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gn/firefox-100.0.tar.bz2";
195195 locale = "gn";
196196 arch = "linux-x86_64";
197− sha256 = "261cb7858277e012b8d67f890312b3fa333522542a6a7c71019f06e1340e0349";
197+ sha256 = "44a2699e0c3d79bfb2dbf3d4da4bcb92e7a4453daebfd57a53d9a0a6ac3e3248";
198198 }
199− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/gu-IN/firefox-99.0.1.tar.bz2";
199+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/gu-IN/firefox-100.0.tar.bz2";
200200 locale = "gu-IN";
201201 arch = "linux-x86_64";
202− sha256 = "7a3421aa896d08984f9d2cb38fea3e4bf93d9d0dbcb74bdf06dccb3f5039db44";
202+ sha256 = "5d817fdcff89b4c440580facabb01d30915962d8b076e7e79781f7209bf83023";
203203 }
204− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/he/firefox-99.0.1.tar.bz2";
204+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/he/firefox-100.0.tar.bz2";
205205 locale = "he";
206206 arch = "linux-x86_64";
207− sha256 = "f734cef92e78b3713e179959c6af917a64c4b16d00d834c776652337d42bc65e";
207+ sha256 = "1756cb46aa5cae3d4cdedd720441a2ef97dfc5cfb22eed734f0b649eb65a282f";
208208 }
209− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hi-IN/firefox-99.0.1.tar.bz2";
209+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hi-IN/firefox-100.0.tar.bz2";
210210 locale = "hi-IN";
211211 arch = "linux-x86_64";
212− sha256 = "e0694ff508e38ae758a96ef5023e7d7d39cabc2b7bbb56cff2854b51009a0732";
212+ sha256 = "27dcf3edd4b9fa67132c761dc3186d8ddbc0f63b32d5606abd43140a4f2a58b6";
213213 }
214− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hr/firefox-99.0.1.tar.bz2";
214+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hr/firefox-100.0.tar.bz2";
215215 locale = "hr";
216216 arch = "linux-x86_64";
217− sha256 = "438665aa04f02cb9275c8b76ee5c0ff6d7814fc0c1439f50f714613fb902b9c6";
217+ sha256 = "1aa433ebcb2b0fc185efd98b8312dc1c5b5315ffb6710e3ab69ceac0d22e1871";
218218 }
219− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hsb/firefox-99.0.1.tar.bz2";
219+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hsb/firefox-100.0.tar.bz2";
220220 locale = "hsb";
221221 arch = "linux-x86_64";
222− sha256 = "1b17d24231fd22db70f6f7bcfe793d31390a441355275771749352221320d4cd";
222+ sha256 = "a0d343a341c593f6b746acb81eab4386a68cd023a5409e0182d908786243e5e1";
223223 }
224− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hu/firefox-99.0.1.tar.bz2";
224+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hu/firefox-100.0.tar.bz2";
225225 locale = "hu";
226226 arch = "linux-x86_64";
227− sha256 = "d2be4860a0019e9385f48b989300ad42ced0ab2c3873e8074a6863f3afc4719a";
227+ sha256 = "de0a800eef3f292b7157dda727878d9ed953c1ffff1c7ecdd2cf49c1024dfcf0";
228228 }
229− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/hy-AM/firefox-99.0.1.tar.bz2";
229+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/hy-AM/firefox-100.0.tar.bz2";
230230 locale = "hy-AM";
231231 arch = "linux-x86_64";
232− sha256 = "b9decd8f427362e1070c17242a906d170122c2bcc17641a2132d87ab24e52467";
232+ sha256 = "44c824309b419151fcc634d4d20774fee6f514df428c6203990ffbe7cb56e6bd";
233233 }
234− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ia/firefox-99.0.1.tar.bz2";
234+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ia/firefox-100.0.tar.bz2";
235235 locale = "ia";
236236 arch = "linux-x86_64";
237− sha256 = "97a9ec4317bc432ed6c79f796fd0547fab0a156d9c9c959235f6b941ad4fb6fe";
237+ sha256 = "edf777a9904981d1b345390a7ab06c23e543f600a57d3e0ce0e41ab7dcca2ee0";
238238 }
239− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/id/firefox-99.0.1.tar.bz2";
239+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/id/firefox-100.0.tar.bz2";
240240 locale = "id";
241241 arch = "linux-x86_64";
242− sha256 = "621add55642a28cf95ff1f0acde8881862c1d4487500e5cc0705bf3ba0055c56";
242+ sha256 = "458ad2e7a89dfb4c50376114f270d36220c9986bad5103ccfdb11eb5452d6f5f";
243243 }
244− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/is/firefox-99.0.1.tar.bz2";
244+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/is/firefox-100.0.tar.bz2";
245245 locale = "is";
246246 arch = "linux-x86_64";
247− sha256 = "9293bce28c6252e9ee561f41e54b39e6a66d916e18e34965d1fec77a2d8088de";
247+ sha256 = "5bf8868b2dbea3f4d08a4201864dab6682c351912a7cd3622dcda5eb0fc67e20";
248248 }
249− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/it/firefox-99.0.1.tar.bz2";
249+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/it/firefox-100.0.tar.bz2";
250250 locale = "it";
251251 arch = "linux-x86_64";
252− sha256 = "aeeface0275cdb426fe851d91bd49014aa8aadc7becf18f4763b44f0526260a4";
252+ sha256 = "057b3ee3698696b59b49a66a8622d281c50c35c2b900fcfc95aedf4cb06701b4";
253253 }
254− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ja/firefox-99.0.1.tar.bz2";
254+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ja/firefox-100.0.tar.bz2";
255255 locale = "ja";
256256 arch = "linux-x86_64";
257− sha256 = "dc51a842e0a8aaeea874fc73e99de5978615c250afc17309e7edaf80802acb56";
257+ sha256 = "168207c2ed591603529d9f281f0fba5be8c775d130082fa6016ab77a06e392b4";
258258 }
259− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ka/firefox-99.0.1.tar.bz2";
259+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ka/firefox-100.0.tar.bz2";
260260 locale = "ka";
261261 arch = "linux-x86_64";
262− sha256 = "85562b0af98292e923c39de4b0c15d2ea0e95cd8fcb7d86c4d941eabdf9a1827";
262+ sha256 = "92564e5dda8d74245d00d83ef06c29fbff798db36d665cdd69b88d4e00474299";
263263 }
264− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kab/firefox-99.0.1.tar.bz2";
264+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kab/firefox-100.0.tar.bz2";
265265 locale = "kab";
266266 arch = "linux-x86_64";
267− sha256 = "c06e7fd59bcb82a989c90a2095c467eccdd1a98b4e704348befc89061ad9a6da";
267+ sha256 = "c6641d1b22d9fd07885e18ac4ae6d0770ff6c1f88c04d41c6e43020c774a47cd";
268268 }
269− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kk/firefox-99.0.1.tar.bz2";
269+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kk/firefox-100.0.tar.bz2";
270270 locale = "kk";
271271 arch = "linux-x86_64";
272− sha256 = "d041abeb5f207a234fde69fd265ec98b5bc94a29ba5d231334d74caccd7c1d16";
272+ sha256 = "24dce49c8e0c343f3178b0280e01c34716654fa705cfc16f22b5815f2d4c524b";
273273 }
274− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/km/firefox-99.0.1.tar.bz2";
274+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/km/firefox-100.0.tar.bz2";
275275 locale = "km";
276276 arch = "linux-x86_64";
277− sha256 = "b02b241b7ca07732c26aad728d1d15b637d4bb032673d92b0ff1a65fefca0d80";
277+ sha256 = "662aabaa2dfb2d6d217f359979770cc698063816d4f2db28d959cde88931aa4f";
278278 }
279− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/kn/firefox-99.0.1.tar.bz2";
279+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/kn/firefox-100.0.tar.bz2";
280280 locale = "kn";
281281 arch = "linux-x86_64";
282− sha256 = "0ad5133784a27dec78031db198ee762e4ee0d0514d03dc175130a64eab93d302";
282+ sha256 = "343213168dd6522af4e206a33c9c6f8872853207ecfa34e85189439a46be6aa3";
283283 }
284− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ko/firefox-99.0.1.tar.bz2";
284+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ko/firefox-100.0.tar.bz2";
285285 locale = "ko";
286286 arch = "linux-x86_64";
287− sha256 = "01adfa538c52df224c6b982cb96ed50a3f19b8e0608d323003f2264e6d1c18c1";
287+ sha256 = "31cfa145a16c339911b9374f70b9124fcdc94c7fd630263fd19676279f257ab6";
288288 }
289− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lij/firefox-99.0.1.tar.bz2";
289+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lij/firefox-100.0.tar.bz2";
290290 locale = "lij";
291291 arch = "linux-x86_64";
292− sha256 = "1cd93f13d9cc732f7b580c611f31ce8a71ba20436bc7acc996fa1d22c4c8b954";
292+ sha256 = "7b3cf0ac4286c6ba3dd8167349cefee9f55979651566e82e2d4e979d5f8b47ea";
293293 }
294− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lt/firefox-99.0.1.tar.bz2";
294+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lt/firefox-100.0.tar.bz2";
295295 locale = "lt";
296296 arch = "linux-x86_64";
297− sha256 = "fd92972d632c5c3d1822feaf2372bd6a06ea957b0c8a5663b0eda787da53e4c4";
297+ sha256 = "47715eb38d43b6cf2c873d7d7c9f643c3e895dc31e64b0481fe46d20ea670572";
298298 }
299− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/lv/firefox-99.0.1.tar.bz2";
299+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/lv/firefox-100.0.tar.bz2";
300300 locale = "lv";
301301 arch = "linux-x86_64";
302− sha256 = "cfb5112aca7d7e7af298a0c035ca2d549c849d9ef1536bcc958726df81f64665";
302+ sha256 = "77afd745728346eeba893bb8eb7bc2517c69f68ade939fd2273c595607f7a4f1";
303303 }
304− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mk/firefox-99.0.1.tar.bz2";
304+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mk/firefox-100.0.tar.bz2";
305305 locale = "mk";
306306 arch = "linux-x86_64";
307− sha256 = "bd1c8a1175326fce66cd32ebf394585fe09c5a65cf72e0e0598e572583e46515";
307+ sha256 = "2c287aa2b2854e45b3a49df38d3aa8ded24d63a931c7f37ff320bc8d4358e0a5";
308308 }
309− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/mr/firefox-99.0.1.tar.bz2";
309+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/mr/firefox-100.0.tar.bz2";
310310 locale = "mr";
311311 arch = "linux-x86_64";
312− sha256 = "9912aff12281b1ec3b4605ae72fba291f24e193ff976658e638fdb35a9d40cd0";
312+ sha256 = "4212b8ddb9cd59bc692921d2ab70613ea738ca3a4a23bda0cb038707dda1262e";
313313 }
314− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ms/firefox-99.0.1.tar.bz2";
314+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ms/firefox-100.0.tar.bz2";
315315 locale = "ms";
316316 arch = "linux-x86_64";
317− sha256 = "4f155ab0ce5420d272a86eb8b52cb816b90aabf34900bc5ba56d869e44408733";
317+ sha256 = "a0b878c3171af29ab631b734c20dac581ec7c1cd0487835bdb23db6ca72ca378";
318318 }
319− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/my/firefox-99.0.1.tar.bz2";
319+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/my/firefox-100.0.tar.bz2";
320320 locale = "my";
321321 arch = "linux-x86_64";
322− sha256 = "5b01096123e71ff94e6a44ba44edaf9453d2770f8918019e349f20f55f4fbe04";
322+ sha256 = "afeeea7ec03567ec058c5d77e813997f8cda6a654771da1a433a69bc27bf254a";
323323 }
324− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nb-NO/firefox-99.0.1.tar.bz2";
324+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nb-NO/firefox-100.0.tar.bz2";
325325 locale = "nb-NO";
326326 arch = "linux-x86_64";
327− sha256 = "2d4b0706d46e92438a3ec1067515ca4eaa37aa168f6c633339a7c78c1e447f62";
327+ sha256 = "a359e3b9a83aec399890324ab484c811a9a5f615ee8237bf1a1f58d9140432f5";
328328 }
329− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ne-NP/firefox-99.0.1.tar.bz2";
329+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ne-NP/firefox-100.0.tar.bz2";
330330 locale = "ne-NP";
331331 arch = "linux-x86_64";
332− sha256 = "3f6e8d2b081bd23bc0a6425b0f956fbb8431c301b01563d43d1ec976ec5daa32";
332+ sha256 = "2aa43032307675ce450c2e35a2e833edddd9ab94626be008785c8226f0d62ecc";
333333 }
334− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nl/firefox-99.0.1.tar.bz2";
334+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nl/firefox-100.0.tar.bz2";
335335 locale = "nl";
336336 arch = "linux-x86_64";
337− sha256 = "00d8fb594fd4ced7ab5c7fe3de74bc193630547b5a537f0025a1ac11ec2adc53";
337+ sha256 = "ca8eaebfbbc6843f1273ff8ae8bca03209a436a3de86784049aafe52d7a3e950";
338338 }
339− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/nn-NO/firefox-99.0.1.tar.bz2";
339+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/nn-NO/firefox-100.0.tar.bz2";
340340 locale = "nn-NO";
341341 arch = "linux-x86_64";
342− sha256 = "de3b36fabf65ff0d6f8f24c2dd0490214f08fe4216645c7af0a0f271f443aec5";
342+ sha256 = "5472b83b2e26c8ce88a959cc3e97c140f6e3efdff5f0c9208fb2d599f43081e0";
343343 }
344− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/oc/firefox-99.0.1.tar.bz2";
344+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/oc/firefox-100.0.tar.bz2";
345345 locale = "oc";
346346 arch = "linux-x86_64";
347− sha256 = "df7391bdfbf21175f3e935dbdb6985b0fbd3550824d4203c93b91d52ef0841e8";
347+ sha256 = "19552e9822f186ec64e38ce170f0d93f433ba1d15fa25fd7388567af48925bc4";
348348 }
349− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pa-IN/firefox-99.0.1.tar.bz2";
349+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pa-IN/firefox-100.0.tar.bz2";
350350 locale = "pa-IN";
351351 arch = "linux-x86_64";
352− sha256 = "653b0bb83de0787c37985968822c1637e4707a9dd96a521450048e25d220f1fd";
352+ sha256 = "75f3516e0f14233bb158cde3a57be644fcd6b01256ade0a9cef21ad81d434454";
353353 }
354− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pl/firefox-99.0.1.tar.bz2";
354+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pl/firefox-100.0.tar.bz2";
355355 locale = "pl";
356356 arch = "linux-x86_64";
357− sha256 = "31e861138205a8d69503550dff92e3a530b5d4212bd2f1f905298cceb53dbf40";
357+ sha256 = "2cbb208a9f23b39c66c9e50be0a873d989083f0abf9ab56e48e9b7ada91718e6";
358358 }
359− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-BR/firefox-99.0.1.tar.bz2";
359+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-BR/firefox-100.0.tar.bz2";
360360 locale = "pt-BR";
361361 arch = "linux-x86_64";
362− sha256 = "20e992c16e7dc1d0c2e641a7ecac46e29fb00bcbe1ddca3a34cfe7a9344eadd1";
362+ sha256 = "2b9a5b1d37a000d86fb7cc41977c3ff8444047330ab0b2e10da288e418569905";
363363 }
364− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/pt-PT/firefox-99.0.1.tar.bz2";
364+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/pt-PT/firefox-100.0.tar.bz2";
365365 locale = "pt-PT";
366366 arch = "linux-x86_64";
367− sha256 = "5be572a2928648ba36d1e775c79967ac17810f341dc84a2c69e8d7bad07e3a21";
367+ sha256 = "73de91287952c4bc9dc53099ce911aab140bcda6356788e8bab5c667f1d363c4";
368368 }
369− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/rm/firefox-99.0.1.tar.bz2";
369+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/rm/firefox-100.0.tar.bz2";
370370 locale = "rm";
371371 arch = "linux-x86_64";
372− sha256 = "47d11d7f4ba7fa8753845f3ab2cb4c36c2a20fa31cd9dd561d7032f3c28a9b22";
372+ sha256 = "39c934e5c3b08e41889ed47f63e2e9f24a08602e40d20497cc7d9edb42132aff";
373373 }
374− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ro/firefox-99.0.1.tar.bz2";
374+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ro/firefox-100.0.tar.bz2";
375375 locale = "ro";
376376 arch = "linux-x86_64";
377− sha256 = "c533fb1f8f845970e647a2d612c6ca23962d476b51696d12dde01e143ec50857";
377+ sha256 = "d23606050f9956d22efd779f09db6cb439cf8624cdc3e509f0ec6a7f0e3c9e46";
378378 }
379− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ru/firefox-99.0.1.tar.bz2";
379+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ru/firefox-100.0.tar.bz2";
380380 locale = "ru";
381381 arch = "linux-x86_64";
382− sha256 = "571b016d12ec198148d52fa3e8ed25781cde49f3aaf8187ba881764b52d1c3f9";
382+ sha256 = "b940390f3199cba2de06ef37a48ce6d0a892c8edd6e0125be088d50fa6c2e06b";
383383 }
384− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sco/firefox-99.0.1.tar.bz2";
384+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sco/firefox-100.0.tar.bz2";
385385 locale = "sco";
386386 arch = "linux-x86_64";
387− sha256 = "b30a42bd17bd2ee8843d791a00ac29f3ac91aa3d4de7b70ae603fe6365fc7906";
387+ sha256 = "3a1bb5b617b7a1633c79b6d7c80e559de15e6e6c9265d574de89628cc246e2f8";
388388 }
389− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/si/firefox-99.0.1.tar.bz2";
389+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/si/firefox-100.0.tar.bz2";
390390 locale = "si";
391391 arch = "linux-x86_64";
392− sha256 = "509f987eac7b593cf24f6446ac7b78b2dc8e43dbf8b29dd82d0a107a596207f0";
392+ sha256 = "e90f56c11a25fd023b3fe282858d93504e49cace7c26fd542fef10565f844742";
393393 }
394− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sk/firefox-99.0.1.tar.bz2";
394+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sk/firefox-100.0.tar.bz2";
395395 locale = "sk";
396396 arch = "linux-x86_64";
397− sha256 = "4f44c500b355c5100dc476a807e8b212962e12c45b058b14cc0b5f84abac81b5";
397+ sha256 = "a33f598ef8e2d9865cc01ef4a03a1a0e6ea96231dec4301ada4d128bb672d35f";
398398 }
399− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sl/firefox-99.0.1.tar.bz2";
399+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sl/firefox-100.0.tar.bz2";
400400 locale = "sl";
401401 arch = "linux-x86_64";
402− sha256 = "6ecd0f30d8ecf6e6b63512f59363c7a4a17389f468a21ac1119a98b467ecee39";
402+ sha256 = "939ffbab94871eb84bf36719debfaad1f160e0b10e0481082e5a1cf534537a54";
403403 }
404− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/son/firefox-99.0.1.tar.bz2";
404+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/son/firefox-100.0.tar.bz2";
405405 locale = "son";
406406 arch = "linux-x86_64";
407− sha256 = "ddefd1ef806f3b39a51cd52d33a286f0145fc106c479e3f14a45a9e63c8ee374";
407+ sha256 = "ecb166da7e16c925f14cbc3fb4748a039b942f20088ff6f9ba02489f1602c0c4";
408408 }
409− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sq/firefox-99.0.1.tar.bz2";
409+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sq/firefox-100.0.tar.bz2";
410410 locale = "sq";
411411 arch = "linux-x86_64";
412− sha256 = "b69459ef0165648ba0b13b6d4ff6b27e80ad81181bf65b415e87574b21a2a021";
412+ sha256 = "53b31c2c83fd1aab0b54cbbcf77459c38a8d466b4df866a49b1a0474038651d9";
413413 }
414− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sr/firefox-99.0.1.tar.bz2";
414+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sr/firefox-100.0.tar.bz2";
415415 locale = "sr";
416416 arch = "linux-x86_64";
417− sha256 = "8d53bd7943aa99bbea08be26cd4e5465b3889c8ee0dfb718c82f1ab65ce9e2fe";
417+ sha256 = "15b9b971d1ca2a7ab1422b040b813de9e984c451ea41eab8bad2939c5b9ae604";
418418 }
419− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/sv-SE/firefox-99.0.1.tar.bz2";
419+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/sv-SE/firefox-100.0.tar.bz2";
420420 locale = "sv-SE";
421421 arch = "linux-x86_64";
422− sha256 = "d70d78df84a39f921253c613518e0737439d1e516248b64c8b79fe29eadf4520";
422+ sha256 = "7f44e7cec1f32a69b173ef832501dcb38002c0b690284af21a53b4862053c596";
423423 }
424− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/szl/firefox-99.0.1.tar.bz2";
424+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/szl/firefox-100.0.tar.bz2";
425425 locale = "szl";
426426 arch = "linux-x86_64";
427− sha256 = "c02e86f128049d894f1d2144bc1baa3ceac4b58745c19428f2de5def7dc8ca36";
427+ sha256 = "df3d1186c2472d0e42e36efedd231b6beef43c1dbf18bcb1a27f86aee47257d2";
428428 }
429− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ta/firefox-99.0.1.tar.bz2";
429+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ta/firefox-100.0.tar.bz2";
430430 locale = "ta";
431431 arch = "linux-x86_64";
432− sha256 = "18754112a15bd8d25ebc8ee456e43fd7bc97b5af014a8bb6ebc481e0fc18559d";
432+ sha256 = "d14d94ab5bed1b3c2118d5ac1dd31caf950f287b3b40de80e136b3500bdc773c";
433433 }
434− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/te/firefox-99.0.1.tar.bz2";
434+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/te/firefox-100.0.tar.bz2";
435435 locale = "te";
436436 arch = "linux-x86_64";
437− sha256 = "afeb892e3656d2d3c802d548bc78bada5a9a2d4f7300d5dccbb4af0b96902371";
437+ sha256 = "e11c66e7eae928a06f3d705ce3024cda3961c52727bed2217ac6dce444367107";
438438 }
439− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/th/firefox-99.0.1.tar.bz2";
439+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/th/firefox-100.0.tar.bz2";
440440 locale = "th";
441441 arch = "linux-x86_64";
442− sha256 = "049baf07a0db7abecdc3477c9965119c4acb0da26a9e8a4201fc2311ae3bc966";
442+ sha256 = "4b29e95c96b9c8c5ff9fce146c3d85a1313c849a74694b56de177d921173956d";
443443 }
444− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tl/firefox-99.0.1.tar.bz2";
444+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tl/firefox-100.0.tar.bz2";
445445 locale = "tl";
446446 arch = "linux-x86_64";
447− sha256 = "9898714292846b9ec1bd277c279d6bc3a33186ad02e1c09a995c766044d168a2";
447+ sha256 = "0d9c3749adc06152e7bf8a72f81e1652901a020abee1a46c9e68b1a37009f96c";
448448 }
449− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/tr/firefox-99.0.1.tar.bz2";
449+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/tr/firefox-100.0.tar.bz2";
450450 locale = "tr";
451451 arch = "linux-x86_64";
452− sha256 = "378a940ecc44d0016f5e1764f667abd60fa2241ac11477811eda477621085475";
452+ sha256 = "fea26051836eaec249373404e594329c7a0f357cf94edd93f494989a80e8b6c6";
453453 }
454− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/trs/firefox-99.0.1.tar.bz2";
454+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/trs/firefox-100.0.tar.bz2";
455455 locale = "trs";
456456 arch = "linux-x86_64";
457− sha256 = "c338b68e0fb85bde3949abe2bb739e127453acd692e0460ffe1914ea4a5cf150";
457+ sha256 = "cef307d45f53e95ee954731106a66bc313a007dbaf96ec3b670acc392345cea8";
458458 }
459− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uk/firefox-99.0.1.tar.bz2";
459+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uk/firefox-100.0.tar.bz2";
460460 locale = "uk";
461461 arch = "linux-x86_64";
462− sha256 = "2602c70ef4e449e15f95e661e916a4f5b978158f8e2e998f552ef79c4462d319";
462+ sha256 = "20b1054ed238bf426ecdc511a86e1a01c946522caed30a21f8d0b470949db921";
463463 }
464− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/ur/firefox-99.0.1.tar.bz2";
464+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/ur/firefox-100.0.tar.bz2";
465465 locale = "ur";
466466 arch = "linux-x86_64";
467− sha256 = "bc195325efa7668db62c3307d488b721843c620d804e75754d540789b0545950";
467+ sha256 = "3009c02b5983a89dcb331daedc49bfc6bd629161a755a5e29f28405b4706ca32";
468468 }
469− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/uz/firefox-99.0.1.tar.bz2";
469+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/uz/firefox-100.0.tar.bz2";
470470 locale = "uz";
471471 arch = "linux-x86_64";
472− sha256 = "14cff13fe9ba0bc91629b95cc3f2f6df5164b538be5e285acd54cb8d6656e109";
472+ sha256 = "2ecf4078582f805b624f6ac612ceb10c22d1c2c3fd1a855cb86704addb9f9180";
473473 }
474− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/vi/firefox-99.0.1.tar.bz2";
474+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/vi/firefox-100.0.tar.bz2";
475475 locale = "vi";
476476 arch = "linux-x86_64";
477− sha256 = "5852f4eee3136058d7228c5eccc173153706d72b90c61ca632623d926aa84d7b";
477+ sha256 = "a73072f4a152256972a41a38ebd7dd72f1cae40bbb568bd6384bef2ffa8c7d64";
478478 }
479− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/xh/firefox-99.0.1.tar.bz2";
479+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xh/firefox-100.0.tar.bz2";
480480 locale = "xh";
481481 arch = "linux-x86_64";
482− sha256 = "ca10968059585ceb6bdc0902f94bb69798c9b0666e2dec1cbcf42e5979be97c3";
482+ sha256 = "eec036004690e9fbd1e1d6934b594787e8e269e2a2a10a818096ea5854da481f";
483483 }
484− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-CN/firefox-99.0.1.tar.bz2";
484+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-CN/firefox-100.0.tar.bz2";
485485 locale = "zh-CN";
486486 arch = "linux-x86_64";
487− sha256 = "f9d5c1a1aef830b4276e0af88c783b419674219d599c52c414bc8da3eb99fd4f";
487+ sha256 = "b65ee16996593d88be41f19fae95f7f5826db828b3f0d7e40f1dbd9c45f43fbc";
488488 }
489− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-x86_64/zh-TW/firefox-99.0.1.tar.bz2";
489+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/zh-TW/firefox-100.0.tar.bz2";
490490 locale = "zh-TW";
491491 arch = "linux-x86_64";
492− sha256 = "6857ee348392d9cedc4f2bbe1c355bcbdaa1a886d4babc65ccfb2c95421219c5";
492+ sha256 = "c3e5b7119b95c3da1145cdecded90b8194b99f722d41855e5282d615ae2a86f9";
493493 }
494− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ach/firefox-99.0.1.tar.bz2";
494+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ach/firefox-100.0.tar.bz2";
495495 locale = "ach";
496496 arch = "linux-i686";
497− sha256 = "9b8a8950e770bf53cb85b0fb79f63d6aaed9a09df86421ef2ee30dab3b250ede";
497+ sha256 = "6ada766fccaa1e54ecbf0ee75bd807a42ecbfcedd9f218ff65443aa43f4e18e1";
498498 }
499− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/af/firefox-99.0.1.tar.bz2";
499+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/af/firefox-100.0.tar.bz2";
500500 locale = "af";
501501 arch = "linux-i686";
502− sha256 = "fd464ccc673892932cf98fc4696146034928078de14f8c5df68a9103c20076df";
502+ sha256 = "6925ff4e7b2746249c526c11b65a87b95ccfaaa2e3f57dfe38fa5ed8bfde7637";
503503 }
504− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/an/firefox-99.0.1.tar.bz2";
504+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/an/firefox-100.0.tar.bz2";
505505 locale = "an";
506506 arch = "linux-i686";
507− sha256 = "76837e6555079a23fc33e83bbf9e507d4eb6e896501d43ae78cf5b8536e88a62";
507+ sha256 = "bf146035e88c2b2c80bd3e352a251f4bf527089fd0252ef320b13752e045b0d4";
508508 }
509− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ar/firefox-99.0.1.tar.bz2";
509+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ar/firefox-100.0.tar.bz2";
510510 locale = "ar";
511511 arch = "linux-i686";
512− sha256 = "8346570bb699370f34d19ee93a705c9f81b57164ca14f7758c339be0837e9319";
512+ sha256 = "f891728a186e9746b46b12cdaf7a28e81152bf71a361f49b3fb9e048050b216d";
513513 }
514− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ast/firefox-99.0.1.tar.bz2";
514+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ast/firefox-100.0.tar.bz2";
515515 locale = "ast";
516516 arch = "linux-i686";
517− sha256 = "f14088ae65cda0b3ae518cc517d6d786fa4c7a471510ddf4d45f6c268761d324";
517+ sha256 = "3fe9530affb6eee7fd3c35d8f3274c0659f54ff45a51e04b02d4685b22283d97";
518518 }
519− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/az/firefox-99.0.1.tar.bz2";
519+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/az/firefox-100.0.tar.bz2";
520520 locale = "az";
521521 arch = "linux-i686";
522− sha256 = "e15d3764842a0febc41882c9f82e607b0b4dd875d765ab4079880b1cf8d0f327";
522+ sha256 = "7d62e6cb2de5130e24aef684a014ae72db408cfd3227e0b67f080a8395004d71";
523523 }
524− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/be/firefox-99.0.1.tar.bz2";
524+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/be/firefox-100.0.tar.bz2";
525525 locale = "be";
526526 arch = "linux-i686";
527− sha256 = "e7336bcf602bb95697eb5c134da3ef96cdb9229233a4f135e44d7439fbc3d972";
527+ sha256 = "2c7c9285e61e0b74f7fec985462098459475e9932b6e2a44243bf54c649add52";
528528 }
529− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bg/firefox-99.0.1.tar.bz2";
529+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bg/firefox-100.0.tar.bz2";
530530 locale = "bg";
531531 arch = "linux-i686";
532− sha256 = "a5c9d5cb091f4a643293879f7f0f0e2afa4a2e53efe08a97eca1fc8f5c77cb41";
532+ sha256 = "31ba288d27f7b045cc7c685e83f49ec8b9b6579745f7c1ab373a18c8e8264aa8";
533533 }
534− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bn/firefox-99.0.1.tar.bz2";
534+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bn/firefox-100.0.tar.bz2";
535535 locale = "bn";
536536 arch = "linux-i686";
537− sha256 = "2edcbeebb3a7afdb1322c55ad1ac1a8cd4f2dae7e45a009d113cfee4d159ef2e";
537+ sha256 = "927749fadf833f84120c36996e1364e714bf353de6cff38cc68f78af6143390e";
538538 }
539− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/br/firefox-99.0.1.tar.bz2";
539+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/br/firefox-100.0.tar.bz2";
540540 locale = "br";
541541 arch = "linux-i686";
542− sha256 = "dc78c6a0a71856b42c6654b3f3d2f93bd30808878a90c49dfecf2b724f42532c";
542+ sha256 = "82f398c8b1ae36706b8d5e0e1bd12a568de584d342141eab4d35a40abcf14fcb";
543543 }
544− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/bs/firefox-99.0.1.tar.bz2";
544+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/bs/firefox-100.0.tar.bz2";
545545 locale = "bs";
546546 arch = "linux-i686";
547− sha256 = "f9ba0d138252aff3abbd8f8447680b59f24f1a9b7a40d6ec753fccb74344a853";
547+ sha256 = "01609251ed3198064326e99c9e97b2c9128f1216581971896ccbd692ea9aaefa";
548548 }
549− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca-valencia/firefox-99.0.1.tar.bz2";
549+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca-valencia/firefox-100.0.tar.bz2";
550550 locale = "ca-valencia";
551551 arch = "linux-i686";
552− sha256 = "68a8522e03191f286514b648d1cc7d6c9b7d1683638bb7a88d2ba33c3c8031c1";
552+ sha256 = "c35d207480e63f3b2538290e74fe6859e1de3061eeebddc10de4e44d040080b8";
553553 }
554− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ca/firefox-99.0.1.tar.bz2";
554+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ca/firefox-100.0.tar.bz2";
555555 locale = "ca";
556556 arch = "linux-i686";
557− sha256 = "71b29981fe6da252296c9669e3b05bcfa8914282b982455f6c21e1e47fc6c452";
557+ sha256 = "3419b0ce1e30db92646c4675701eb6a7201c0c65b722b3f86bbd90c4cc236ace";
558558 }
559− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cak/firefox-99.0.1.tar.bz2";
559+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cak/firefox-100.0.tar.bz2";
560560 locale = "cak";
561561 arch = "linux-i686";
562− sha256 = "0964328bc005e028371852ecfeefed0b1bb4334840dd9e343ed15b3e0add3cfa";
562+ sha256 = "3f19b7d4a9ab541b12f2a2156039d38af9c13b10ff2f80a22dc365e41d307d96";
563563 }
564− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cs/firefox-99.0.1.tar.bz2";
564+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cs/firefox-100.0.tar.bz2";
565565 locale = "cs";
566566 arch = "linux-i686";
567− sha256 = "b72dbc0d7bc48884fb55d1e419680d753175e2d2d7fc91b362337e5963c59339";
567+ sha256 = "2df78b68ddf8771f5e0bb2b24d024a04972a75b2b4aacfb85ac5d1b122cfc47d";
568568 }
569− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/cy/firefox-99.0.1.tar.bz2";
569+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/cy/firefox-100.0.tar.bz2";
570570 locale = "cy";
571571 arch = "linux-i686";
572− sha256 = "553ba01218ca17602bf67fc4cd7940d6259fd1cedf1d70665d06053b7336311f";
572+ sha256 = "263fc246ede739f74cdb5d266a871cfc063fc162c42ace9cd111c2522bd7044a";
573573 }
574− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/da/firefox-99.0.1.tar.bz2";
574+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/da/firefox-100.0.tar.bz2";
575575 locale = "da";
576576 arch = "linux-i686";
577− sha256 = "41c01f3979fdec4823e18031497fcccba3380393a3b5e142ab8b1e59e247c87a";
577+ sha256 = "225a09327f2d8bdcd2084eeb5cba8995b899150fe5a42f97efd34e39ca9b9693";
578578 }
579− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/de/firefox-99.0.1.tar.bz2";
579+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/de/firefox-100.0.tar.bz2";
580580 locale = "de";
581581 arch = "linux-i686";
582− sha256 = "7d88786442c856c8502019d494d8c3b5bd09ad9aa0ce1e5a45216594ac915b5b";
582+ sha256 = "e636784c7a794d8a18741aa4915c8028dfb8259381c1a0dcccd8a17796a9e340";
583583 }
584− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/dsb/firefox-99.0.1.tar.bz2";
584+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/dsb/firefox-100.0.tar.bz2";
585585 locale = "dsb";
586586 arch = "linux-i686";
587− sha256 = "4b94ebf19d6fdd64e7fd1181bb47f1b89d68f04a5e9b3c29a3cd8e43c36ac898";
587+ sha256 = "f9bad69c8fda65665c556f736401a4ce522fcc90592aedc7576076fa530a3599";
588588 }
589− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/el/firefox-99.0.1.tar.bz2";
589+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/el/firefox-100.0.tar.bz2";
590590 locale = "el";
591591 arch = "linux-i686";
592− sha256 = "12f61d5b97c906a9532028b14c7d86ef8ee04398460ecdb08496922f4c6abe34";
592+ sha256 = "b825735e8461779f3dab037360e67fe4fa8d849881f811a179f8db33d49f44f6";
593593 }
594− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-CA/firefox-99.0.1.tar.bz2";
594+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-CA/firefox-100.0.tar.bz2";
595595 locale = "en-CA";
596596 arch = "linux-i686";
597− sha256 = "b5804a8edc39eca3b04ec76fd87f5fc228a3df02b47094ca1a9d2020de0c1c29";
597+ sha256 = "e944d750a11e9ab1ee653402e058cb3f65b46eadf551a29d31919ee1640b1272";
598598 }
599− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-GB/firefox-99.0.1.tar.bz2";
599+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-GB/firefox-100.0.tar.bz2";
600600 locale = "en-GB";
601601 arch = "linux-i686";
602− sha256 = "211b7adde34ffc0ef075cc4d34fb5bbc50d00543920747db7e434268c0948e74";
602+ sha256 = "0039ab82d3eb22e9c8d1036f2d3ada46d37faeb192209b447d3e20dbe0450163";
603603 }
604− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/en-US/firefox-99.0.1.tar.bz2";
604+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/en-US/firefox-100.0.tar.bz2";
605605 locale = "en-US";
606606 arch = "linux-i686";
607− sha256 = "da446e05101a645ebc51cb9fb60bb33e68b8570448072c56baea4561b638338a";
607+ sha256 = "5013a7a3d601c4f532becf4efad8090e73fab442a1bc8599f4195c65d5813dc0";
608608 }
609− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eo/firefox-99.0.1.tar.bz2";
609+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eo/firefox-100.0.tar.bz2";
610610 locale = "eo";
611611 arch = "linux-i686";
612− sha256 = "e217817389a32bfd05272210b7bef6c80547c58e51d7df69b26e2931b2e89ec9";
612+ sha256 = "b05d2600e407bf47c1eeeda8a5154495dfee6f0aa7044f089d5fad558134ff3f";
613613 }
614− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-AR/firefox-99.0.1.tar.bz2";
614+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-AR/firefox-100.0.tar.bz2";
615615 locale = "es-AR";
616616 arch = "linux-i686";
617− sha256 = "5f5c35e50809f33b769344c986fe468a404dad2b5c0a933f5dccf9481bad32c3";
617+ sha256 = "27e30ab50cf1be112c8dcc625d98de5a14495bdc639de9b0e5d8795eab90f4c3";
618618 }
619− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-CL/firefox-99.0.1.tar.bz2";
619+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-CL/firefox-100.0.tar.bz2";
620620 locale = "es-CL";
621621 arch = "linux-i686";
622− sha256 = "12434003ff87d5269cbe751adc53ce5396f98f36c8df7ab5535236cf778deb26";
622+ sha256 = "c82b39f32baf5a63bed4ddd4bd97e7c45ba213957d114559506039986cc78c0d";
623623 }
624− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-ES/firefox-99.0.1.tar.bz2";
624+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-ES/firefox-100.0.tar.bz2";
625625 locale = "es-ES";
626626 arch = "linux-i686";
627− sha256 = "eef66f4f53ef38baf4b664b0428528117e376fbc57a743cade265adebe451d62";
627+ sha256 = "1ca07d869f0f36cfb79b00cc24f374f546f8e8ed9061caeba9ccd82ea1890b62";
628628 }
629− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/es-MX/firefox-99.0.1.tar.bz2";
629+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/es-MX/firefox-100.0.tar.bz2";
630630 locale = "es-MX";
631631 arch = "linux-i686";
632− sha256 = "e56dfa4f160d60b70d905c4acde1b78d4598dadaa63a0833f638cdadcc850e35";
632+ sha256 = "8775da0ec29b758d82e2c33defe858c45a50eaeb824c34c1e31f97a07c9a9f48";
633633 }
634− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/et/firefox-99.0.1.tar.bz2";
634+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/et/firefox-100.0.tar.bz2";
635635 locale = "et";
636636 arch = "linux-i686";
637− sha256 = "ab7b3244b55e3d663a89e46f7cf1ee211ab643c6f92112cf921b05343ded25e7";
637+ sha256 = "29655eefbcbb0975f4d73124881c13ce465d0422088d33ea2c62bcc23a94a372";
638638 }
639− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/eu/firefox-99.0.1.tar.bz2";
639+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/eu/firefox-100.0.tar.bz2";
640640 locale = "eu";
641641 arch = "linux-i686";
642− sha256 = "b626fa244d85a9c266e2c11f311133e6704adfcfcaa0ebd00a7dbf487e0d7a8b";
642+ sha256 = "47394c402cbb327335d7ed47670cc3f0c16a875581637d171d3c714d03e859c1";
643643 }
644− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fa/firefox-99.0.1.tar.bz2";
644+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fa/firefox-100.0.tar.bz2";
645645 locale = "fa";
646646 arch = "linux-i686";
647− sha256 = "743f58643846d3a769da6ba2fec2ba50f7c00a7f4a4447b684ef08f64d8be16d";
647+ sha256 = "133433694832d6b4d0a03ff93f1a51a52543e67da3b58d171ee9ddf8caf10d24";
648648 }
649− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ff/firefox-99.0.1.tar.bz2";
649+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ff/firefox-100.0.tar.bz2";
650650 locale = "ff";
651651 arch = "linux-i686";
652− sha256 = "3cd80abe0d157427d17cc502cdfb67fb4f48f237de97c7ba9e9d4af5f8ee1fc7";
652+ sha256 = "16078dcca2ef7dff68d20f29cdf941f08df9ca2b3c247be26e0386e88fc1b16e";
653653 }
654− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fi/firefox-99.0.1.tar.bz2";
654+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fi/firefox-100.0.tar.bz2";
655655 locale = "fi";
656656 arch = "linux-i686";
657− sha256 = "d7ddda88e29c89e34c56e7467aabd3262430267fda1814933b2b03e1201b549d";
657+ sha256 = "2c2a44c45a3f4e449f270b8eabfbf279c922eaa0596794c0fa80b06d2f17db19";
658658 }
659− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fr/firefox-99.0.1.tar.bz2";
659+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fr/firefox-100.0.tar.bz2";
660660 locale = "fr";
661661 arch = "linux-i686";
662− sha256 = "b442b7cd5b1dafe98fb04ef68ef3d21fdb6a6beeacda3537c0fb2ff26a5d0a67";
662+ sha256 = "59b0f88988d896144cbf6c9f4ed607fc318e8357b2d96c6df6ad3488f73fc9e4";
663663 }
664− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/fy-NL/firefox-99.0.1.tar.bz2";
664+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/fy-NL/firefox-100.0.tar.bz2";
665665 locale = "fy-NL";
666666 arch = "linux-i686";
667− sha256 = "fbbe401d602c88cec32ea608eab714ebfa873ccf70d07102bfd3b8c59bcc39e4";
667+ sha256 = "97a98a714e543c101e159d7f3ca052a970421a1f74e2bcbbfdb9b9755388caa2";
668668 }
669− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ga-IE/firefox-99.0.1.tar.bz2";
669+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ga-IE/firefox-100.0.tar.bz2";
670670 locale = "ga-IE";
671671 arch = "linux-i686";
672− sha256 = "fe6c9544bf67a30bd8266fafa92c56e1825c0e155d6e30225b5587719a683fe1";
672+ sha256 = "3221dda3f7d232f986e1e111a6cfb945bc1c1768464cc18d0a345ba140eef706";
673673 }
674− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gd/firefox-99.0.1.tar.bz2";
674+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gd/firefox-100.0.tar.bz2";
675675 locale = "gd";
676676 arch = "linux-i686";
677− sha256 = "d62bad0b209df9b74173e894af3a5e6c48b8d9321a2bbc3ef05e40f24db972e2";
677+ sha256 = "c61156527cfe9966916573cfd7005a16313b134e353258b05e2362414ef0d9f8";
678678 }
679− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gl/firefox-99.0.1.tar.bz2";
679+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gl/firefox-100.0.tar.bz2";
680680 locale = "gl";
681681 arch = "linux-i686";
682− sha256 = "caa93a08ac9fe456f6f1480b514492ba884814dada450845a86cfb486463ef90";
682+ sha256 = "16f762ba8291f190b165b05f9980c22d93a1612ed2251d6ec1ec18fa465044b6";
683683 }
684− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gn/firefox-99.0.1.tar.bz2";
684+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gn/firefox-100.0.tar.bz2";
685685 locale = "gn";
686686 arch = "linux-i686";
687− sha256 = "eb44f048ae40e1c5693bcb31f7c2b50644b55c7f7229fb087b3757ad7c232fc3";
687+ sha256 = "c1d51a4e5629a0f04187d76edd1dd94bb5d55ff2e0757932aa218eec3a50027c";
688688 }
689− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/gu-IN/firefox-99.0.1.tar.bz2";
689+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/gu-IN/firefox-100.0.tar.bz2";
690690 locale = "gu-IN";
691691 arch = "linux-i686";
692− sha256 = "5a536e35bb8734541b9a8266def5418c8b4eae66a60323c40dca7e0bc11e2ecd";
692+ sha256 = "a3f92bc8d213b0cdd4df2a853951a5f446786ae5d08bebef2799e866fcde06bd";
693693 }
694− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/he/firefox-99.0.1.tar.bz2";
694+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/he/firefox-100.0.tar.bz2";
695695 locale = "he";
696696 arch = "linux-i686";
697− sha256 = "b045e3b0a9789804775fdb9f28cf7c8a1293b12adb06f105afc4001648f22dd9";
697+ sha256 = "ea432d8c4cb390f92d42c27101b7b1b3c331d7b1f18a88f6acfbd3ef1b2c1544";
698698 }
699− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hi-IN/firefox-99.0.1.tar.bz2";
699+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hi-IN/firefox-100.0.tar.bz2";
700700 locale = "hi-IN";
701701 arch = "linux-i686";
702− sha256 = "955ba8c9936da6b12f1422b0de5a696a849a72a352b994d62818477b07af5890";
702+ sha256 = "a6aa3110e9b792398860bbb2ceed29d6fa619a8ac73af96b858813d2d388855e";
703703 }
704− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hr/firefox-99.0.1.tar.bz2";
704+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hr/firefox-100.0.tar.bz2";
705705 locale = "hr";
706706 arch = "linux-i686";
707− sha256 = "bbbc1d1bd23b49197861fe389d2ab92580def84ce97f1643e50f4cd8de748e8c";
707+ sha256 = "ea1e36606ac218db3dd39891fb17ce2ac398381ab41102a3dd3170ccc37fd329";
708708 }
709− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hsb/firefox-99.0.1.tar.bz2";
709+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hsb/firefox-100.0.tar.bz2";
710710 locale = "hsb";
711711 arch = "linux-i686";
712− sha256 = "23afed3429959fee426a2e5fc08cb0cba058e2544b5f8c742fbcbdd51ac31afe";
712+ sha256 = "ec80f48bcc37a517bacc258411da614c472a5179743717cb47561f8968c395e1";
713713 }
714− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hu/firefox-99.0.1.tar.bz2";
714+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hu/firefox-100.0.tar.bz2";
715715 locale = "hu";
716716 arch = "linux-i686";
717− sha256 = "2a42af969db30183a5fc547f4cdc75db99a8405550a2791de4303e5604a24133";
717+ sha256 = "d8622685ea6132887d8f9657d2e09d5dbcf6b9571cc7c64a85646219e5c972b0";
718718 }
719− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/hy-AM/firefox-99.0.1.tar.bz2";
719+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/hy-AM/firefox-100.0.tar.bz2";
720720 locale = "hy-AM";
721721 arch = "linux-i686";
722− sha256 = "79d134d0c95fb3be213ded965d02ec898891efe2c07dd82046e02adeb24641e4";
722+ sha256 = "dd3eb9c5db97fe3e6c6dd0705406eed897e955423a96e773eb842d2e4d65f845";
723723 }
724− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ia/firefox-99.0.1.tar.bz2";
724+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ia/firefox-100.0.tar.bz2";
725725 locale = "ia";
726726 arch = "linux-i686";
727− sha256 = "3e9f078057e53822a59509f1658f64b8d5563ffc69528193aa1473668e390f62";
727+ sha256 = "7e94b98322ad8cbcbe5ee4bebd84f2ac82a4b78673ed357bbb02a4f0b2c63c6c";
728728 }
729− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/id/firefox-99.0.1.tar.bz2";
729+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/id/firefox-100.0.tar.bz2";
730730 locale = "id";
731731 arch = "linux-i686";
732− sha256 = "5133875012d3165d3941740b80addfa3adcd0eec015dc21a6b1261b4d48b824c";
732+ sha256 = "b4bc9b6384b44b392a70144cb71fbd9e6d5afc3cccec4e7c86ad023bcc52dd72";
733733 }
734− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/is/firefox-99.0.1.tar.bz2";
734+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/is/firefox-100.0.tar.bz2";
735735 locale = "is";
736736 arch = "linux-i686";
737− sha256 = "d59c86f8c71468cbbb7d8d4641e8baa8672fae0ee38a232782a63f29d1ad4d10";
737+ sha256 = "951d6273c916a84e9139f74f916a9db4b4a976f83900d3e5506356b8817943ee";
738738 }
739− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/it/firefox-99.0.1.tar.bz2";
739+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/it/firefox-100.0.tar.bz2";
740740 locale = "it";
741741 arch = "linux-i686";
742− sha256 = "d583c577d73623e06aec514635c4191a9dbfc14a8cfd88880bc50abb0f5ae308";
742+ sha256 = "ac5c51fb5e42544696d975d769edf81c07e2a42bd5279eddb016e434c1945f1e";
743743 }
744− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ja/firefox-99.0.1.tar.bz2";
744+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ja/firefox-100.0.tar.bz2";
745745 locale = "ja";
746746 arch = "linux-i686";
747− sha256 = "31fd6b653338050651b8432a84278ae26bccdd7cdf0d4c2674a6208f5a3ad9a0";
747+ sha256 = "99c6b533a3e3ddab8dfd9b4a66f6e403bc79ab214027d604671d9f27ae897041";
748748 }
749− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ka/firefox-99.0.1.tar.bz2";
749+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ka/firefox-100.0.tar.bz2";
750750 locale = "ka";
751751 arch = "linux-i686";
752− sha256 = "09e6a905151bcf7d373c6b9ec3bb00043361a4e06e08752834d581f6f211a595";
752+ sha256 = "73eb8f1c4f22fda48ba752982265363730e23d4695fe2296b30cd74191da3c08";
753753 }
754− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kab/firefox-99.0.1.tar.bz2";
754+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kab/firefox-100.0.tar.bz2";
755755 locale = "kab";
756756 arch = "linux-i686";
757− sha256 = "117bd25831806d7d8774907a49288ea91c8160add23d0decce9d1dd95bd3c918";
757+ sha256 = "a3ee102058a90cc02c745434178fe519aead9ed4552d3923eaddfaed8fbea207";
758758 }
759− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kk/firefox-99.0.1.tar.bz2";
759+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kk/firefox-100.0.tar.bz2";
760760 locale = "kk";
761761 arch = "linux-i686";
762− sha256 = "6511f3a53cea4f210b52d37e7298427382c7a5738e1a055b38a4d41b6eb9fe3d";
762+ sha256 = "0858af4f79d5b8592ce18701968331a19ac0d35d50117dc95096bb9f7d3cbca1";
763763 }
764− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/km/firefox-99.0.1.tar.bz2";
764+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/km/firefox-100.0.tar.bz2";
765765 locale = "km";
766766 arch = "linux-i686";
767− sha256 = "af231614cea8b247215d79c101bd59a135ff86965b6aaab2226016215164d240";
767+ sha256 = "b4509b98696f18d19850320f6b9e3d97dbcc0f5f55019cf3e0e62581ebd5d747";
768768 }
769− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/kn/firefox-99.0.1.tar.bz2";
769+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/kn/firefox-100.0.tar.bz2";
770770 locale = "kn";
771771 arch = "linux-i686";
772− sha256 = "abe0ba12cad7eb53f8592476efe3fbd93a1cf3d1108828db7eb3d9d6d3b639a5";
772+ sha256 = "8b9e139b3e0e98f266a77cba5d5a7deb3ee714176cffd5cb2b8f9e8ae85189e4";
773773 }
774− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ko/firefox-99.0.1.tar.bz2";
774+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ko/firefox-100.0.tar.bz2";
775775 locale = "ko";
776776 arch = "linux-i686";
777− sha256 = "6415de365af3c132afacaf114a804446d4df566693254e6659551d95016ed830";
777+ sha256 = "a43471bf0cb5e36f8e8db03e6d9e8be46bf4cb3209f66c6d721cd8ddcaf1b560";
778778 }
779− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lij/firefox-99.0.1.tar.bz2";
779+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lij/firefox-100.0.tar.bz2";
780780 locale = "lij";
781781 arch = "linux-i686";
782− sha256 = "d882562d34ea5e49cd035cda2aa2489bc75db90b1e777be1a74dedc394d02e8f";
782+ sha256 = "8dadda12fef18c64ed1331eac980c87772a45b821f524f48d73384758a003357";
783783 }
784− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lt/firefox-99.0.1.tar.bz2";
784+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lt/firefox-100.0.tar.bz2";
785785 locale = "lt";
786786 arch = "linux-i686";
787− sha256 = "59add081878210ffbb9445dacf12f999ea6995fddec1444fb11b9c93c615abb5";
787+ sha256 = "93dbe1924d766b5dce326597c7a5557b26bf1137bae68bed6a319ce5caf63ab1";
788788 }
789− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/lv/firefox-99.0.1.tar.bz2";
789+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/lv/firefox-100.0.tar.bz2";
790790 locale = "lv";
791791 arch = "linux-i686";
792− sha256 = "d11227308bb407aedc6d2559256d92fe931e5ea34498b511f5e23b8091e91766";
792+ sha256 = "a161963a911846e93e64beff2eda2db9bf449f266697214a4483dafa97d1a2fb";
793793 }
794− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mk/firefox-99.0.1.tar.bz2";
794+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mk/firefox-100.0.tar.bz2";
795795 locale = "mk";
796796 arch = "linux-i686";
797− sha256 = "34e1a97d0944d241d12b8a5d2f64ff34f7bc7a3c43b23ac05d13d794bf36e960";
797+ sha256 = "77db19a56be146f189436ca7d6c71defa6006ba3e34f2e10a8d1d362526dad71";
798798 }
799− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/mr/firefox-99.0.1.tar.bz2";
799+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/mr/firefox-100.0.tar.bz2";
800800 locale = "mr";
801801 arch = "linux-i686";
802− sha256 = "98746bc7f75898bbd5ca5c38b47f311d09d43a2264da85b0303ea4bd01d7a0fb";
802+ sha256 = "fbdf4862658eb780d499f089c1fa89b4374945e1990ed8892b2fdbaeffb28ed5";
803803 }
804− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ms/firefox-99.0.1.tar.bz2";
804+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ms/firefox-100.0.tar.bz2";
805805 locale = "ms";
806806 arch = "linux-i686";
807− sha256 = "48a1a0892ad1ef2ab03e3e66f05401c1d6e231801d5f03ac63a7984225624818";
807+ sha256 = "16e5dcdba19020f498c767732f3426915cb5f9b8f5b2be3adb2825d0db52a1d4";
808808 }
809− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/my/firefox-99.0.1.tar.bz2";
809+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/my/firefox-100.0.tar.bz2";
810810 locale = "my";
811811 arch = "linux-i686";
812− sha256 = "745a7e7c73d3161aff4bcaba915ed9939970d8e4478cbaebbb32f47380f1c029";
812+ sha256 = "c19ed3d409233f055ac633b4baa40de0e2be99d731f3091f0cccf772eaa39f2b";
813813 }
814− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nb-NO/firefox-99.0.1.tar.bz2";
814+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nb-NO/firefox-100.0.tar.bz2";
815815 locale = "nb-NO";
816816 arch = "linux-i686";
817− sha256 = "c67804a726c68c534fc763893f0e7cc94ab55b9fd4844113ffffb467cefb63ed";
817+ sha256 = "c36dd328395d5fe3e7907d990e1f8185144e93961da9d8aaf81a1bbede55eed8";
818818 }
819− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ne-NP/firefox-99.0.1.tar.bz2";
819+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ne-NP/firefox-100.0.tar.bz2";
820820 locale = "ne-NP";
821821 arch = "linux-i686";
822− sha256 = "69073cf042a8e78184f7f01db3ca88bd3b3d59960a3e51124cb9908150452115";
822+ sha256 = "6672d29f0fb08645f7cd4b7b7de2edff850da86e29f078fe7e49c10dbf4c35ca";
823823 }
824− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nl/firefox-99.0.1.tar.bz2";
824+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nl/firefox-100.0.tar.bz2";
825825 locale = "nl";
826826 arch = "linux-i686";
827− sha256 = "24d30ce7f9cc2ad445c9aca32616a2efb9a3d392e62f855bbf5709d8160823bd";
827+ sha256 = "71f9339624aa2014238c35c78142a1fda6762c61f5b199becc0682532c9c8de8";
828828 }
829− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/nn-NO/firefox-99.0.1.tar.bz2";
829+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/nn-NO/firefox-100.0.tar.bz2";
830830 locale = "nn-NO";
831831 arch = "linux-i686";
832− sha256 = "d3a5034cb8ce135ec245c2ef94e799a31744a8592e6c5ba3935b19a77c087d53";
832+ sha256 = "5f9f59d3ef36aaa01d3b058adb9a08f09e184ed408d1b5b25ec415c3e83b404a";
833833 }
834− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/oc/firefox-99.0.1.tar.bz2";
834+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/oc/firefox-100.0.tar.bz2";
835835 locale = "oc";
836836 arch = "linux-i686";
837− sha256 = "dbe0dfd961a543017ca8dcca6fae7168ca4d85a637f4d2dae7b02b6ea671b28f";
837+ sha256 = "76d7b330ba2f5c7df4df6bdddda7a887a5222f0ba3caa13f77d6ea956ec7e685";
838838 }
839− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pa-IN/firefox-99.0.1.tar.bz2";
839+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pa-IN/firefox-100.0.tar.bz2";
840840 locale = "pa-IN";
841841 arch = "linux-i686";
842− sha256 = "1bcfb488ec1f3934415ee4af684e7dd40966265be65f43488d3d670d14790124";
842+ sha256 = "569b151ad53b47338ad8f78d4266247e7e7fa4ef207ee58b3606dc299b0f16af";
843843 }
844− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pl/firefox-99.0.1.tar.bz2";
844+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pl/firefox-100.0.tar.bz2";
845845 locale = "pl";
846846 arch = "linux-i686";
847− sha256 = "484a8ee788ab6edce6b66f31c94f7fd0e671269ae470569129662ed4b7e9294b";
847+ sha256 = "af4ca741d8eb82e40775b0a2cc9338c2e81854df5107815bab8f4b6188c7189a";
848848 }
849− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-BR/firefox-99.0.1.tar.bz2";
849+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-BR/firefox-100.0.tar.bz2";
850850 locale = "pt-BR";
851851 arch = "linux-i686";
852− sha256 = "d764f17b9eb2c8ac61c92490a20bcb4dd83810635b89a6405c4a0389ab15104f";
852+ sha256 = "16ed593e6c116418ca5969a07fbcbd9f93af3972edc2227271256d269066b61d";
853853 }
854− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/pt-PT/firefox-99.0.1.tar.bz2";
854+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/pt-PT/firefox-100.0.tar.bz2";
855855 locale = "pt-PT";
856856 arch = "linux-i686";
857− sha256 = "1a9b64665abf305dd38c6441e22448fa0cd5d142a69de96220b2f8683230a341";
857+ sha256 = "2a5b5a26185ff4560691d5f32fbb29ecd9123df63020492aa2829e0088aa6b1b";
858858 }
859− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/rm/firefox-99.0.1.tar.bz2";
859+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/rm/firefox-100.0.tar.bz2";
860860 locale = "rm";
861861 arch = "linux-i686";
862− sha256 = "8870c35cf68d654db389cea3df9951660d371c53804cb2d9fb5d8006155cb82c";
862+ sha256 = "e80cf9ebb3010c97acd5d2f6cc672aa6ce4fdca930974238a148c2683f8a8dd8";
863863 }
864− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ro/firefox-99.0.1.tar.bz2";
864+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ro/firefox-100.0.tar.bz2";
865865 locale = "ro";
866866 arch = "linux-i686";
867− sha256 = "cb72b5316bc807095a64d8767822732ad18a2cec28c7a23bd603dcafbfd08f1a";
867+ sha256 = "4db1842a3ead551700c83be677aacdd00e1957ecb6534f2b8933a19a6eedb38b";
868868 }
869− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ru/firefox-99.0.1.tar.bz2";
869+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ru/firefox-100.0.tar.bz2";
870870 locale = "ru";
871871 arch = "linux-i686";
872− sha256 = "a5456041bc8cfc22d3f7a96a610c6d37b77bcba32b630fdab7fdb2753e46b40c";
872+ sha256 = "6f821c7186343dc0bc5860bce1ae24f45c3de253223a0e99d05e582f037e7447";
873873 }
874− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sco/firefox-99.0.1.tar.bz2";
874+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sco/firefox-100.0.tar.bz2";
875875 locale = "sco";
876876 arch = "linux-i686";
877− sha256 = "539014a44ac79130666c6c4f5205ababf3bbb17d357632a0ba584a73c63bda93";
877+ sha256 = "e213b13f3ffc309feb993239308053d029f200fa58cb35f27a52e540e544e83c";
878878 }
879− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/si/firefox-99.0.1.tar.bz2";
879+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/si/firefox-100.0.tar.bz2";
880880 locale = "si";
881881 arch = "linux-i686";
882− sha256 = "5f231e14acf1c896fdb9778d7821dfda13a756d4f861e74076b8fb02848dd08d";
882+ sha256 = "a59e9a00f0e1b054e08706abb823ec7c6a87ca0975b97444f6cfd265e0c25b22";
883883 }
884− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sk/firefox-99.0.1.tar.bz2";
884+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sk/firefox-100.0.tar.bz2";
885885 locale = "sk";
886886 arch = "linux-i686";
887− sha256 = "17c32fb881566fa09759d1374e957023c5fc6123b24791d4e8c94d4c2e971405";
887+ sha256 = "b6602ad437d41c679d43cbe7e705bb5ed31909591a8ef51ef4b5604b3a4c884e";
888888 }
889− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sl/firefox-99.0.1.tar.bz2";
889+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sl/firefox-100.0.tar.bz2";
890890 locale = "sl";
891891 arch = "linux-i686";
892− sha256 = "d6121d2dcf47504111e924150cdf8360b039a5d7c4cef2a42b80ddb876a47127";
892+ sha256 = "b82f1f2745235271d7a99ad0c36f664b67826276a447285165100678f4de3030";
893893 }
894− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/son/firefox-99.0.1.tar.bz2";
894+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/son/firefox-100.0.tar.bz2";
895895 locale = "son";
896896 arch = "linux-i686";
897− sha256 = "e83f6e4da3820c91cdb3125d49a71e4417cb37c0e7598fcf1bf138f21d94f485";
897+ sha256 = "508c90bede375fe243f39a6ee26b972e0ec86bfa2978f3d01d0e83784731cafb";
898898 }
899− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sq/firefox-99.0.1.tar.bz2";
899+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sq/firefox-100.0.tar.bz2";
900900 locale = "sq";
901901 arch = "linux-i686";
902− sha256 = "dcf6ed239eb78e370db2a60b9fc0eed96f71e741be66f9ac2a537357648304b2";
902+ sha256 = "db2799e56ade9c1b691d41803255a5fd1ddc08c69e199f5c1b253df11249cf67";
903903 }
904− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sr/firefox-99.0.1.tar.bz2";
904+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sr/firefox-100.0.tar.bz2";
905905 locale = "sr";
906906 arch = "linux-i686";
907− sha256 = "d724ad02d8153aa15bfeba33e476bbbc937c5a5210a3747a5ba253ab3605b725";
907+ sha256 = "d3502cba898ee0009292f942c2e3fc2ca0225cdd2470667bd943103fa7770201";
908908 }
909− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/sv-SE/firefox-99.0.1.tar.bz2";
909+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/sv-SE/firefox-100.0.tar.bz2";
910910 locale = "sv-SE";
911911 arch = "linux-i686";
912− sha256 = "6c6ce7c4a7bf73b3cc26af264e4d6dfabcf75d88226903ffb11142657cfbf94e";
912+ sha256 = "eca5f29ebd1e756206dde952980c03b8d4fb19c544bdf814bdab5ed05ce5fef3";
913913 }
914− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/szl/firefox-99.0.1.tar.bz2";
914+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/szl/firefox-100.0.tar.bz2";
915915 locale = "szl";
916916 arch = "linux-i686";
917− sha256 = "d9996d12531225e5d181a2304326ca8de19cd6c0f02efedc890f90e4d5d1b72e";
917+ sha256 = "fbc098de33187fde99bbf3d205882d281e404140619d624961d0b8d1af7e3fed";
918918 }
919− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ta/firefox-99.0.1.tar.bz2";
919+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ta/firefox-100.0.tar.bz2";
920920 locale = "ta";
921921 arch = "linux-i686";
922− sha256 = "d4b3776a8728da72a233db501eed0014cb60e87dd0c3b76cb4e5fd834dc323da";
922+ sha256 = "a3f3f3472932be60c4f8296a13538bd12b898057a977dd7c33edc12016438dbd";
923923 }
924− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/te/firefox-99.0.1.tar.bz2";
924+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/te/firefox-100.0.tar.bz2";
925925 locale = "te";
926926 arch = "linux-i686";
927− sha256 = "8246cfb157b68d09a7e57f910ae33d522495120112a6debc3cfeb60a3e238d92";
927+ sha256 = "d0b562f554afa76bcc034eca7a167151a7ee38c6e82005d9a47273df08e6c0f5";
928928 }
929− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/th/firefox-99.0.1.tar.bz2";
929+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/th/firefox-100.0.tar.bz2";
930930 locale = "th";
931931 arch = "linux-i686";
932− sha256 = "80c37b977ae6eaf6da2647800584a6ff9c430d6fd368ad89713a1ed7166cb197";
932+ sha256 = "c362a365677131af77786b0f6390b62bd224ba26b7f79e69ad1826a6a15800db";
933933 }
934− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tl/firefox-99.0.1.tar.bz2";
934+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tl/firefox-100.0.tar.bz2";
935935 locale = "tl";
936936 arch = "linux-i686";
937− sha256 = "f7757f0e751989854f240bf5eb13b8c660a587bdb7f44616ee8e7a41bb71b2d3";
937+ sha256 = "8249e0d3bb2aaf5c0be9def1842874af417bae275ba224c912371049de62a43d";
938938 }
939− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/tr/firefox-99.0.1.tar.bz2";
939+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/tr/firefox-100.0.tar.bz2";
940940 locale = "tr";
941941 arch = "linux-i686";
942− sha256 = "533a04e78947202d86dbd79b170495e9027c81bd2db8be3d5f281d665e3505d6";
942+ sha256 = "82a3a504ba862849c4574ed96bdc5a737479a06a21f011f6cd74b2001bb192ff";
943943 }
944− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/trs/firefox-99.0.1.tar.bz2";
944+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/trs/firefox-100.0.tar.bz2";
945945 locale = "trs";
946946 arch = "linux-i686";
947− sha256 = "eda683d0df13db0de392bd136ed86c3abbaf41a0617d559ee1d308e28f519487";
947+ sha256 = "da6f0d69580df77ae2b1d091aecfbeda640440d3a15348ac38221209c6674079";
948948 }
949− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uk/firefox-99.0.1.tar.bz2";
949+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uk/firefox-100.0.tar.bz2";
950950 locale = "uk";
951951 arch = "linux-i686";
952− sha256 = "4c1cce01a785b8fa7c31fd5394337231db614cd96dacfa7963bb612996fc287c";
952+ sha256 = "c04848cd11abb05635e33977c98f76b4acda3a6807c8f5bc8b5d2a9b49208f1d";
953953 }
954− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/ur/firefox-99.0.1.tar.bz2";
954+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/ur/firefox-100.0.tar.bz2";
955955 locale = "ur";
956956 arch = "linux-i686";
957− sha256 = "628baa7d2e0f200ba2b623aada71bd0e69856b903a92d98c46f0552df8acca4c";
957+ sha256 = "ba779105d6a9dfe3138f4b73ba60078ec66ad9fe8468f2d72f57dd19161fa09c";
958958 }
959− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/uz/firefox-99.0.1.tar.bz2";
959+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/uz/firefox-100.0.tar.bz2";
960960 locale = "uz";
961961 arch = "linux-i686";
962− sha256 = "626cc29fd753802c3a57d2521553d5957f985b925561eee6c2046464ded084f4";
962+ sha256 = "190691fd5777153daa29d56542f6792356aa916073d5e842845fe1c9444e632b";
963963 }
964− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/vi/firefox-99.0.1.tar.bz2";
964+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/vi/firefox-100.0.tar.bz2";
965965 locale = "vi";
966966 arch = "linux-i686";
967− sha256 = "963ea1b4758b64b67fe05a25d6775a1f8601a438d639bdda0d3ed740fe9ad8a5";
967+ sha256 = "b5ea01ae5980892d6379eac4ba7d0f3d2643c54ade18452d39be84e44c676c01";
968968 }
969− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/xh/firefox-99.0.1.tar.bz2";
969+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/xh/firefox-100.0.tar.bz2";
970970 locale = "xh";
971971 arch = "linux-i686";
972− sha256 = "030f5a08c37ecaae8ef9c59f58e007b3c3484b9eabba33dbae91d89710390d85";
972+ sha256 = "6c2f218caa8effa6fd6d9553088f7eb9a8ccf6297e3a9cd8c57d0ec5902c4c19";
973973 }
974− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-CN/firefox-99.0.1.tar.bz2";
974+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-CN/firefox-100.0.tar.bz2";
975975 locale = "zh-CN";
976976 arch = "linux-i686";
977− sha256 = "097b3e3912b1b024d7cb615ed400ea244af47ef90cdb0c89d7223915a040108d";
977+ sha256 = "61838f9c25bec8dbb0d386ae8412f34be8701e0d6f593503eab51c2009c5e069";
978978 }
979− { url = "http://archive.mozilla.org/pub/firefox/releases/99.0.1/linux-i686/zh-TW/firefox-99.0.1.tar.bz2";
979+ { url = "http://archive.mozilla.org/pub/firefox/releases/100.0/linux-i686/zh-TW/firefox-100.0.tar.bz2";
980980 locale = "zh-TW";
981981 arch = "linux-i686";
982− sha256 = "ca10fd6cafa25cdbd12b4e087d80a8212c947099a848b0b9f754ec6dbe8c6be9";
982+ sha256 = "48ea7e4ae524dbb9ef83aada60b597524091be85a1dfc3665d1fdc9dba16498b";
983983 }
984984 ];
985985}
pkgs/applications/networking/browsers/firefox/common.nix−12
@@ -19,12 +19,10 @@
1919
2020{ lib
2121, stdenv
22−, fetchpatch
2322
2423# build time
2524, autoconf
2625, cargo
27−, gnused
2826, makeWrapper
2927, nodejs
3028, perl
@@ -112,7 +110,6 @@
112110## other
113111
114112, crashreporterSupport ? false
115−, safeBrowsingSupport ? false
116113
117114# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
118115# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
@@ -180,14 +177,6 @@ buildStdenv.mkDerivation ({
180177 ];
181178
182179 patches = [
183− (fetchpatch {
184− # RDD Sandbox paths for NixOS, remove with Firefox>=100
185− # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14
186− # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692
187− name = "mozbz-1761692-rdd-sandbox-paths.patch";
188− url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14";
189− hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y=";
190− })
191180 ]
192181 ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
193182 ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch
@@ -208,7 +197,6 @@ buildStdenv.mkDerivation ({
208197 nativeBuildInputs = [
209198 autoconf
210199 cargo
211− gnused
212200 llvmPackages.llvm # llvm-objdump
213201 makeWrapper
214202 nodejs
pkgs/applications/networking/browsers/firefox/librewolf/src.json+5−5
@@ -1,11 +1,11 @@
11{
2− "packageVersion": "99.0.1-3",
2+ "packageVersion": "100.0-1",
33 "source": {
4− "rev": "99.0.1-3",
5− "sha256": "0ag4n86hvyp6kx3hp60yn7q45rgjbx7054frj6226ni2ribjx4ln"
4+ "rev": "100.0-1",
5+ "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla"
66 },
77 "firefox": {
8− "version": "99.0.1",
9− "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"
8+ "version": "100.0",
9+ "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"
1010 }
1111}
pkgs/applications/networking/browsers/firefox/packages.nix+4−4
@@ -7,10 +7,10 @@ in
77rec {
88 firefox = common rec {
99 pname = "firefox";
10− version = "99.0.1";
10+ version = "100.0";
1111 src = fetchurl {
1212 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
13− sha512 = "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f";
13+ sha512 = "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa";
1414 };
1515
1616 meta = {
@@ -32,10 +32,10 @@ rec {
3232
3333 firefox-esr-91 = common rec {
3434 pname = "firefox-esr";
35− version = "91.8.0esr";
35+ version = "91.9.0esr";
3636 src = fetchurl {
3737 url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
38− sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
38+ sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133";
3939 };
4040
4141 meta = {
pkgs/applications/networking/browsers/google-chrome/default.nix+1−1
@@ -32,7 +32,7 @@
3232, channel ? "stable"
3333
3434# Necessary for USB audio devices.
35−, pulseSupport ? true, libpulseaudio ? null
35+, pulseSupport ? true, libpulseaudio
3636
3737# Only needed for getting information about upstream binaries
3838, chromium
pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6
@@ -1,20 +1,20 @@
11{
22 beta = import ./browser.nix {
33 channel = "beta";
4− version = "99.0.1150.16";
4+ version = "101.0.1210.19";
55 revision = "1";
6− sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";
6+ sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";
77 };
88 dev = import ./browser.nix {
99 channel = "dev";
10− version = "100.0.1163.1";
10+ version = "102.0.1227.0";
1111 revision = "1";
12− sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";
12+ sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";
1313 };
1414 stable = import ./browser.nix {
1515 channel = "stable";
16− version = "98.0.1108.56";
16+ version = "100.0.1185.44";
1717 revision = "1";
18− sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";
18+ sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";
1919 };
2020}
pkgs/applications/networking/browsers/qutebrowser/default.nix+1
@@ -132,5 +132,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
132132 description = "Keyboard-focused browser with a minimal GUI";
133133 license = licenses.gpl3Plus;
134134 maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ];
135+ inherit (backendPackage.meta) platforms;
135136 };
136137}
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+8−1
@@ -366,6 +366,11 @@ stdenv.mkDerivation rec {
366366 PULSE_SERVER="\''${PULSE_SERVER:-}" \
367367 PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
368368 \
369+ MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \
370+ WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \
371+ XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \
372+ XCURSOR_PATH="\$XCURSOR_PATH" \
373+ \
369374 APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
370375 \
371376 TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
@@ -404,7 +409,9 @@ stdenv.mkDerivation rec {
404409 LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
405410
406411 echo "Checking tor-browser wrapper ..."
407− DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
412+ DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \
413+ XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \
414+ DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
408415 $out/bin/tor-browser --version >/dev/null
409416 '';
410417
pkgs/applications/networking/browsers/vivaldi/default.nix+2−2
@@ -20,11 +20,11 @@ let
2020 vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
2121in stdenv.mkDerivation rec {
2222 pname = "vivaldi";
23− version = "5.2.2623.39-1";
23+ version = "5.2.2623.41-1";
2424
2525 src = fetchurl {
2626 url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
27− sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk";
27+ sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d";
2828 };
2929
3030 unpackPhase = ''
pkgs/applications/networking/cloudflare-dyndns/default.nixnew file+53
@@ -0,0 +1,53 @@
1+{ buildPythonApplication
2+, attrs
3+, click
4+, cloudflare
5+, fetchFromGitHub
6+, lib
7+, poetry
8+, pydantic
9+, pytestCheckHook
10+, requests
11+}:
12+
13+buildPythonApplication rec {
14+ pname = "cloudflare-dyndns";
15+ version = "4.1";
16+
17+ src = fetchFromGitHub {
18+ owner = "kissgyorgy";
19+ repo = pname;
20+ rev = "v${version}";
21+ hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis=";
22+ };
23+
24+ format = "pyproject";
25+
26+ nativeBuildInputs = [ poetry ];
27+
28+ propagatedBuildInputs = [
29+ attrs
30+ click
31+ cloudflare
32+ pydantic
33+ requests
34+ ];
35+
36+ postPatch = ''
37+ substituteInPlace pyproject.toml \
38+ --replace 'click = "^7.0"' 'click = "*"'
39+ '';
40+
41+ checkInputs = [ pytestCheckHook ];
42+
43+ disabledTests = [
44+ "test_get_ipv4"
45+ ];
46+
47+ meta = with lib; {
48+ description = " CloudFlare Dynamic DNS client ";
49+ homepage = "https://github.com/kissgyorgy/cloudflare-dyndns";
50+ license = licenses.mit;
51+ maintainers = with maintainers; [ lovesegfault ];
52+ };
53+}
pkgs/applications/networking/cloudflared/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "cloudflared";
5− version = "2022.4.1";
5+ version = "2022.5.0";
66
77 src = fetchFromGitHub {
88 owner = "cloudflare";
99 repo = "cloudflared";
1010 rev = version;
11− hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";
11+ hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/applications/networking/cluster/flink/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "flink";
5− version = "1.14.3";
5+ version = "1.14.4";
66
77 src = fetchurl {
88 url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
9− sha256 = "sha256-dst0Q1AlDdggtOwYROoV6QcBLRNfmGTo7DL2BV/5PB4=";
9+ sha256 = "sha256-qvWUh+EQT/MljN5LCX2JLMEapIEGAbAljrCMTYsFqtw=";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/networking/cluster/fluxcd/default.nix+5−5
@@ -1,9 +1,9 @@
11{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
22
33let
4− version = "0.29.3";
5− sha256 = "02qdczd8x6dl6gsyjyrmga9i67shm54xixckxvva1lhl33zz5wwm";
6− manifestsSha256 = "0ar73dwz5j19qwcp85cd87gx0kwm7ys4xcyk91gj88s5i3djd9sl";
4+ version = "0.30.2";
5+ sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";
6+ manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";
77
88 manifests = fetchzip {
99 url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
2323 inherit sha256;
2424 };
2525
26− vendorSha256 = "sha256-VWTtHquq/8/nKBGLuIdg2xkpGz1ofhPlQf3NTaQaHBI=";
26+ vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";
2727
2828 postUnpack = ''
2929 cp -r ${manifests} source/cmd/flux/manifests
@@ -65,6 +65,6 @@ in buildGoModule rec {
6565 '';
6666 homepage = "https://fluxcd.io";
6767 license = licenses.asl20;
68− maintainers = with maintainers; [ jlesquembre bryanasdev000 ];
68+ maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];
6969 };
7070}
pkgs/applications/networking/cluster/fluxcd/update.sh+38−31
@@ -3,36 +3,43 @@
33
44set -x -eu -o pipefail
55
6−cd $(dirname "${BASH_SOURCE[0]}")
7−
8−TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
9−
10−VERSION=$(echo ${TAG} | sed 's/^v//')
11−
12−SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz)
13−
14−SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
15−
16−setKV () {
17− sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
18−}
19−
20−setKV version ${VERSION}
21−setKV sha256 ${SHA256}
22−setKV manifestsSha256 ${SPEC_SHA256}
23−setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
24−
25−cd ../../../../../
26−set +e
27−VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
28−set -e
29−
30−cd - > /dev/null
31−
32−if [ -n "${VENDOR_SHA256:-}" ]; then
33− setKV vendorSha256 ${VENDOR_SHA256}
6+NIXPKGS_PATH="$(git rev-parse --show-toplevel)"
7+FLUXCD_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
8+
9+OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; fluxcd.version or (builtins.parseDrvName fluxcd.name).version" | tr -d '"')"
10+LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
11+LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
12+
13+if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
14+ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz)
15+ SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz)
16+
17+ setKV () {
18+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/default.nix"
19+ }
20+
21+ setKV version ${LATEST_VERSION}
22+ setKV sha256 ${SHA256}
23+ setKV manifestsSha256 ${SPEC_SHA256}
24+ setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256
25+
26+ set +e
27+ VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
28+ set -e
29+
30+ if [ -n "${VENDOR_SHA256:-}" ]; then
31+ setKV vendorSha256 ${VENDOR_SHA256}
32+ else
33+ echo "Update failed. VENDOR_SHA256 is empty."
34+ exit 1
35+ fi
36+
37+ # `git` flag here is to be used by local maintainers to speed up the bump process
38+ if [ $# -eq 1 ] && [ "$1" = "git" ]; then
39+ git switch -c "package-fluxcd-${LATEST_VERSION}"
40+ git add "$FLUXCD_PATH"/default.nix
41+ git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"
42+ fi
3443else
35− echo "Update failed. VENDOR_SHA256 is empty."
36− exit 1
44+ echo "fluxcd is already up-to-date at $OLD_VERSION"
3745fi
38−
pkgs/applications/networking/cluster/istioctl/default.nix+8−3
@@ -2,15 +2,15 @@
22
33buildGoModule rec {
44 pname = "istioctl";
5− version = "1.13.2";
5+ version = "1.13.3";
66
77 src = fetchFromGitHub {
88 owner = "istio";
99 repo = "istio";
1010 rev = version;
11− sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ=";
11+ sha256 = "sha256-XvV6OlGHW/eB0EUrmyTlFVbDjbxUpVo6WvrEnh6Q68I=";
1212 };
13− vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k=";
13+ vendorSha256 = "sha256-Ex86yLMTqqiSkJns/eeodmGswAzPVQAQOf8Wqi7DRaE=";
1414
1515 nativeBuildInputs = [ installShellFiles ];
1616
@@ -26,6 +26,11 @@ buildGoModule rec {
2626
2727 subPackages = [ "istioctl/cmd/istioctl" ];
2828
29+ doInstallCheck = true;
30+ installCheckPhase = ''
31+ $out/bin/istioctl version --remote=false | grep ${version} > /dev/null
32+ '';
33+
2934 postInstall = ''
3035 $out/bin/istioctl collateral --man --bash --zsh
3136 installManPage *.1
pkgs/applications/networking/cluster/kn/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "kn";
5− version = "1.3.1";
5+ version = "1.4.0";
66
77 src = fetchFromGitHub {
88 owner = "knative";
99 repo = "client";
1010 rev = "knative-v${version}";
11− sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo=";
11+ sha256 = "sha256-Q67dictDE+HWw99lFAiidBvIL30mMAkjYb2CDLDcalw=";
1212 };
1313
1414 vendorSha256 = null;
pkgs/applications/networking/cluster/kompose/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testVersion, kompose }:
1+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose }:
22
33buildGoModule rec {
44 pname = "kompose";
@@ -26,7 +26,7 @@ buildGoModule rec {
2626 done
2727 '';
2828
29− passthru.tests.version = testVersion {
29+ passthru.tests.version = testers.testVersion {
3030 package = kompose;
3131 command = "kompose version";
3232 };
pkgs/applications/networking/cluster/kube3d/default.nix+28−12
@@ -1,16 +1,28 @@
1−{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.22.2-k3s2" }:
1+{ lib
2+, buildGoModule
3+, fetchFromGitHub
4+, installShellFiles
5+, k3sVersion ? null
6+}:
27
8+let
9+ hasVPrefix = ver: (builtins.elemAt (lib.stringToCharacters ver) 0) == "v";
10+ k3sVersionSet =
11+ if k3sVersion != null then
12+ if hasVPrefix k3sVersion then throw "k3sVersion should not have a v prefix" else true
13+ else
14+ false;
15+in
316buildGoModule rec {
417 pname = "kube3d";
5− version = "5.3.0";
18+ version = "5.4.1";
619
720 src = fetchFromGitHub {
8− owner = "rancher";
21+ owner = "k3d-io";
922 repo = "k3d";
1023 rev = "v${version}";
11− sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc=";
24+ sha256 = "sha256-DVQrD4JMei9yRFzuiVb6AcydEupNSlpgYLfGWWRiaao=";
1225 };
13−
1426 vendorSha256 = null;
1527
1628 nativeBuildInputs = [ installShellFiles ];
@@ -18,10 +30,14 @@ buildGoModule rec {
1830 excludedPackages = [ "tools" "docgen" ];
1931
2032 ldflags =
21− let t = "github.com/rancher/k3d/v5/version"; in
22− [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ];
33+ let t = "github.com/k3d-io/k3d/v5/version"; in
34+ [ "-s" "-w" "-X ${t}.Version=v${version}" ] ++ lib.optionals k3sVersionSet [ "-X ${t}.K3sVersion=v${k3sVersion}" ];
2335
24− doCheck = false;
36+ preCheck = ''
37+ # skip test that uses networking
38+ substituteInPlace version/version_test.go \
39+ --replace "TestGetK3sVersion" "SkipGetK3sVersion"
40+ '';
2541
2642 postInstall = ''
2743 installShellCompletion --cmd k3d \
@@ -34,13 +50,13 @@ buildGoModule rec {
3450 installCheckPhase = ''
3551 runHook preInstallCheck
3652 $out/bin/k3d --help
37− $out/bin/k3d --version | grep -e "k3d version v${version}" -e "k3s version v${k3sVersion}"
53+ $out/bin/k3d --version | grep -e "k3d version v${version}" ${lib.optionalString k3sVersionSet "-e \"k3s version v${k3sVersion}\""}
3854 runHook postInstallCheck
3955 '';
4056
4157 meta = with lib; {
42− homepage = "https://github.com/rancher/k3d";
43− changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md";
58+ homepage = "https://github.com/k3d-io/k3d/";
59+ changelog = "https://github.com/k3d-io/k3d/blob/v${version}/CHANGELOG.md";
4460 description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d";
4561 longDescription = ''
4662 k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s
@@ -50,7 +66,7 @@ buildGoModule rec {
5066 '';
5167 license = licenses.mit;
5268 maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ];
53− mainProgram = "k3d";
5469 platforms = platforms.linux ++ platforms.darwin;
70+ mainProgram = "k3d";
5571 };
5672}
pkgs/applications/networking/cluster/kubecfg/default.nix+7−7
@@ -1,17 +1,17 @@
1−{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
1+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "kubecfg";
5− version = "0.22.0";
5+ version = "0.26.0";
66
77 src = fetchFromGitHub {
8− owner = "bitnami";
8+ owner = "kubecfg";
99 repo = "kubecfg";
1010 rev = "v${version}";
11− sha256 = "sha256-8U/A4F4DboS46ftpuk5fQGT2Y0V+X0y0L3/o4x8qpnY=";
11+ sha256 = "sha256-ekojX7gl8wC7GlHG3Y+dwry7jxjIm5dbS7cNN1xu4kY=";
1212 };
1313
14− goPackagePath = "github.com/bitnami/kubecfg";
14+ vendorSha256 = "sha256-dPdF3qTrYRbKUepgo6WVIVyGnaWxhQ0371fzXlBD8rE=";
1515
1616 ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
1717
@@ -25,7 +25,7 @@ buildGoPackage rec {
2525
2626 meta = {
2727 description = "A tool for managing Kubernetes resources as code";
28− homepage = "https://github.com/bitnami/kubecfg";
28+ homepage = "https://github.com/kubecfg/kubecfg";
2929 license = lib.licenses.asl20;
3030 maintainers = with lib.maintainers; [ benley ];
3131 platforms = lib.platforms.unix;
pkgs/applications/networking/cluster/nerdctl/default.nix+3−3
@@ -10,16 +10,16 @@
1010
1111buildGoModule rec {
1212 pname = "nerdctl";
13− version = "0.18.0";
13+ version = "0.19.0";
1414
1515 src = fetchFromGitHub {
1616 owner = "containerd";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0=";
19+ sha256 = "sha256-FuWfHd4LfFHX5oRopDIDTi90cARi8cYjJBK0BgeCD/U=";
2020 };
2121
22− vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk=";
22+ vendorSha256 = "sha256-mHitGjOfSRlqORWFtB16buSSJrCf7Li9+oHX4rcO4ek=";
2323
2424 nativeBuildInputs = [ makeWrapper installShellFiles ];
2525
pkgs/applications/networking/cluster/nomad-pack/default.nix+4−4
@@ -5,17 +5,17 @@
55
66buildGoModule rec {
77 pname = "nomad-pack";
8− version = "2022-02-11";
9− rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff";
8+ version = "2022-04-12";
9+ rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea";
1010
1111 src = fetchFromGitHub {
1212 owner = "hashicorp";
1313 repo = pname;
1414 inherit rev;
15− sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8=";
15+ sha256 = "sha256-VG6Dmx5WD2AzKReMbmrpzXCNhrJqaZY3aQV9P+4ET68=";
1616 };
1717
18− vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s=";
18+ vendorSha256 = "sha256-7ovR2F9N94iFK/B5OXRcqfykOYHST3354+Ge2L8yzq0=";
1919
2020 # skip running go tests as they require network access
2121 doCheck = false;
pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3
@@ -1,13 +1,13 @@
11{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:
22let
3− ver = "1.2.54.0";
3+ ver = "1.2.312.0";
44 source =
55 if stdenv.isDarwin then {
66 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";
7− sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";
7+ sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";
88 } else {
99 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";
10− sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";
10+ sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";
1111 };
1212 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";
1313in
pkgs/applications/networking/cluster/talosctl/default.nix+4−4
@@ -1,10 +1,10 @@
11{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
22let
33 # look for GO_LDFLAGS getting set in the Makefile
4− version = "1.0.3";
5− sha256 = "sha256-unGr+T2uYg7/4pAXf8vp9Hpi6IrCsLCqGbyBC7QXGX8=";
6− vendorSha256 = "sha256-9NYr5Ok9oQ1ajYFiTeU9ztmX/55UROBjNawLGjm4HYU=";
7− pkgsVersion = "v1.0.0-8-g76f8c5b";
4+ version = "1.0.4";
5+ sha256 = "sha256-kO48MRQDQGDUvFfsxAt+CAHn2EGU44NMpSKDWnNwAdk=";
6+ vendorSha256 = "sha256-QcD5MKQO51ZZ/NvVIiAmDsN6wLI2N8YkhA387KB77W8=";
7+ pkgsVersion = "v1.0.0-10-gbf81bd2";
88 extrasVersion = "v1.0.0-2-gc5d3ab0";
99in
1010buildGoModule rec {
pkgs/applications/networking/cluster/terraform-providers/providers.json+86−77
@@ -17,6 +17,15 @@
1717 "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc",
1818 "version": "2.8.0"
1919 },
20+ "age": {
21+ "owner": "clementblaise",
22+ "provider-source-address": "registry.terraform.io/clementblaise/age",
23+ "repo": "terraform-provider-age",
24+ "rev": "v0.1.1",
25+ "sha256": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=",
26+ "vendorSha256": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=",
27+ "version": "0.1.1"
28+ },
2029 "aiven": {
2130 "owner": "aiven",
2231 "provider-source-address": "registry.terraform.io/aiven/aiven",
@@ -30,10 +39,10 @@
3039 "owner": "akamai",
3140 "provider-source-address": "registry.terraform.io/akamai/akamai",
3241 "repo": "terraform-provider-akamai",
33− "rev": "v1.12.1",
34− "sha256": "sha256-UQD1RiXIRcP0CvVO8Tx/qkBhRD3LFj/KI3WP/yKeBek=",
35− "vendorSha256": "sha256-GZFLnKHk6YaMwFGgy79ric388EMIH6NUVw4JVLNxWZY=",
36− "version": "1.12.1"
42+ "rev": "v2.0.0",
43+ "sha256": "sha256-LcqP4gO1dhNaLkpaZIRxmC8B7DUTLC1fPZutohBqKSQ=",
44+ "vendorSha256": "sha256-Vu5vyCEkZNf8TXryDalI5RKM/hjWeEkXbnYLhGwc2y8=",
45+ "version": "2.0.0"
3746 },
3847 "alicloud": {
3948 "deleteVendor": true,
@@ -94,28 +103,28 @@
94103 "owner": "hashicorp",
95104 "provider-source-address": "registry.terraform.io/hashicorp/aws",
96105 "repo": "terraform-provider-aws",
97− "rev": "v4.11.0",
98− "sha256": "sha256-d7edKXwjktpHGMxL/sAowOjiGdsAk9cdGVMgj0uIVIg=",
99− "vendorSha256": "sha256-xQ9EbzwLfRZuBzytJ4SpoEIYJ9DuN+eWPy7RRg4jPkU=",
100− "version": "4.11.0"
106+ "rev": "v4.12.1",
107+ "sha256": "sha256-z19DTiio6dXIgTmOxehOjIno6XhSUIS/YFtXKocq2Kk=",
108+ "vendorSha256": "sha256-zxOiLStuGuylsKTJteR/9Xs/XcVgDlihCBmnMNLTTd4=",
109+ "version": "4.12.1"
101110 },
102111 "azuread": {
103112 "owner": "hashicorp",
104113 "provider-source-address": "registry.terraform.io/hashicorp/azuread",
105114 "repo": "terraform-provider-azuread",
106− "rev": "v2.21.0",
107− "sha256": "sha256-H2G9n9pvDF1VKXC773ubRFzGYZJeAj+t/V89omxmcps=",
115+ "rev": "v2.22.0",
116+ "sha256": "sha256-x3SRTGCokEZGoG2l46PSelI8+FkHp5sbDdd14Iyei54=",
108117 "vendorSha256": null,
109− "version": "2.21.0"
118+ "version": "2.22.0"
110119 },
111120 "azurerm": {
112121 "owner": "hashicorp",
113122 "provider-source-address": "registry.terraform.io/hashicorp/azurerm",
114123 "repo": "terraform-provider-azurerm",
115− "rev": "v3.3.0",
116− "sha256": "sha256-ZkyuZ2q9V2CKuXGUcDI5X3O21y8xtZiYGPnl5mIjuZc=",
124+ "rev": "v3.4.0",
125+ "sha256": "sha256-hfjwlW7tbs/b7mvtbmFnNXr82b2exCRC4WxfCdZ6bbw=",
117126 "vendorSha256": null,
118− "version": "3.3.0"
127+ "version": "3.4.0"
119128 },
120129 "azurestack": {
121130 "owner": "hashicorp",
@@ -330,19 +339,19 @@
330339 "owner": "dome9",
331340 "provider-source-address": "registry.terraform.io/dome9/dome9",
332341 "repo": "terraform-provider-dome9",
333− "rev": "v1.25.2",
334− "sha256": "sha256-6AtJEeAoOfqGwLC687aMTBg4yRXIDYqDbkXyXuiV8aQ=",
342+ "rev": "v1.25.3",
343+ "sha256": "sha256-0Pde+xVToBP5gavr0ckEIUmgCmRBbqSP5C0YkMthQGQ=",
335344 "vendorSha256": null,
336− "version": "1.25.2"
345+ "version": "1.25.3"
337346 },
338347 "elasticsearch": {
339348 "owner": "phillbaker",
340349 "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
341350 "repo": "terraform-provider-elasticsearch",
342− "rev": "v2.0.0",
343− "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=",
344− "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=",
345− "version": "2.0.0"
351+ "rev": "v2.0.1",
352+ "sha256": "sha256-WdGwLQe4jInZiMxJ7BasfwVBsei0V02D6vAA4dLLoAI=",
353+ "vendorSha256": "sha256-gBC5+6bGJzfb0yLKlolfrZNuhpPacqX3p1HjIB4i3IU=",
354+ "version": "2.0.1"
346355 },
347356 "exoscale": {
348357 "owner": "exoscale",
@@ -366,28 +375,28 @@
366375 "owner": "fastly",
367376 "provider-source-address": "registry.terraform.io/fastly/fastly",
368377 "repo": "terraform-provider-fastly",
369− "rev": "v1.1.2",
370− "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=",
378+ "rev": "v1.1.4",
379+ "sha256": "sha256-sLVeVXVCvhSx51B4unYEOs0UpNsChF9guB22gpsratw=",
371380 "vendorSha256": null,
372− "version": "1.1.2"
381+ "version": "1.1.4"
373382 },
374383 "flexibleengine": {
375384 "owner": "FlexibleEngineCloud",
376385 "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
377386 "repo": "terraform-provider-flexibleengine",
378− "rev": "v1.28.0",
379− "sha256": "sha256-UeRgbPHwKZ6HfoHOG3yYLFhv6GqzGhLB3fETYWq6k7A=",
380− "vendorSha256": "sha256-/Z8VbNtwBYROyzvhwFwpmyGMWF1LeWEKxgwbFd9M+Gw=",
381− "version": "1.28.0"
387+ "rev": "v1.29.0",
388+ "sha256": "sha256-HPcJRLP20fDt3qr2edkol2jXSsWLotJkx13ZV7n7w8g=",
389+ "vendorSha256": "sha256-De4NRWTdE4QutQkB0m0YlJg6LNysxi4bSSIxYY6lRP0=",
390+ "version": "1.29.0"
382391 },
383392 "fortios": {
384393 "owner": "fortinetdev",
385394 "provider-source-address": "registry.terraform.io/fortinetdev/fortios",
386395 "repo": "terraform-provider-fortios",
387− "rev": "v1.14.0",
388− "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h",
396+ "rev": "v1.14.1",
397+ "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=",
389398 "vendorSha256": null,
390− "version": "1.14.0"
399+ "version": "1.14.1"
391400 },
392401 "gandi": {
393402 "owner": "go-gandi",
@@ -402,10 +411,10 @@
402411 "owner": "integrations",
403412 "provider-source-address": "registry.terraform.io/integrations/github",
404413 "repo": "terraform-provider-github",
405− "rev": "v4.23.0",
406− "sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=",
414+ "rev": "v4.24.1",
415+ "sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=",
407416 "vendorSha256": null,
408− "version": "4.23.0"
417+ "version": "4.24.1"
409418 },
410419 "gitlab": {
411420 "owner": "gitlabhq",
@@ -421,29 +430,29 @@
421430 "provider-source-address": "registry.terraform.io/hashicorp/google",
422431 "proxyVendor": true,
423432 "repo": "terraform-provider-google",
424− "rev": "v4.18.0",
425− "sha256": "sha256-/s0O2ZBNPfBNffZp9sdG2omfXKDgwLaX4cJZs553WLU=",
433+ "rev": "v4.19.0",
434+ "sha256": "sha256-b6oEKiz8REeJIDFLDI80+kA4f32KRjZy/GhKg0qeN24=",
426435 "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
427− "version": "4.18.0"
436+ "version": "4.19.0"
428437 },
429438 "google-beta": {
430439 "owner": "hashicorp",
431440 "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
432441 "proxyVendor": true,
433442 "repo": "terraform-provider-google-beta",
434− "rev": "v4.18.0",
435− "sha256": "sha256-mVuo+dFDNcmWIh9WJNkkpowF7lI3mQy8scgij6jM9Zw=",
443+ "rev": "v4.19.0",
444+ "sha256": "sha256-MPB/ca0GIIs7yEfIyqeOkzK2mkEdkE/DkEbaSqpaF0U=",
436445 "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
437− "version": "4.18.0"
446+ "version": "4.19.0"
438447 },
439448 "grafana": {
440449 "owner": "grafana",
441450 "provider-source-address": "registry.terraform.io/grafana/grafana",
442451 "repo": "terraform-provider-grafana",
443− "rev": "v1.21.1",
444− "sha256": "sha256-2eTVJB0Scs6cZzwy+DQLgKqP0JPNnQMjUcG7THH2Cgg=",
445− "vendorSha256": "sha256-YfE5ob/gB+X9x0Zx6gqjUR3+P+EhQrZ6aNiHOkbkNIc=",
446− "version": "1.21.1"
452+ "rev": "v1.22.0",
453+ "sha256": "sha256-0OkFf2YiwJHwXheYkN1HA1DG5vadyhZOzVjmu0BNDHI=",
454+ "vendorSha256": "sha256-Pd4cSmDzRhu8MD2osXg6mVYiKG2VM6MQ67aC6jDy59U=",
455+ "version": "1.22.0"
447456 },
448457 "gridscale": {
449458 "owner": "gridscale",
@@ -458,10 +467,10 @@
458467 "owner": "hetznercloud",
459468 "provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
460469 "repo": "terraform-provider-hcloud",
461− "rev": "v1.33.1",
462− "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg",
463− "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv",
464− "version": "1.33.1"
470+ "rev": "v1.33.2",
471+ "sha256": "sha256-kERpOIEy6UsT2BEY9kkINuWbncDXJuwWjR/Kzua97m8=",
472+ "vendorSha256": "sha256-p+NFt9QjbR12bGnCrhUTJzwtBagjXn5w1UcQFMQpY+I=",
473+ "version": "1.33.2"
465474 },
466475 "helm": {
467476 "owner": "hashicorp",
@@ -602,10 +611,10 @@
602611 "owner": "hashicorp",
603612 "provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
604613 "repo": "terraform-provider-kubernetes",
605− "rev": "v2.10.0",
606− "sha256": "sha256-pA0yI59iRBmiT3rdvoP4vkSz/+bH29O4eLGPCBjfiZU=",
614+ "rev": "v2.11.0",
615+ "sha256": "sha256-qrADveCJUvYcseTUmqQzmRKn4Whb/KfJjwz2+6V7yZc=",
607616 "vendorSha256": null,
608− "version": "2.10.0"
617+ "version": "2.11.0"
609618 },
610619 "launchdarkly": {
611620 "owner": "launchdarkly",
@@ -656,10 +665,10 @@
656665 "owner": "logicmonitor",
657666 "provider-source-address": "registry.terraform.io/logicmonitor/logicmonitor",
658667 "repo": "terraform-provider-logicmonitor",
659− "rev": "v2.0.0",
660− "sha256": "sha256-wamP36zV5HZ1qQlNZWIZyAYx/jOiRO1ODQpcd10Sl4w=",
668+ "rev": "v2.0.1",
669+ "sha256": "sha256-LW88NTWwzGrpOpliVqc1AOjxaZ4p/8gq9twEpjY3FzE=",
661670 "vendorSha256": null,
662− "version": "2.0.0"
671+ "version": "2.0.1"
663672 },
664673 "lxd": {
665674 "owner": "terraform-lxd",
@@ -746,10 +755,10 @@
746755 "owner": "newrelic",
747756 "provider-source-address": "registry.terraform.io/newrelic/newrelic",
748757 "repo": "terraform-provider-newrelic",
749− "rev": "v2.43.3",
750− "sha256": "sha256-RSE0JHhIKR0Xst2iol3L02OZnEHwkVoaN32Yu2YZy7s=",
751− "vendorSha256": "sha256-4C8OWJSaUp4W8ScERveGYJ0m8avl6HHeTtGleJa5mdk=",
752− "version": "2.43.3"
758+ "rev": "v2.43.4",
759+ "sha256": "sha256-7ckPPU5ieVEZogW7lWd5vMHyXSlTuSqXj1suxKfEyis=",
760+ "vendorSha256": "sha256-HhjTcdw8LbwMJ7P5LcZtgtEojLsqnsiBDrRIp62EZhQ=",
761+ "version": "2.43.4"
753762 },
754763 "nomad": {
755764 "owner": "hashicorp",
@@ -801,19 +810,19 @@
801810 "owner": "oracle",
802811 "provider-source-address": "registry.terraform.io/oracle/oci",
803812 "repo": "terraform-provider-oci",
804− "rev": "v4.72.0",
805− "sha256": "sha256-ztlMhwcRraPdR95iZGiEKJAKe7PZeE4ABLBNVo2maUQ=",
813+ "rev": "v4.73.0",
814+ "sha256": "sha256-duONflOa+ZmWNAOZTcjLJUaeIUSiDR3VC4+SC4UXBBg=",
806815 "vendorSha256": null,
807− "version": "4.72.0"
816+ "version": "4.73.0"
808817 },
809818 "okta": {
810819 "owner": "okta",
811820 "provider-source-address": "registry.terraform.io/okta/okta",
812821 "repo": "terraform-provider-okta",
813− "rev": "v3.24.0",
814− "sha256": "sha256-nP42jYvdXmW4gz1fRcEm3Cmv7RXlpk6l2qL5dImIvAw=",
815− "vendorSha256": "sha256-S4HVfl/PbgpgWFedkWM+EGyYAL5P0cdkLMYL+y+aX8w=",
816− "version": "3.24.0"
822+ "rev": "v3.25.1",
823+ "sha256": "sha256-+XCpk/vfAD8TWxMdi/WqXxDEh6cEZ684Zr+vkHnNMsI=",
824+ "vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=",
825+ "version": "3.25.1"
817826 },
818827 "oktaasa": {
819828 "owner": "oktadeveloper",
@@ -855,10 +864,10 @@
855864 "owner": "opentelekomcloud",
856865 "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
857866 "repo": "terraform-provider-opentelekomcloud",
858− "rev": "v1.29.2-alpha.1",
859− "sha256": "sha256-OAbsX7GMGeDvc22xj4V/Jfap2ROg7ECTFf+FJTm0aDM=",
860− "vendorSha256": "sha256-kSZvxbovF2/oCqFY/0zpGmAhLFuCw6nWG3B4ppyxzLY=",
861− "version": "1.29.2-alpha.1"
867+ "rev": "v1.29.2",
868+ "sha256": "sha256-V5EGRd5/JmCDaF1fQkpwHA4DNVFKwvGnMR/AyKvgLtk=",
869+ "vendorSha256": "sha256-FOcddb1+uG5avqYZMvzR1UXDvtDDwtxBzf7FsN6ZROM=",
870+ "version": "1.29.2"
862871 },
863872 "opsgenie": {
864873 "owner": "opsgenie",
@@ -1017,10 +1026,10 @@
10171026 "owner": "splunk-terraform",
10181027 "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
10191028 "repo": "terraform-provider-signalfx",
1020− "rev": "v6.12.1",
1021− "sha256": "sha256-JmkuYv3vDCSUuD69+dw8fG4EvuDMhfImlfmZslp8AfQ=",
1022− "vendorSha256": "sha256-hI0yz796+xxAFQg+O/2g5ueNx/wrx/40DlQyxtx11aQ=",
1023− "version": "6.12.1"
1029+ "rev": "v6.13.0",
1030+ "sha256": "sha256-te5+WjbvU7RV22o22iWu8rGEnBfPkZNzkigziOlxMQg=",
1031+ "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=",
1032+ "version": "6.13.0"
10241033 },
10251034 "skytap": {
10261035 "owner": "skytap",
@@ -1053,10 +1062,10 @@
10531062 "owner": "spotinst",
10541063 "provider-source-address": "registry.terraform.io/spotinst/spotinst",
10551064 "repo": "terraform-provider-spotinst",
1056− "rev": "v1.73.1",
1057− "sha256": "sha256-tA80gL0IJVO0g+sXdXLYgW1a0hLP0rnQCUtLAS9Y614=",
1058− "vendorSha256": "sha256-25h8VMeXKWth06+5ZBibDWvjWyJmKM64k0zhkUsIYeM=",
1059− "version": "1.73.1"
1065+ "rev": "v1.73.2",
1066+ "sha256": "sha256-Q5DNFJ1g6jfHQVYF5Xf5Phx/4b2nbUvE651JNp/zgJg=",
1067+ "vendorSha256": "sha256-szdzI/42RExYQlHnm178RM3wlKOLax+nwgRVzonxXoI=",
1068+ "version": "1.73.2"
10601069 },
10611070 "stackpath": {
10621071 "owner": "stackpath",
pkgs/applications/networking/firewalld/default.nixnew file+104
@@ -0,0 +1,104 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoreconfHook
5+, bash
6+, docbook_xml_dtd_42
7+, docbook-xsl-nons
8+, glib
9+, gobject-introspection
10+, gtk3
11+, intltool
12+, libnotify
13+, libxml2
14+, libxslt
15+, networkmanagerapplet
16+, pkg-config
17+, python3
18+, wrapGAppsNoGuiHook
19+, withGui ? false
20+}:
21+
22+let
23+ pythonPath = python3.withPackages (ps: with ps; [
24+ dbus-python
25+ nftables
26+ pygobject3
27+ ] ++ lib.optionals withGui [
28+ pyqt5
29+ pyqt5_sip
30+ ]);
31+in
32+stdenv.mkDerivation rec {
33+ pname = "firewalld";
34+ version = "1.1.1";
35+
36+ src = fetchFromGitHub {
37+ owner = "firewalld";
38+ repo = "firewalld";
39+ rev = "v${version}";
40+ sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";
41+ };
42+
43+ patches = [
44+ ./respect-xml-catalog-files-var.patch
45+ ];
46+
47+ postPatch = ''
48+ substituteInPlace src/firewall/config/__init__.py.in \
49+ --replace "/usr/share" "$out/share"
50+
51+ for file in config/firewall-{applet,config}.desktop.in; do
52+ substituteInPlace $file \
53+ --replace "/usr/bin/" "$out/bin/"
54+ done
55+ '' + lib.optionalString withGui ''
56+ substituteInPlace src/firewall-applet.in \
57+ --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"
58+ '';
59+
60+ nativeBuildInputs = [
61+ autoreconfHook
62+ docbook_xml_dtd_42
63+ docbook-xsl-nons
64+ glib
65+ intltool
66+ libxml2
67+ libxslt
68+ pkg-config
69+ python3
70+ python3.pkgs.wrapPython
71+ ] ++ lib.optionals withGui [
72+ gobject-introspection
73+ wrapGAppsNoGuiHook
74+ ];
75+
76+ buildInputs = [
77+ bash
78+ glib
79+ ] ++ lib.optionals withGui [
80+ gtk3
81+ libnotify
82+ pythonPath
83+ ];
84+
85+ dontWrapGApps = true;
86+
87+ preFixup = lib.optionalString withGui ''
88+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
89+ '';
90+
91+ postFixup = ''
92+ chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite
93+ patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py
94+ wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"
95+ wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"
96+ '';
97+
98+ meta = with lib; {
99+ description = "Firewall daemon with D-Bus interface";
100+ homepage = "https://github.com/firewalld/firewalld";
101+ license = licenses.gpl2Plus;
102+ maintainers = with maintainers; [ SuperSandro2000 ];
103+ };
104+}
pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchnew file+13
@@ -0,0 +1,13 @@
1+--- a/m4/jh_path_xml_catalog.m4
2++++ b/m4/jh_path_xml_catalog.m4
3+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
4+ [
5+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
6+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
7+- if $jh_found_xmlcatalog && \
8+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
9++ # empty argument forces libxml to use XML_CATALOG_FILES variable
10++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
11+ AC_MSG_RESULT([found])
12+ ifelse([$3],,,[$3
13+ ])dnl
pkgs/applications/networking/gmailctl/default.nix+4−6
@@ -6,18 +6,16 @@
66
77buildGoModule rec {
88 pname = "gmailctl";
9− # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232
10− # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f
11− version = "unstable-2022-03-24";
9+ version = "0.10.2";
1210
1311 src = fetchFromGitHub {
1412 owner = "mbrt";
1513 repo = "gmailctl";
16− rev = "484bb689866987580e0576165180ef06375a543f";
17− sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA=";
14+ rev = "v${version}";
15+ sha256 = "sha256-tj+jKJuKwuqic/qfaUbf+Tao1X2FW0VVoGwqyx3q+go=";
1816 };
1917
20− vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo=";
18+ vendorSha256 = "sha256-aBw9C488a3Wxde3QCCU0eiagiRYOS9mkjcCsB2Mrdr0=";
2119
2220 nativeBuildInputs = [
2321 installShellFiles
pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3
@@ -1,7 +1,7 @@
11{ lib, callPackage, stdenvNoCC }:
22let
33 pname = "caprine";
4− version = "2.55.2";
4+ version = "2.55.4";
55 metaCommon = with lib; {
66 description = "An elegant Facebook Messenger desktop app";
77 homepage = "https://sindresorhus.com/caprine";
@@ -10,11 +10,11 @@ let
1010 };
1111 x86_64-appimage = callPackage ./build-from-appimage.nix {
1212 inherit pname version metaCommon;
13− sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";
13+ sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";
1414 };
1515 x86_64-dmg = callPackage ./build-from-dmg.nix {
1616 inherit pname version metaCommon;
17− sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA=";
17+ sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";
1818 };
1919in
2020(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix+1
@@ -31,6 +31,7 @@ let
3131 name = "${old.pname}-${version}";
3232 hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok=";
3333 };
34+ patches = [ ./libdeltachat-darwin-dylib.patch ] ++ old.patches;
3435 });
3536 electronExec = if stdenv.isDarwin then
3637 "${electron_16}/Applications/Electron.app/Contents/MacOS/Electron"
pkgs/development/libraries/libdeltachat/darwin-dylib.patch → pkgs/applications/networking/instant-messengers/deltachat-desktop/libdeltachat-darwin-dylib.patchrenamed

The content is the same.

pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+2−1
@@ -2,7 +2,7 @@
22 "name": "element-desktop",
33 "productName": "Element",
44 "main": "lib/electron-main.js",
5− "version": "1.10.10",
5+ "version": "1.10.11",
66 "description": "A feature-rich client for Matrix.org",
77 "author": "Element",
88 "repository": {
@@ -89,6 +89,7 @@
8989 },
9090 "build": {
9191 "appId": "im.riot.app",
92+ "asarUnpack": "**/*.node",
9293 "files": [
9394 "package.json",
9495 {
pkgs/applications/networking/instant-messengers/element/pin.json+3−3
@@ -1,6 +1,6 @@
11{
2− "version": "1.10.10",
3− "desktopSrcHash": "Atgcu+K28pScYokS/lTu+/mMeEC+1yTcn3Akq+KZJNY=",
2+ "version": "1.10.11",
3+ "desktopSrcHash": "n74KFmHI6ZQWBEJCR55VZHS//myh2RePcJRVOmZ6XHo=",
44 "desktopYarnHash": "0jm0i1yyfkg1ll11pb3qif1vdxx6rp0yl9kd8jg9nhsg2jzw66pr",
5− "webHash": "1xp0rhw3k2znwvqqikhd771l2n6xyx8npcz87m9d4cisl82lpnr0"
5+ "webHash": "02m64bhg1ls4a5igmizkkxnqfmbfhs0xy24ycr75vxmn0zmwa3yd"
66}
pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "jitsi-meet-electron";
12− version = "2022.1.1";
12+ version = "2022.3.1";
1313
1414 src = fetchurl {
1515 url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
16− sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l";
16+ sha256 = "sha256-/5WpjmTLwQN73m7nHg4DKPbXIbD9WyJ+YBbFMD4ZDfg=";
1717 name = "${pname}-${version}.AppImage";
1818 };
1919
pkgs/applications/networking/instant-messengers/linphone/default.nix+40−13
@@ -13,7 +13,6 @@
1313, ffmpeg
1414, gdk-pixbuf
1515, glib
16−, gnused
1716, graphviz
1817, gtk2
1918, intltool
@@ -49,9 +48,25 @@
4948, zlib
5049}:
5150
51+# How to update Linphone? (The Qt desktop app)
52+#
53+# Belledonne Communications (BC), the company making Linphone, has split the
54+# project into several sub-projects that they maintain, plus some third-party
55+# dependencies that they also extend with commits of their own, specific to
56+# Linphone and not (yet?) upstreamed.
57+#
58+# All of this is organised in a Software Development Kit (SDK) meta-repository
59+# with git submodules to pin all those repositories into a coherent whole.
60+#
61+# The Linphone Qt desktop app uses this SDK as submodule as well.
62+#
63+# So, in order to update the desktop app to a new release, one has to follow
64+# the submodule chain and update the corresponding derivations here, in nixpkgs,
65+# with the corresponding version number (or commit hash)
66+
5267mkDerivation rec {
5368 pname = "linphone-desktop";
54− version = "4.2.5";
69+ version = "4.4.1";
5570
5671 src = fetchFromGitLab {
5772 domain = "gitlab.linphone.org";
@@ -59,12 +74,13 @@ mkDerivation rec {
5974 group = "BC";
6075 repo = pname;
6176 rev = version;
62− sha256 = "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz";
77+ sha256 = "sha256-BBOTyKMZikkxMJSmzAuChVHpVeCvbAimn1K3REGbqEg=";
6378 };
6479
6580 patches = [
6681 ./do-not-build-linphone-sdk.patch
6782 ./remove-bc_compute_full_version-usage.patch
83+ ./no-store-path-in-autostart.patch
6884 ];
6985
7086 # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21
@@ -78,12 +94,21 @@ mkDerivation rec {
7894 # there might be some build inputs here that aren't needed for
7995 # linphone-desktop.
8096 buildInputs = [
97+ # Made by BC
8198 bcg729
8299 bctoolbox
83100 belcard
84101 belle-sip
85102 belr
86103 bzrtp
104+ liblinphone
105+ mediastreamer
106+ mediastreamer-openh264
107+ ortp
108+
109+ # Vendored by BC but we use upstream, might cause problems
110+ libmatroska
111+
87112 cairo
88113 cyrus_sasl
89114 ffmpeg
@@ -92,19 +117,14 @@ mkDerivation rec {
92117 gtk2
93118 libX11
94119 libexosip
95− liblinphone
96− libmatroska
97120 libnotify
98121 libosip
99122 libsoup
100123 libupnp
101124 libxml2
102125 mbedtls
103− mediastreamer
104− mediastreamer-openh264
105126 minizip2
106127 openldap
107− ortp
108128 pango
109129 qtbase
110130 qtgraphicaleffects
@@ -118,9 +138,10 @@ mkDerivation rec {
118138 ];
119139
120140 nativeBuildInputs = [
141+ # Made by BC
121142 bcunit
143+
122144 cmake
123− gnused
124145 graphviz
125146 intltool
126147 makeWrapper
@@ -128,7 +149,6 @@ mkDerivation rec {
128149 ];
129150
130151 cmakeFlags = [
131− "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
132152 "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
133153 "-DMINIZIP_LIBRARIES=minizip"
134154 ];
@@ -162,18 +182,25 @@ mkDerivation rec {
162182 # Linphone will randomly crash when it tries to access those files. Then,
163183 # those just need to be copied manually below.
164184 installPhase = ''
165− mkdir -p $out/bin
185+ mkdir -p $out/bin $out/lib
166186 cp linphone-app/linphone $out/bin/
187+ cp linphone-app/libapp-plugin.so $out/lib/
188+ mkdir -p $out/lib/mediastreamer/plugins
189+ ln -s ${mediastreamer-openh264}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/
190+ ln -s ${mediastreamer}/lib/mediastreamer/plugins/* $out/lib/mediastreamer/plugins/
167191 wrapProgram $out/bin/linphone \
168192 --set MEDIASTREAMER_PLUGINS_DIR \
169− ${mediastreamer-openh264}/lib/mediastreamer/plugins
193+ $out/lib/mediastreamer/plugins
170194 mkdir -p $out/share/applications
171195 cp linphone-app/linphone.desktop $out/share/applications/
172− cp -r ../linphone-app/assets/icons $out/share/
196+ mkdir -p $out/share/icons/hicolor/scalable/apps
197+ cp ../linphone-app/assets/images/linphone_logo.svg $out/share/icons/hicolor/scalable/apps/linphone.svg
173198 mkdir -p $out/share/belr/grammars
174199 ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
200+ ln -s ${belle-sip}/share/belr/grammars/* $out/share/belr/grammars/
175201 mkdir -p $out/share/linphone
176202 ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
203+ ln -s ${liblinphone}/share/sounds $out/share/sounds
177204 '';
178205
179206 meta = with lib; {
pkgs/applications/networking/instant-messengers/linphone/do-not-build-linphone-sdk.patch+56−31
@@ -1,30 +1,31 @@
1−From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001
2−From: David P <megver83@parabola.nu>
3−Date: Thu, 26 Nov 2020 15:56:30 -0300
4−Subject: [PATCH 1/2] do not build linphone-sdk
1+From e6a9992461f368d08d1ad63ffe454714ec0c59ce Mon Sep 17 00:00:00 2001
2+From: Lorenz Brun <lorenz@brun.one>
3+Date: Fri, 28 Jan 2022 02:36:01 +0100
4+Subject: [PATCH] Remove Linphone SDK build
55
6−Signed-off-by: David P <megver83@parabola.nu>
76---
8− CMakeLists.txt | 61 +------------------
9− .../cmake_builder/additional_steps.cmake | 9 ---
10− 2 files changed, 3 insertions(+), 67 deletions(-)
7+ CMakeLists.txt | 86 ++-----------------
8+ .../cmake_builder/additional_steps.cmake | 9 --
9+ 2 files changed, 5 insertions(+), 90 deletions(-)
1110
1211diff --git a/CMakeLists.txt b/CMakeLists.txt
13−index f7eb05f2..5921ee5b 100644
12+index 2002b925..6d92a8e5 100644
1413--- a/CMakeLists.txt
1514+++ b/CMakeLists.txt
16−@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
17−
15+@@ -152,7 +152,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}")
1816 list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}")
17+ list(APPEND APP_OPTIONS "-DENABLE_QT_GL=${ENABLE_VIDEO}")#Activate on video
1918
2019-include(ExternalProject)
2120 set(PROJECT_BUILD_COMMAND "")
2221 if(CMAKE_BUILD_PARALLEL_LEVEL)
2322 list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}")
24−@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE)
25− set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}")
26− list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}")
23+@@ -190,30 +189,8 @@ if(ENABLE_BUILD_APP_PLUGINS)
24+ endif()
2725 endif()
26+
27+-
28+-if(NOT LINPHONE_QT_ONLY)
2829-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk"
2930- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk"
3031- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}"
@@ -35,7 +36,7 @@ index f7eb05f2..5921ee5b 100644
3536- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
3637- LIST_SEPARATOR | # Use the alternate list separator
3738- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
38−- #BUILD_ALWAYS NO #${DO_BUILD}
39+- BUILD_ALWAYS NO #${DO_BUILD}
3940-)
4041-ExternalProject_Add_Step(sdk force_build
4142- COMMENT "Forcing build for 'desktop'"
@@ -43,18 +44,17 @@ index f7eb05f2..5921ee5b 100644
4344- DEPENDERS build
4445- ALWAYS 1
4546-)
47+-endif()
4648 include(FindPkgConfig)
4749
4850-set(APP_DEPENDS sdk)
49−-
50−-
51− find_package(Qt5 5.12 COMPONENTS Core REQUIRED)
51+ find_package(Qt5 5.10 COMPONENTS Core REQUIRED)
5252
5353 if ( NOT Qt5_FOUND )
54−@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET)
54+@@ -227,62 +204,9 @@ find_package(belcard CONFIG QUIET)
55+ find_package(Mediastreamer2 CONFIG QUIET)
5556 find_package(ortp CONFIG QUIET)
5657
57−
5858-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS)
5959- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install")
6060- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
@@ -63,23 +63,51 @@ index f7eb05f2..5921ee5b 100644
6363- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app"
6464- DEPENDS ${APP_DEPENDS}
6565- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
66−- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project"
66+- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
6767- LIST_SEPARATOR | # Use the alternate list separator
6868- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
6969- # ${APP_OPTIONS}
7070- BUILD_ALWAYS ON
7171- )
72+- if( ENABLE_BUILD_APP_PLUGINS)
73+- ExternalProject_Add(app-plugins PREFIX "${CMAKE_BINARY_DIR}/plugins-app"
74+- SOURCE_DIR "${CMAKE_SOURCE_DIR}/plugins"
75+- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
76+- BINARY_DIR "${CMAKE_BINARY_DIR}/plugins-app"
77+- DEPENDS linphone-qt
78+- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND}
79+- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time."
80+- LIST_SEPARATOR | # Use the alternate list separator
81+- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
82+- )
83+- endif()
7284- install(CODE "message(STATUS Running install)")
7385- set(AUTO_REGENERATION auto_regeneration)
74−- add_custom_target(${AUTO_REGENERATION} ALL
75−- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
76−- DEPENDS linphone-qt)
86+- if( ENABLE_BUILD_APP_PLUGINS)
87+- add_custom_target(${AUTO_REGENERATION} ALL
88+- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
89+- DEPENDS app-plugins)
90+- else()
91+- add_custom_target(${AUTO_REGENERATION} ALL
92+- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}
93+- DEPENDS linphone-qt)
94+- endif()
7795-else()
7896- message("Adding Linphone Desktop in an IDE-friendly state")
7997- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
8098- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
81−- add_dependencies(app-library ${APP_DEPENDS})
82−-endif()
99+- if(NOT LINPHONE_QT_ONLY)
100+- add_dependencies(app-library ${APP_DEPENDS})
101+- endif()
102+- if( ENABLE_BUILD_APP_PLUGINS)
103+- add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app")
104+- endif()
105++message("Adding Linphone Desktop in an IDE-friendly state")
106++set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
107++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
108++if( ENABLE_BUILD_APP_PLUGINS)
109++ add_subdirectory(${CMAKE_SOURCE_DIR}/plugins "plugins-app")
110+ endif()
83111-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app"
84112- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app"
85113- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}"
@@ -89,11 +117,8 @@ index f7eb05f2..5921ee5b 100644
89117- LIST_SEPARATOR | # Use the alternate list separator
90118- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH}
91119- EXCLUDE_FROM_ALL ON
92−- BUILD_ALWAYS ON
120+- #BUILD_ALWAYS ON
93121-)
94−+message("Adding Linphone Desktop in an IDE-friendly state")
95−+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}")
96−+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app)
97122diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake
98123index 7f7fd573..a69a04e8 100644
99124--- a/linphone-app/cmake_builder/additional_steps.cmake
@@ -114,5 +139,5 @@ index 7f7fd573..a69a04e8 100644
114139 endif ()
115140 endif ()
116141--
117−2.29.2
142+2.25.1
118143
pkgs/applications/networking/instant-messengers/linphone/no-store-path-in-autostart.patchnew file+27
@@ -0,0 +1,27 @@
1+From 6a26922e5e4363de36057d635a1bf889160b2533 Mon Sep 17 00:00:00 2001
2+From: Lorenz Brun <lorenz@brun.one>
3+Date: Fri, 28 Jan 2022 18:44:43 +0100
4+Subject: [PATCH] Do not use store path for autostart on Nix
5+
6+---
7+ linphone-app/src/app/App.cpp | 4 ++++
8+ 1 file changed, 4 insertions(+)
9+
10+diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
11+index 868f8f44..2c61c648 100644
12+--- a/linphone-app/src/app/App.cpp
13++++ b/linphone-app/src/app/App.cpp
14+@@ -858,6 +858,10 @@ void App::setAutoStart (bool enabled) {
15+ exec = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
16+ qDebug() << "exec path autostart set appimage=" << exec;
17+ }
18++ else if (binPath.startsWith("/nix/store")) { // Nix/NixOS
19++ exec = QStringLiteral("linphone");
20++ qDebug() << "exec path autostart set nix=" << exec;
21++ }
22+ else { //classic package
23+ exec = binPath;
24+ qDebug() << "exec path autostart set classic package=" << exec;
25+--
26+2.25.1
27+
pkgs/applications/networking/instant-messengers/linphone/remove-bc_compute_full_version-usage.patch+6−6
@@ -1,7 +1,7 @@
1−From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001
1+From 4849d5633b98e6d3514355436eab5ba537cbfd99 Mon Sep 17 00:00:00 2001
22From: David P <megver83@parabola.nu>
33Date: Fri, 23 Oct 2020 16:44:17 -0300
4−Subject: [PATCH 2/2] remove bc_compute_full_version usage
4+Subject: [PATCH] remove bc_compute_full_version usage
55
66---
77 linphone-app/CMakeLists.txt | 11 +----------
@@ -10,7 +10,7 @@ Subject: [PATCH 2/2] remove bc_compute_full_version usage
1010 3 files changed, 2 insertions(+), 24 deletions(-)
1111
1212diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
13−index 3bc9420a..27b418ee 100644
13+index de7f917f..ee14ff78 100644
1414--- a/linphone-app/CMakeLists.txt
1515+++ b/linphone-app/CMakeLists.txt
1616@@ -21,17 +21,8 @@
@@ -30,8 +30,8 @@ index 3bc9420a..27b418ee 100644
3030-
3131-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}")
3232
33+
3334 if(ENABLE_BUILD_VERBOSE)
34− #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}")
3535diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt
3636index 8ef03faa..97d94bd6 100644
3737--- a/linphone-app/build/CMakeLists.txt
@@ -49,7 +49,7 @@ index 8ef03faa..97d94bd6 100644
4949
5050 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
5151diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
52−index baea03cf..08ffc1b5 100644
52+index ac85c68a..e6af5a66 100644
5353--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
5454+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt
5555@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
@@ -70,5 +70,5 @@ index baea03cf..08ffc1b5 100644
7070 endif ()
7171 string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}")
7272--
73−2.29.2
73+2.25.1
7474
pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2
@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;
4343
4444mkDerivation rec {
4545 pname = "psi-plus";
46− version = "1.5.1615";
46+ version = "1.5.1618";
4747
4848 src = fetchFromGitHub {
4949 owner = "psi-plus";
5050 repo = "psi-plus-snapshots";
5151 rev = version;
52− sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI=";
52+ sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A=";
5353 };
5454
5555 cmakeFlags = [
pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix+3−3
@@ -4,11 +4,11 @@ let
44in
55stdenv.mkDerivation rec {
66 pname = "rocketchat-desktop";
7− version = "3.7.8";
7+ version = "3.8.5";
88
99 src = fetchurl {
10− url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb";
11− sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI=";
10+ url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
11+ sha256 = "sha256-nKEfdbHfLjM4w79hzQdKiC4+IT3WXdDdlXkzelCKqOw";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix+2−2
@@ -7,12 +7,12 @@
77}:
88
99let
10− version = "1.7.9";
10+ version = "1.8.4";
1111 pname = "session-desktop-appimage";
1212
1313 src = fetchurl {
1414 url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
15− sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef";
15+ sha256 = "Az9NEsqU4ZcmuSno38zflT4M4lI6/4ShEh3FVTcyRJg=";
1616 };
1717 appimage = appimageTools.wrapType2 {
1818 inherit version pname src;
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "signalbackup-tools";
5− version = "20220411";
5+ version = "20220425";
66
77 src = fetchFromGitHub {
88 owner = "bepaald";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-ia+8RZ1wQTyUCs+6o9AMCH4Kh2neHjPWbXWjLkDb6/w=";
11+ sha256 = "sha256-FWW4rVaoShT55ZWN/siFHoTTNcarnfTa2h/J2GWxLW8=";
1212 };
1313
1414 # Remove when Apple SDK is >= 10.13
pkgs/applications/networking/instant-messengers/teams/default.nix+3−3
@@ -22,7 +22,7 @@
2222
2323let
2424 pname = "teams";
25− version = "1.4.00.26453";
25+ version = "1.5.00.10453";
2626 meta = with lib; {
2727 description = "Microsoft Teams";
2828 homepage = "https://teams.microsoft.com";
@@ -37,7 +37,7 @@ let
3737
3838 src = fetchurl {
3939 url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
40− sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf";
40+ hash = "sha256-fLVw2axSMetuaoRzjg+x4DRYY8WP5TQbL7LbfF6LFfA=";
4141 };
4242
4343 nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ];
@@ -134,7 +134,7 @@ let
134134
135135 src = fetchurl {
136136 url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg";
137− sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0";
137+ hash = "sha256-vLUEvOSBUyAJIWHOAIkTqTW/W6TkgmeyRzQbquZP810=";
138138 };
139139
140140 buildInputs = [ xar cpio makeWrapper ];
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix+1
@@ -98,6 +98,7 @@ stdenv.mkDerivation rec {
9898 };
9999
100100 patches = [
101+ ./kf594.patch
101102 ./shortcuts-binary-path.patch
102103 # let it build with nixpkgs 10.12 sdk
103104 ./kotato-10.12-sdk.patch
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patchnew file+57
@@ -0,0 +1,57 @@
1+diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
2+index 7641579aa..3c195e397 100644
3+--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
4++++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
5+@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
6+
7+ #include "base/platform/base_platform_info.h"
8+
9+-#include <connection_thread.h>
10+-#include <registry.h>
11+-#include <surface.h>
12+-#include <plasmashell.h>
13++#include <KWayland/Client/connection_thread.h>
14++#include <KWayland/Client/registry.h>
15++#include <KWayland/Client/surface.h>
16++#include <KWayland/Client/plasmashell.h>
17+
18+ using namespace KWayland::Client;
19+
20+Submodule Telegram/lib_base contains modified content
21+diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
22+index 32f0de6..30a087f 100644
23+--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
24++++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
25+@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
26+ #include <QtCore/QPointer>
27+ #include <QtGui/QWindow>
28+
29+-#include <connection_thread.h>
30+-#include <registry.h>
31+-#include <surface.h>
32+-#include <xdgforeign.h>
33+-#include <idleinhibit.h>
34++#include <KWayland/Client/connection_thread.h>
35++#include <KWayland/Client/registry.h>
36++#include <KWayland/Client/surface.h>
37++#include <KWayland/Client/xdgforeign.h>
38++#include <KWayland/Client/idleinhibit.h>
39+
40+ using namespace KWayland::Client;
41+
42+Submodule Telegram/lib_ui contains modified content
43+diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
44+index 01f1e80..163cb6a 100644
45+--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
46++++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
47+@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
48+ #include <private/qwaylandwindow_p.h>
49+ #include <private/qwaylandshellsurface_p.h>
50+
51+-#include <connection_thread.h>
52+-#include <registry.h>
53++#include <KWayland/Client/connection_thread.h>
54++#include <KWayland/Client/registry.h>
55+
56+ Q_DECLARE_METATYPE(QMargins);
57+
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix+3−6
@@ -63,12 +63,9 @@ stdenv.mkDerivation {
6363
6464 postPatch = lib.optionalString stdenv.isLinux ''
6565 substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
66− --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"'
67− substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
68− --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"'
69− substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
70− --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"'
71− substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \
66+ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \
67+ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
68+ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
7269 --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
7370 '';
7471
pkgs/applications/networking/instant-messengers/zoom-us/default.nix+46−7
@@ -2,6 +2,8 @@
22, lib
33, fetchurl
44, makeWrapper
5+, xar
6+, cpio
57 # Dynamic libraries
68, alsa-lib
79, atk
@@ -28,8 +30,27 @@
2830}:
2931
3032let
31− version = "5.9.6.2225";
33+ inherit (stdenv.hostPlatform) system;
34+ throwSystem = throw "Unsupported system: ${system}";
35+
36+ # Zoom versions are released at different times for each platform and linux
37+ # is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is
38+ # resolved
39+ version = {
40+ aarch64-darwin = "5.10.4.6592";
41+ x86_64-darwin = "5.10.4.6592";
42+ x86_64-linux = "5.9.6.2225";
43+ }.${system} or throwSystem;
44+
3245 srcs = {
46+ aarch64-darwin = fetchurl {
47+ url = "https://zoom.us/client/${version}/Zoom.pkg?archType=arm64";
48+ sha256 = "0jg5f9hvb67hhfnifpx5fzz65fcijldy1znlia6pqflxwci3m5rq";
49+ };
50+ x86_64-darwin = fetchurl {
51+ url = "https://zoom.us/client/${version}/Zoom.pkg";
52+ sha256 = "1p83691bid8kz5mw09x6l9zvjglfszi5vbhfmbbpiqhiqcxlfz83";
53+ };
3354 x86_64-linux = fetchurl {
3455 url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
3556 sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53";
@@ -69,23 +90,41 @@ stdenv.mkDerivation rec {
6990 pname = "zoom";
7091 inherit version;
7192
72− src = srcs.${stdenv.hostPlatform.system};
93+ src = srcs.${system} or throwSystem;
7394
74− dontUnpack = true;
95+ dontUnpack = stdenv.isLinux;
96+ unpackPhase = lib.optionalString stdenv.isDarwin ''
97+ xar -xf $src
98+ zcat < zoomus.pkg/Payload | cpio -i
99+ '';
75100
76101 nativeBuildInputs = [
77102 makeWrapper
103+ ]
104+ ++ lib.optionals stdenv.isDarwin [
105+ xar
106+ cpio
78107 ];
79108
80109 installPhase = ''
81110 runHook preInstall
82− mkdir $out
83− tar -C $out -xf $src
84− mv $out/usr/* $out/
111+ ${rec {
112+ aarch64-darwin = ''
113+ mkdir -p $out/Applications
114+ cp -R zoom.us.app $out/Applications/
115+ '';
116+ # darwin steps same on both architectures
117+ x86_64-darwin = aarch64-darwin;
118+ x86_64-linux = ''
119+ mkdir $out
120+ tar -C $out -xf $src
121+ mv $out/usr/* $out/
122+ '';
123+ }.${system} or throwSystem}
85124 runHook postInstall
86125 '';
87126
88− postFixup = ''
127+ postFixup = lib.optionalString stdenv.isLinux ''
89128 # Desktop File
90129 substituteInPlace $out/share/applications/Zoom.desktop \
91130 --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
pkgs/applications/networking/instant-messengers/zulip/default.nix+2−2
@@ -5,12 +5,12 @@
55
66let
77 pname = "zulip";
8− version = "5.9.2";
8+ version = "5.9.3";
99 name = "${pname}-${version}";
1010
1111 src = fetchurl {
1212 url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
13− hash = "sha256-PJ7/KOtfjH1RHMzAKSr9Y/82Z0vL2wBy3GgI/0JrlpM=";
13+ hash = "sha256-Hws9vENGzCLQqav4uXtbbI0iNoS3JozC5m2DG38+3Fk=";
1414 name="${pname}-${version}.AppImage";
1515 };
1616
pkgs/applications/networking/ipfs-cluster/default.nix+3−12
@@ -2,26 +2,17 @@
22
33buildGoModule rec {
44 pname = "ipfs-cluster";
5− version = "0.14.5";
5+ version = "1.0.0";
66
7− vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY=";
7+ vendorSha256 = "sha256-b0k1V1+JikGemSQjyiKcH7cgyDEt0Nn5aVUf6nnE+/0=";
88
99 src = fetchFromGitHub {
1010 owner = "ipfs";
1111 repo = "ipfs-cluster";
1212 rev = "v${version}";
13− sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8=";
13+ sha256 = "sha256-vwu+Fj7PegbK9pmnsNuEl/AQz2gejRiFAAAov5+VNMQ=";
1414 };
1515
16− # Remove patch when updating to >0.14.5
17− patches = [
18− (fetchpatch {
19− name = "remove-distribution-test.patch";
20− url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch";
21− sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE=";
22− })
23− ];
24−
2516 meta = with lib; {
2617 description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
2718 homepage = "https://cluster.ipfs.io/";
pkgs/applications/networking/irc/senpai/default.nix+4−4
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "senpai";
5− version = "unstable-2021-12-14";
5+ version = "unstable-2022-04-29";
66
77 src = fetchFromSourcehut {
88 owner = "~taiite";
99 repo = "senpai";
10− rev = "8091752a67781273944e7a79a803b7a671378313";
11− sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";
10+ rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";
11+ sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";
1212 };
1313
14− vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";
14+ vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";
1515
1616 subPackages = [
1717 "cmd/senpai"
pkgs/applications/networking/irc/weechat/default.nix+2−2
@@ -28,14 +28,14 @@ let
2828 in
2929 assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
3030 stdenv.mkDerivation rec {
31− version = "3.4.1";
31+ version = "3.5";
3232 pname = "weechat";
3333
3434 hardeningEnable = [ "pie" ];
3535
3636 src = fetchurl {
3737 url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
38− sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw=";
38+ sha256 = "sha256-8ZSa2dQPTiChGW00T5OASHmd0C2PatUtTu9Gr4CF4Oc=";
3939 };
4040
4141 outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "evolution-ews";
6− version = "3.44.0";
6+ version = "3.44.1";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA=";
10+ sha256 = "LJNidefwnQtOtWgMVb/4Xw2A0lU4R2Gm0Z3XfOaU/oM=";
1111 };
1212
1313 nativeBuildInputs = [ cmake gettext intltool pkg-config ];
pkgs/applications/networking/mailreaders/meli/default.nix+1−2
@@ -6,7 +6,6 @@
66, dbus
77, sqlite
88, file
9−, gzip
109, makeWrapper
1110, notmuch
1211 # Build with support for notmuch backend
@@ -25,7 +24,7 @@ rustPlatform.buildRustPackage rec {
2524
2625 cargoSha256 = "sha256-ZE653OtXyZ9454bKPApmuL2kVko/hGBWEAya1L1KIoc=";
2726
28− nativeBuildInputs = [ pkg-config gzip makeWrapper ];
27+ nativeBuildInputs = [ pkg-config makeWrapper ];
2928
3029 buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
3130
pkgs/applications/networking/mailreaders/mutt/default.nix+2−2
@@ -27,11 +27,11 @@ with lib;
2727
2828stdenv.mkDerivation rec {
2929 pname = "mutt";
30− version = "2.2.3";
30+ version = "2.2.4";
3131
3232 src = fetchurl {
3333 url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
34− sha256 = "12cds5qm0x51wj1bz1a2f4q4qwbyfssq9pnisxz48ks5mg6xv2lp";
34+ sha256 = "0q70qrsjvmkfns1qxc0il2rlmfjwzbmfg89zlch0iqghpyz7c9xq";
3535 };
3636
3737 patches = optional smimeSupport (fetchpatch {
pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }:
1+{ lib, stdenv, fetchFromGitHub, mercury, pandoc, ncurses, gpgme }:
22
33stdenv.mkDerivation rec {
44 pname = "notmuch-bower";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0r5s16pc3ym5nd33lv9ljv1p1gpb7yysrdni4g7w7yvjrnwk35l6";
1212 };
1313
14− nativeBuildInputs = [ gawk mercury pandoc ];
14+ nativeBuildInputs = [ mercury pandoc ];
1515
1616 buildInputs = [ ncurses gpgme ];
1717
pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+261−261

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/packages.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/modem-manager-gui/default.nix+15

This diff is too big to show here.

pkgs/applications/networking/n8n/node-packages.nix+315−240

This diff is too big to show here.

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/nextcloud-client/default.nix+7−4

This diff is too big to show here.

pkgs/applications/networking/p2p/gnunet/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/seafile-client/default.nix+5−3

This diff is too big to show here.

pkgs/applications/networking/sync/onedrive/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/sync/rclone/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/termius/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/zerobin/default.nix+1−1

This diff is too big to show here.

pkgs/applications/office/beamerpresenter/default.nix+45−22

This diff is too big to show here.

pkgs/applications/office/bookworm/default.nix−2

This diff is too big to show here.

pkgs/applications/office/calligra/default.nix+16

This diff is too big to show here.

pkgs/applications/office/libreoffice/soffice-template.desktopnew file+6

This diff is too big to show here.

pkgs/applications/office/libreoffice/wrapper.nix+25−12

This diff is too big to show here.

pkgs/applications/office/qownnotes/default.nix+2−2

This diff is too big to show here.

pkgs/applications/office/tusk/default.nix+3−2

This diff is too big to show here.

pkgs/applications/office/zotero/default.nix+2−2

This diff is too big to show here.

pkgs/applications/radio/gnuradio/wrapper.nix+1−1

This diff is too big to show here.

pkgs/applications/radio/kalibrate-rtl/default.nix+5−5

This diff is too big to show here.

pkgs/applications/radio/rtl-sdr/default.nix+11−7

This diff is too big to show here.

pkgs/applications/radio/uhd/default.nix+2

This diff is too big to show here.

pkgs/applications/science/biology/blast/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/bwa/default.nix+2

This diff is too big to show here.

pkgs/applications/science/biology/megahit/default.nix+3

This diff is too big to show here.

pkgs/applications/science/biology/quast/default.nix+1−3

This diff is too big to show here.

pkgs/applications/science/biology/samtools/default.nix+8−1

This diff is too big to show here.

pkgs/applications/science/biology/tebreak/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/computer-architecture/qtrvsim/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/easycrypt/default.nixnew file+50

This diff is too big to show here.

pkgs/applications/science/logic/easycrypt/runtest.nixnew file+24

This diff is too big to show here.

pkgs/applications/science/math/adolc/default.nixnew file+23

This diff is too big to show here.

pkgs/applications/science/misc/colmap/default.nix+22−6

This diff is too big to show here.

pkgs/applications/science/misc/snakemake/default.nix+27−13

This diff is too big to show here.

pkgs/applications/science/robotics/mavproxy/default.nix+2−2

This diff is too big to show here.

pkgs/applications/terminal-emulators/alacritty/default.nix−2

This diff is too big to show here.

pkgs/applications/terminal-emulators/foot/default.nix+3−2

This diff is too big to show here.

pkgs/applications/terminal-emulators/wezterm/default.nix+17−9

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/gh/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-cliff/default.nix+3−3

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix+4−12

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git/default.nix+6−4

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/gitbatch/default.nix+12−10

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/gitbatch/deps.nixdeleted−543

This diff is too big to show here.

pkgs/applications/version-management/git-repo/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitea/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitlab/data.json+7−7

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitaly/Gemfile+1−1

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+13−13

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitaly/default.nix+4−4

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitaly/gemset.nix+16−16

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+3−3

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile+10−9

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock+87−83

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix+75−64

This diff is too big to show here.

pkgs/applications/version-management/redmine/Gemfile+2−2

This diff is too big to show here.

pkgs/applications/version-management/redmine/Gemfile.lock+48−50

This diff is too big to show here.

pkgs/applications/version-management/redmine/default.nix+3−5

This diff is too big to show here.

pkgs/applications/version-management/redmine/gemset.nix+39−49

This diff is too big to show here.

pkgs/applications/version-management/redmine/update.shnew file+17

This diff is too big to show here.

pkgs/applications/version-management/subversion/default.nix−5

This diff is too big to show here.

pkgs/applications/video/clickshare-csc1/default.nix−2

This diff is too big to show here.

pkgs/applications/video/davinci-resolve/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/hyperion-ng/default.nixnew file+50

This diff is too big to show here.

pkgs/applications/video/kodi/unwrapped.nix+2−2

This diff is too big to show here.

pkgs/applications/video/lightworks/default.nix+4−4

This diff is too big to show here.

pkgs/applications/video/mkvtoolnix/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/peek/default.nix−2

This diff is too big to show here.

pkgs/applications/video/vdr/plugins.nix+5−80

This diff is too big to show here.

pkgs/applications/video/vlc/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/containerd/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/crun/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/distrobox/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/lima/default.nix+8−3

This diff is too big to show here.

pkgs/applications/virtualization/podman-tui/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/podman/default.nix+1

This diff is too big to show here.

pkgs/applications/virtualization/vmware-workstation/default.nixnew file+341

This diff is too big to show here.

pkgs/applications/virtualization/vmware-workstation/vmware-bootstrapnew file+11

This diff is too big to show here.

pkgs/applications/virtualization/vmware-workstation/vmware-confignew file+21

This diff is too big to show here.

pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrapnew file+5

This diff is too big to show here.

pkgs/applications/virtualization/vmware-workstation/vmware-modconfignew file+8

This diff is too big to show here.

pkgs/applications/window-managers/wmfs/default.nix+1−5

This diff is too big to show here.

pkgs/applications/window-managers/wmii-hg/default.nixdeleted−46

This diff is too big to show here.

pkgs/applications/window-managers/wmii/default.nixnew file+72

This diff is too big to show here.

pkgs/build-support/docker/default.nix+1−2

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/default.nix+10−5

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh+2−1

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh+2−1

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh+5−1

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh+5−4

This diff is too big to show here.

pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh+2−1

This diff is too big to show here.

pkgs/build-support/dotnet/make-nuget-source/default.nix+26−18

This diff is too big to show here.

pkgs/build-support/dotnet/nuget-to-nix/default.nix+25−3

This diff is too big to show here.

pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh+3−1

This diff is too big to show here.

pkgs/build-support/fetchfirefoxaddon/default.nix+2−2

This diff is too big to show here.

pkgs/build-support/fetchnextcloudapp/default.nix+1−6

This diff is too big to show here.

pkgs/build-support/kernel/make-initrd-ng-tool.nix+8−1

This diff is too big to show here.

pkgs/build-support/kernel/make-initrd-ng.nix+2−2

This diff is too big to show here.

pkgs/build-support/kernel/make-initrd-ng/src/main.rs+15−7

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/build-crate.nix+3−2

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/configure-crate.nix+2−1

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/default.nix+4−2

This diff is too big to show here.

pkgs/build-support/rust/default-crate-overrides.nix+1−1

This diff is too big to show here.

pkgs/build-support/writers/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/amiri/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/annapurna-sil/default.nixnew file+29

This diff is too big to show here.

pkgs/data/fonts/ezra-sil/default.nixnew file+26

This diff is too big to show here.

pkgs/data/fonts/galatia-sil/default.nixnew file+29

This diff is too big to show here.

pkgs/data/fonts/iosevka/bin.nix+1−1

This diff is too big to show here.

pkgs/data/fonts/iosevka/variants.nix+92−92

This diff is too big to show here.

pkgs/data/fonts/kacst/default.nixnew file+22

This diff is too big to show here.

pkgs/data/fonts/lao/default.nixnew file+22

This diff is too big to show here.

pkgs/data/fonts/uni-vga/default.nix+4−6

This diff is too big to show here.

pkgs/data/icons/comixcursors/default.nix+5−25

This diff is too big to show here.

pkgs/data/icons/luna-icons/default.nix+5−2

This diff is too big to show here.

pkgs/data/misc/hackage/pin.json+4−4

This diff is too big to show here.

pkgs/data/themes/flat-remix-gnome/default.nix+4−4

This diff is too big to show here.

pkgs/data/themes/flat-remix-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/data/themes/orchis-theme/default.nix+2−2

This diff is too big to show here.

pkgs/data/themes/vimix/default.nix+12−4

This diff is too big to show here.

pkgs/desktops/cdesktopenv/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/enlightenment/econnman/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/enlightenment/ecrire/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/efl/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/enlightenment/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/ephoto/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/evisum/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/rage/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/enlightenment/terminology/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/gnome-2/platform/libglade/default.nix+2−5

This diff is too big to show here.

pkgs/desktops/gnome/apps/ghex/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome/apps/gnome-calendar/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome/apps/gnome-todo/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome/core/gnome-software/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome/core/zenity/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome/extensions/collisions.json+20

This diff is too big to show here.

pkgs/desktops/gnome/extensions/extensionRenames.nix+6−3

This diff is too big to show here.

pkgs/desktops/gnome/extensions/extensions.json+99−86

This diff is too big to show here.

pkgs/desktops/gnome/extensions/update-extensions.py+1−1

This diff is too big to show here.

pkgs/desktops/lumina/lumina-calculator/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lumina/lumina-pdf/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lumina/lumina/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lxqt/compton-conf/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lxqt/default.nix+2−5

This diff is too big to show here.

pkgs/desktops/lxqt/libfm-qt/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/liblxqt/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/libqtxdg/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/libsysstat/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lxqt/lximage-qt/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-about/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-admin/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-archiver/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-build-tools/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-config/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-globalkeys/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-notificationd/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-panel/default.nix+4−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-policykit/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-powermanagement/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-qtplugin/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-runner/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-session/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-sudo/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/lxqt-themes/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/obconf-qt/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lxqt/pavucontrol-qt/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/pcmanfm-qt/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/qlipper/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/lxqt/qps/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/qterminal/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/qtermwidget/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/screengrab/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nixnew file+41

This diff is too big to show here.

pkgs/desktops/pantheon/apps/switchboard/default.nix+2−15

This diff is too big to show here.

pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix+12−5

This diff is too big to show here.

pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/pantheon/default.nix+2

This diff is too big to show here.

pkgs/desktops/pantheon/granite/7/default.nixnew file+73

This diff is too big to show here.

pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce/applications/xfce4-terminal/default.nix+2−2

This diff is too big to show here.

pkgs/development/beam-modules/erlang-ls/default.nix+2−2

This diff is too big to show here.

pkgs/development/beam-modules/erlang-ls/rebar-deps.nix+8−7

This diff is too big to show here.

pkgs/development/compilers/abcl/default.nix+6−1

This diff is too big to show here.

pkgs/development/compilers/bupc/default.nix−1

This diff is too big to show here.

pkgs/development/compilers/chez/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/chicken/5/eggs.nix+414

This diff is too big to show here.

pkgs/development/compilers/chicken/5/eggs.scm+5

This diff is too big to show here.

pkgs/development/compilers/ghc/8.10.2-binary.nix+14

This diff is too big to show here.

pkgs/development/compilers/ghc/8.10.7-binary.nix+14

This diff is too big to show here.

pkgs/development/compilers/glslang/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/graalvm/community-edition/default.nix+4−6

This diff is too big to show here.

pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json+24−24

This diff is too big to show here.

pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json+24−24

This diff is too big to show here.

pkgs/development/compilers/graalvm/community-edition/update.nix+1

This diff is too big to show here.

pkgs/development/compilers/hare/config-template.mknew file+27

This diff is too big to show here.

pkgs/development/compilers/hare/hare.nixnew file+93

This diff is too big to show here.

pkgs/development/compilers/hare/harec.nixnew file+45

This diff is too big to show here.

pkgs/development/compilers/jasmin-compiler/default.nixnew file+41

This diff is too big to show here.

pkgs/development/compilers/open-watcom/v2.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/opendylan/bin.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/openjdk/11.nix+8−5

This diff is too big to show here.

pkgs/development/compilers/openjdk/17.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/openjdk/fix-library-path-jdk11.patch+21−3

This diff is too big to show here.

pkgs/development/compilers/ponyc/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/purescript/purescript/default.nix+5−7

This diff is too big to show here.

pkgs/development/compilers/purescript/purescript/test-minimal-module/Main.js+1−1

This diff is too big to show here.

pkgs/development/compilers/purescript/purescript/test-minimal-module/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/sbcl/2.2.4.nixnew file+4

This diff is too big to show here.

pkgs/development/compilers/solc/default.nix+34−11

This diff is too big to show here.

pkgs/development/compilers/squeak/default.nix+1−3

This diff is too big to show here.

pkgs/development/compilers/swift/default.nix−6

This diff is too big to show here.

pkgs/development/coq-modules/coqtail-math/default.nix+6−1

This diff is too big to show here.

pkgs/development/coq-modules/flocq/default.nix+2−2

This diff is too big to show here.

pkgs/development/coq-modules/metacoq/default.nixnew file+76

This diff is too big to show here.

pkgs/development/coq-modules/metalib/default.nix+7−3

This diff is too big to show here.

pkgs/development/coq-modules/parsec/default.nix+6−2

This diff is too big to show here.

pkgs/development/coq-modules/simple-io/default.nix+10−3

This diff is too big to show here.

pkgs/development/coq-modules/tlc/default.nix+2

This diff is too big to show here.

pkgs/development/embedded/fpga/apio/default.nix+5−4

This diff is too big to show here.

pkgs/development/embedded/openocd/default.nix+1

This diff is too big to show here.

pkgs/development/gnuradio-modules/osmosdr/default.nix+2

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-common.nix+22−12

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-darwin.nix+6−7

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+7

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+3

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+2−1

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+10−5

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+4

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml+47−15

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+7−4

This diff is too big to show here.

pkgs/development/haskell-modules/hackage-packages.nix+1178−365

This diff is too big to show here.

pkgs/development/interpreters/alda/default.nix+3−3

This diff is too big to show here.

pkgs/development/interpreters/guile/1.8.nix−1

This diff is too big to show here.

pkgs/development/interpreters/guile/2.0.nix−1

This diff is too big to show here.

pkgs/development/interpreters/guile/2.2.nix−1

This diff is too big to show here.

pkgs/development/interpreters/guile/3.0.nix−1

This diff is too big to show here.

pkgs/development/interpreters/pixie/default.nixdeleted−94

This diff is too big to show here.

pkgs/development/interpreters/pixie/dust.nixdeleted−46

This diff is too big to show here.

pkgs/development/interpreters/pixie/load_paths.patchdeleted−25

This diff is too big to show here.

pkgs/development/interpreters/pixie/make-paths-configurable.patchdeleted−119

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/default.nix+6

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh+3

This diff is too big to show here.

pkgs/development/interpreters/python/hooks/sphinx-hook.shnew file+57

This diff is too big to show here.

pkgs/development/interpreters/python/wrapper.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/racket/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/racket/minimal.nix+1−1

This diff is too big to show here.

pkgs/development/interpreters/sollya/default.nix+2−2

This diff is too big to show here.

pkgs/development/java-modules/liquibase_redshift_extension/default.nixnew file+27

This diff is too big to show here.

pkgs/development/java-modules/redshift_jdbc/default.nixnew file+28

This diff is too big to show here.

pkgs/development/libraries/at-spi2-core/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/audio/libspecbleach/default.nixnew file+26

This diff is too big to show here.

pkgs/development/libraries/bc-decaf/default.nixnew file+36

This diff is too big to show here.

pkgs/development/libraries/bctoolbox/default.nix+16−6

This diff is too big to show here.

pkgs/development/libraries/belcard/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/belle-sip/default.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/belr/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/bzrtp/default.nix+5−6

This diff is too big to show here.

pkgs/development/libraries/dbus/default.nix+7

This diff is too big to show here.

pkgs/development/libraries/docopt_cpp/default.nix+10−2

This diff is too big to show here.

pkgs/development/libraries/doctest/default.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/duckdb/default.nix+36−3

This diff is too big to show here.

pkgs/development/libraries/entt/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/fcft/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ffmpegthumbnailer/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/gdal/2.4.nix+11−1

This diff is too big to show here.

pkgs/development/libraries/gecode/3.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/glib/default.nix+2−10

This diff is too big to show here.

pkgs/development/libraries/glibc/default.nix+4−7

This diff is too big to show here.

pkgs/development/libraries/glibmm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/goffice/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/goocanvas/2.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/bad/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/gstreamer/base/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/core/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/default.nix+2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/devtools/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ges/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/good/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/libav/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/rtsp-server/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ugly/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/viperfx/default.nixnew file+41

This diff is too big to show here.

pkgs/development/libraries/gtk/4.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gusb/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/htmlcxx/c++17.patchnew file+24

This diff is too big to show here.

pkgs/development/libraries/htmlcxx/default.nix+7−4

This diff is too big to show here.

pkgs/development/libraries/hyperscan/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/imath/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/inih/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/java/commons/daemon/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/jellyfin-ffmpeg/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/kpmcore/default.nix+10−18

This diff is too big to show here.

pkgs/development/libraries/libarchive/default.nix+20−7

This diff is too big to show here.

pkgs/development/libraries/libcef/default.nix+6−6

This diff is too big to show here.

pkgs/development/libraries/libdeltachat/default.nix+3−5

This diff is too big to show here.

pkgs/development/libraries/libinjection/default.nix+12−4

This diff is too big to show here.

pkgs/development/libraries/libinput/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libixp-hg/default.nixdeleted−27

This diff is too big to show here.

pkgs/development/libraries/libixp/default.nixnew file+28

This diff is too big to show here.

pkgs/development/libraries/libjcat/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/liblinphone/default.nix+23−9

This diff is too big to show here.

pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patchnew file+57

This diff is too big to show here.

pkgs/development/libraries/libosmscout/default.nix+9−8

This diff is too big to show here.

pkgs/development/libraries/libpqxx/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libslirp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libvdpau/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libviperfx/default.nixnew file+30

This diff is too big to show here.

pkgs/development/libraries/libxcrypt/default.nix+4

This diff is too big to show here.

pkgs/development/libraries/libxmlb/default.nix+4−12

This diff is too big to show here.

pkgs/development/libraries/libxsmm/default.nix+1−3

This diff is too big to show here.

pkgs/development/libraries/lime/default.nix+15−5

This diff is too big to show here.

pkgs/development/libraries/mediastreamer/default.nix+22−17

This diff is too big to show here.

pkgs/development/libraries/mediastreamer/msopenh264.nix+6−7

This diff is too big to show here.

pkgs/development/libraries/mesa/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/mimetic/default.nix+8−2

This diff is too big to show here.

pkgs/development/libraries/nghttp3/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/ngtcp2/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/nss/85_security_load_3.77+.patchnew file+76

This diff is too big to show here.

pkgs/development/libraries/nss/generic.nix+5−1

This diff is too big to show here.

pkgs/development/libraries/nss/latest.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openal-soft/default.nix+14−8

This diff is too big to show here.

pkgs/development/libraries/openal-soft/search-out.patch+2−2

This diff is too big to show here.

pkgs/development/libraries/opendht/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openfst/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openjpeg/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/openssl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ortp/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/physics/cernlib/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/poppler/0.61-CVE-2019-9959.patchdeleted−20

This diff is too big to show here.

pkgs/development/libraries/poppler/0.61.nixdeleted−94

This diff is too big to show here.

pkgs/development/libraries/proj/default.nix+17−8

This diff is too big to show here.

pkgs/development/libraries/ptex/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebengine.nix+18−3

This diff is too big to show here.

pkgs/development/libraries/qwt/default.nix+2

This diff is too big to show here.

pkgs/development/libraries/rocclr/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/rocm-comgr/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/rocm-device-libs/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/rocm-runtime/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/rocm-thunk/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/science/astronomy/indilib/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/science/biology/htslib/default.nix+18−2

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/default.nixdeleted−151

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patchdeleted−46

This diff is too big to show here.

pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patchdeleted−55

This diff is too big to show here.

pkgs/development/libraries/science/math/liblapack/default.nix+2−11

This diff is too big to show here.

pkgs/development/libraries/science/math/scalapack/default.nix+8−1

This diff is too big to show here.

pkgs/development/libraries/skalibs/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/slang/default.nix+7

This diff is too big to show here.

pkgs/development/libraries/snack/default.nixdeleted−36

This diff is too big to show here.

pkgs/development/libraries/soci/bc-soci.nixnew file+53

This diff is too big to show here.

pkgs/development/libraries/spirv-headers/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/utmps/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/vapoursynth/default.nix+3−6

This diff is too big to show here.

pkgs/development/libraries/vulkan-headers/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/vulkan-loader/default.nix+6−3

This diff is too big to show here.

pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patchnew file+14

This diff is too big to show here.

pkgs/development/libraries/waylandpp/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/webkitgtk/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/wolfssl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/xdg-desktop-portal/default.nix+18−12

This diff is too big to show here.

pkgs/development/libraries/xdg-desktop-portal/fix-paths.patchdeleted−13

This diff is too big to show here.

pkgs/development/lisp-modules-new/.gitattributesnew file+1

This diff is too big to show here.

pkgs/development/lisp-modules-new/.gitignorenew file+3

This diff is too big to show here.

pkgs/development/lisp-modules-new/doc/api.mdnew file+197

This diff is too big to show here.

pkgs/development/lisp-modules-new/doc/nix-cl.mdnew file+98

This diff is too big to show here.

pkgs/development/lisp-modules-new/doc/quicklisp.mdnew file+54

This diff is too big to show here.

pkgs/development/lisp-modules-new/doc/quirks.mdnew file+5

This diff is too big to show here.

pkgs/development/lisp-modules-new/examples/abcl-package-set.nixnew file+24

This diff is too big to show here.

pkgs/development/lisp-modules-new/examples/abcl-with-packages.nixnew file+23

This diff is too big to show here.

pkgs/development/lisp-modules-new/examples/bordeaux-threads.nixnew file+43

This diff is too big to show here.

pkgs/development/lisp-modules-new/examples/sbcl-with-bt.nixnew file+31

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/api.lispnew file+18

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/database/sqlite.lispnew file+134

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/init.sqlnew file+41

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/main.lispnew file+40

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/nix.lispnew file+81

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/org.lispbuilds.nix.asdnew file+24

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/repository/quicklisp.lispnew file+199

This diff is too big to show here.

pkgs/development/lisp-modules-new/import/util.lispnew file+16

This diff is too big to show here.

pkgs/development/lisp-modules-new/imported.nixnew file+65675

This diff is too big to show here.

pkgs/development/lisp-modules-new/lisp-packages.nixnew file+432

This diff is too big to show here.

pkgs/development/lisp-modules-new/old-make-wrapper.shnew file+155

This diff is too big to show here.

pkgs/development/lisp-modules-new/packages.nixnew file+369

This diff is too big to show here.

pkgs/development/lisp-modules-new/patches/swank-pure-paths.patchnew file+28

This diff is too big to show here.

pkgs/development/lisp-modules-new/ql-import.lispnew file+6

This diff is too big to show here.

pkgs/development/lisp-modules-new/ql.nixnew file+140

This diff is too big to show here.

pkgs/development/lisp-modules-new/readme.mdnew file+34

This diff is too big to show here.

pkgs/development/lisp-modules-new/shell.nixnew file+7

This diff is too big to show here.

pkgs/development/lisp-modules-new/test/lispPackagesToTest.txtnew file+395

This diff is too big to show here.

pkgs/development/lisp-modules-new/test/test.lispnew file+94

This diff is too big to show here.

pkgs/development/lua-modules/generated-packages.nix+42−9

This diff is too big to show here.

pkgs/development/lua-modules/luaexpat.patchdeleted−36

This diff is too big to show here.

pkgs/development/lua-modules/overrides.nix+6−3

This diff is too big to show here.

pkgs/development/node-packages/composition.nix+1−1

This diff is too big to show here.

pkgs/development/node-packages/default.nix+8−41

This diff is too big to show here.

pkgs/development/node-packages/node-env.nix+21−11

This diff is too big to show here.

pkgs/development/node-packages/node-packages.json+1−2

This diff is too big to show here.

pkgs/development/node-packages/node-packages.nix+3297−3709

This diff is too big to show here.

pkgs/development/ocaml-modules/atd/default.nix+6−14

This diff is too big to show here.

pkgs/development/ocaml-modules/atdgen/codec-runtime.nixnew file+18

This diff is too big to show here.

pkgs/development/ocaml-modules/atdgen/default.nix+8−17

This diff is too big to show here.

pkgs/development/ocaml-modules/atdgen/runtime.nixnew file+15

This diff is too big to show here.

pkgs/development/ocaml-modules/camlp-streams/default.nixnew file+20

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-action-plugin/default.nix+4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-glob/default.nix+4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-private-libs/default.nix+4

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-rpc/default.nixnew file+23

This diff is too big to show here.

pkgs/development/ocaml-modules/dune-site/default.nix+4

This diff is too big to show here.

pkgs/development/ocaml-modules/fiber/default.nixnew file+23

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/default.nix+7−8

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix+8−4

This diff is too big to show here.

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix+25−5

This diff is too big to show here.

pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix+15−3

This diff is too big to show here.

pkgs/development/ocaml-modules/ocsigen-ppx-rpc/default.nixnew file+23

This diff is too big to show here.

pkgs/development/ocaml-modules/ocsigen-start/default.nix+4−2

This diff is too big to show here.

pkgs/development/ocaml-modules/stdune/default.nix+6−2

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nixdeleted−39

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nixdeleted−35

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/base-test-helpers.nixdeleted−32

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/base.nixdeleted−37

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/clic.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/client-010-PtGRANAD.nixdeleted−38

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nixdeleted−44

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/client-base.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/context.nixdeleted−34

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/crypto.nixdeleted−42

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/error-monad.nixdeleted−35

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nixdeleted−25

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/event-logging.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/hacl-glue-unix.nixdeleted−26

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/hacl-glue.nixdeleted−17

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/legacy-store.nixdeleted−42

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/lmdb.nixdeleted−51

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nixdeleted−31

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/micheline.nixdeleted−32

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/mockup-proxy.nixdeleted−27

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/mockup-registration.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/p2p-services.nixdeleted−19

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/p2p.nixdeleted−38

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-alpha.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-compiler.nixdeleted−34

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nixdeleted−18

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nixdeleted−42

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nixdeleted−25

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-environment.nixdeleted−43

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/protocol-updater.nixdeleted−26

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/proxy.nixdeleted−36

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/requester.nixdeleted−34

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/rpc-http-client-unix.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/rpc-http-client.nixdeleted−23

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/rpc-http.nixdeleted−25

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/rpc.nixdeleted−25

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/sapling.nixdeleted−35

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/shell-context.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nixdeleted−32

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/shell-services.nixdeleted−30

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/shell.nixdeleted−44

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/signer-backends.nixdeleted−30

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/signer-services.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/stdlib-unix.nixdeleted−33

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/stdlib.nixdeleted−64

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/store.nixdeleted−50

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/test-helpers.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/validation.nixdeleted−28

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/version.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/tezos/workers.nixdeleted−21

This diff is too big to show here.

pkgs/development/ocaml-modules/uuuu/default.nix+6−9

This diff is too big to show here.

pkgs/development/ocaml-modules/xdg/default.nixnew file+17

This diff is too big to show here.

pkgs/development/octave-modules/octproj/default.nix+1

This diff is too big to show here.

pkgs/development/php-packages/openswoole/default.nixnew file+22

This diff is too big to show here.

pkgs/development/php-packages/pdepend/default.nixnew file+41

This diff is too big to show here.

pkgs/development/python-modules/Nikola/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/Theano/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/XlsxWriter/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/advocate/default.nixnew file+45

This diff is too big to show here.

pkgs/development/python-modules/afsapi/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/aioairzone/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aiohttp-apispec/default.nix+2−7

This diff is too big to show here.

pkgs/development/python-modules/aiolifx/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aiomysql/default.nix+17−27

This diff is too big to show here.

pkgs/development/python-modules/aiooncue/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/aioqsw/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/aioslimproto/default.nixnew file+41

This diff is too big to show here.

pkgs/development/python-modules/amqp/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/androidtv/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ansible-doctor/default.nix+25−25

This diff is too big to show here.

pkgs/development/python-modules/ansible-later/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ansible/default.nix+3−2

This diff is too big to show here.

pkgs/development/python-modules/apispec/default.nix+13−9

This diff is too big to show here.

pkgs/development/python-modules/apprise/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/av/default.nix+8−2

This diff is too big to show here.

pkgs/development/python-modules/aws-adfs/default.nix+2−12

This diff is too big to show here.

pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/awscrt/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/azure-identity/default.nix+15−18

This diff is too big to show here.

pkgs/development/python-modules/beautifulsoup4/default.nix+9−3

This diff is too big to show here.

pkgs/development/python-modules/bleach/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/bleak/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/bpython/default.nix+16−2

This diff is too big to show here.

pkgs/development/python-modules/breezy/default.nix+20−5

This diff is too big to show here.

pkgs/development/python-modules/browser-cookie3/default.nix+6−5

This diff is too big to show here.

pkgs/development/python-modules/bsblan/default.nix+14−13

This diff is too big to show here.

pkgs/development/python-modules/can/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/canonicaljson/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/casbin/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/cert-chain-resolver/default.nix+22−7

This diff is too big to show here.

pkgs/development/python-modules/codepy/default.nixnew file+35

This diff is too big to show here.

pkgs/development/python-modules/commoncode/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/connexion/default.nix+10−16

This diff is too big to show here.

pkgs/development/python-modules/contexttimer/default.nixnew file+42

This diff is too big to show here.

pkgs/development/python-modules/dask-yarn/default.nixnew file+47

This diff is too big to show here.

pkgs/development/python-modules/deezer-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/deltachat/default.nix+7−3

This diff is too big to show here.

pkgs/development/python-modules/denonavr/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/devito/default.nixnew file+100

This diff is too big to show here.

pkgs/development/python-modules/django-taggit/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/dockerfile-parse/default.nix+27−9

This diff is too big to show here.

pkgs/development/python-modules/docstring-parser/default.nix+25−11

This diff is too big to show here.

pkgs/development/python-modules/dropbox/default.nix+3

This diff is too big to show here.

pkgs/development/python-modules/duckdb-engine/default.nixnew file+40

This diff is too big to show here.

pkgs/development/python-modules/dungeon-eos/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/durus/default.nixnew file+28

This diff is too big to show here.

pkgs/development/python-modules/elementpath/default.nix+4−4

This diff is too big to show here.

pkgs/development/python-modules/elkm1-lib/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/envs/default.nix+15−11

This diff is too big to show here.

pkgs/development/python-modules/exceptiongroup/default.nixnew file+39

This diff is too big to show here.

pkgs/development/python-modules/faraday-agent-parameters-types/default.nix+6−1

This diff is too big to show here.

pkgs/development/python-modules/faraday-plugins/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/fastavro/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/fastbencode/default.nixnew file+26

This diff is too big to show here.

pkgs/development/python-modules/fastjsonschema/default.nix+3−14

This diff is too big to show here.

pkgs/development/python-modules/filetype/default.nix+26−6

This diff is too big to show here.

pkgs/development/python-modules/flake8-debugger/default.nix+23−14

This diff is too big to show here.

pkgs/development/python-modules/flask-compress/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/flask-jwt-extended/default.nix+31−10

This diff is too big to show here.

pkgs/development/python-modules/flask-login/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/flask-testing/default.nix+41−15

This diff is too big to show here.

pkgs/development/python-modules/flatdict/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/fontmake/default.nixnew file+42

This diff is too big to show here.

pkgs/development/python-modules/fonttools/default.nix+7−3

This diff is too big to show here.

pkgs/development/python-modules/fqdn/default.nixnew file+36

This diff is too big to show here.

pkgs/development/python-modules/garminconnect/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/gbulb/default.nixnew file+43

This diff is too big to show here.

pkgs/development/python-modules/gcal-sync/default.nixnew file+46

This diff is too big to show here.

pkgs/development/python-modules/gehomesdk/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/gensim/default.nix+37−20

This diff is too big to show here.

pkgs/development/python-modules/ghp-import/default.nix+12−4

This diff is too big to show here.

pkgs/development/python-modules/glances-api/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/glyphslib/default.nixnew file+59

This diff is too big to show here.

pkgs/development/python-modules/google-cloud-videointelligence/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/gradient/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/gtts/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/hahomematic/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/hatasmota/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/hatchling/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/hg-evolve/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/howdoi/default.nix+16−2

This diff is too big to show here.

pkgs/development/python-modules/http-message-signatures/default.nixnew file+56

This diff is too big to show here.

pkgs/development/python-modules/http-sfv/default.nixnew file+39

This diff is too big to show here.

pkgs/development/python-modules/ibis-framework/default.nix+34−47

This diff is too big to show here.

pkgs/development/python-modules/identify/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ihatemoney/default.nix+36−35

This diff is too big to show here.

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixnew file+26

This diff is too big to show here.

pkgs/development/python-modules/ipython-sql/default.nixnew file+58

This diff is too big to show here.

pkgs/development/python-modules/ismartgate/default.nix+12−2

This diff is too big to show here.

pkgs/development/python-modules/isoduration/default.nixnew file+50

This diff is too big to show here.

pkgs/development/python-modules/jc/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/jedi-language-server/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/json-schema-for-humans/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/jsonrpc-async/default.nix+25−4

This diff is too big to show here.

pkgs/development/python-modules/jsonrpc-base/default.nix+9−1

This diff is too big to show here.

pkgs/development/python-modules/jug/default.nix+31−18

This diff is too big to show here.

pkgs/development/python-modules/jwcrypto/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/lektor/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/lightwave2/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/limnoria/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/loo-py/default.nix → pkgs/development/python-modules/loopy/default.nixrenamed+28−24

This diff is too big to show here.

pkgs/development/python-modules/luxtronik/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mailchecker/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/marshmallow-dataclass/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mat2/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mautrix/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/meater-python/default.nixnew file+37

This diff is too big to show here.

pkgs/development/python-modules/meshtastic/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mkdocs-minify/default.nixnew file+37

This diff is too big to show here.

pkgs/development/python-modules/mkdocs-redirects/default.nixnew file+31

This diff is too big to show here.

pkgs/development/python-modules/monty/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/murmurhash/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mwdblib/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/mypy-boto3-s3/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/namedlist/default.nix+30−9

This diff is too big to show here.

pkgs/development/python-modules/nbclient/default.nix+33−10

This diff is too big to show here.

pkgs/development/python-modules/nbconvert/default.nix+8−7

This diff is too big to show here.

pkgs/development/python-modules/nettigo-air-monitor/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/netutils/default.nixnew file+66

This diff is too big to show here.

pkgs/development/python-modules/nutils/default.nixnew file+32

This diff is too big to show here.

pkgs/development/python-modules/nvchecker/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/openstep-plist/default.nixnew file+31

This diff is too big to show here.

pkgs/development/python-modules/pandas/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/pathy/default.nix+37−14

This diff is too big to show here.

pkgs/development/python-modules/peaqevcore/default.nixnew file+38

This diff is too big to show here.

pkgs/development/python-modules/peewee/default.nix+7−4

This diff is too big to show here.

pkgs/development/python-modules/pex/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pilkit/default.nix+29−17

This diff is too big to show here.

pkgs/development/python-modules/pims/default.nix+42−19

This diff is too big to show here.

pkgs/development/python-modules/pipdate/default.nix+9−5

This diff is too big to show here.

pkgs/development/python-modules/pipdeptree/default.nixnew file+41

This diff is too big to show here.

pkgs/development/python-modules/plugwise/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/poetry-dynamic-versioning/default.nixnew file+58

This diff is too big to show here.

pkgs/development/python-modules/policyuniverse/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/preprocess-cancellation/default.nix+36−6

This diff is too big to show here.

pkgs/development/python-modules/preprocess-cancellation/pep-621.patchnew file+20

This diff is too big to show here.

pkgs/development/python-modules/proton-client/0001-OpenSSL-path-fix.patchnew file+41

This diff is too big to show here.

pkgs/development/python-modules/proton-client/default.nix+18−8

This diff is too big to show here.

pkgs/development/python-modules/pubnub/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/py-desmume/default.nix+3−14

This diff is too big to show here.

pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pybind11/default.nix+3−2

This diff is too big to show here.

pkgs/development/python-modules/pybullet/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pychromecast/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pycm/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pydantic/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/pydeconz/default.nix+6−4

This diff is too big to show here.

pkgs/development/python-modules/pydeps/default.nixnew file+60

This diff is too big to show here.

pkgs/development/python-modules/pyeapi/default.nix+36−8

This diff is too big to show here.

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyezviz/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyfritzhome/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pyhiveapi/default.nix+4−2

This diff is too big to show here.

pkgs/development/python-modules/pyinfra/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyinsteon/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pyiqvia/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pykulersky/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pylast/default.nix+5−5

This diff is too big to show here.

pkgs/development/python-modules/pymyq/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pync/default.nix−2

This diff is too big to show here.

pkgs/development/python-modules/pynetgear/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pynrrd/default.nix+14−4

This diff is too big to show here.

pkgs/development/python-modules/pynws/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyomo/default.nix+34−22

This diff is too big to show here.

pkgs/development/python-modules/pyopenuv/default.nix+4−4

This diff is too big to show here.

pkgs/development/python-modules/pyplatec/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/pyqtwebengine/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/pyradios/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/pyrevolve/default.nixnew file+41

This diff is too big to show here.

pkgs/development/python-modules/pyrogram/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pysensibo/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pyshp/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pysigma/default.nix+2−7

This diff is too big to show here.

pkgs/development/python-modules/pytenable/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/pytest-aiohttp/default.nix+11−13

This diff is too big to show here.

pkgs/development/python-modules/pytest-datafiles/default.nix+33−8

This diff is too big to show here.

pkgs/development/python-modules/python-benedict/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/python-efl/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/python-gitlab/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/python-kasa/default.nix+4−2

This diff is too big to show here.

pkgs/development/python-modules/python-smarttub/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/python-sql/default.nix+24−8

This diff is too big to show here.

pkgs/development/python-modules/pytomorrowio/default.nix+4−2

This diff is too big to show here.

pkgs/development/python-modules/pytorch-metric-learning/default.nix+1

This diff is too big to show here.

pkgs/development/python-modules/pytorch-pfn-extras/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/pytorch/default.nix+6−2

This diff is too big to show here.

pkgs/development/python-modules/pytrafikverket/default.nix+11−4

This diff is too big to show here.

pkgs/development/python-modules/pyvo/default.nix+1−1

This diff is too big to show here.

pkgs/development/python-modules/pywinrm/default.nix+28−12

This diff is too big to show here.

pkgs/development/python-modules/ratelimiter/default.nix+21−13

This diff is too big to show here.

pkgs/development/python-modules/reorder-python-imports/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/requests-cache/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/requests-http-signature/default.nix+16−4

This diff is too big to show here.

pkgs/development/python-modules/requests-pkcs12/default.nix+10−3

This diff is too big to show here.

pkgs/development/python-modules/rns/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ropper/default.nix+26−15

This diff is too big to show here.

pkgs/development/python-modules/s3-credentials/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/scikit-survival/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/scmrepo/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/secretstorage/default.nix+17−6

This diff is too big to show here.

pkgs/development/python-modules/segyio/default.nixnew file+55

This diff is too big to show here.

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/signedjson/default.nix+31−18

This diff is too big to show here.

pkgs/development/python-modules/simplisafe-python/default.nix+6−2

This diff is too big to show here.

pkgs/development/python-modules/skein/default.nix+34−13

This diff is too big to show here.

pkgs/development/python-modules/skein/skeinjar.nix+11−12

This diff is too big to show here.

pkgs/development/python-modules/skein/skeinrepo.nixdeleted−44

This diff is too big to show here.

pkgs/development/python-modules/skia-pathops/default.nixnew file+43

This diff is too big to show here.

pkgs/development/python-modules/skytemple-files/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/skytemple-rust/default.nix+15−6

This diff is too big to show here.

pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/slack-sdk/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/slixmpp/0001-xep_0030-allow-extra-args-in-get_info_from_domain.patchnew file+36

This diff is too big to show here.

pkgs/development/python-modules/slixmpp/default.nix+2

This diff is too big to show here.

pkgs/development/python-modules/smart-open/default.nix+8−26

This diff is too big to show here.

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/snowflake-sqlalchemy/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/socid-extractor/default.nix+7−1

This diff is too big to show here.

pkgs/development/python-modules/spacy-transformers/default.nix+8−6

This diff is too big to show here.

pkgs/development/python-modules/spacy/default.nix+26−21

This diff is too big to show here.

pkgs/development/python-modules/sphinxcontrib-spelling/default.nix+21−7

This diff is too big to show here.

pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/sqlmap/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/srvlookup/default.nix+28−11

This diff is too big to show here.

pkgs/development/python-modules/stringly/default.nixnew file+28

This diff is too big to show here.

pkgs/development/python-modules/stripe/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/superqt/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/svdtools/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/swspotify/default.nix+36−19

This diff is too big to show here.

pkgs/development/python-modules/tern/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/teslajsonpy/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/textual/default.nix+16−13

This diff is too big to show here.

pkgs/development/python-modules/timetagger/default.nix+3−3

This diff is too big to show here.

pkgs/development/python-modules/total-connect-client/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/treelog/default.nixnew file+28

This diff is too big to show here.

pkgs/development/python-modules/trimesh/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/twitch-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-cryptography/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-dateutil/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-decorator/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-paramiko/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-pytz/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-requests/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-tabulate/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-toml/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-typed-ast/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/types-urllib3/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/typical/default.nix+10−9

This diff is too big to show here.

pkgs/development/python-modules/ufo2ft/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/ufoLib2/default.nix+3

This diff is too big to show here.

pkgs/development/python-modules/voluptuous/default.nix+15−11

This diff is too big to show here.

pkgs/development/python-modules/wandb/default.nix+20−12

This diff is too big to show here.

pkgs/development/python-modules/webssh/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/xknx/default.nix+9−4

This diff is too big to show here.

pkgs/development/python-modules/youtube-search-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/python-modules/yte/default.nixnew file+57

This diff is too big to show here.

pkgs/development/python-modules/zeroconf/default.nix+4−2

This diff is too big to show here.

pkgs/development/python-modules/zha-quirks/default.nix+10−4

This diff is too big to show here.

pkgs/development/python-modules/zigpy-deconz/default.nix+6−3

This diff is too big to show here.

pkgs/development/python-modules/zigpy/default.nix+4−2

This diff is too big to show here.

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

This diff is too big to show here.

pkgs/development/quickemu/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/altair-graphql-client/default.nix+3−4

This diff is too big to show here.

pkgs/development/tools/analysis/brakeman/Gemfile.lock+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/brakeman/gemset.nix+2−2

This diff is too big to show here.

pkgs/development/tools/analysis/checkov/default.nix+3−2

This diff is too big to show here.

pkgs/development/tools/analysis/codeql/default.nix+4−4

This diff is too big to show here.

pkgs/development/tools/analysis/cvehound/default.nix+17−12

This diff is too big to show here.

pkgs/development/tools/analysis/tfsec/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/build-managers/alibuild/default.nix+9−6

This diff is too big to show here.

pkgs/development/tools/build-managers/bazel/bazel_4/default.nix−3

This diff is too big to show here.

pkgs/development/tools/build-managers/bazel/bazel_5/default.nix−3

This diff is too big to show here.

pkgs/development/tools/build-managers/bloop/default.nix+16−46

This diff is too big to show here.

pkgs/development/tools/build-managers/mage/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/build-managers/meson/default.nix+7

This diff is too big to show here.

pkgs/development/tools/build-managers/redo-apenwarr/default.nix+1−2

This diff is too big to show here.

pkgs/development/tools/build-managers/rocm-cmake/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/build-managers/scala-cli/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/build-managers/tup/default.nix+2

This diff is too big to show here.

pkgs/development/tools/build-managers/tup/fusermount-setuid.patchnew file+31

This diff is too big to show here.

pkgs/development/tools/continuous-integration/github-runner/default.nix+2

This diff is too big to show here.

pkgs/development/tools/database/liquibase/default.nix+22−7

This diff is too big to show here.

pkgs/development/tools/database/pg_activity/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/database/prisma-engines/default.nix+15−3

This diff is too big to show here.

pkgs/development/tools/ddosify/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/dive/default.nix−2

This diff is too big to show here.

pkgs/development/tools/earthly/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/fq/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/fx/default.nixnew file+22

This diff is too big to show here.

pkgs/development/tools/ginkgo/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/go-motion/default.nix+10−13

This diff is too big to show here.

pkgs/development/tools/go-toml/default.nix+8−6

This diff is too big to show here.

pkgs/development/tools/gosec/default.nix−2

This diff is too big to show here.

pkgs/development/tools/hcloud/default.nix+1−1

This diff is too big to show here.

pkgs/development/tools/hjson-go/default.nix+14−12

This diff is too big to show here.

pkgs/development/tools/jdt-language-server/default.nixnew file+103

This diff is too big to show here.

pkgs/development/tools/just/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/kdash/default.nixnew file+34

This diff is too big to show here.

pkgs/development/tools/krankerl/default.nix−2

This diff is too big to show here.

pkgs/development/tools/metals/default.nix+6−11

This diff is too big to show here.

pkgs/development/tools/misc/binutils/default.nix+4−6

This diff is too big to show here.

pkgs/development/tools/misc/blackfire/default.nix+6−6

This diff is too big to show here.

pkgs/development/tools/misc/blackfire/php-probe.nix+158−16

This diff is too big to show here.

pkgs/development/tools/misc/clojure-lsp/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/misc/d-feet/default.nix+1−1

This diff is too big to show here.

pkgs/development/tools/misc/mkcert/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/misc/saleae-logic-2/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/misc/universal-ctags/default.nix+1−1

This diff is too big to show here.

pkgs/development/tools/mold/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/mustache-go/default.nix+9−6

This diff is too big to show here.

pkgs/development/tools/mysql-shell/default.nix−1

This diff is too big to show here.

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+2

This diff is too big to show here.

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.jsonnew file+11

This diff is too big to show here.

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.jsonnew file+11

This diff is too big to show here.

pkgs/development/tools/parsing/tree-sitter/update.nix+8

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+10−2

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+153−5

This diff is too big to show here.

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+98−4

This diff is too big to show here.

pkgs/development/tools/protoc-gen-entgrpc/default.nixnew file+28

This diff is too big to show here.

pkgs/development/tools/protolint/default.nixnew file+39

This diff is too big to show here.

pkgs/development/tools/purescript/spago/spago.nix+3−3

This diff is too big to show here.

pkgs/development/tools/reflex/default.nix+8−7

This diff is too big to show here.

pkgs/development/tools/relic/default.nixnew file+23

This diff is too big to show here.

pkgs/development/tools/rocminfo/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/rust/cargo-make/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/rust/cargo-sync-readme/default.nix+4−3

This diff is too big to show here.

pkgs/development/tools/rust/cbindgen/default.nix+4−4

This diff is too big to show here.

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/scalafix/default.nix+10−7

This diff is too big to show here.

pkgs/development/tools/snazy/default.nixnew file+34

This diff is too big to show here.

pkgs/development/tools/spirv-tools/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/sumneko-lua-language-server/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/tracy/default.nix+6−4

This diff is too big to show here.

pkgs/development/tools/unityhub/default.nix+5−6

This diff is too big to show here.

pkgs/development/tools/vala-language-server/default.nix−2

This diff is too big to show here.

pkgs/development/tools/vulkan-validation-layers/default.nix+15−9

This diff is too big to show here.

pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nixnew file+33

This diff is too big to show here.

pkgs/development/tools/wails/default.nix+3−3

This diff is too big to show here.

pkgs/development/tools/wp4nix/default.nixnew file+30

This diff is too big to show here.

pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js+2−1

This diff is too big to show here.

pkgs/development/tools/yq-go/default.nix+2−2

This diff is too big to show here.

pkgs/development/web/cypress/default.nix+2−2

This diff is too big to show here.

pkgs/development/web/deno/default.nix+3−3

This diff is too big to show here.

pkgs/development/web/nodejs/nodejs.nix+2−2

This diff is too big to show here.

pkgs/development/web/nodejs/v14.nix+2−2

This diff is too big to show here.

pkgs/development/web/nodejs/v16.nix+3−9

This diff is too big to show here.

pkgs/development/web/nodejs/v18.nix+2−2

This diff is too big to show here.

pkgs/games/7kaa/default.nix+7−10

This diff is too big to show here.

pkgs/games/assaultcube/default.nix+55−29

This diff is too big to show here.

pkgs/games/dwarf-fortress/dfhack/default.nix+3

This diff is too big to show here.

pkgs/games/factorio/versions.json+24−24

This diff is too big to show here.

pkgs/games/hedgewars/default.nix+5

This diff is too big to show here.

pkgs/games/kabeljau/default.nix+9−7

This diff is too big to show here.

pkgs/games/mindustry/default.nix+11−9

This diff is too big to show here.

pkgs/games/quake2/yquake2/default.nix+19−27

This diff is too big to show here.

pkgs/games/quake2/yquake2/games.nix+2−4

This diff is too big to show here.

pkgs/games/quakespasm/vulkan.nix+2−2

This diff is too big to show here.

pkgs/games/tintin/default.nixdeleted−35

This diff is too big to show here.

pkgs/misc/cups/drivers/kyodialog3/default.nix+1−1

This diff is too big to show here.

pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix+2−2

This diff is too big to show here.

pkgs/misc/drivers/pantum-driver/default.nixnew file+52

This diff is too big to show here.

pkgs/misc/openrussian-cli/default.nix+2−2

This diff is too big to show here.

pkgs/misc/platformsh/default.nix+4−4

This diff is too big to show here.

pkgs/misc/rich-cli/default.nix+18−8

This diff is too big to show here.

pkgs/misc/scrcpy/default.nix+3−3

This diff is too big to show here.

pkgs/misc/tpm2-pkcs11/default.nix+4−4

This diff is too big to show here.

pkgs/misc/uboot/default.nix+6−29

This diff is too big to show here.

pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/darwin/mas/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/apparmor/default.nix−1

This diff is too big to show here.

pkgs/os-specific/linux/bionic-prebuilt/default.nix+38−12

This diff is too big to show here.

pkgs/os-specific/linux/cifs-utils/default.nix+17−1

This diff is too big to show here.

pkgs/os-specific/linux/device-tree/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/ell/default.nix+4−3

This diff is too big to show here.

pkgs/os-specific/linux/evdi/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nixnew file+62

This diff is too big to show here.

pkgs/os-specific/linux/firmware/fwupd/default.nix+17−19

This diff is too big to show here.

pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch+10−10

This diff is too big to show here.

pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix+8−9

This diff is too big to show here.

pkgs/os-specific/linux/kernel-headers/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/hardened/patches.json+25−25

This diff is too big to show here.

pkgs/os-specific/linux/kernel/hardened/update.py+9

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.15.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.16.nixdeleted−18

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.17.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-libre.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix+3−3

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-zen.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/manual-config.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/update-zen.sh+1−1

This diff is too big to show here.

pkgs/os-specific/linux/libcap-ng/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/multipath-tools/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/musl-obstack/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/nftables/default.nix+7−9

This diff is too big to show here.

pkgs/os-specific/linux/nvidia-x11/default.nix+4−4

This diff is too big to show here.

pkgs/os-specific/linux/s6-linux-init/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/sasutils/default.nix+7−1

This diff is too big to show here.

pkgs/os-specific/linux/sgx/ssl/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/sysstat/default.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/vmware/default.nixnew file+47

This diff is too big to show here.

pkgs/servers/adguardhome/bins.nix+8−4

This diff is too big to show here.

pkgs/servers/adguardhome/default.nix+7−3

This diff is too big to show here.

pkgs/servers/adguardhome/update.sh+3−2

This diff is too big to show here.

pkgs/servers/calibre-web/default.nix+10−7

This diff is too big to show here.

pkgs/servers/dict/wiktionary/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/knot-dns/default.nix+2−2

This diff is too big to show here.

pkgs/servers/dns/pdns/default.nix+2−2

This diff is too big to show here.

pkgs/servers/etebase/default.nix+8−23

This diff is too big to show here.

pkgs/servers/foundationdb/vsmake.nix+2−2

This diff is too big to show here.

pkgs/servers/gpm/default.nix+13−26

This diff is too big to show here.

pkgs/servers/heisenbridge/default.nix+2−5

This diff is too big to show here.

pkgs/servers/home-assistant/component-packages.nix+35−14

This diff is too big to show here.

pkgs/servers/home-assistant/default.nix+15−4

This diff is too big to show here.

pkgs/servers/home-assistant/frontend.nix+2−2

This diff is too big to show here.

pkgs/servers/hqplayerd/default.nix+30−27

This diff is too big to show here.

pkgs/servers/http/couchdb/3.nix+6−6

This diff is too big to show here.

pkgs/servers/http/unit/default.nix−3

This diff is too big to show here.

pkgs/servers/irc/inspircd/default.nix+2−2

This diff is too big to show here.

pkgs/servers/keycloak/default.nix+4−4

This diff is too big to show here.

pkgs/servers/mail/opensmtpd/cross_fix.diffnew file+13

This diff is too big to show here.

pkgs/servers/mail/opensmtpd/default.nix+1

This diff is too big to show here.

pkgs/servers/mastodon/default.nix+1−1

This diff is too big to show here.

pkgs/servers/mastodon/gemset.nix+72−72

This diff is too big to show here.

pkgs/servers/mastodon/source.nix+2−2

This diff is too big to show here.

pkgs/servers/mastodon/version.nix+1−1

This diff is too big to show here.

pkgs/servers/matrix-synapse/default.nix+2−2

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+7−7

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2

This diff is too big to show here.

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4

This diff is too big to show here.

pkgs/servers/mattermost/matterircd.nix+7−5

This diff is too big to show here.

pkgs/servers/mautrix-facebook/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mautrix-signal/default.nix+2−2

This diff is too big to show here.

pkgs/servers/mautrix-telegram/default.nix+5−5

This diff is too big to show here.

pkgs/servers/monitoring/grafana/default.nix+4−4

This diff is too big to show here.

pkgs/servers/monitoring/net-snmp/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/default.nix+60−119

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/haproxy-exporter.nix+9−7

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/codemirror-promql/default.nixdeleted−17

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/codemirror-promql/node-packages.nixdeleted−9436

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package-lock.json−22167

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/codemirror-promql/package.json−93

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/update-web-deps.sh−32

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/webui/default.nix−17

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/webui/node-packages.nix−17600

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/webui/package-lock.json−48650

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui/webui/package.json−109

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/bower-packages.nix−25

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/default.nix−53

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/src.nix−4

This diff is too big to show here.

pkgs/servers/monitoring/uchiwa/update.sh−42

This diff is too big to show here.

pkgs/servers/moonraker/default.nix+3−3

This diff is too big to show here.

pkgs/servers/nosql/cassandra/generic.nix+1−2

This diff is too big to show here.

pkgs/servers/nosql/redis/default.nix+8−2

This diff is too big to show here.

pkgs/servers/openvscode-server/default.nix+11−14

This diff is too big to show here.

pkgs/servers/openvscode-server/remove-node-download.patch+9−7

This diff is too big to show here.

pkgs/servers/pulseaudio/default.nix+10−3

This diff is too big to show here.

pkgs/servers/redpanda/default.nix+35

This diff is too big to show here.

pkgs/servers/roon-server/default.nix+2−2

This diff is too big to show here.

pkgs/servers/sabnzbd/default.nix+15−1

This diff is too big to show here.

pkgs/servers/tailscale/default.nix+6−7

This diff is too big to show here.

pkgs/servers/unifi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/vouch-proxy/default.nix+3−3

This diff is too big to show here.

pkgs/servers/web-apps/nifi/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/sogo/default.nix+2−2

This diff is too big to show here.

pkgs/servers/web-apps/wallabag/default.nix+3−1

This diff is too big to show here.

pkgs/servers/wishlist/default.nix+27

This diff is too big to show here.

pkgs/servers/xmpp/prosody/default.nix+9−22

This diff is too big to show here.

pkgs/servers/zookeeper/default.nix+5−2

This diff is too big to show here.

pkgs/shells/fish/plugins/fzf-fish.nix+2−2

This diff is too big to show here.

pkgs/shells/zsh/oh-my-zsh/default.nix+3−3

This diff is too big to show here.

pkgs/stdenv/darwin/default.nix+1−1

This diff is too big to show here.

pkgs/stdenv/freebsd/default.nix+1−1

This diff is too big to show here.

pkgs/stdenv/generic/check-meta.nix+40−15

This diff is too big to show here.

pkgs/stdenv/generic/default.nix+1−1

This diff is too big to show here.

pkgs/stdenv/generic/make-derivation.nix+71−6

This diff is too big to show here.

pkgs/stdenv/linux/default.nix+1−1

This diff is too big to show here.

pkgs/stdenv/linux/make-bootstrap-tools.nix+1−1

This diff is too big to show here.

pkgs/tools/X11/libstrangle/default.nix+6−4

This diff is too big to show here.

pkgs/tools/X11/libstrangle/nixos.patch+1−1

This diff is too big to show here.

pkgs/tools/X11/mmutils/default.nix+24

This diff is too big to show here.

pkgs/tools/X11/opentabletdriver/default.nix+2−2

This diff is too big to show here.

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

This diff is too big to show here.

pkgs/tools/admin/aws-google-auth/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/cli53/default.nix+17−8

This diff is too big to show here.

pkgs/tools/admin/colmena/default.nix+10−5

This diff is too big to show here.

pkgs/tools/admin/eksctl/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/lxd/default.nix+5−5

This diff is too big to show here.

pkgs/tools/admin/pgadmin/default.nix+87−54

This diff is too big to show here.

pkgs/tools/admin/pgadmin/package.json+7−4

This diff is too big to show here.

pkgs/tools/admin/pgadmin/yarn.lock+231−22

This diff is too big to show here.

pkgs/tools/admin/pgadmin/yarn.nix+226−18

This diff is too big to show here.

pkgs/tools/admin/pulumi/data.nix+73−73

This diff is too big to show here.

pkgs/tools/admin/pulumi/update.sh+4−2

This diff is too big to show here.

pkgs/tools/admin/scaleway-cli/default.nix+10

This diff is too big to show here.

pkgs/tools/admin/ssh-import-id/default.nix+7−1

This diff is too big to show here.

pkgs/tools/admin/stripe-cli/default.nix+48−7

This diff is too big to show here.

pkgs/tools/admin/syft/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/trivy/default.nix+3−3

This diff is too big to show here.

pkgs/tools/admin/winbox/default.nix+1−1

This diff is too big to show here.

pkgs/tools/archivers/gbl/default.nix+2−2

This diff is too big to show here.

pkgs/tools/audio/abcmidi/default.nix+2−2

This diff is too big to show here.

pkgs/tools/audio/mictray/default.nix+53

This diff is too big to show here.

pkgs/tools/audio/mpdsync/default.nix−25

This diff is too big to show here.

pkgs/tools/backup/duply/default.nix+5−5

This diff is too big to show here.

pkgs/tools/cd-dvd/ventoy-bin/default.nix+11−6

This diff is too big to show here.

pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop+10

This diff is too big to show here.

pkgs/tools/filesystems/bcachefs-tools/default.nix+3−3

This diff is too big to show here.

pkgs/tools/filesystems/ceph/default.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/fuse-7z-ng/default.nix+1−1

This diff is too big to show here.

pkgs/tools/filesystems/httm/default.nix+32

This diff is too big to show here.

pkgs/tools/filesystems/irods/common.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/irods/default.nix+2−3

This diff is too big to show here.

pkgs/tools/filesystems/squashfs/default.nix+10−1

This diff is too big to show here.

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

This diff is too big to show here.

pkgs/tools/filesystems/zkfuse/default.nix+1−2

This diff is too big to show here.

pkgs/tools/graphics/feedgnuplot/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/gnuplot/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/graphviz/default.nix+3−14

This diff is too big to show here.

pkgs/tools/graphics/pfstools/default.nix+1−1

This diff is too big to show here.

pkgs/tools/graphics/pfstools/glut.patch+12

This diff is too big to show here.

pkgs/tools/graphics/pixel2svg/default.nix+20

This diff is too big to show here.

pkgs/tools/graphics/svgcleaner/default.nix+26

This diff is too big to show here.

pkgs/tools/graphics/vulkan-extension-layer/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/vulkan-tools-lunarg/default.nix+2−2

This diff is too big to show here.

pkgs/tools/graphics/vulkan-tools/default.nix+38−6

This diff is too big to show here.

pkgs/tools/inputmethods/fcitx5/fcitx5-rime-with-nix-env-variable.patch+18

This diff is too big to show here.

pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix+2

This diff is too big to show here.

pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix+5−2

This diff is too big to show here.

pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix+3−7

This diff is too big to show here.

pkgs/tools/inputmethods/lisgd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/agedu/default.nix+9−5

This diff is too big to show here.

pkgs/tools/misc/antimicrox/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/bat-extras/default.nix+6−4

This diff is too big to show here.

pkgs/tools/misc/bcunit/default.nix+4−6

This diff is too big to show here.

pkgs/tools/misc/calamares-nixos-extensions/default.nix+30

This diff is too big to show here.

pkgs/tools/misc/calamares/default.nix+52−14

This diff is too big to show here.

pkgs/tools/misc/calamares/nixos-extensions-paths.patch+46

This diff is too big to show here.

pkgs/tools/misc/calamares/nonroot.patch+105

This diff is too big to show here.

pkgs/tools/misc/calamares/packagechooserq.patch+136

This diff is too big to show here.

pkgs/tools/misc/calamares/partitions.patch+28

This diff is too big to show here.

pkgs/tools/misc/calamares/uimod.patch+85

This diff is too big to show here.

pkgs/tools/misc/calamares/unfreeq.patch+109

This diff is too big to show here.

pkgs/tools/misc/calamares/userjob.patch+31

This diff is too big to show here.

pkgs/tools/misc/chezmoi/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/cht.sh/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/cmdpack/default.nix+136

This diff is too big to show here.

pkgs/tools/misc/dsq/default.nix+33−29

This diff is too big to show here.

pkgs/tools/misc/fclones/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/fortune/default.nix+5

This diff is too big to show here.

pkgs/tools/misc/geekbench/4.nix+41

This diff is too big to show here.

pkgs/tools/misc/gosu/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/idutils/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/ikill/default.nix+23

This diff is too big to show here.

pkgs/tools/misc/lookatme/default.nix−67

This diff is too big to show here.

pkgs/tools/misc/lrzsz/default.nix+2

This diff is too big to show here.

pkgs/tools/misc/lsd/default.nix+5−1

This diff is too big to show here.

pkgs/tools/misc/man-db/default.nix+7−18

This diff is too big to show here.

pkgs/tools/misc/mutagen/default.nix+6−6

This diff is too big to show here.

pkgs/tools/misc/ncdu_2/c-import-order.patch−17

This diff is too big to show here.

pkgs/tools/misc/ncdu_2/default.nix+3−7

This diff is too big to show here.

pkgs/tools/misc/ntfy-sh/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/partition-manager/default.nix+5−5

This diff is too big to show here.

pkgs/tools/misc/pferd/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/phoronix-test-suite/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/pouf/default.nix+5−3

This diff is too big to show here.

pkgs/tools/misc/rpm-ostree/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/rust-motd/default.nix+5−3

This diff is too big to show here.

pkgs/tools/misc/s6-portable-utils/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/sharedown/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/sharedown/yarn.lock+217−258

This diff is too big to show here.

pkgs/tools/misc/sharedown/yarndeps.nix+204−260

This diff is too big to show here.

pkgs/tools/misc/snapper/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/starship/default.nix+3−3

This diff is too big to show here.

pkgs/tools/misc/swaglyrics/default.nix+30−8

This diff is too big to show here.

pkgs/tools/misc/tlp/default.nix+1−1

This diff is too big to show here.

pkgs/tools/misc/topgrade/default.nix+14−6

This diff is too big to show here.

pkgs/tools/misc/wlc/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/yle-dl/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/you-get/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/yt-dlp/default.nix+4−2

This diff is too big to show here.

pkgs/tools/misc/ytarchive/default.nix+10−4

This diff is too big to show here.

pkgs/tools/misc/yubico-piv-tool/default.nix+13−4

This diff is too big to show here.

pkgs/tools/misc/zellij/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/bore-cli/default.nix+14−4

This diff is too big to show here.

pkgs/tools/networking/corerad/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/croc/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/curl/default.nix+6−5

This diff is too big to show here.

pkgs/tools/networking/frp/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/globalprotect-openconnect/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/godns/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/gof5/default.nix+30

This diff is too big to show here.

pkgs/tools/networking/magic-wormhole-rs/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/mqttui/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/networkmanager/l2tp/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/ntopng/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/ooniprobe-cli/default.nix+27

This diff is too big to show here.

pkgs/tools/networking/philter/default.nix−32

This diff is too big to show here.

pkgs/tools/networking/pssh/default.nix+7−4

This diff is too big to show here.

pkgs/tools/networking/slirp4netns/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/sstp/default.nix+1−1

This diff is too big to show here.

pkgs/tools/networking/termscp/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/tun2socks/default.nix+31

This diff is too big to show here.

pkgs/tools/networking/urlwatch/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/comma/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/nix-eval-jobs/default.nix+2−2

This diff is too big to show here.

pkgs/tools/package-management/nix/default.nix+3−3

This diff is too big to show here.

pkgs/tools/package-management/packagekit/default.nix+2−10

This diff is too big to show here.

pkgs/tools/security/adreaper/default.nix+33

This diff is too big to show here.

pkgs/tools/security/bitwarden/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/browserpass/default.nix+5−5

This diff is too big to show here.

pkgs/tools/security/cosign/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/cryptomator/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/exploitdb/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/fulcio/default.nix+26−16

This diff is too big to show here.

pkgs/tools/security/gitleaks/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/gopass/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/grype/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/jadx/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/john/default.nix+17−7

This diff is too big to show here.

pkgs/tools/security/jwt-cli/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/libtpms/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/metasploit/Gemfile+1−1

This diff is too big to show here.

pkgs/tools/security/metasploit/Gemfile.lock+21−21

This diff is too big to show here.

pkgs/tools/security/metasploit/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/metasploit/gemset.nix+23−23

This diff is too big to show here.

pkgs/tools/security/munge/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/nmap/default.nix+6−18

This diff is too big to show here.

pkgs/tools/security/oath-toolkit/update.sh+1−1

This diff is too big to show here.

pkgs/tools/security/pass/extensions/otp.nix+3−3

This diff is too big to show here.

pkgs/tools/security/plasma-pass/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/rage/default.nix+15−6

This diff is too big to show here.

pkgs/tools/security/sigma-cli/default.nix+4−3

This diff is too big to show here.

pkgs/tools/security/step-cli/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/tor/default.nix+9−5

This diff is too big to show here.

pkgs/tools/security/vault/default.nix+3−3

This diff is too big to show here.

pkgs/tools/security/vault/vault-bin.nix+6−6

This diff is too big to show here.

pkgs/tools/security/wprecon/default.nix+8−4

This diff is too big to show here.

pkgs/tools/security/yara/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/envconsul/default.nix+13−8

This diff is too big to show here.

pkgs/tools/system/freeipmi/default.nix+6−1

This diff is too big to show here.

pkgs/tools/system/htop/default.nix+11−13

This diff is too big to show here.

pkgs/tools/system/rocm-smi/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/runitor/default.nix+52

This diff is too big to show here.

pkgs/tools/system/s6-rc/default.nix+2−2

This diff is too big to show here.

pkgs/tools/system/s6/default.nix+2−2

This diff is too big to show here.

pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch+25

This diff is too big to show here.

pkgs/tools/text/bashblog/default.nix+59

This diff is too big to show here.

pkgs/tools/text/cmigemo/default.nix+2−2

This diff is too big to show here.

pkgs/tools/text/groff/default.nix+10−2

This diff is too big to show here.

pkgs/tools/text/gucci/default.nix+14−12

This diff is too big to show here.

pkgs/tools/text/gucci/deps.nix−30

This diff is too big to show here.

pkgs/tools/text/vale/default.nix+4−4

This diff is too big to show here.

pkgs/tools/text/xml/xpf/default.nix−21

This diff is too big to show here.

pkgs/tools/typesetting/tectonic/default.nix+6−5

This diff is too big to show here.

pkgs/tools/virtualization/lxd-image-server/default.nix+3

This diff is too big to show here.

pkgs/tools/virtualization/nixos-container/default.nix+21−1

This diff is too big to show here.

pkgs/tools/virtualization/nixos-container/nixos-container.pl+24−10

This diff is too big to show here.

pkgs/tools/wayland/swaysome/default.nix+3−3

This diff is too big to show here.

pkgs/top-level/aliases.nix+21−7

This diff is too big to show here.

pkgs/top-level/all-packages.nix+185−80

This diff is too big to show here.

pkgs/top-level/config.nix+59

This diff is too big to show here.

pkgs/top-level/coq-packages.nix+1

This diff is too big to show here.

pkgs/top-level/linux-kernels.nix+18−11

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix+14−61

This diff is too big to show here.

pkgs/top-level/perl-packages.nix+33−2

This diff is too big to show here.

pkgs/top-level/php-packages.nix+2

This diff is too big to show here.

pkgs/top-level/python-aliases.nix+2

This diff is too big to show here.

pkgs/top-level/python-packages.nix+91−7

This diff is too big to show here.

pkgs/top-level/qt5-packages.nix−6

This diff is too big to show here.

pkgs/top-level/release-haskell.nix+12−11

This diff is too big to show here.

pkgs/top-level/release-lib.nix+1−1

This diff is too big to show here.