git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next
commit91104b5417275b780f6947b46a5c1bcc0d99f10b authorJan Tojnar <jtojnar@gmail.com> dateSun 23 Aug 2020, 02:00 (6 years ago) parent4cf394eddfa221
417 files changed+14391−8843
.github/CODEOWNERS+4−4 doc/languages-frameworks/android.section.md+2 lib/modules.nix+13−2 maintainers/maintainer-list.nix+70 nixos/doc/manual/configuration/gpu-accel.xml+1−24 nixos/doc/manual/man-nixos-enter.xml+1−1 nixos/doc/manual/release-notes/rl-2009.xml+72−8 nixos/maintainers/scripts/ec2/create-amis.sh+1−1 nixos/modules/config/fonts/fontconfig.nix−7 nixos/modules/config/system-path.nix+1−4 nixos/modules/hardware/onlykey.nix+1−1 nixos/modules/misc/ids.nix+2−2 nixos/modules/module-list.nix−1 nixos/modules/profiles/base.nix+1 nixos/modules/rename.nix+1 nixos/modules/security/acme.nix+19−2 nixos/modules/services/databases/postgresql.nix+34−38 nixos/modules/services/editors/emacs.xml+6−6 nixos/modules/services/hardware/undervolt.nix+17−1 nixos/modules/services/logging/logrotate.nix+105−41 nixos/modules/services/logging/logstash.nix+1−5 nixos/modules/services/mail/dovecot.nix+15−18 nixos/modules/services/misc/gitlab.nix+7−1 nixos/modules/services/misc/gollum.nix+7 nixos/modules/services/misc/jellyfin.nix+14−1 nixos/modules/services/monitoring/monit.nix+14−4 nixos/modules/services/monitoring/smartd.nix+1−5 nixos/modules/services/monitoring/zabbix-proxy.nix+9−8 nixos/modules/services/monitoring/zabbix-server.nix+9−8 nixos/modules/services/web-servers/apache-httpd/default.nix+28−3 nixos/modules/services/web-servers/meguca.nix−174 nixos/modules/services/x11/imwheel.nix+2−1 nixos/modules/services/x11/window-managers/xmonad.nix+5−6 nixos/modules/system/boot/stage-1-init.sh+4−2 nixos/modules/virtualisation/cri-o.nix+3−1 nixos/tests/all-tests.nix+1 nixos/tests/bitwarden.nix+188 nixos/tests/prometheus.nix+5−2 nixos/tests/transmission.nix+2 pkgs/applications/audio/ashuffle/default.nix+26 pkgs/applications/audio/bs1770gain/default.nix+2−2 pkgs/applications/audio/csound/default.nix+2−2 pkgs/applications/audio/ft2-clone/default.nix+2−2 pkgs/applications/audio/gspeech/default.nix+4−4 pkgs/applications/audio/lv2-cpp-tools/default.nix+28 pkgs/applications/audio/molot-lite/default.nix+37 pkgs/applications/audio/parlatype/default.nix+2−2 pkgs/applications/audio/pulseeffects/default.nix+2−4 pkgs/applications/audio/qtractor/default.nix+2−2 pkgs/applications/audio/reaper/default.nix+2−2 pkgs/applications/audio/snd/default.nix+2−2 pkgs/applications/audio/strawberry/default.nix+2−2 pkgs/applications/audio/talentedhack/default.nix+36 pkgs/applications/audio/tamgamp.lv2/default.nix+53 pkgs/applications/audio/virtual-ans/default.nix+89 pkgs/applications/audio/vocproc/default.nix+27 pkgs/applications/blockchains/bitcoin-abc.nix+2−2 pkgs/applications/blockchains/bitcoin-unlimited.nix+3−3 pkgs/applications/blockchains/ergo/default.nix+2−2 pkgs/applications/blockchains/monero/default.nix+2−2 pkgs/applications/blockchains/mycrypto/default.nix+59 pkgs/applications/editors/android-studio/default.nix+2−1 pkgs/applications/editors/emacs-modes/elpa-generated.nix+219−99 pkgs/applications/editors/emacs-modes/org-generated.nix+6−6 pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json+7253−4925 pkgs/applications/editors/emacs-modes/updater-emacs.nix+1−1 pkgs/applications/editors/emacs/25.nix−146 pkgs/applications/editors/emacs/26.nix+8 pkgs/applications/editors/emacs/27.nix+8 pkgs/applications/editors/emacs/clean-env-26.patch+15 pkgs/applications/editors/emacs/default.nix → pkgs/applications/editors/emacs/generic.nix+10−10 pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch+14 pkgs/applications/editors/jetbrains/default.nix+2−5 pkgs/applications/editors/vscode/vscode.nix+3−3 pkgs/applications/editors/vscode/vscodium.nix+3−3 pkgs/applications/editors/xxe-pe/default.nix+77 pkgs/applications/graphics/gnome-photos/default.nix+1−1 pkgs/applications/graphics/lightburn/default.nix+49 pkgs/applications/graphics/qosmic/default.nix+70 pkgs/applications/graphics/runwayml/default.nix+4−5 pkgs/applications/kde/default.nix+1 pkgs/applications/kde/ksquares.nix+22 pkgs/applications/misc/coolreader/default.nix+26 pkgs/applications/misc/copyq/default.nix+2−2 pkgs/applications/misc/dbeaver/default.nix+2−2 pkgs/applications/misc/electrum/ltc.nix+6−2 pkgs/applications/misc/foot/default.nix+38 pkgs/applications/misc/imag/default.nix+63 pkgs/applications/misc/keepassx/community.nix+2−2 pkgs/applications/misc/lutris/default.nix+4−5 pkgs/applications/misc/lutris/chrootenv.nix → pkgs/applications/misc/lutris/fhsenv.nix pkgs/applications/misc/mlterm/default.nix+4−1 pkgs/applications/misc/moolticute/default.nix+2−2 pkgs/applications/misc/nnn/default.nix+2−2 pkgs/applications/misc/obsidian/default.nix+2−2 pkgs/applications/misc/pdfpc/default.nix+2−10 pkgs/applications/misc/pipr/default.nix+34 pkgs/applications/misc/rescuetime/default.nix+7−5 pkgs/applications/misc/sidequest/default.nix+2−2 pkgs/applications/misc/taskell/default.nix−66 pkgs/applications/misc/wofi/default.nix+5 pkgs/applications/misc/wofi/do_not_follow_symlinks.patch+39 pkgs/applications/misc/xmenu/default.nix+25 pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9 pkgs/applications/networking/browsers/eolie/default.nix+13−5 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch+1 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch+1 pkgs/applications/networking/browsers/google-chrome/default.nix+6−2 pkgs/applications/networking/cluster/atlantis/default.nix+2−2 pkgs/applications/networking/cluster/fluxctl/default.nix+3−3 pkgs/applications/networking/cluster/kpt/default.nix+4−8 pkgs/applications/networking/cluster/kube3d/default.nix+2−2 pkgs/applications/networking/cluster/tanka/default.nix+8−1 pkgs/applications/networking/instant-messengers/gajim/default.nix+16−14 pkgs/applications/networking/instant-messengers/nheko/default.nix+5 pkgs/applications/networking/ipfs/default.nix−2 pkgs/applications/networking/mailreaders/aerc/default.nix+1−1 pkgs/applications/networking/mailreaders/neomutt/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird/68.nix+2−9 pkgs/applications/networking/mailreaders/thunderbird/default.nix+2−9 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch+1 pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch+1 pkgs/applications/networking/remote/anydesk/default.nix+3−3 pkgs/applications/networking/ssb-patchwork/default.nix+13−13 pkgs/applications/networking/syncplay/default.nix+2−2 pkgs/applications/office/timeular/default.nix+45 pkgs/applications/science/biology/star/default.nix+2−2 pkgs/applications/science/biology/whisper/default.nix+34 pkgs/applications/science/electronics/adms/default.nix+2−2 pkgs/applications/science/electronics/hyp2mat/default.nix+3−3 pkgs/applications/science/electronics/vhd2vl/default.nix+39 pkgs/applications/science/logic/coq/default.nix−2 pkgs/applications/science/logic/ltl2ba/default.nix+2−2 pkgs/applications/science/logic/z3/default.nix+3−3 pkgs/applications/science/machine-learning/finalfusion-utils/default.nix+3−3 pkgs/applications/science/machine-learning/labelimg/default.nix+22−11 pkgs/applications/science/math/calculix/calculix.patch+9−18 pkgs/applications/science/math/calculix/default.nix+2−2 pkgs/applications/science/math/qalculate-gtk/default.nix+7−3 pkgs/applications/system/glances/default.nix+2−2 pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix+12−3 pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix+9−13 pkgs/applications/version-management/p4/default.nix+30 pkgs/applications/version-management/p4v/default.nix+18−11 pkgs/applications/video/mpv/scripts/sponsorblock.nix+51 pkgs/applications/video/smplayer/default.nix+2−2 pkgs/applications/video/smtube/default.nix+2−2 pkgs/applications/video/streamlink-twitch-gui/bin.nix+100 pkgs/applications/video/vlc/default.nix+2−2 pkgs/applications/video/vokoscreen/default.nix+2−2 pkgs/applications/virtualization/docker-slim/default.nix+2−2 pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix+58 pkgs/applications/virtualization/virt-manager/qt.nix+2−2 pkgs/applications/window-managers/hikari/default.nix+2−2 pkgs/applications/window-managers/leftwm/default.nix+3−3 pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix+123 pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix+167 pkgs/data/documentation/anarchism/default.nix+45 pkgs/data/documentation/scheme-manpages/default.nix+6−6 pkgs/data/fonts/kanji-stroke-order-font/default.nix+11−9 pkgs/data/fonts/recursive/default.nix+6−6 pkgs/data/themes/arc/default.nix+2−2 pkgs/desktops/deepin/dde-api/default.nix+1 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+2−2 pkgs/development/compilers/elm/packages/elm-json.nix−1 pkgs/development/compilers/go/1.15.nix+2−2 pkgs/development/compilers/go/ssl-cert-file-1.15.patch+8−8 pkgs/development/compilers/idris2/default.nix+39−6 pkgs/development/compilers/llvm/rocm/clang.nix+1−2 pkgs/development/compilers/llvm/rocm/default.nix+2−2 pkgs/development/compilers/mozart/default.nix+1−2 pkgs/development/compilers/ocaml/generic.nix+6−2 pkgs/development/compilers/souffle/default.nix+2−2 pkgs/development/coq-modules/QuickChick/default.nix+8−2 pkgs/development/coq-modules/coq-ext-lib/default.nix+5−4 pkgs/development/coq-modules/coqhammer/default.nix+8−4 pkgs/development/coq-modules/simple-io/default.nix+1−1 pkgs/development/go-modules/generic/default.nix−5 pkgs/development/go-modules/generic/old.nix−229 pkgs/development/haskell-modules/configuration-common.nix+50−58 pkgs/development/haskell-modules/configuration-ghc-head.nix+1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+28−41 pkgs/development/haskell-modules/configuration-nix.nix+7−3 pkgs/development/haskell-modules/generic-builder.nix+35−35 pkgs/development/haskell-modules/hackage-packages.nix+1037−729 pkgs/development/haskell-modules/with-packages-wrapper.nix+3−2 pkgs/development/interpreters/alda/default.nix+27 pkgs/development/interpreters/php/default.nix+5−1 pkgs/development/interpreters/python/mk-python-derivation.nix+77−77 pkgs/development/libraries/amdvlk/default.nix+2−2 pkgs/development/libraries/arrow-cpp/default.nix+37−25 pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch−11 pkgs/development/libraries/draco/default.nix+34 pkgs/development/libraries/duckdb/default.nix+2−2 pkgs/development/libraries/fcft/default.nix+6−1 pkgs/development/libraries/libqalculate/default.nix+2−2 pkgs/development/libraries/libunibreak/default.nix+13−7 pkgs/development/libraries/libxmlb/default.nix+2−2 pkgs/development/libraries/orcania/default.nix+2−2 pkgs/development/libraries/qt-5/5.12/default.nix+4−2 pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patch+31 pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch+41−3 pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch+20 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+29−23 pkgs/development/libraries/relibc/default.nix+62−17 pkgs/development/libraries/rocclr/default.nix+7−7 pkgs/development/libraries/rocm-comgr/default.nix+2−2 pkgs/development/libraries/rocm-device-libs/default.nix+3−4 pkgs/development/libraries/rocm-opencl-icd/default.nix+1−1 pkgs/development/libraries/rocm-opencl-runtime/default.nix+14−15 pkgs/development/libraries/rocm-runtime-ext/default.nix−42 pkgs/development/libraries/rocm-runtime-ext/setup-hook.sh−7 pkgs/development/libraries/rocm-runtime/default.nix+16−15 pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diff−23 pkgs/development/libraries/rocm-thunk/default.nix+2−2 pkgs/development/libraries/science/math/osqp/default.nix+27 pkgs/development/libraries/snap7/default.nix+38 pkgs/development/libraries/utf8proc/default.nix+6−2 pkgs/development/libraries/webkitgtk/default.nix+2−1 pkgs/development/libraries/zimg/default.nix+2−2 pkgs/development/mobile/androidenv/convertaddons.xsl+6−6 pkgs/development/mobile/androidenv/convertpackages.xsl+2−2 pkgs/development/mobile/androidenv/convertsystemimages.xsl+1−1 pkgs/development/node-packages/default.nix+8 pkgs/development/node-packages/node-packages.json−1 pkgs/development/ocaml-modules/genspio/default.nix+32 pkgs/development/ocaml-modules/jwto/default.nix+30 pkgs/development/ocaml-modules/lablgtk3/default.nix+3−4 pkgs/development/ocaml-modules/nonstd/default.nix+24 pkgs/development/ocaml-modules/ocamlnet/default.nix+2−2 pkgs/development/ocaml-modules/sosa/default.nix+30 pkgs/development/ocaml-modules/uunf/default.nix+33−5 pkgs/development/python-modules/avro/default.nix+14−4 pkgs/development/python-modules/behave/default.nix+15−21 pkgs/development/python-modules/buildbot/default.nix+7 pkgs/development/python-modules/coloredlogs/default.nix+10−8 pkgs/development/python-modules/cucumber-tag-expressions/default.nix+21 pkgs/development/python-modules/django-widget-tweaks/default.nix+25 pkgs/development/python-modules/dogtail/default.nix+3−3 pkgs/development/python-modules/geoip2/default.nix+11−6 pkgs/development/python-modules/m2crypto/default.nix+2−2 pkgs/development/python-modules/maxminddb/default.nix+4−3 pkgs/development/python-modules/mocket/default.nix+43 pkgs/development/python-modules/nbxmpp/default.nix+6−10 pkgs/development/python-modules/osc/default.nix+6−4 pkgs/development/python-modules/pyfxa/default.nix+4−3 pkgs/development/python-modules/pytorch-lightning/default.nix+46 pkgs/development/python-modules/rdflib-jsonld/default.nix+21 pkgs/development/python-modules/rethinkdb/default.nix+3−2 pkgs/development/python-modules/sopel/default.nix+15−8 pkgs/development/python-modules/spacy/annotation-test/annotate.py+69 pkgs/development/python-modules/spacy/annotation-test/default.nix+23 pkgs/development/python-modules/spacy/default.nix+3 pkgs/development/python-modules/spacy/models.nix+2 pkgs/development/python-modules/wtf-peewee/default.nix+2−2 pkgs/development/python-modules/xpybutil/default.nix+24 pkgs/development/python-modules/zodb/default.nix+6−11 pkgs/development/ruby-modules/solargraph/Gemfile.lock+15−11 pkgs/development/ruby-modules/solargraph/gemset.nix+37−19 pkgs/development/tools/analysis/pmd/default.nix+2−2 pkgs/development/tools/azcopy/default.nix+3−3 pkgs/development/tools/bazelisk/default.nix+2−2 pkgs/development/tools/build-managers/rocm-cmake/default.nix+1−1 pkgs/development/tools/buildpack/default.nix+14−7 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix+4−4 pkgs/development/tools/database/timescaledb-parallel-copy/default.nix+12−16 pkgs/development/tools/database/timescaledb-parallel-copy/deps.nix−21 pkgs/development/tools/database/timescaledb-tune/default.nix+9−11 pkgs/development/tools/database/timescaledb-tune/deps.nix−21 pkgs/development/tools/go-migrate/default.nix+24 pkgs/development/tools/godot/default.nix+2−2 pkgs/development/tools/godot/dont_clobber_environment.patch+11−9 pkgs/development/tools/godot/headless.nix+18 pkgs/development/tools/godot/pkg_config_additions.patch+17−14 pkgs/development/tools/godot/server.nix+18 pkgs/development/tools/haskell/haskell-language-server/default.nix+18−17 pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix+12−12 pkgs/development/tools/haskell/haskell-language-server/update.sh+1−1 pkgs/development/tools/lattice-diamond/default.nix+2−1 pkgs/development/tools/metals/default.nix+2−2 pkgs/development/tools/misc/clojure-lsp/default.nix+2−2 pkgs/development/tools/misc/fujprog/default.nix+37 pkgs/development/tools/misc/mkrom/default.nix+27 pkgs/development/tools/misc/patchelf/unstable.nix+3−3 pkgs/development/tools/misc/replacement/default.nix+46 pkgs/development/tools/nsis/default.nix+9−4 pkgs/development/tools/ocaml/camlp4/default.nix+5 pkgs/development/tools/ocaml/ocp-indent/default.nix+2−2 pkgs/development/tools/osslsigncode/default.nix+4−5 pkgs/development/tools/pipenv/default.nix+3−3 pkgs/development/tools/purescript/spago/spago.nix+3−3 pkgs/development/tools/rebazel/default.nix+21 pkgs/development/tools/rust/cargo-make/Cargo.lock+68−108 pkgs/development/tools/rust/cargo-make/default.nix+3−3 pkgs/development/tools/summon/default.nix+35 pkgs/development/tools/summon/resolve-paths.patch+39 pkgs/development/tools/vend/default.nix+21−11 pkgs/development/web/deno/default.nix+3−3 pkgs/development/web/deno/update/common.ts+14−1 pkgs/development/web/grails/default.nix+2−2 pkgs/development/web/lucky-cli/default.nix+2−2 pkgs/games/crawl/crawl_purify.patch+14−29 pkgs/games/crawl/default.nix+2−2 pkgs/games/dwarf-fortress/dfhack/default.nix+24−5 pkgs/games/dwarf-fortress/twbt/default.nix+9−4 pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in+1−1 pkgs/games/hyperrogue/default.nix+2−2 pkgs/games/legendary-gl/default.nix+30 pkgs/games/minecraft-server/default.nix+3−3 pkgs/games/osu-lazer/default.nix+5−1 pkgs/games/sm64ex/default.nix+69 pkgs/games/steam/default.nix+3−2 pkgs/games/steam/chrootenv.nix → pkgs/games/steam/fhsenv.nix pkgs/misc/cups/drivers/hl1210w/default.nix+62 pkgs/misc/flashfocus/default.nix+28 pkgs/misc/screensavers/pipes/default.nix+5−2 pkgs/misc/vim-plugins/generated.nix+117−117 pkgs/misc/vim-plugins/vim-plugin-names+1−1 pkgs/os-specific/linux/iputils/default.nix+14−13 pkgs/os-specific/linux/kernel/hardened/patches.json+9−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.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.7.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+2−2 pkgs/os-specific/linux/nvidia-x11/default.nix+4−4 pkgs/os-specific/linux/rtl8192eu/default.nix+6−4 pkgs/os-specific/linux/rtl8821cu/default.nix+37 pkgs/servers/atlassian/confluence.nix+2−2 pkgs/servers/demoit/default.nix+7−5 pkgs/servers/freeradius/default.nix+2−2 pkgs/servers/home-assistant/component-packages.nix+1−1 pkgs/servers/home-assistant/default.nix+2−2 pkgs/servers/http/apache-httpd/2.4.nix−1 pkgs/servers/jellyfin/10.5.x.nix+61 pkgs/servers/jellyfin/default.nix+4−5 pkgs/servers/mattermost/default.nix+3−3 pkgs/servers/mautrix-whatsapp/default.nix+1−1 pkgs/servers/meguca/default.nix−50 pkgs/servers/meguca/server_deps.nix−390 pkgs/servers/monitoring/grafana/default.nix+7−7 pkgs/servers/monitoring/loki/default.nix+2−2 pkgs/servers/monitoring/prometheus/default.nix+5−3 pkgs/servers/monitoring/prometheus/webui-yarndeps.nix+8−8 pkgs/servers/monitoring/timescale-prometheus/default.nix+5−3 pkgs/servers/monitoring/zabbix/server.nix+9−2 pkgs/servers/monitoring/zabbix/versions.nix+3−3 pkgs/servers/monitoring/zabbix/web.nix+1−1 pkgs/servers/nosql/rethinkdb/default.nix+6−12 pkgs/servers/sickbeard/sickgear.nix+2−2 pkgs/servers/sql/postgresql/ext/plpgsql_check.nix+29 pkgs/servers/sql/postgresql/packages.nix+2 pkgs/servers/unifi/default.nix+2−2 pkgs/shells/zsh/oh-my-zsh/default.nix+3−3 pkgs/stdenv/generic/make-derivation.nix+2−1 pkgs/tools/X11/xpra/libfakeXinerama.nix+1−2 pkgs/tools/admin/ansible/default.nix+17−12 pkgs/tools/admin/chamber/default.nix+28 pkgs/tools/admin/exoscale-cli/default.nix+2−2 pkgs/tools/admin/google-cloud-sdk/default.nix+3−3 pkgs/tools/archivers/bomutils/default.nix+25 pkgs/tools/archivers/innoextract/default.nix+2−2 pkgs/tools/archivers/maxcso/default.nix+26 pkgs/tools/archivers/undmg/default.nix+6−4 pkgs/tools/archivers/undmg/setup-hook.sh+1−1 pkgs/tools/bluetooth/blueberry/default.nix+96 pkgs/tools/compression/lzfse/default.nix+2−4 pkgs/tools/filesystems/wiimms-iso-tools/default.nix+37 pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff+12 pkgs/tools/graphics/gnuplot/default.nix+2−2 pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix+5−3 pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+4−3 pkgs/tools/misc/clpeak/default.nix+25 pkgs/tools/misc/fet-sh/default.nix+28 pkgs/tools/misc/fzf/default.nix+8−1 pkgs/tools/misc/lf/default.nix+2−2 pkgs/tools/misc/mcfly/default.nix+8−4 pkgs/tools/misc/mstflint/default.nix+2−2 pkgs/tools/misc/pandoc-plantuml-filter/default.nix+26 pkgs/tools/misc/psrecord/default.nix+2−2 pkgs/tools/misc/pubs/default.nix+11−16 pkgs/tools/misc/qt5ct/default.nix+2−2 pkgs/tools/misc/rargs/default.nix+24 pkgs/tools/misc/rockbox-utility/default.nix+8−6 pkgs/tools/networking/clash/default.nix+3−3 pkgs/tools/networking/croc/default.nix+2−2 pkgs/tools/networking/dnsproxy/default.nix+2−2 pkgs/tools/networking/mozwire/default.nix+24 pkgs/tools/networking/mu/default.nix+2−2 pkgs/tools/networking/shadowsocks-rust/default.nix+3−3 pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix+23 pkgs/tools/networking/tridactyl-native/default.nix+2−2 pkgs/tools/networking/wireguard-tools/default.nix+2−2 pkgs/tools/networking/wstunnel/default.nix+6−12 pkgs/tools/package-management/cargo-release/default.nix+6−5 pkgs/tools/package-management/cargo-tree/default.nix−25 pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch → pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patch+63−67 pkgs/tools/package-management/cargo-update/default.nix+21−7 pkgs/tools/security/bitwarden_rs/default.nix+3−1 pkgs/tools/security/bitwarden_rs/vault.nix+3−1 pkgs/tools/security/doppler/default.nix+2−2 pkgs/tools/security/genpass/default.nix+5 pkgs/tools/system/rocm-smi/default.nix+2−2 pkgs/tools/system/smartmontools/default.nix+5 pkgs/tools/system/storebrowse/default.nix−44 pkgs/tools/text/shfmt/default.nix+9−1 pkgs/tools/typesetting/asciidoctorj/default.nix+2−2 pkgs/tools/typesetting/lowdown/default.nix+2−2 pkgs/tools/typesetting/tex/texlive/default.nix+5−2 pkgs/top-level/aliases.nix+6−1 pkgs/top-level/all-packages.nix+181−47 pkgs/top-level/ocaml-packages.nix+8 pkgs/top-level/perl-packages.nix+33 pkgs/top-level/python-packages.nix+16 pkgs/top-level/release-small.nix+1−1
.github/CODEOWNERS+4−4
@@ -195,10 +195,10 @@
195195/pkgs/top-level/php-packages.nix @NixOS/php
196196
197197# Podman, CRI-O modules and related
198−/nixos/modules/virtualisation/containers.nix @NixOS/podman
199−/nixos/modules/virtualisation/cri-o.nix @NixOS/podman
200−/nixos/modules/virtualisation/podman.nix @NixOS/podman
201−/nixos/tests/podman.nix @NixOS/podman
198+/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq
199+/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq
200+/nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq
201+/nixos/tests/podman.nix @NixOS/podman @zowoq
202202
203203# Blockchains
204204/pkgs/applications/blockchains @mmahut
doc/languages-frameworks/android.section.md+2
@@ -191,6 +191,8 @@ androidenv.emulateApp {
191191}
192192```
193193
194+Additional flags may be applied to the Android SDK's emulator through the runtime environment variable `$NIX_ANDROID_EMULATOR_FLAGS`.
195+
194196It is also possible to specify an APK to deploy inside the emulator
195197and the package and activity names to launch it:
196198
lib/modules.nix+13−2
@@ -115,8 +115,19 @@ rec {
115115
116116 checkUnmatched =
117117 if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then
118− let firstDef = head merged.unmatchedDefns;
119− in throw "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."
118+ let
119+ firstDef = head merged.unmatchedDefns;
120+ baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist.";
121+ in
122+ if attrNames options == [ "_module" ]
123+ then throw ''
124+ ${baseMsg}
125+
126+ However there are no options defined in `${showOption prefix}'. Are you sure you've
127+ declared your options properly? This can happen if you e.g. declared your options in `types.submodule'
128+ under `config' rather than `options'.
129+ ''
130+ else throw baseMsg
120131 else null;
121132
122133 result = builtins.seq checkUnmatched {
maintainers/maintainer-list.nix+70
@@ -254,6 +254,12 @@
254254 githubId = 732652;
255255 name = "Andreas Herrmann";
256256 };
257+ ahrzb = {
258+ email = "ahrzb5@gmail.com";
259+ github = "ahrzb";
260+ githubId = 5220438;
261+ name = "AmirHossein Roozbahani";
262+ };
257263 ahuzik = {
258264 email = "ales.guzik@gmail.com";
259265 github = "alesguzik";
@@ -2467,6 +2473,12 @@
24672473 githubId = 97852;
24682474 name = "Ellis Whitehead";
24692475 };
2476+ elkowar = {
2477+ email = "thereal.elkowar@gmail.com";
2478+ github = "elkowar";
2479+ githubId = 5300871;
2480+ name = "Leon Kowarschick";
2481+ };
24702482 elohmeier = {
24712483 email = "elo-nixos@nerdworks.de";
24722484 github = "elohmeier";
@@ -3829,6 +3841,12 @@
38293841 githubId = 51518420;
38303842 name = "jitwit";
38313843 };
3844+ jjjollyjim = {
3845+ email = "jamie@kwiius.com";
3846+ github = "JJJollyjim";
3847+ githubId = 691552;
3848+ name = "Jamie McClymont";
3849+ };
38323850 jk = {
38333851 email = "hello+nixpkgs@j-k.io";
38343852 github = "06kellyjac";
@@ -4184,6 +4202,12 @@
41844202 githubId = 87115;
41854203 name = "Wael Nasreddine";
41864204 };
4205+ kalekseev = {
4206+ email = "mail@kalekseev.com";
4207+ github = "kalekseev";
4208+ githubId = 367259;
4209+ name = "Konstantin Alekseev";
4210+ };
41874211 kamadorueda = {
41884212 name = "Kevin Amado";
41894213 email = "kamadorueda@gmail.com";
@@ -4421,6 +4445,12 @@
44214445 githubId = 524268;
44224446 name = "Koral";
44234447 };
4448+ koslambrou = {
4449+ email = "koslambrou@gmail.com";
4450+ github = "koslambrou";
4451+ githubId = 2037002;
4452+ name = "Konstantinos";
4453+ };
44244454 kovirobi = {
44254455 email = "kovirobi@gmail.com";
44264456 github = "kovirobi";
@@ -5188,6 +5218,12 @@
51885218 githubId = 35892750;
51895219 name = "Maxine Aubrey";
51905220 };
5221+ maxxk = {
5222+ email = "maxim.krivchikov@gmail.com";
5223+ github = "maxxk";
5224+ githubId = 1191859;
5225+ name = "Maxim Krivchikov";
5226+ };
51915227 mbakke = {
51925228 email = "mbakke@fastmail.com";
51935229 github = "mbakke";
@@ -5951,6 +5987,12 @@
59515987 githubId = 1224006;
59525988 name = "Roberto Abdelkader Martínez Pérez";
59535989 };
5990+ nilsirl = {
5991+ email = "nils@nilsand.re";
5992+ github = "NilsIrl";
5993+ githubId = 26231126;
5994+ name = "Nils ANDRÉ-CHANG";
5995+ };
59545996 ninjatrappeur = {
59555997 email = "felix@alternativebit.fr";
59565998 github = "ninjatrappeur";
@@ -6335,6 +6377,12 @@
63356377 githubId = 157610;
63366378 name = "Piotr Bogdan";
63376379 };
6380+ pblkt = {
6381+ email = "pebblekite@gmail.com";
6382+ github = "pblkt";
6383+ githubId = 6498458;
6384+ name = "pebble kite";
6385+ };
63386386 pcarrier = {
63396387 email = "pc@rrier.ca";
63406388 github = "pcarrier";
@@ -6719,6 +6767,12 @@
67196767 githubId = 115877;
67206768 name = "Kenny Shen";
67216769 };
6770+ quentini = {
6771+ email = "quentini@airmail.cc";
6772+ github = "QuentinI";
6773+ githubId = 18196237;
6774+ name = "Quentin Inkling";
6775+ };
67226776 qyliss = {
67236777 email = "hi@alyssa.is";
67246778 github = "alyssais";
@@ -8097,6 +8151,12 @@
80978151 githubId = 863327;
80988152 name = "Tyler Benster";
80998153 };
8154+ tcbravo = {
8155+ email = "tomas.bravo@protonmail.ch";
8156+ github = "tcbravo";
8157+ githubId = 66133083;
8158+ name = "Tomas Bravo";
8159+ };
81008160 tckmn = {
81018161 email = "andy@tck.mn";
81028162 github = "tckmn";
@@ -9096,6 +9156,16 @@
90969156 fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";
90979157 }];
90989158 };
9159+ yusdacra = {
9160+ email = "y.bera003.06@protonmail.com";
9161+ github = "yusdacra";
9162+ githubId = 19897088;
9163+ name = "Yusuf Bera Ertan";
9164+ keys = [{
9165+ longkeyid = "rsa2048/0x61807181F60EFCB2";
9166+ fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2";
9167+ }];
9168+ };
90999169 yvesf = {
91009170 email = "yvesf+nix@xapek.org";
91019171 github = "yvesf";
nixos/doc/manual/configuration/gpu-accel.xml+1−24
@@ -70,35 +70,12 @@ Platform Vendor Advanced Micro Devices, Inc.</screen>
7070 Core Next</link> (GCN) GPUs are supported through the
7171 <package>rocm-opencl-icd</package> package. Adding this package to
7272 <xref linkend="opt-hardware.opengl.extraPackages"/> enables OpenCL
73− support. However, OpenCL Image support is provided through the
74− non-free <package>rocm-runtime-ext</package> package. This package can
75− be added to the same configuration option, but requires that
76− <varname>allowUnfree</varname> option is is enabled for nixpkgs. Full
77− OpenCL support on supported AMD GPUs is thus enabled as follows:
73+ support:
7874
7975 <programlisting><xref linkend="opt-hardware.opengl.extraPackages"/> = [
8076 rocm-opencl-icd
81− rocm-runtime-ext
8277];</programlisting>
8378 </para>
84−
85− <para>
86− It is also possible to use the OpenCL Image extension without a
87− system-wide installation of the <package>rocm-runtime-ext</package>
88− package by setting the <varname>ROCR_EXT_DIR</varname> environment
89− variable to the directory that contains the extension:
90−
91− <screen><prompt>$</prompt> export \
92−ROCR_EXT_DIR=`nix-build '&lt;nixpkgs&gt;' --no-out-link -A rocm-runtime-ext`/lib/rocm-runtime-ext</screen>
93− </para>
94−
95− <para>
96− With either approach, you can verify that OpenCL Image support
97− is indeed working with the <command>clinfo</command> command:
98−
99− <screen><prompt>$</prompt> clinfo | grep Image
100− Image support Yes</screen>
101− </para>
10279 </section>
10380
10481 <section xml:id="sec-gpu-accel-opencl-intel">
nixos/doc/manual/man-nixos-enter.xml+1−1
@@ -136,7 +136,7 @@
136136 <filename>/mnt</filename>:
137137 </para>
138138<screen>
139−# nixos-enter /mnt
139+# nixos-enter --root /mnt
140140</screen>
141141 <para>
142142 Run a shell command:
nixos/doc/manual/release-notes/rl-2009.xml+72−8
@@ -137,7 +137,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
137137 </listitem>
138138 <listitem>
139139 <para>
140− <varname>services.postfix.sslCACert</varname> was replaced by <varname>services.postfix.tlsTrustedAuthorities</varname> which now defaults to system certifcate authorities.
140+ <varname>services.postfix.sslCACert</varname> was replaced by <varname>services.postfix.tlsTrustedAuthorities</varname> which now defaults to system certificate authorities.
141141 </para>
142142 </listitem>
143143 <listitem>
@@ -156,6 +156,45 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
156156 Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). <varname>hardware.logitech.lcd.enable</varname> enables support for all hardware supported by the g15daemon project.
157157 </para>
158158 </listitem>
159+ <listitem>
160+ <para>
161+ Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through
162+ <link xlink:href="https://www.zabbix.com/documentation/current/manual/installation/upgrade/sources">the upgrade guide</link>
163+ and apply any changes required. Be sure to take special note of the section on
164+ <link xlink:href="https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500#enabling_extended_range_of_numeric_float_values">enabling extended range of numeric (float) values</link>
165+ as you will need to apply this database migration manually.
166+ </para>
167+ <para>
168+ If you are using Zabbix Server with a MySQL or MariaDB database you should note that using a character set of <literal>utf8</literal> and a collate of <literal>utf8_bin</literal> has become mandatory with
169+ this release. See the upstream <link xlink:href="https://support.zabbix.com/browse/ZBX-17357">issue</link> for further discussion. Before upgrading you should check the character set and collation used by
170+ your database and ensure they are correct:
171+<programlisting>
172+ SELECT
173+ default_character_set_name,
174+ default_collation_name
175+ FROM
176+ information_schema.schemata
177+ WHERE
178+ schema_name = 'zabbix';
179+</programlisting>
180+ If these values are not correct you should take a backup of your database and convert the character set and collation as required. Here is an
181+ <link xlink:href="https://www.zabbix.com/forum/zabbix-help/396573-reinstall-after-upgrade?p=396891#post396891">example</link> of how to do so, taken from
182+ the Zabbix forums:
183+<programlisting>
184+ ALTER DATABASE `zabbix` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
185+
186+ -- the following will produce a list of SQL commands you should subsequently execute
187+ SELECT CONCAT("ALTER TABLE ", TABLE_NAME," CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;") AS ExecuteTheString
188+ FROM information_schema.`COLUMNS`
189+ WHERE table_schema = "zabbix" AND COLLATION_NAME = "utf8_general_ci";
190+</programlisting>
191+ </para>
192+ </listitem>
193+ <listitem>
194+ <para>
195+ The NixOS module system now supports freeform modules as a mix between <literal>types.attrsOf</literal> and <literal>types.submodule</literal>. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See <xref linkend='sec-freeform-modules'/> for how to use them.
196+ </para>
197+ </listitem>
159198 </itemizedlist>
160199 </section>
161200
@@ -199,12 +238,10 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
199238 in the source tree for downloaded modules instead of using go's <link
200239 xlink:href="https://golang.org/cmd/go/#hdr-Module_proxy_protocol">module
201240 proxy protocol</link>. This storage format is simpler and therefore less
202− likekly to break with future versions of go. As a result
241+ likely to break with future versions of go. As a result
203242 <literal>buildGoModule</literal> switched from
204243 <literal>modSha256</literal> to the <literal>vendorSha256</literal>
205− attribute to pin fetched version data. <literal>buildGoModule</literal>
206− still accepts <literal>modSha256</literal> with a warning, but support will
207− be removed in the next release.
244+ attribute to pin fetched version data.
208245 </para>
209246 </listitem>
210247 <listitem>
@@ -213,7 +250,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
213250 <link xlink:href="https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/">deprecated in Grafana</link>
214251 and the <package>phantomjs</package> project is
215252 <link xlink:href="https://github.com/ariya/phantomjs/issues/15344#issue-302015362">currently unmaintained</link>.
216− It can still be enabled by providing <literal>phantomJsSupport = true</literal> to the package instanciation:
253+ It can still be enabled by providing <literal>phantomJsSupport = true</literal> to the package instantiation:
217254<programlisting>{
218255 services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec {
219256 phantomJsSupport = false;
@@ -225,7 +262,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
225262 <para>
226263 The <link linkend="opt-services.supybot.enable">supybot</link> module now uses <literal>/var/lib/supybot</literal>
227264 as its default <link linkend="opt-services.supybot.stateDir">stateDir</link> path if <literal>stateVersion</literal>
228− is 20.09 or higher. It also enables number of
265+ is 20.09 or higher. It also enables a number of
229266 <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Sandboxing">systemd sandboxing options</link>
230267 which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in
231268 <option>systemd.services.supybot.serviceConfig</option>.
@@ -678,11 +715,19 @@ services.dokuwiki."mywiki" = {
678715 <listitem>
679716 <para>
680717 The <xref linkend="opt-services.postgresql.dataDir"/> option is now set to <literal>"/var/lib/postgresql/${cfg.package.psqlSchema}"</literal> regardless of your
681− <xref linkend="opt-system.stateVersion"/>. Users with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.09</literal> or below
718+ <xref linkend="opt-system.stateVersion"/>. Users with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.03</literal> or below
682719 should double check what the value of their <xref linkend="opt-services.postgresql.dataDir"/> option is (<literal>/var/db/postgresql</literal>) and then explicitly
683720 set this value to maintain compatibility:
684721<programlisting>
685722services.postgresql.dataDir = "/var/db/postgresql";
723+</programlisting>
724+ </para>
725+ <para>
726+ The postgresql module now expects there to be a database super user account called <literal>postgres</literal> regardless of your <xref linkend="opt-system.stateVersion"/>. Users
727+ with an existing postgresql install that have a <xref linkend="opt-system.stateVersion"/> of <literal>17.03</literal> or below should run the following SQL statements as a
728+ database super admin user before upgrading:
729+<programlisting>
730+CREATE ROLE postgres LOGIN SUPERUSER;
686731</programlisting>
687732 </para>
688733 </listitem>
@@ -691,6 +736,13 @@ services.postgresql.dataDir = "/var/db/postgresql";
691736 The USBGuard module now removes options and instead hardcodes values for <literal>IPCAccessControlFiles</literal>, <literal>ruleFiles</literal>, and <literal>auditFilePath</literal>. Audit logs can be found in the journal.
692737 </para>
693738 </listitem>
739+ <listitem>
740+ <para>
741+ The NixOS module system now evaluates option definitions more strictly, allowing it to detect a larger set of problems.
742+ As a result, what previously evaluated may not do so anymore.
743+ See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/82743#issuecomment-674520472">the PR that changed this</link> for more info.
744+ </para>
745+ </listitem>
694746 </itemizedlist>
695747 </section>
696748
@@ -907,6 +959,18 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
907959 Fontconfig 2.10.x was removed from Nixpkgs - it hasn't been used in any nixpkgs package anymore.
908960 </para>
909961 </listitem>
962+ <listitem>
963+ <para>
964+ The packages <package>perl</package>, <package>rsync</package> and <package>strace</package> were removed from <option>systemPackages</option>. If you need them, install them again with <code><xref linkend="opt-environment.systemPackages"/> = with pkgs; [ perl rsync strace ];</code> in your <filename>configuration.nix</filename>.
965+ </para>
966+ </listitem>
967+ <listitem>
968+ <para>
969+ The <literal>undervolt</literal> option no longer needs to apply its
970+ settings every 30s. If they still become undone, open an issue and restore
971+ the previous behaviour using <literal>undervolt.useTimer</literal>.
972+ </para>
973+ </listitem>
910974 </itemizedlist>
911975 </section>
912976</section>
nixos/maintainers/scripts/ec2/create-amis.sh+1−1
@@ -29,7 +29,7 @@ log() {
2929 echo "$@" >&2
3030}
3131
32−if [ -z "$1" ]; then
32+if [ "$#" -ne 1 ]; then
3333 log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT"
3434 exit 1
3535fi
nixos/modules/config/fonts/fontconfig.nix−7
@@ -190,13 +190,6 @@ let
190190 ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \
191191 $dst/
192192
193− # update 51-local.conf path to look at local.conf
194− rm $dst/51-local.conf
195−
196− substitute ${pkg.out}/etc/fonts/conf.d/51-local.conf \
197− $dst/51-local.conf \
198− --replace local.conf /etc/fonts/${pkg.configVersion}/local.conf
199−
200193 # 00-nixos-cache.conf
201194 ln -s ${cacheConf} $dst/00-nixos-cache.conf
202195
nixos/modules/config/system-path.nix+1−4
@@ -33,14 +33,11 @@ let
3333 pkgs.ncurses
3434 pkgs.netcat
3535 config.programs.ssh.package
36− pkgs.perl
3736 pkgs.procps
38− pkgs.rsync
39− pkgs.strace
4037 pkgs.su
4138 pkgs.time
4239 pkgs.utillinux
43− pkgs.which # 88K size
40+ pkgs.which
4441 pkgs.zstd
4542 ];
4643
nixos/modules/hardware/onlykey.nix+1−1
@@ -26,7 +26,7 @@ with lib;
2626 ####### implementation
2727
2828 config = mkIf config.hardware.onlykey.enable {
29− services.udev.extraRules = builtin.readFile ./onlykey.udev;
29+ services.udev.extraRules = builtins.readFile ./onlykey.udev;
3030 };
3131
3232
nixos/modules/misc/ids.nix+2−2
@@ -321,7 +321,7 @@ in
321321 monetdb = 290;
322322 restic = 291;
323323 openvpn = 292;
324− meguca = 293;
324+ # meguca = 293; # removed 2020-08-21
325325 yarn = 294;
326326 hdfs = 295;
327327 mapred = 296;
@@ -622,7 +622,7 @@ in
622622 monetdb = 290;
623623 restic = 291;
624624 openvpn = 292;
625− meguca = 293;
625+ # meguca = 293; # removed 2020-08-21
626626 yarn = 294;
627627 hdfs = 295;
628628 mapred = 296;
nixos/modules/module-list.nix−1
@@ -886,7 +886,6 @@
886886 ./services/web-servers/lighttpd/collectd.nix
887887 ./services/web-servers/lighttpd/default.nix
888888 ./services/web-servers/lighttpd/gitweb.nix
889− ./services/web-servers/meguca.nix
890889 ./services/web-servers/mighttpd2.nix
891890 ./services/web-servers/minio.nix
892891 ./services/web-servers/molly-brown.nix
nixos/modules/profiles/base.nix+1
@@ -26,6 +26,7 @@
2626 pkgs.fuse
2727 pkgs.fuse3
2828 pkgs.sshfs-fuse
29+ pkgs.rsync
2930 pkgs.socat
3031 pkgs.screen
3132
nixos/modules/rename.nix+1
@@ -48,6 +48,7 @@ with lib;
4848 instead, or any other display manager in NixOS as they all support auto-login.
4949 '')
5050 (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
51+ (mkRemovedOptionModule [ "services" "meguca" ] "Use meguca has been removed from nixpkgs")
5152 (mkRemovedOptionModule ["hardware" "brightnessctl" ] ''
5253 The brightnessctl module was removed because newer versions of
5354 brightnessctl don't require the udev rules anymore (they can use the
nixos/modules/security/acme.nix+19−2
@@ -150,6 +150,14 @@ let
150150 '';
151151 };
152152
153+ extraLegoFlags = mkOption {
154+ type = types.listOf types.str;
155+ default = [];
156+ description = ''
157+ Additional global flags to pass to all lego commands.
158+ '';
159+ };
160+
153161 extraLegoRenewFlags = mkOption {
154162 type = types.listOf types.str;
155163 default = [];
@@ -157,6 +165,14 @@ let
157165 Additional flags to pass to lego renew.
158166 '';
159167 };
168+
169+ extraLegoRunFlags = mkOption {
170+ type = types.listOf types.str;
171+ default = [];
172+ description = ''
173+ Additional flags to pass to lego run.
174+ '';
175+ };
160176 };
161177 };
162178
@@ -313,9 +329,10 @@ in
313329 ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ]
314330 ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains)
315331 ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ])
316− ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)];
332+ ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)]
333+ ++ data.extraLegoFlags;
317334 certOpts = optionals data.ocspMustStaple [ "--must-staple" ];
318− runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts);
335+ runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts ++ data.extraLegoRunFlags);
319336 renewOpts = escapeShellArgs (globalOpts ++
320337 [ "renew" "--days" (toString cfg.validMinDays) ] ++
321338 certOpts ++ data.extraLegoRenewFlags);
nixos/modules/services/databases/postgresql.nix+34−38
@@ -225,14 +225,15 @@ in
225225 Contents of the <filename>recovery.conf</filename> file.
226226 '';
227227 };
228+
228229 superUser = mkOption {
229230 type = types.str;
230− default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
231+ default = "postgres";
231232 internal = true;
233+ readOnly = true;
232234 description = ''
233− NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
234− From 17.09 we also try to follow this standard. Internal since changing this value
235− would lead to breakage while setting up databases.
235+ PostgreSQL superuser account to use for various operations. Internal since changing
236+ this value would lead to breakage while setting up databases.
236237 '';
237238 };
238239 };
@@ -310,6 +311,35 @@ in
310311 ''}
311312 '';
312313
314+ # Wait for PostgreSQL to be ready to accept connections.
315+ postStart =
316+ ''
317+ PSQL="psql --port=${toString cfg.port}"
318+
319+ while ! $PSQL -d postgres -c "" 2> /dev/null; do
320+ if ! kill -0 "$MAINPID"; then exit 1; fi
321+ sleep 0.1
322+ done
323+
324+ if test -e "${cfg.dataDir}/.first_startup"; then
325+ ${optionalString (cfg.initialScript != null) ''
326+ $PSQL -f "${cfg.initialScript}" -d postgres
327+ ''}
328+ rm -f "${cfg.dataDir}/.first_startup"
329+ fi
330+ '' + optionalString (cfg.ensureDatabases != []) ''
331+ ${concatMapStrings (database: ''
332+ $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
333+ '') cfg.ensureDatabases}
334+ '' + ''
335+ ${concatMapStrings (user: ''
336+ $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
337+ ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
338+ $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
339+ '') user.ensurePermissions)}
340+ '') cfg.ensureUsers}
341+ '';
342+
313343 serviceConfig = mkMerge [
314344 { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
315345 User = "postgres";
@@ -329,40 +359,6 @@ in
329359 TimeoutSec = 120;
330360
331361 ExecStart = "${postgresql}/bin/postgres";
332−
333− # Wait for PostgreSQL to be ready to accept connections.
334− ExecStartPost =
335− let
336− setupScript = pkgs.writeScript "postgresql-setup" (''
337− #!${pkgs.runtimeShell} -e
338−
339− PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}"
340−
341− while ! $PSQL -d postgres -c "" 2> /dev/null; do
342− if ! kill -0 "$MAINPID"; then exit 1; fi
343− sleep 0.1
344− done
345−
346− if test -e "${cfg.dataDir}/.first_startup"; then
347− ${optionalString (cfg.initialScript != null) ''
348− $PSQL -f "${cfg.initialScript}" -d postgres
349− ''}
350− rm -f "${cfg.dataDir}/.first_startup"
351− fi
352− '' + optionalString (cfg.ensureDatabases != []) ''
353− ${concatMapStrings (database: ''
354− $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${database}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${database}"'
355− '') cfg.ensureDatabases}
356− '' + ''
357− ${concatMapStrings (user: ''
358− $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
359− ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
360− $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
361− '') user.ensurePermissions)}
362− '') cfg.ensureUsers}
363− '');
364− in
365− "+${setupScript}";
366362 }
367363 (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") {
368364 StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}";
nixos/modules/services/editors/emacs.xml+6−6
@@ -53,11 +53,11 @@
5353 <varname>emacs</varname>
5454 </term>
5555 <term>
56− <varname>emacs25</varname>
56+ <varname>emacs</varname>
5757 </term>
5858 <listitem>
5959 <para>
60− The latest stable version of Emacs 25 using the
60+ The latest stable version of Emacs using the
6161 <link
6262 xlink:href="http://www.gtk.org">GTK 2</link>
6363 widget toolkit.
@@ -66,11 +66,11 @@
6666 </varlistentry>
6767 <varlistentry>
6868 <term>
69− <varname>emacs25-nox</varname>
69+ <varname>emacs-nox</varname>
7070 </term>
7171 <listitem>
7272 <para>
73− Emacs 25 built without any dependency on X11 libraries.
73+ Emacs built without any dependency on X11 libraries.
7474 </para>
7575 </listitem>
7676 </varlistentry>
@@ -79,11 +79,11 @@
7979 <varname>emacsMacport</varname>
8080 </term>
8181 <term>
82− <varname>emacs25Macport</varname>
82+ <varname>emacsMacport</varname>
8383 </term>
8484 <listitem>
8585 <para>
86− Emacs 25 with the "Mac port" patches, providing a more native look and
86+ Emacs with the "Mac port" patches, providing a more native look and
8787 feel under macOS.
8888 </para>
8989 </listitem>
nixos/modules/services/hardware/undervolt.nix+17−1
@@ -103,6 +103,17 @@ in
103103 The temperature target on battery power in Celsius degrees.
104104 '';
105105 };
106+
107+ useTimer = mkOption {
108+ type = types.bool;
109+ default = false;
110+ description = ''
111+ Whether to set a timer that applies the undervolt settings every 30s.
112+ This will cause spam in the journal but might be required for some
113+ hardware under specific conditions.
114+ Enable this if your undervolt settings don't hold.
115+ '';
116+ };
106117 };
107118
108119 config = mkIf cfg.enable {
@@ -114,6 +125,11 @@ in
114125 path = [ pkgs.undervolt ];
115126
116127 description = "Intel Undervolting Service";
128+
129+ # Apply undervolt on boot, nixos generation switch and resume
130+ wantedBy = [ "multi-user.target" "post-resume.target" ];
131+ after = [ "post-resume.target" ]; # Not sure why but it won't work without this
132+
117133 serviceConfig = {
118134 Type = "oneshot";
119135 Restart = "no";
@@ -121,7 +137,7 @@ in
121137 };
122138 };
123139
124− systemd.timers.undervolt = {
140+ systemd.timers.undervolt = mkIf cfg.useTimer {
125141 description = "Undervolt timer to ensure voltage settings are always applied";
126142 partOf = [ "undervolt.service" ];
127143 wantedBy = [ "multi-user.target" ];
nixos/modules/services/logging/logrotate.nix+105−41
@@ -5,54 +5,93 @@ with lib;
55let
66 cfg = config.services.logrotate;
77
8− pathOptions = {
8+ pathOpts = {
99 options = {
10+ enable = mkOption {
11+ type = types.bool;
12+ default = true;
13+ description = ''
14+ Whether to enable log rotation for this path. This can be used to explicitly disable
15+ logging that has been configured by NixOS.
16+ '';
17+ };
18+
1019 path = mkOption {
1120 type = types.str;
12− description = "The path to log files to be rotated";
21+ description = ''
22+ The path to log files to be rotated.
23+ '';
1324 };
25+
1426 user = mkOption {
15− type = types.str;
16− description = "The user account to use for rotation";
27+ type = with types; nullOr str;
28+ default = null;
29+ description = ''
30+ The user account to use for rotation.
31+ '';
1732 };
33+
1834 group = mkOption {
19− type = types.str;
20− description = "The group to use for rotation";
35+ type = with types; nullOr str;
36+ default = null;
37+ description = ''
38+ The group to use for rotation.
39+ '';
2140 };
41+
2242 frequency = mkOption {
23− type = types.enum [
24− "daily" "weekly" "monthly" "yearly"
25− ];
43+ type = types.enum [ "daily" "weekly" "monthly" "yearly" ];
2644 default = "daily";
27− description = "How often to rotate the logs";
45+ description = ''
46+ How often to rotate the logs.
47+ '';
2848 };
49+
2950 keep = mkOption {
3051 type = types.int;
3152 default = 20;
32− description = "How many rotations to keep";
53+ description = ''
54+ How many rotations to keep.
55+ '';
3356 };
57+
3458 extraConfig = mkOption {
3559 type = types.lines;
3660 default = "";
37− description = "Extra logrotate config options for this path";
61+ description = ''
62+ Extra logrotate config options for this path. Refer to
63+ <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details.
64+ '';
65+ };
66+
67+ priority = mkOption {
68+ type = types.int;
69+ default = 1000;
70+ description = ''
71+ Order of this logrotate block in relation to the others. The semantics are
72+ the same as with `lib.mkOrder`. Smaller values have a greater priority.
73+ '';
3874 };
3975 };
40− };
4176
42− pathConfig = options: ''
43− "${options.path}" {
44− su ${options.user} ${options.group}
45− ${options.frequency}
77+ config.extraConfig = ''
4678 missingok
4779 notifempty
48− rotate ${toString options.keep}
49− ${options.extraConfig}
80+ '';
81+ };
82+
83+ mkConf = pathOpts: ''
84+ # generated by NixOS using the `services.logrotate.paths.${pathOpts.name}` attribute set
85+ "${pathOpts.path}" {
86+ ${optionalString (pathOpts.user != null || pathOpts.group != null) "su ${pathOpts.user} ${pathOpts.group}"}
87+ ${pathOpts.frequency}
88+ rotate ${toString pathOpts.keep}
89+ ${pathOpts.extraConfig}
5090 }
5191 '';
5292
53− configFile = pkgs.writeText "logrotate.conf" (
54− (concatStringsSep "\n" ((map pathConfig cfg.paths) ++ [cfg.extraConfig]))
55− );
93+ paths = sortProperties (mapAttrsToList (name: pathOpts: pathOpts // { name = name; }) (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths));
94+ configFile = pkgs.writeText "logrotate.conf" (concatStringsSep "\n" ((map mkConf paths) ++ [ cfg.extraConfig ]));
5695
5796in
5897{
@@ -65,41 +104,66 @@ in
65104 enable = mkEnableOption "the logrotate systemd service";
66105
67106 paths = mkOption {
68− type = types.listOf (types.submodule pathOptions);
69− default = [];
70− description = "List of attribute sets with paths to rotate";
71− example = {
72− "/var/log/myapp/*.log" = {
73− user = "myuser";
74− group = "mygroup";
75− rotate = "weekly";
76− keep = 5;
77− };
78− };
107+ type = with types; attrsOf (submodule pathOpts);
108+ default = {};
109+ description = ''
110+ Attribute set of paths to rotate. The order each block appears in the generated configuration file
111+ can be controlled by the <link linkend="opt-services.logrotate.paths._name_.priority">priority</link> option
112+ using the same semantics as `lib.mkOrder`. Smaller values have a greater priority.
113+ '';
114+ example = literalExample ''
115+ {
116+ httpd = {
117+ path = "/var/log/httpd/*.log";
118+ user = config.services.httpd.user;
119+ group = config.services.httpd.group;
120+ keep = 7;
121+ };
122+
123+ myapp = {
124+ path = "/var/log/myapp/*.log";
125+ user = "myuser";
126+ group = "mygroup";
127+ frequency = "weekly";
128+ keep = 5;
129+ priority = 1;
130+ };
131+ }
132+ '';
79133 };
80134
81135 extraConfig = mkOption {
82136 default = "";
83137 type = types.lines;
84138 description = ''
85− Extra contents to add to the logrotate config file.
86− See https://linux.die.net/man/8/logrotate
139+ Extra contents to append to the logrotate configuration file. Refer to
140+ <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details.
87141 '';
88142 };
89143 };
90144 };
91145
92146 config = mkIf cfg.enable {
93− systemd.services.logrotate = {
94− description = "Logrotate Service";
95− wantedBy = [ "multi-user.target" ];
96− startAt = "*-*-* *:05:00";
147+ assertions = mapAttrsToList (name: pathOpts:
148+ { assertion = (pathOpts.user != null) == (pathOpts.group != null);
149+ message = ''
150+ If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified.
151+ '';
152+ }
153+ ) cfg.paths;
97154
98− serviceConfig.Restart = "no";
99− serviceConfig.User = "root";
155+ systemd.services.logrotate = {
156+ description = "Logrotate Service";
157+ wantedBy = [ "multi-user.target" ];
158+ startAt = "*-*-* *:05:00";
100159 script = ''
101160 exec ${pkgs.logrotate}/sbin/logrotate ${configFile}
102161 '';
162+
163+ serviceConfig = {
164+ Restart = "no";
165+ User = "root";
166+ };
103167 };
104168 };
105169}
nixos/modules/services/logging/logstash.nix+1−5
@@ -4,13 +4,9 @@ with lib;
44
55let
66 cfg = config.services.logstash;
7− pluginPath = lib.concatStringsSep ":" cfg.plugins;
8− havePluginPath = lib.length cfg.plugins > 0;
97 ops = lib.optionalString;
108 verbosityFlag = "--log.level " + cfg.logLevel;
119
12− pluginsPath = "--path.plugins ${pluginPath}";
13−
1410 logstashConf = pkgs.writeText "logstash.conf" ''
1511 input {
1612 ${cfg.inputConfig}
@@ -173,7 +169,7 @@ in
173169 ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [
174170 "${cfg.package}/bin/logstash"
175171 "-w ${toString cfg.filterWorkers}"
176− (ops havePluginPath pluginsPath)
172+ (concatMapStringsSep " " (x: "--path.plugins ${x}") cfg.plugins)
177173 "${verbosityFlag}"
178174 "-f ${logstashConf}"
179175 "--path.settings ${logstashSettingsDir}"
nixos/modules/services/mail/dovecot.nix+15−18
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, ... }:
1+{ options, config, lib, pkgs, ... }:
22
33with lib;
44
@@ -83,11 +83,11 @@ let
8383 )
8484
8585 (
86− optionalString (cfg.mailboxes != []) ''
86+ optionalString (cfg.mailboxes != {}) ''
8787 protocol imap {
8888 namespace inbox {
8989 inbox=yes
90− ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
90+ ${concatStringsSep "\n" (map mailboxConfig (attrValues cfg.mailboxes))}
9191 }
9292 }
9393 ''
@@ -131,12 +131,13 @@ let
131131 special_use = \${toString mailbox.specialUse}
132132 '' + "}";
133133
134− mailboxes = { ... }: {
134+ mailboxes = { name, ... }: {
135135 options = {
136136 name = mkOption {
137− type = types.nullOr (types.strMatching ''[^"]+'');
137+ type = types.strMatching ''[^"]+'';
138138 example = "Spam";
139− default = null;
139+ default = name;
140+ readOnly = true;
140141 description = "The name of the mailbox.";
141142 };
142143 auto = mkOption {
@@ -335,19 +336,11 @@ in
335336 };
336337
337338 mailboxes = mkOption {
338− type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m);
339+ type = with types; coercedTo
340+ (listOf unspecified)
341+ (list: listToAttrs (map (entry: { name = entry.name; value = removeAttrs entry ["name"]; }) list))
342+ (attrsOf (submodule mailboxes));
339343 default = {};
340− apply = x:
341− if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x
342− else mapAttrsToList (name: value:
343− if value.name != null
344− then throw ''
345− When specifying dovecot2 mailboxes as attributes, declaring
346− a `name'-attribute is prohibited! The name ${value.name} should
347− be the attribute key!
348− ''
349− else value // { inherit name; }
350− ) x;
351344 example = literalExample ''
352345 {
353346 Spam = { specialUse = "Junk"; auto = "create"; };
@@ -471,6 +464,10 @@ in
471464
472465 environment.systemPackages = [ dovecotPkg ];
473466
467+ warnings = mkIf (any isList options.services.dovecot2.mailboxes.definitions) [
468+ "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03! See the release notes for more info for migration."
469+ ];
470+
474471 assertions = [
475472 {
476473 assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
nixos/modules/services/misc/gitlab.nix+7−1
@@ -54,7 +54,7 @@ let
5454 '') gitlabConfig.production.repositories.storages))}
5555 '';
5656
57− gitlabShellConfig = {
57+ gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig {
5858 user = cfg.user;
5959 gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
6060 http_settings.self_signed_cert = false;
@@ -517,6 +517,12 @@ in {
517517 '';
518518 };
519519
520+ extraShellConfig = mkOption {
521+ type = types.attrs;
522+ default = {};
523+ description = "Extra configuration to merge into shell-config.yml";
524+ };
525+
520526 extraConfig = mkOption {
521527 type = types.attrs;
522528 default = {};
nixos/modules/services/misc/gollum.nix+7
@@ -50,6 +50,12 @@ in
5050 description = "Parse and interpret emoji tags";
5151 };
5252
53+ h1-title = mkOption {
54+ type = types.bool;
55+ default = false;
56+ description = "Use the first h1 as page title";
57+ };
58+
5359 branch = mkOption {
5460 type = types.str;
5561 default = "master";
@@ -102,6 +108,7 @@ in
102108 --ref ${cfg.branch} \
103109 ${optionalString cfg.mathjax "--mathjax"} \
104110 ${optionalString cfg.emoji "--emoji"} \
111+ ${optionalString cfg.h1-title "--h1-title"} \
105112 ${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \
106113 ${cfg.stateDir}
107114 '';
nixos/modules/services/misc/jellyfin.nix+14−1
@@ -16,6 +16,14 @@ in
1616 description = "User account under which Jellyfin runs.";
1717 };
1818
19+ package = mkOption {
20+ type = types.package;
21+ example = literalExample "pkgs.jellyfin";
22+ description = ''
23+ Jellyfin package to use.
24+ '';
25+ };
26+
1927 group = mkOption {
2028 type = types.str;
2129 default = "jellyfin";
@@ -35,11 +43,16 @@ in
3543 Group = cfg.group;
3644 StateDirectory = "jellyfin";
3745 CacheDirectory = "jellyfin";
38− ExecStart = "${pkgs.jellyfin}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
46+ ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'";
3947 Restart = "on-failure";
4048 };
4149 };
4250
51+ services.jellyfin.package = mkDefault (
52+ if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin
53+ else pkgs.jellyfin_10_5
54+ );
55+
4356 users.users = mkIf (cfg.user == "jellyfin") {
4457 jellyfin = {
4558 group = cfg.group;
nixos/modules/services/monitoring/monit.nix+14−4
@@ -4,19 +4,29 @@ with lib;
44
55let
66 cfg = config.services.monit;
7+ extraConfig = pkgs.writeText "monitConfig" cfg.extraConfig;
78in
89
910{
11+ imports = [
12+ (mkRenamedOptionModule [ "services" "monit" "config" ] ["services" "monit" "extraConfig" ])
13+ ];
14+
1015 options.services.monit = {
1116
1217 enable = mkEnableOption "Monit";
1318
14− config = mkOption {
19+ configFiles = mkOption {
20+ type = types.listOf types.path;
21+ default = [];
22+ description = "List of paths to be included in the monitrc file";
23+ };
24+
25+ extraConfig = mkOption {
1526 type = types.lines;
1627 default = "";
17− description = "monitrc content";
28+ description = "Additional monit config as string";
1829 };
19−
2030 };
2131
2232 config = mkIf cfg.enable {
@@ -24,7 +34,7 @@ in
2434 environment.systemPackages = [ pkgs.monit ];
2535
2636 environment.etc.monitrc = {
27− text = cfg.config;
37+ text = concatMapStringsSep "\n" (path: "include ${path}") (cfg.configFiles ++ [extraConfig]);
2838 mode = "0400";
2939 };
3040
nixos/modules/services/monitoring/smartd.nix+1−5
@@ -20,7 +20,7 @@ let
2020 ${pkgs.coreutils}/bin/cat << EOF
2121 From: smartd on ${host} <${nm.sender}>
2222 To: undisclosed-recipients:;
23− Subject: SMART error on $SMARTD_DEVICESTRING: $SMARTD_FAILTYPE
23+ Subject: $SMARTD_SUBJECT
2424
2525 $SMARTD_FULLMESSAGE
2626 EOF
@@ -239,11 +239,7 @@ in
239239
240240 systemd.services.smartd = {
241241 description = "S.M.A.R.T. Daemon";
242−
243242 wantedBy = [ "multi-user.target" ];
244−
245− path = [ pkgs.nettools ]; # for hostname and dnsdomanname calls in smartd
246−
247243 serviceConfig.ExecStart = "${pkgs.smartmontools}/sbin/smartd ${lib.concatStringsSep " " cfg.extraOptions} --no-fork --configfile=${smartdConf}";
248244 };
249245
nixos/modules/services/monitoring/zabbix-proxy.nix+9−8
@@ -5,8 +5,8 @@ let
55 pgsql = config.services.postgresql;
66 mysql = config.services.mysql;
77
8− inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption;
9− inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types;
8+ inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption;
9+ inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types;
1010 inherit (lib.generators) toKeyValue;
1111
1212 user = "zabbix";
@@ -232,14 +232,15 @@ in
232232 services.mysql = optionalAttrs mysqlLocal {
233233 enable = true;
234234 package = mkDefault pkgs.mariadb;
235− ensureDatabases = [ cfg.database.name ];
236− ensureUsers = [
237− { name = cfg.database.user;
238− ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
239− }
240− ];
241235 };
242236
237+ systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal ''
238+ ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;"
239+ echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};"
240+ echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';"
241+ ) | ${config.services.mysql.package}/bin/mysql -N
242+ '');
243+
243244 services.postgresql = optionalAttrs pgsqlLocal {
244245 enable = true;
245246 ensureDatabases = [ cfg.database.name ];
nixos/modules/services/monitoring/zabbix-server.nix+9−8
@@ -5,8 +5,8 @@ let
55 pgsql = config.services.postgresql;
66 mysql = config.services.mysql;
77
8− inherit (lib) mkDefault mkEnableOption mkIf mkMerge mkOption;
9− inherit (lib) attrValues concatMapStringsSep literalExample optional optionalAttrs optionalString types;
8+ inherit (lib) mkAfter mkDefault mkEnableOption mkIf mkMerge mkOption;
9+ inherit (lib) attrValues concatMapStringsSep getName literalExample optional optionalAttrs optionalString types;
1010 inherit (lib.generators) toKeyValue;
1111
1212 user = "zabbix";
@@ -220,14 +220,15 @@ in
220220 services.mysql = optionalAttrs mysqlLocal {
221221 enable = true;
222222 package = mkDefault pkgs.mariadb;
223− ensureDatabases = [ cfg.database.name ];
224− ensureUsers = [
225− { name = cfg.database.user;
226− ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
227− }
228− ];
229223 };
230224
225+ systemd.services.mysql.postStart = mkAfter (optionalString mysqlLocal ''
226+ ( echo "CREATE DATABASE IF NOT EXISTS \`${cfg.database.name}\` CHARACTER SET utf8 COLLATE utf8_bin;"
227+ echo "CREATE USER IF NOT EXISTS '${cfg.database.user}'@'localhost' IDENTIFIED WITH ${if (getName config.services.mysql.package == getName pkgs.mariadb) then "unix_socket" else "auth_socket"};"
228+ echo "GRANT ALL PRIVILEGES ON \`${cfg.database.name}\`.* TO '${cfg.database.user}'@'localhost';"
229+ ) | ${config.services.mysql.package}/bin/mysql -N
230+ '');
231+
231232 services.postgresql = optionalAttrs pgsqlLocal {
232233 enable = true;
233234 ensureDatabases = [ cfg.database.name ];
nixos/modules/services/web-servers/apache-httpd/default.nix+28−3
@@ -10,6 +10,12 @@ let
1010
1111 pkg = cfg.package.out;
1212
13+ apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } ''
14+ mkdir -p $out/bin
15+ cp ${pkg}/bin/apachectl $out/bin/apachectl
16+ sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|'
17+ '';
18+
1319 httpdConf = cfg.configFile;
1420
1521 php = cfg.phpPackage.override { apacheHttpd = pkg; };
@@ -650,10 +656,29 @@ in
650656 postRun = "systemctl reload httpd.service";
651657 }) (filterAttrs (name: hostOpts: hostOpts.enableACME) cfg.virtualHosts);
652658
653− environment.systemPackages = [ pkg ];
659+ environment.systemPackages = [
660+ apachectl
661+ pkg
662+ ];
654663
655− # required for "apachectl configtest"
656− environment.etc."httpd/httpd.conf".source = httpdConf;
664+ services.logrotate = optionalAttrs (cfg.logFormat != "none") {
665+ enable = mkDefault true;
666+ paths.httpd = {
667+ path = "${cfg.logDir}/*.log";
668+ user = cfg.user;
669+ group = cfg.group;
670+ frequency = "daily";
671+ keep = 28;
672+ extraConfig = ''
673+ sharedscripts
674+ compress
675+ delaycompress
676+ postrotate
677+ systemctl reload httpd.service > /dev/null 2>/dev/null || true
678+ endscript
679+ '';
680+ };
681+ };
657682
658683 services.httpd.phpOptions =
659684 ''
nixos/modules/services/web-servers/meguca.nixdeleted−174
@@ -1,174 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−let
4− cfg = config.services.meguca;
5− postgres = config.services.postgresql;
6−in with lib; {
7− options.services.meguca = {
8− enable = mkEnableOption "meguca";
9−
10− dataDir = mkOption {
11− type = types.path;
12− default = "/var/lib/meguca";
13− example = "/home/okina/meguca";
14− description = "Location where meguca stores it's database and links.";
15− };
16−
17− password = mkOption {
18− type = types.str;
19− default = "meguca";
20− example = "dumbpass";
21− description = "Password for the meguca database.";
22− };
23−
24− passwordFile = mkOption {
25− type = types.path;
26− default = "/run/keys/meguca-password-file";
27− example = "/home/okina/meguca/keys/pass";
28− description = "Password file for the meguca database.";
29− };
30−
31− reverseProxy = mkOption {
32− type = types.nullOr types.str;
33− default = null;
34− example = "192.168.1.5";
35− description = "Reverse proxy IP.";
36− };
37−
38− sslCertificate = mkOption {
39− type = types.nullOr types.str;
40− default = null;
41− example = "/home/okina/meguca/ssl.cert";
42− description = "Path to the SSL certificate.";
43− };
44−
45− listenAddress = mkOption {
46− type = types.nullOr types.str;
47− default = null;
48− example = "127.0.0.1:8000";
49− description = "Listen on a specific IP address and port.";
50− };
51−
52− cacheSize = mkOption {
53− type = types.nullOr types.int;
54− default = null;
55− example = 256;
56− description = "Cache size in MB.";
57− };
58−
59− postgresArgs = mkOption {
60− type = types.str;
61− example = "user=meguca password=dumbpass dbname=meguca sslmode=disable";
62− description = "Postgresql connection arguments.";
63− };
64−
65− postgresArgsFile = mkOption {
66− type = types.path;
67− default = "/run/keys/meguca-postgres-args";
68− example = "/home/okina/meguca/keys/postgres";
69− description = "Postgresql connection arguments file.";
70− };
71−
72− compressTraffic = mkOption {
73− type = types.bool;
74− default = false;
75− description = "Compress all traffic with gzip.";
76− };
77−
78− assumeReverseProxy = mkOption {
79− type = types.bool;
80− default = false;
81− description = "Assume the server is behind a reverse proxy, when resolving client IPs.";
82− };
83−
84− httpsOnly = mkOption {
85− type = types.bool;
86− default = false;
87− description = "Serve and listen only through HTTPS.";
88− };
89−
90− videoPaths = mkOption {
91− type = types.listOf types.path;
92− default = [];
93− example = [ "/home/okina/Videos/tehe_pero.webm" ];
94− description = "Videos that will be symlinked into www/videos.";
95− };
96− };
97−
98− config = mkIf cfg.enable {
99− security.sudo.enable = cfg.enable;
100− services.postgresql.enable = cfg.enable;
101− services.postgresql.package = pkgs.postgresql_11;
102− services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password);
103− services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs);
104− services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable";
105−
106− systemd.services.meguca = {
107− description = "meguca";
108− after = [ "network.target" "postgresql.service" ];
109− wantedBy = [ "multi-user.target" ];
110−
111− preStart = ''
112− # Ensure folder exists or create it and links and permissions are correct
113− mkdir -p ${escapeShellArg cfg.dataDir}/www
114− rm -rf ${escapeShellArg cfg.dataDir}/www/videos
115− ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www
116− unlink ${escapeShellArg cfg.dataDir}/www/videos
117− mkdir -p ${escapeShellArg cfg.dataDir}/www/videos
118−
119− for vid in ${escapeShellArg cfg.videoPaths}; do
120− ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos
121− done
122−
123− chmod 750 ${escapeShellArg cfg.dataDir}
124− chown -R meguca:meguca ${escapeShellArg cfg.dataDir}
125−
126− # Ensure the database is correct or create it
127− ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
128− -SDR meguca || true
129− ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
130− -T template0 -E UTF8 -O meguca meguca || true
131− ${pkgs.sudo}/bin/sudo -u meguca ${postgres.package}/bin/psql \
132− -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${escapeShellArg cfg.passwordFile})';" || true
133− '';
134−
135− script = ''
136− cd ${escapeShellArg cfg.dataDir}
137−
138− ${pkgs.meguca}/bin/meguca -d "$(cat ${escapeShellArg cfg.postgresArgsFile})"''
139− + optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"
140− + optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"
141− + optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"
142− + optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"
143− + optionalString (cfg.compressTraffic) " -g"
144− + optionalString (cfg.assumeReverseProxy) " -r"
145− + optionalString (cfg.httpsOnly) " -s" + " start";
146−
147− serviceConfig = {
148− PermissionsStartOnly = true;
149− Type = "forking";
150− User = "meguca";
151− Group = "meguca";
152− ExecStop = "${pkgs.meguca}/bin/meguca stop";
153− };
154− };
155−
156− users = {
157− groups.meguca.gid = config.ids.gids.meguca;
158−
159− users.meguca = {
160− description = "meguca server service user";
161− home = cfg.dataDir;
162− createHome = true;
163− group = "meguca";
164− uid = config.ids.uids.meguca;
165− };
166− };
167− };
168−
169− imports = [
170− (mkRenamedOptionModule [ "services" "meguca" "baseDir" ] [ "services" "meguca" "dataDir" ])
171− ];
172−
173− meta.maintainers = with maintainers; [ chiiruno ];
174−}
nixos/modules/services/x11/imwheel.nix+2−1
@@ -61,7 +61,8 @@ in
6161 "--kill"
6262 ] ++ cfg.extraOptions);
6363 ExecStop = "${pkgs.procps}/bin/pkill imwheel";
64− Restart = "on-failure";
64+ RestartSec = 3;
65+ Restart = "always";
6566 };
6667 };
6768 };
nixos/modules/services/x11/window-managers/xmonad.nix+5−6
@@ -82,12 +82,11 @@ in
8282 services.xserver.windowManager = {
8383 session = [{
8484 name = "xmonad";
85− start = if (cfg.config != null) then ''
86− ${xmonadBin}
87− waitPID=$!
88− '' else ''
89− systemd-cat -t xmonad ${xmonad}/bin/xmonad &
90− waitPID=$!
85+ start = let
86+ xmonadCommand = if (cfg.config != null) then xmonadBin else "${xmonad}/bin/xmonad";
87+ in ''
88+ systemd-cat -t xmonad ${xmonadCommand} &
89+ waitPID=$!
9190 '';
9291 }];
9392 };
nixos/modules/system/boot/stage-1-init.sh+4−2
@@ -378,12 +378,14 @@ mountFS() {
378378
379379 mkdir -p "/mnt-root$mountPoint"
380380
381− # For CIFS mounts, retry a few times before giving up.
381+ # For ZFS and CIFS mounts, retry a few times before giving up.
382+ # We do this for ZFS as a workaround for issue NixOS/nixpkgs#25383.
382383 local n=0
383384 while true; do
384385 mount "/mnt-root$mountPoint" && break
385− if [ "$fsType" != cifs -o "$n" -ge 10 ]; then fail; break; fi
386+ if [ \( "$fsType" != cifs -a "$fsType" != zfs \) -o "$n" -ge 10 ]; then fail; break; fi
386387 echo "retrying..."
388+ sleep 1
387389 n=$((n + 1))
388390 done
389391
nixos/modules/virtualisation/cri-o.nix+3−1
@@ -85,7 +85,7 @@ in
8585
8686 environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml";
8787
88− environment.etc."crio/crio.conf".text = ''
88+ environment.etc."crio/crio.conf.d/00-default.conf".text = ''
8989 [crio]
9090 storage_driver = "${cfg.storageDriver}"
9191
@@ -100,6 +100,7 @@ in
100100 cgroup_manager = "systemd"
101101 log_level = "${cfg.logLevel}"
102102 manage_ns_lifecycle = true
103+ pinns_path = "${cfg.package}/bin/pinns"
103104
104105 ${optionalString (cfg.runtime != null) ''
105106 default_runtime = "${cfg.runtime}"
@@ -109,6 +110,7 @@ in
109110 '';
110111
111112 environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf";
113+ environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf";
112114
113115 # Enable common /etc/containers configuration
114116 virtualisation.containers.enable = true;
nixos/tests/all-tests.nix+1
@@ -34,6 +34,7 @@ in
3434 bind = handleTest ./bind.nix {};
3535 bitcoind = handleTest ./bitcoind.nix {};
3636 bittorrent = handleTest ./bittorrent.nix {};
37+ bitwarden = handleTest ./bitwarden.nix {};
3738 blockbook-frontend = handleTest ./blockbook-frontend.nix {};
3839 buildkite-agents = handleTest ./buildkite-agents.nix {};
3940 boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64
nixos/tests/bitwarden.nixnew file+188
@@ -0,0 +1,188 @@
1+{ system ? builtins.currentSystem
2+, config ? { }
3+, pkgs ? import ../.. { inherit system config; }
4+}:
5+
6+# These tests will:
7+# * Set up a bitwarden-rs server
8+# * Have Firefox use the web vault to create an account, log in, and save a password to the valut
9+# * Have the bw cli log in and read that password from the vault
10+#
11+# Note that Firefox must be on the same machine as the server for WebCrypto APIs to be available (or HTTPS must be configured)
12+#
13+# The same tests should work without modification on the official bitwarden server, if we ever package that.
14+
15+with import ../lib/testing-python.nix { inherit system pkgs; };
16+with pkgs.lib;
17+let
18+ backends = [ "sqlite" "mysql" "postgresql" ];
19+
20+ dbPassword = "please_dont_hack";
21+
22+ userEmail = "meow@example.com";
23+ userPassword = "also_super_secret_ZJWpBKZi668QGt"; # Must be complex to avoid interstitial warning on the signup page
24+
25+ storedPassword = "seeeecret";
26+
27+ makeBitwardenTest = backend: makeTest {
28+ name = "bitwarden_rs-${backend}";
29+ meta = {
30+ maintainers = with pkgs.stdenv.lib.maintainers; [ jjjollyjim ];
31+ };
32+
33+ nodes = {
34+ server = { pkgs, ... }:
35+ let backendConfig = {
36+ mysql = {
37+ services.mysql = {
38+ enable = true;
39+ initialScript = pkgs.writeText "mysql-init.sql" ''
40+ CREATE DATABASE bitwarden;
41+ CREATE USER 'bitwardenuser'@'localhost' IDENTIFIED BY '${dbPassword}';
42+ GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
43+ FLUSH PRIVILEGES;
44+ '';
45+ package = pkgs.mysql;
46+ };
47+
48+ services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";
49+
50+ systemd.services.bitwarden_rs.after = [ "mysql.service" ];
51+ };
52+
53+ postgresql = {
54+ services.postgresql = {
55+ enable = true;
56+ initialScript = pkgs.writeText "postgresql-init.sql" ''
57+ CREATE DATABASE bitwarden;
58+ CREATE USER bitwardenuser WITH PASSWORD '${dbPassword}';
59+ GRANT ALL PRIVILEGES ON DATABASE bitwarden TO bitwardenuser;
60+ '';
61+ };
62+
63+ services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden";
64+
65+ systemd.services.bitwarden_rs.after = [ "postgresql.service" ];
66+ };
67+
68+ sqlite = { };
69+ };
70+ in
71+ mkMerge [
72+ backendConfig.${backend}
73+ {
74+ services.bitwarden_rs = {
75+ enable = true;
76+ dbBackend = backend;
77+ config.rocketPort = 80;
78+ };
79+
80+ networking.firewall.allowedTCPPorts = [ 80 ];
81+
82+ environment.systemPackages =
83+ let
84+ testRunner = pkgs.writers.writePython3Bin "test-runner"
85+ {
86+ libraries = [ pkgs.python3Packages.selenium ];
87+ } ''
88+ from selenium.webdriver import Firefox
89+ from selenium.webdriver.firefox.options import Options
90+ from selenium.webdriver.support.ui import WebDriverWait
91+ from selenium.webdriver.support import expected_conditions as EC
92+
93+ options = Options()
94+ options.add_argument('--headless')
95+ driver = Firefox(options=options)
96+
97+ driver.implicitly_wait(20)
98+ driver.get('http://localhost/#/register')
99+
100+ wait = WebDriverWait(driver, 10)
101+
102+ wait.until(EC.title_contains("Create Account"))
103+
104+ driver.find_element_by_css_selector('input#email').send_keys(
105+ '${userEmail}'
106+ )
107+ driver.find_element_by_css_selector('input#name').send_keys(
108+ 'A Cat'
109+ )
110+ driver.find_element_by_css_selector('input#masterPassword').send_keys(
111+ '${userPassword}'
112+ )
113+ driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
114+ '${userPassword}'
115+ )
116+
117+ driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
118+
119+ wait.until_not(EC.title_contains("Create Account"))
120+
121+ driver.find_element_by_css_selector('input#masterPassword').send_keys(
122+ '${userPassword}'
123+ )
124+ driver.find_element_by_xpath("//button[contains(., 'Log In')]").click()
125+
126+ wait.until(EC.title_contains("My Vault"))
127+
128+ driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click()
129+
130+ driver.find_element_by_css_selector('input#name').send_keys(
131+ 'secrets'
132+ )
133+ driver.find_element_by_css_selector('input#loginPassword').send_keys(
134+ '${storedPassword}'
135+ )
136+
137+ driver.find_element_by_xpath("//button[contains(., 'Save')]").click()
138+ '';
139+ in
140+ [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ];
141+
142+ virtualisation.memorySize = 768;
143+ }
144+ ];
145+
146+ client = { pkgs, ... }:
147+ {
148+ environment.systemPackages = [ pkgs.bitwarden-cli ];
149+ };
150+ };
151+
152+ testScript = ''
153+ start_all()
154+ server.wait_for_unit("bitwarden_rs.service")
155+ server.wait_for_open_port(80)
156+
157+ with subtest("configure the cli"):
158+ client.succeed("bw --nointeraction config server http://server")
159+
160+ with subtest("can't login to nonexistant account"):
161+ client.fail(
162+ "bw --nointeraction --raw login ${userEmail} ${userPassword}"
163+ )
164+
165+ with subtest("use the web interface to sign up, log in, and save a password"):
166+ server.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner")
167+
168+ with subtest("log in with the cli"):
169+ key = client.succeed(
170+ "bw --nointeraction --raw login ${userEmail} ${userPassword}"
171+ ).strip()
172+
173+ with subtest("sync with the cli"):
174+ client.succeed(f"bw --nointeraction --raw --session {key} sync -f")
175+
176+ with subtest("get the password with the cli"):
177+ password = client.succeed(
178+ f"bw --nointeraction --raw --session {key} list items | ${pkgs.jq}/bin/jq -r .[].login.password"
179+ )
180+ assert password.strip() == "${storedPassword}"
181+ '';
182+ };
183+in
184+builtins.listToAttrs (
185+ map
186+ (backend: { name = backend; value = makeBitwardenTest backend; })
187+ backends
188+)
nixos/tests/prometheus.nix+5−2
@@ -158,7 +158,10 @@ in import ./make-test-python.nix {
158158
159159 s3 = { pkgs, ... } : {
160160 # Minio requires at least 1GiB of free disk space to run.
161− virtualisation.diskSize = 2 * 1024;
161+ virtualisation = {
162+ diskSize = 2 * 1024;
163+ memorySize = 1024;
164+ };
162165 networking.firewall.allowedTCPPorts = [ minioPort ];
163166
164167 services.minio = {
@@ -235,7 +238,7 @@ in import ./make-test-python.nix {
235238 # Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
236239 # and check if the blocks have the correct labels:
237240 store.succeed(
238− "thanos bucket ls "
241+ "thanos tools bucket ls "
239242 + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
240243 + "--output=json | "
241244 + "jq .thanos.labels.some_label | "
nixos/tests/transmission.nix+2
@@ -9,6 +9,8 @@ import ./make-test-python.nix ({ pkgs, ...} : {
99
1010 networking.firewall.allowedTCPPorts = [ 9091 ];
1111
12+ security.apparmor.enable = true;
13+
1214 services.transmission.enable = true;
1315 };
1416
pkgs/applications/audio/ashuffle/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "ashuffle";
5+ version = "3.4.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "joshkunz";
9+ repo = "ashuffle";
10+ rev = "v${version}";
11+ sha256 = "09q6lwgc1dc8bg1mb9js9qz3xcsxph3548nxzvyb4v8111gixrp7";
12+ fetchSubmodules = true;
13+ };
14+
15+ dontUseCmakeConfigure = true;
16+ nativeBuildInputs = [ cmake pkg-config meson ninja ];
17+ buildInputs = [ mpd_clientlib ];
18+
19+ meta = with stdenv.lib; {
20+ homepage = "https://github.com/joshkunz/ashuffle";
21+ description = "Automatic library-wide shuffle for mpd";
22+ maintainers = [ maintainers.tcbravo ];
23+ platforms = platforms.unix;
24+ license = licenses.mit;
25+ };
26+}
pkgs/applications/audio/bs1770gain/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ffmpeg_3, sox }:
1+{ stdenv, fetchurl, ffmpeg, sox }:
22
33stdenv.mkDerivation rec {
44 pname = "bs1770gain";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
1010 };
1111
12− buildInputs = [ ffmpeg_3 sox ];
12+ buildInputs = [ ffmpeg sox ];
1313
1414 NIX_CFLAGS_COMPILE = "-Wno-error";
1515
pkgs/applications/audio/csound/default.nix+2−2
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # When updating, please check if https://github.com/csound/csound/issues/1078
1818 # has been fixed in the new version so we can use the normal fluidsynth
1919 # version and remove fluidsynth 1.x from nixpkgs again.
20− version = "6.13.0";
20+ version = "6.14.0";
2121
2222 enableParallelBuilding = true;
2323
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 owner = "csound";
2828 repo = "csound";
2929 rev = version;
30− sha256 = "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh";
30+ sha256 = "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j";
3131 };
3232
3333 cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
pkgs/applications/audio/ft2-clone/default.nix+2−2
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "ft2-clone";
10− version = "1.26";
10+ version = "1.28";
1111
1212 src = fetchFromGitHub {
1313 owner = "8bitbubsy";
1414 repo = "ft2-clone";
1515 rev = "v${version}";
16− sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv";
16+ sha256 = "1hbcl89cpx9bsafxrjyfx6vrbs4h3lnzmqm12smcvdg8ksfgzj0d";
1717 };
1818
1919 nativeBuildInputs = [ cmake ];
pkgs/applications/audio/gspeech/default.nix+4−4
@@ -20,13 +20,13 @@
2020
2121python3.pkgs.buildPythonApplication rec {
2222 pname = "gSpeech";
23− version = "0.9.2";
23+ version = "0.10.1";
2424
2525 src = fetchFromGitHub {
2626 owner = "mothsart";
2727 repo = pname;
2828 rev = version;
29− sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3";
29+ sha256 = "1i0jwgxcn94nsi7c0ad0w77y04g04ka2szijzfqzqfnacdmdyrfc";
3030 };
3131
3232 nativeBuildInputs = [
@@ -56,8 +56,8 @@ python3.pkgs.buildPythonApplication rec {
5656 ];
5757
5858 postFixup = ''
59− wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]}
60− wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]}
59+ wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
60+ wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
6161 '';
6262
6363 strictDeps = false;
pkgs/applications/audio/lv2-cpp-tools/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchzip, pkgconfig, lv2, gtkmm2, boost }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "lv2-cpp-tools";
5+ version = "1.0.5";
6+
7+ src = fetchzip {
8+ url = "http://deb.debian.org/debian/pool/main/l/lv2-c++-tools/lv2-c++-tools_${version}.orig.tar.bz2";
9+ sha256 = "039bq7d7s2bhfcnlsfq0mqxr9a9iqwg5bwcpxfi24c6yl6krydsi";
10+ };
11+
12+ preConfigure = ''
13+ sed -r 's,/bin/bash,${stdenv.shell},g' -i ./configure
14+ sed -r 's,/sbin/ldconfig,ldconfig,g' -i ./Makefile.template
15+ '';
16+
17+ nativeBuildInputs = [ pkgconfig ];
18+
19+ buildInputs = [ lv2 gtkmm2 boost ];
20+
21+ meta = with stdenv.lib; {
22+ homepage = "http://ll-plugins.nongnu.org/hacking.html";
23+ description = "Tools and libraries that may come in handy when writing LV2 plugins in C++";
24+ license = licenses.gpl3;
25+ maintainers = [ maintainers.michalrus ];
26+ platforms = platforms.linux;
27+ };
28+}
pkgs/applications/audio/molot-lite/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ stdenv, fetchurl, unzip, lv2 }:
2+
3+stdenv.mkDerivation {
4+ pname = "molot-lite";
5+ version = "unstable-2014-04-23";
6+
7+ src = fetchurl {
8+ # fetchzip does not accept urls that do not end with .zip.
9+ url = "https://sourceforge.net/p/molot/code/ci/c4eddc426f8d5821e8ebcf1d67265365e4c8c52a/tree/molot_src.zip?format=raw";
10+ sha256 = "1c47dwfgrmn9459px8s5zikcqyr0777v226qzcxlr6azlcjwr51b";
11+ };
12+
13+ nativeBuildInputs = [ unzip ];
14+ buildInputs = [ lv2 ];
15+
16+ unpackPhase = ''
17+ unzip $src
18+ '';
19+
20+ buildPhase = ''
21+ make -C Molot_Mono_Lite
22+ make -C Molot_Stereo_Lite
23+ '';
24+
25+ installPhase = ''
26+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Mono_Lite
27+ make install INSTALL_DIR=$out/lib/lv2 -C Molot_Stereo_Lite
28+ '';
29+
30+ meta = with stdenv.lib; {
31+ description = "Stereo and mono audio signal dynamic range compressor in LV2 format";
32+ homepage = "https://sourceforge.net/projects/molot/";
33+ license = licenses.gpl3Plus;
34+ maintainers = [ maintainers.magnetophon ];
35+ platforms = platforms.linux;
36+ };
37+}
pkgs/applications/audio/parlatype/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "parlatype";
5− version = "2.0";
5+ version = "2.1";
66
77 src = fetchFromGitHub {
88 owner = "gkarsay";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx";
11+ sha256 = "1k53q0kbwpnbgyr0lmfzf5sm4f93d8nbjrzdz9pdhzpxgihndg25";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/applications/audio/pulseeffects/default.nix+2−4
@@ -30,14 +30,12 @@
3030, zita-convolver
3131, zam-plugins
3232, rubberband
33−, mda_lv2
3433, lsp-plugins
3534}:
3635
3736let
3837 lv2Plugins = [
3938 calf # limiter, compressor exciter, bass enhancer and others
40− mda_lv2 # loudness
4139 lsp-plugins # delay
4240 ];
4341 ladspaPlugins = [
@@ -46,13 +44,13 @@ let
4644 ];
4745in stdenv.mkDerivation rec {
4846 pname = "pulseeffects";
49− version = "4.7.3";
47+ version = "4.8.0";
5048
5149 src = fetchFromGitHub {
5250 owner = "wwmm";
5351 repo = "pulseeffects";
5452 rev = "v${version}";
55− sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f";
53+ sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg=";
5654 };
5755
5856 nativeBuildInputs = [
pkgs/applications/audio/qtractor/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "qtractor";
8− version = "0.9.14";
8+ version = "0.9.15";
99
1010 src = fetchurl {
1111 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
12− sha256 = "1gh268gdpj7nw19xfh7k2l3aban4yrs1lmx33qswrnngs2izj1fk";
12+ sha256 = "0k7a6llwrzs07flr9mvzvay9ygc2x64syg8npyabsw5a4d85fwsx";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/applications/audio/reaper/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "reaper";
9− version = "6.10";
9+ version = "6.12c";
1010
1111 src = fetchurl {
1212 url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
13− sha256 = "1p54phmsa6xbqxb5cpgwnz7ny4famb8zi25y3cmxwgr4pfy94b2p";
13+ sha256 = "1xnd4qvgwsz1dmgb656i611776dqcb84m1gh30i8jhpwcr9ym46w";
1414 };
1515
1616 nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
pkgs/applications/audio/snd/default.nix+2−2
@@ -4,11 +4,11 @@
44}:
55
66stdenv.mkDerivation rec {
7− name = "snd-20.2";
7+ name = "snd-20.3";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/snd/${name}.tar.gz";
11− sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r";
11+ sha256 = "016slh34gb6qqb38m8k9yg48rbhc5p12084szcwvanhh5v7fc7mk";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];
pkgs/applications/audio/strawberry/default.nix+2−2
@@ -35,13 +35,13 @@
3535
3636mkDerivation rec {
3737 pname = "strawberry";
38− version = "0.6.13";
38+ version = "0.7.2";
3939
4040 src = fetchFromGitHub {
4141 owner = "jonaski";
4242 repo = pname;
4343 rev = version;
44− sha256 = "1v0334aivqyqx611cmhgshknzmrgyynbmxcg70qzrs2lyybw2fc1";
44+ sha256 = "sha256-YUR9SDiRV/gJKx4H1cgdDnKGulTQPVP7MpHyihUEgqg=";
4545 };
4646
4747 buildInputs = [
pkgs/applications/audio/talentedhack/default.nixnew file+36
@@ -0,0 +1,36 @@
1+{ stdenv, fetchFromGitHub, lv2, fftwFloat, pkgconfig }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "talentedhack";
5+ version = "1.86";
6+
7+ src = fetchFromGitHub {
8+ owner = "jeremysalwen";
9+ repo = "talentedhack";
10+ rev = "v${version}";
11+ sha256 = "0kwvayalysmk7y49jq0k16al252md8d45z58hphzsksmyz6148bx";
12+ };
13+
14+ nativeBuildInputs = [ pkgconfig ];
15+
16+ buildInputs = [ lv2 fftwFloat ];
17+
18+ # To avoid name clashes, plugins should be compiled with symbols hidden, except for `lv2_descriptor`:
19+ preConfigure = ''
20+ sed -r 's/^CFLAGS.*$/\0 -fvisibility=hidden/' -i Makefile
21+ '';
22+
23+ installPhase = ''
24+ d=$out/lib/lv2/talentedhack.lv2
25+ mkdir -p $d
26+ cp *.so *.ttl $d
27+ '';
28+
29+ meta = with stdenv.lib; {
30+ homepage = "https://github.com/jeremysalwen/TalentedHack";
31+ description = "LV2 port of Autotalent pitch correction plugin";
32+ license = licenses.gpl3;
33+ maintainers = [ maintainers.michalrus ];
34+ platforms = platforms.linux;
35+ };
36+}
pkgs/applications/audio/tamgamp.lv2/default.nixnew file+53
@@ -0,0 +1,53 @@
1+{ stdenv, fetchFromGitHub, pkg-config, lv2, zita-resampler }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "tamgamp.lv2";
5+ version = "unstable-2020-06-14";
6+
7+ src = fetchFromGitHub {
8+ owner = "sadko4u";
9+ repo = pname;
10+ rev = "426da74142fcb6b7687a35b2b1dda3392e171b92";
11+ sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp";
12+ };
13+
14+ nativeBuildInputs = [ pkg-config ];
15+
16+ buildInputs = [ lv2 zita-resampler ];
17+
18+ makeFlags = [ "PREFIX=$(out)" ];
19+
20+ enableParallelBuilding = true;
21+
22+ meta = with stdenv.lib; {
23+ homepage = "https://github.com/sadko4u/tamgamp.lv2";
24+ description = "Guitar amplifier simulator";
25+ longDescription = ''
26+ Tamgamp (Pronouncement: "Damage Amp") is an LV2 guitar amp simulator that provides two plugins:
27+
28+ - Tamgamp - a plugin based on Guitarix DK Builder simulated chains.
29+ - TamgampGX - a plugin based on tuned Guitarix internal amplifiers implementation.
30+
31+ The reference to the original Guitarix project: https://guitarix.org/
32+
33+ It simulates the set of the following guitar amplifiers:
34+
35+ - Fender Princeton Reverb-amp AA1164 (without reverb module)
36+ - Fender Twin Reverb-Amp AA769 (Normal channel, bright off)
37+ - Fender Twin Reverb-Amp AA769 (Vibrato channel, bright on)
38+ - Marshall JCM-800 High-gain input
39+ - Marshall JCM-800 Low-gain input
40+ - Mesa/Boogie DC3 preamplifier (lead channel)
41+ - Mesa/Boogie DC3 preamplifier (rhythm channel)
42+ - Mesa Dual Rectifier preamplifier (orange channel, less gain)
43+ - Mesa Dual Rectifier preamplifier (red channel, more gain)
44+ - Peavey 5150II crunch channel
45+ - Peavey 5150II lead channel
46+ - VOX AC-30 Brilliant channel
47+ - VOX AC-30 normal channel
48+ '';
49+ maintainers = [ maintainers.magnetophon ];
50+ platforms = platforms.linux;
51+ license = licenses.lgpl3Plus;
52+ };
53+}
pkgs/applications/audio/virtual-ans/default.nixnew file+89
@@ -0,0 +1,89 @@
1+{ stdenv
2+, fetchzip
3+, libX11
4+, libXi
5+, libGL
6+, alsaLib
7+, SDL2
8+, autoPatchelfHook
9+}:
10+
11+stdenv.mkDerivation rec {
12+ pname = "virtual-ans";
13+ version = "3.0.2c";
14+
15+ src = fetchzip {
16+ url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip";
17+ sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n";
18+ };
19+
20+ nativeBuildInputs = [
21+ autoPatchelfHook
22+ ];
23+
24+ buildInputs = [
25+ stdenv.cc.cc.lib
26+ libX11
27+ libXi
28+ libGL
29+ alsaLib
30+ SDL2
31+ ];
32+
33+ installPhase = ''
34+ mkdir -p $out
35+ cp -R ./* $out/
36+
37+ # Remove all executables except for current architecture
38+ ls -1d $out/START* | grep -v ${startScript} | xargs rm -rf
39+ ls -1d $out/bin/pixilang_linux* | grep -v ${linuxExecutable} | xargs rm -rf
40+
41+ # Start script performs relative search for resources, so it cannot be moved
42+ # to bin directory
43+ ln -s $out/${startScript} $out/bin/virtual-ans
44+ '';
45+
46+ startScript = if stdenv.isx86_32 then "START_LINUX_X86"
47+ else if stdenv.isx86_64 then "START_LINUX_X86_64"
48+ #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin
49+ else abort "Unsupported platform: ${stdenv.platform.kernelArch}.";
50+
51+ linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86"
52+ else if stdenv.isx86_64 then "pixilang_linux_x86_64"
53+ else "";
54+
55+ meta = with stdenv.lib; {
56+ description = "Photoelectronic microtonal/spectral musical instrument";
57+ longDescription = ''
58+ Virtual ANS is a software simulator of the unique Russian synthesizer ANS
59+ - photoelectronic musical instrument created by Evgeny Murzin from 1938 to
60+ 1958. The ANS made it possible to draw music in the form of a spectrogram
61+ (sonogram), without live instruments and performers. It was used by
62+ Stanislav Kreichi, Alfred Schnittke, Edward Artemiev and other Soviet
63+ composers in their experimental works. You can also hear the sound of the
64+ ANS in Andrei Tarkovsky's movies Solaris, The Mirror, Stalker.
65+
66+ The simulator extends the capabilities of the original instrument. Now
67+ it's a full-featured graphics editor where you can convert sound into an
68+ image, load and play pictures, draw microtonal/spectral music and create
69+ some unusual deep atmospheric sounds. This app is for everyone who loves
70+ experiments and is looking for something new.
71+
72+ Key features:
73+
74+ + unlimited number of pure tone generators;
75+ + powerful sonogram editor - you can draw the spectrum and play it at the same time;
76+ + any sound (from a WAV file or a Microphone/Line-in) can be converted to image (sonogram) and vice versa;
77+ + support for MIDI devices;
78+ + polyphonic synth mode with MIDI mapping;
79+ + supported file formats: WAV, AIFF, PNG, JPEG, GIF;
80+ + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA.
81+ '';
82+ homepage = "https://warmplace.ru/soft/ans/";
83+ license = licenses.free;
84+ # I cannot test the Darwin version, so I'll leave it disabled
85+ platforms = [ "x86_64-linux" "i686-linux" ];
86+ maintainers = with maintainers; [ jacg ];
87+ };
88+
89+}
pkgs/applications/audio/vocproc/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv, fetchzip, pkgconfig, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "vocproc";
5+ version = "0.2.1";
6+
7+ src = fetchzip {
8+ url = "https://hyperglitch.com/files/vocproc/${pname}-${version}.default.tar.gz";
9+ sha256 = "07a1scyz14mg2jdbw6fpv4qg91zsw61qqii64n9qbnny9d5pn8n2";
10+ };
11+
12+ nativeBuildInputs = [ pkgconfig ];
13+
14+ buildInputs = [ lv2 fftw lv2-cpp-tools gtkmm2 ];
15+
16+ makeFlags = [
17+ "INSTALL_DIR=$(out)/lib/lv2"
18+ ];
19+
20+ meta = with stdenv.lib; {
21+ homepage = "https://hyperglitch.com/dev/VocProc";
22+ description = "An LV2 plugin for pitch shifting (with or without formant correction), vocoding, automatic pitch correction and harmonizing of singing voice (harmonizer)";
23+ license = licenses.gpl2;
24+ maintainers = [ maintainers.michalrus ];
25+ platforms = platforms.linux;
26+ };
27+}
pkgs/applications/blockchains/bitcoin-abc.nix+2−2
@@ -7,13 +7,13 @@ with stdenv.lib;
77mkDerivation rec {
88
99 name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
10− version = "0.21.12";
10+ version = "0.21.13";
1111
1212 src = fetchFromGitHub {
1313 owner = "bitcoin-ABC";
1414 repo = "bitcoin-abc";
1515 rev = "v${version}";
16− sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j";
16+ sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav";
1717 };
1818
1919 patches = [ ./fix-bitcoin-qt-build.patch ];
pkgs/applications/blockchains/bitcoin-unlimited.nix+3−3
@@ -7,13 +7,13 @@ with stdenv.lib;
77
88stdenv.mkDerivation rec {
99 name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
10− version = "1.7.0.0";
10+ version = "1.8.0.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "bitcoinunlimited";
1414 repo = "bitcoinunlimited";
15− rev = "bucash${version}";
16− sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i";
15+ rev = "BCHunlimited${version}";
16+ sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q";
1717 };
1818
1919 nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
pkgs/applications/blockchains/ergo/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "ergo";
5− version = "3.3.0";
5+ version = "3.3.1";
66
77 src = fetchurl {
88 url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
9− sha256 = "1lja4ba6bm1jk0lh2ra5v8i5g3f1gy7mk2b3yrx1w7x02ll9gr06";
9+ sha256 = "1qr1vfb6mhm2hxl2ksydkhadm7phadn93lwm3f9zni01plk56bb5";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/blockchains/monero/default.nix+2−2
@@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null;
1010
1111stdenv.mkDerivation rec {
1212 pname = "monero";
13− version = "0.16.0.1";
13+ version = "0.16.0.3";
1414
1515 src = fetchFromGitHub {
1616 owner = "monero-project";
1717 repo = "monero";
1818 rev = "v${version}";
19− sha256 = "0n2cviqm8radpynx70fc0819k1xknjc58cvb4whlc49ilyvh8ky6";
19+ sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33";
2020 fetchSubmodules = true;
2121 };
2222
pkgs/applications/blockchains/mycrypto/default.nixnew file+59
@@ -0,0 +1,59 @@
1+{ lib, appimageTools, fetchurl, makeDesktopItem
2+, gsettings-desktop-schemas, gtk2
3+}:
4+
5+let
6+ pname = "MyCrypto";
7+ version = "1.7.12";
8+ sha256 = "0zmdmkli9zxygrcvrd4lbi0xqyq32dqlkxby8lsjknj1nd6l26n3";
9+ name = "${pname}-${version}";
10+
11+ src = fetchurl {
12+ url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage";
13+ inherit sha256;
14+ };
15+
16+ appimageContents = appimageTools.extractType2 {
17+ inherit name src;
18+ };
19+
20+ desktopItem = makeDesktopItem {
21+ name = pname;
22+ desktopName = pname;
23+ comment = "MyCrypto is a free, open-source interface for interacting with the blockchain";
24+ exec = pname;
25+ icon = "mycrypto";
26+ categories = "Finance;";
27+ };
28+
29+in appimageTools.wrapType2 rec {
30+ inherit name src;
31+
32+ profile = ''
33+ export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk2}/share/gsettings-schemas/${gtk2.name}:$XDG_DATA_DIRS
34+ '';
35+
36+ multiPkgs = null; # no p32bit needed
37+ extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
38+
39+ extraInstallCommands = ''
40+ mv $out/bin/{${name},${pname}}
41+
42+ mkdir -p $out/share
43+ cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
44+ chmod -R +w $out/share
45+ mv $out/share/icons/hicolor/{0x0,256x256}
46+ '';
47+
48+ meta = with lib; {
49+ description = "A free, open-source interface for interacting with the blockchain";
50+ longDescription = ''
51+ MyCrypto is an open-source, client-side tool for generating ether wallets,
52+ handling ERC-20 tokens, and interacting with the blockchain more easily.
53+ '';
54+ homepage = "https://mycrypto.com";
55+ license = licenses.mit;
56+ platforms = [ "x86_64-linux" ];
57+ maintainers = with maintainers; [ oxalica ];
58+ };
59+}
pkgs/applications/editors/android-studio/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ callPackage, makeFontsConf, gnome2 }:
1+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:
22
33let
44 mkStudio = opts: callPackage (import ./common.nix opts) {
@@ -6,6 +6,7 @@ let
66 fontDirectories = [];
77 };
88 inherit (gnome2) GConf gnome_vfs;
9+ inherit buildFHSUserEnv;
910 };
1011 stableVersion = {
1112 version = "4.0.1.0"; # "Android Studio 4.0.1"
pkgs/applications/editors/emacs-modes/elpa-generated.nix+219−99
@@ -19,10 +19,10 @@
1919 elpaBuild {
2020 pname = "ack";
2121 ename = "ack";
22− version = "1.8";
22+ version = "1.10";
2323 src = fetchurl {
24− url = "https://elpa.gnu.org/packages/ack-1.8.tar";
25− sha256 = "1d4218km7j1bx1fsna29j3gi3k2ak2fzbk1gyki327pnnlma6bav";
24+ url = "https://elpa.gnu.org/packages/ack-1.10.tar";
25+ sha256 = "0jz8badhjpzjlrprpzgcm1z6ask1ykc7ab62ixjrj9wcgfjif5qw";
2626 };
2727 packageRequires = [];
2828 meta = {
@@ -39,10 +39,10 @@
3939 elpaBuild {
4040 pname = "ada-mode";
4141 ename = "ada-mode";
42− version = "7.1.1";
42+ version = "7.1.4";
4343 src = fetchurl {
44− url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar";
45− sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp";
44+ url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar";
45+ sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd";
4646 };
4747 packageRequires = [ emacs uniquify-files wisi ];
4848 meta = {
@@ -54,10 +54,10 @@
5454 elpaBuild {
5555 pname = "ada-ref-man";
5656 ename = "ada-ref-man";
57− version = "2012.5";
57+ version = "2020.1";
5858 src = fetchurl {
59− url = "https://elpa.gnu.org/packages/ada-ref-man-2012.5.tar";
60− sha256 = "0n7izqc44i3l6fxbzkq9gwwlcf04rr9g1whrk8biz84jhbyh23x8";
59+ url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar";
60+ sha256 = "1g4brb9g2spd55issyqldfc4azwilbrz8kh8sl0lka2kn42l3qqc";
6161 };
6262 packageRequires = [];
6363 meta = {
@@ -223,10 +223,10 @@
223223 elpaBuild {
224224 pname = "auctex";
225225 ename = "auctex";
226− version = "12.2.1";
226+ version = "12.2.4";
227227 src = fetchurl {
228− url = "https://elpa.gnu.org/packages/auctex-12.2.1.tar";
229− sha256 = "14y0kdri2zvz81qwpncsr3ly4ciqab6g8yxl956k3ddn36b3a56s";
228+ url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar";
229+ sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py";
230230 };
231231 packageRequires = [ cl-lib emacs ];
232232 meta = {
@@ -557,10 +557,10 @@
557557 elpaBuild {
558558 pname = "company";
559559 ename = "company";
560− version = "0.9.12";
560+ version = "0.9.13";
561561 src = fetchurl {
562− url = "https://elpa.gnu.org/packages/company-0.9.12.tar";
563− sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j";
562+ url = "https://elpa.gnu.org/packages/company-0.9.13.tar";
563+ sha256 = "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw";
564564 };
565565 packageRequires = [ emacs ];
566566 meta = {
@@ -636,6 +636,36 @@
636636 license = lib.licenses.free;
637637 };
638638 }) {};
639+ counsel = callPackage ({ elpaBuild, emacs, fetchurl, lib, swiper }:
640+ elpaBuild {
641+ pname = "counsel";
642+ ename = "counsel";
643+ version = "0.13.1";
644+ src = fetchurl {
645+ url = "https://elpa.gnu.org/packages/counsel-0.13.1.el";
646+ sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli";
647+ };
648+ packageRequires = [ emacs swiper ];
649+ meta = {
650+ homepage = "https://elpa.gnu.org/packages/counsel.html";
651+ license = lib.licenses.free;
652+ };
653+ }) {};
654+ cpio-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
655+ elpaBuild {
656+ pname = "cpio-mode";
657+ ename = "cpio-mode";
658+ version = "0.16";
659+ src = fetchurl {
660+ url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar";
661+ sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q";
662+ };
663+ packageRequires = [ emacs ];
664+ meta = {
665+ homepage = "https://elpa.gnu.org/packages/cpio-mode.html";
666+ license = lib.licenses.free;
667+ };
668+ }) {};
639669 crisp = callPackage ({ elpaBuild, fetchurl, lib }:
640670 elpaBuild {
641671 pname = "crisp";
@@ -730,10 +760,10 @@
730760 elpaBuild {
731761 pname = "debbugs";
732762 ename = "debbugs";
733− version = "0.22";
763+ version = "0.25";
734764 src = fetchurl {
735− url = "https://elpa.gnu.org/packages/debbugs-0.22.tar";
736− sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z";
765+ url = "https://elpa.gnu.org/packages/debbugs-0.25.tar";
766+ sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni";
737767 };
738768 packageRequires = [ emacs soap-client ];
739769 meta = {
@@ -745,10 +775,10 @@
745775 elpaBuild {
746776 pname = "delight";
747777 ename = "delight";
748− version = "1.5";
778+ version = "1.7";
749779 src = fetchurl {
750− url = "https://elpa.gnu.org/packages/delight-1.5.el";
751− sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7";
780+ url = "https://elpa.gnu.org/packages/delight-1.7.el";
781+ sha256 = "0pihsghrf9xnd1kqlq48qmjcmp5ra95wwwgrb3l8m1wagmmc0bi1";
752782 };
753783 packageRequires = [ cl-lib nadvice ];
754784 meta = {
@@ -925,10 +955,10 @@
925955 elpaBuild {
926956 pname = "ebdb";
927957 ename = "ebdb";
928− version = "0.6.17";
958+ version = "0.6.18";
929959 src = fetchurl {
930− url = "https://elpa.gnu.org/packages/ebdb-0.6.17.tar";
931− sha256 = "07335pcqvvj1apzbwy4dc4i6pc6w21hr7v9fvgkc9c2x7fqlqg24";
960+ url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar";
961+ sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw";
932962 };
933963 packageRequires = [ cl-lib emacs seq ];
934964 meta = {
@@ -970,10 +1000,10 @@
9701000 elpaBuild {
9711001 pname = "ediprolog";
9721002 ename = "ediprolog";
973− version = "1.2";
1003+ version = "2.1";
9741004 src = fetchurl {
975− url = "https://elpa.gnu.org/packages/ediprolog-1.2.el";
976− sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz";
1005+ url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
1006+ sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
9771007 };
9781008 packageRequires = [];
9791009 meta = {
@@ -1040,10 +1070,10 @@
10401070 elpaBuild {
10411071 pname = "eldoc";
10421072 ename = "eldoc";
1043− version = "1.0.0";
1073+ version = "1.8.0";
10441074 src = fetchurl {
1045− url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el";
1046− sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m";
1075+ url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el";
1076+ sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w";
10471077 };
10481078 packageRequires = [ emacs ];
10491079 meta = {
@@ -1085,10 +1115,10 @@
10851115 elpaBuild {
10861116 pname = "elisp-benchmarks";
10871117 ename = "elisp-benchmarks";
1088− version = "1.4";
1118+ version = "1.7";
10891119 src = fetchurl {
1090− url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar";
1091− sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb";
1120+ url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar";
1121+ sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz";
10921122 };
10931123 packageRequires = [];
10941124 meta = {
@@ -1096,6 +1126,21 @@
10961126 license = lib.licenses.free;
10971127 };
10981128 }) {};
1129+ emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
1130+ elpaBuild {
1131+ pname = "emms";
1132+ ename = "emms";
1133+ version = "5.42";
1134+ src = fetchurl {
1135+ url = "https://elpa.gnu.org/packages/emms-5.42.tar";
1136+ sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj";
1137+ };
1138+ packageRequires = [ cl-lib ];
1139+ meta = {
1140+ homepage = "https://elpa.gnu.org/packages/emms.html";
1141+ license = lib.licenses.free;
1142+ };
1143+ }) {};
10991144 enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
11001145 elpaBuild {
11011146 pname = "enwc";
@@ -1187,10 +1232,10 @@
11871232 elpaBuild {
11881233 pname = "exwm";
11891234 ename = "exwm";
1190− version = "0.23";
1235+ version = "0.24";
11911236 src = fetchurl {
1192− url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
1193− sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
1237+ url = "https://elpa.gnu.org/packages/exwm-0.24.tar";
1238+ sha256 = "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s";
11941239 };
11951240 packageRequires = [ xelb ];
11961241 meta = {
@@ -1243,16 +1288,16 @@
12431288 license = lib.licenses.free;
12441289 };
12451290 }) {};
1246− flymake = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
1291+ flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }:
12471292 elpaBuild {
12481293 pname = "flymake";
12491294 ename = "flymake";
1250− version = "1.0.8";
1295+ version = "1.0.9";
12511296 src = fetchurl {
1252− url = "https://elpa.gnu.org/packages/flymake-1.0.8.el";
1253− sha256 = "1hqxrqb227v4ncjjqx8im3c4mhg8w5yjbz9hpfcm5x8xnr2yd6bp";
1297+ url = "https://elpa.gnu.org/packages/flymake-1.0.9.el";
1298+ sha256 = "0xm1crhjcs14iqkf481igbf40wj2ib3hjzinw1gn8w1n0462ymp6";
12541299 };
1255− packageRequires = [ emacs ];
1300+ packageRequires = [ eldoc emacs ];
12561301 meta = {
12571302 homepage = "https://elpa.gnu.org/packages/flymake.html";
12581303 license = lib.licenses.free;
@@ -1292,10 +1337,10 @@
12921337 elpaBuild {
12931338 pname = "frog-menu";
12941339 ename = "frog-menu";
1295− version = "0.2.10";
1340+ version = "0.2.11";
12961341 src = fetchurl {
1297− url = "https://elpa.gnu.org/packages/frog-menu-0.2.10.el";
1298− sha256 = "050qikvgh9v7kgvhznjsfrpyhs7iq1x63bryqdkrwlf668yhzi1m";
1342+ url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.el";
1343+ sha256 = "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff";
12991344 };
13001345 packageRequires = [ avy emacs posframe ];
13011346 meta = {
@@ -1591,10 +1636,10 @@
15911636 elpaBuild {
15921637 pname = "hyperbole";
15931638 ename = "hyperbole";
1594− version = "7.0.6";
1639+ version = "7.1.2";
15951640 src = fetchurl {
1596− url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar";
1597− sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab";
1641+ url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar";
1642+ sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1";
15981643 };
15991644 packageRequires = [ emacs ];
16001645 meta = {
@@ -1636,10 +1681,10 @@
16361681 elpaBuild {
16371682 pname = "ivy";
16381683 ename = "ivy";
1639− version = "0.13.0";
1684+ version = "0.13.1";
16401685 src = fetchurl {
1641− url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar";
1642− sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8";
1686+ url = "https://elpa.gnu.org/packages/ivy-0.13.1.tar";
1687+ sha256 = "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx";
16431688 };
16441689 packageRequires = [ emacs ];
16451690 meta = {
@@ -1726,10 +1771,10 @@
17261771 elpaBuild {
17271772 pname = "jsonrpc";
17281773 ename = "jsonrpc";
1729− version = "1.0.11";
1774+ version = "1.0.12";
17301775 src = fetchurl {
1731− url = "https://elpa.gnu.org/packages/jsonrpc-1.0.11.el";
1732− sha256 = "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23";
1776+ url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el";
1777+ sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad";
17331778 };
17341779 packageRequires = [ emacs ];
17351780 meta = {
@@ -1782,6 +1827,21 @@
17821827 license = lib.licenses.free;
17831828 };
17841829 }) {};
1830+ leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
1831+ elpaBuild {
1832+ pname = "leaf";
1833+ ename = "leaf";
1834+ version = "4.2.5";
1835+ src = fetchurl {
1836+ url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar";
1837+ sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw";
1838+ };
1839+ packageRequires = [ emacs ];
1840+ meta = {
1841+ homepage = "https://elpa.gnu.org/packages/leaf.html";
1842+ license = lib.licenses.free;
1843+ };
1844+ }) {};
17851845 let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
17861846 elpaBuild {
17871847 pname = "let-alist";
@@ -2026,10 +2086,10 @@
20262086 elpaBuild {
20272087 pname = "mmm-mode";
20282088 ename = "mmm-mode";
2029− version = "0.5.7";
2089+ version = "0.5.8";
20302090 src = fetchurl {
2031− url = "https://elpa.gnu.org/packages/mmm-mode-0.5.7.tar";
2032− sha256 = "0c4azrkgagyfm9znh7hmw93gkvddpsxlr0dwjp96winymih7mahf";
2091+ url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
2092+ sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
20332093 };
20342094 packageRequires = [ cl-lib ];
20352095 meta = {
@@ -2041,10 +2101,10 @@
20412101 elpaBuild {
20422102 pname = "modus-operandi-theme";
20432103 ename = "modus-operandi-theme";
2044− version = "0.8.1";
2104+ version = "0.11.0";
20452105 src = fetchurl {
2046− url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.8.1.el";
2047− sha256 = "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb";
2106+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el";
2107+ sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd";
20482108 };
20492109 packageRequires = [ emacs ];
20502110 meta = {
@@ -2056,10 +2116,10 @@
20562116 elpaBuild {
20572117 pname = "modus-vivendi-theme";
20582118 ename = "modus-vivendi-theme";
2059− version = "0.8.1";
2119+ version = "0.11.0";
20602120 src = fetchurl {
2061− url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.8.1.el";
2062− sha256 = "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1";
2121+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el";
2122+ sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif";
20632123 };
20642124 packageRequires = [ emacs ];
20652125 meta = {
@@ -2485,10 +2545,10 @@
24852545 elpaBuild {
24862546 pname = "phps-mode";
24872547 ename = "phps-mode";
2488− version = "0.3.48";
2548+ version = "0.3.52";
24892549 src = fetchurl {
2490− url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar";
2491− sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv";
2550+ url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar";
2551+ sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92";
24922552 };
24932553 packageRequires = [ emacs ];
24942554 meta = {
@@ -2530,10 +2590,10 @@
25302590 elpaBuild {
25312591 pname = "posframe";
25322592 ename = "posframe";
2533− version = "0.7.0";
2593+ version = "0.8.0";
25342594 src = fetchurl {
2535− url = "https://elpa.gnu.org/packages/posframe-0.7.0.el";
2536− sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9";
2595+ url = "https://elpa.gnu.org/packages/posframe-0.8.0.el";
2596+ sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp";
25372597 };
25382598 packageRequires = [ emacs ];
25392599 meta = {
@@ -2541,16 +2601,16 @@
25412601 license = lib.licenses.free;
25422602 };
25432603 }) {};
2544− project = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
2604+ project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
25452605 elpaBuild {
25462606 pname = "project";
25472607 ename = "project";
2548− version = "0.1.2";
2608+ version = "0.5.1";
25492609 src = fetchurl {
2550− url = "https://elpa.gnu.org/packages/project-0.1.2.el";
2551− sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d";
2610+ url = "https://elpa.gnu.org/packages/project-0.5.1.el";
2611+ sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4";
25522612 };
2553− packageRequires = [ emacs ];
2613+ packageRequires = [ emacs xref ];
25542614 meta = {
25552615 homepage = "https://elpa.gnu.org/packages/project.html";
25562616 license = lib.licenses.free;
@@ -2571,6 +2631,21 @@
25712631 license = lib.licenses.free;
25722632 };
25732633 }) {};
2634+ pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }:
2635+ elpaBuild {
2636+ pname = "pspp-mode";
2637+ ename = "pspp-mode";
2638+ version = "1.1";
2639+ src = fetchurl {
2640+ url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el";
2641+ sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca";
2642+ };
2643+ packageRequires = [];
2644+ meta = {
2645+ homepage = "https://elpa.gnu.org/packages/pspp-mode.html";
2646+ license = lib.licenses.free;
2647+ };
2648+ }) {};
25742649 python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
25752650 elpaBuild {
25762651 pname = "python";
@@ -2620,10 +2695,10 @@
26202695 elpaBuild {
26212696 pname = "rainbow-mode";
26222697 ename = "rainbow-mode";
2623− version = "1.0.4";
2698+ version = "1.0.5";
26242699 src = fetchurl {
2625− url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el";
2626− sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg";
2700+ url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el";
2701+ sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9";
26272702 };
26282703 packageRequires = [];
26292704 meta = {
@@ -2840,10 +2915,10 @@
28402915 elpaBuild {
28412916 pname = "relint";
28422917 ename = "relint";
2843− version = "1.17";
2918+ version = "1.18";
28442919 src = fetchurl {
2845− url = "https://elpa.gnu.org/packages/relint-1.17.tar";
2846− sha256 = "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7";
2920+ url = "https://elpa.gnu.org/packages/relint-1.18.tar";
2921+ sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci";
28472922 };
28482923 packageRequires = [ emacs xr ];
28492924 meta = {
@@ -2881,6 +2956,21 @@
28812956 license = lib.licenses.free;
28822957 };
28832958 }) {};
2959+ rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }:
2960+ elpaBuild {
2961+ pname = "rt-liberation";
2962+ ename = "rt-liberation";
2963+ version = "1.31";
2964+ src = fetchurl {
2965+ url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar";
2966+ sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c";
2967+ };
2968+ packageRequires = [];
2969+ meta = {
2970+ homepage = "https://elpa.gnu.org/packages/rt-liberation.html";
2971+ license = lib.licenses.free;
2972+ };
2973+ }) {};
28842974 rudel = callPackage ({ cl-generic
28852975 , cl-lib ? null
28862976 , cl-print
@@ -3067,6 +3157,21 @@
30673157 license = lib.licenses.free;
30683158 };
30693159 }) {};
3160+ so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
3161+ elpaBuild {
3162+ pname = "so-long";
3163+ ename = "so-long";
3164+ version = "1.0";
3165+ src = fetchurl {
3166+ url = "https://elpa.gnu.org/packages/so-long-1.0.el";
3167+ sha256 = "00z9gnxz32rakd0k7lqaj050fwmqzq5vr9d6rb7ji3fn01rjp7kj";
3168+ };
3169+ packageRequires = [ emacs ];
3170+ meta = {
3171+ homepage = "https://elpa.gnu.org/packages/so-long.html";
3172+ license = lib.licenses.free;
3173+ };
3174+ }) {};
30703175 soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
30713176 elpaBuild {
30723177 pname = "soap-client";
@@ -3191,10 +3296,10 @@
31913296 elpaBuild {
31923297 pname = "svg-clock";
31933298 ename = "svg-clock";
3194− version = "1.1";
3299+ version = "1.2";
31953300 src = fetchurl {
3196− url = "https://elpa.gnu.org/packages/svg-clock-1.1.el";
3197− sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3";
3301+ url = "https://elpa.gnu.org/packages/svg-clock-1.2.el";
3302+ sha256 = "15pmj07wnlcpv78av9qpnbfwdjlkf237vib8smpa7nvyikdfszfr";
31983303 };
31993304 packageRequires = [ emacs svg ];
32003305 meta = {
@@ -3202,6 +3307,21 @@
32023307 license = lib.licenses.free;
32033308 };
32043309 }) {};
3310+ swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }:
3311+ elpaBuild {
3312+ pname = "swiper";
3313+ ename = "swiper";
3314+ version = "0.13.1";
3315+ src = fetchurl {
3316+ url = "https://elpa.gnu.org/packages/swiper-0.13.1.el";
3317+ sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y";
3318+ };
3319+ packageRequires = [ emacs ivy ];
3320+ meta = {
3321+ homepage = "https://elpa.gnu.org/packages/swiper.html";
3322+ license = lib.licenses.free;
3323+ };
3324+ }) {};
32053325 system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
32063326 elpaBuild {
32073327 pname = "system-packages";
@@ -3300,10 +3420,10 @@
33003420 elpaBuild {
33013421 pname = "tramp";
33023422 ename = "tramp";
3303− version = "2.4.3.4";
3423+ version = "2.4.4.1";
33043424 src = fetchurl {
3305− url = "https://elpa.gnu.org/packages/tramp-2.4.3.4.tar";
3306− sha256 = "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f";
3425+ url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar";
3426+ sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3";
33073427 };
33083428 packageRequires = [ emacs ];
33093429 meta = {
@@ -3491,10 +3611,10 @@
34913611 elpaBuild {
34923612 pname = "verilog-mode";
34933613 ename = "verilog-mode";
3494− version = "2020.2.23.232634261";
3614+ version = "2020.6.27.14326051";
34953615 src = fetchurl {
3496− url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el";
3497− sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6";
3616+ url = "https://elpa.gnu.org/packages/verilog-mode-2020.6.27.14326051.el";
3617+ sha256 = "194gn8cj01jb9xcl0qq3gq6mzxfdyn459ysb35fnib7pcnafm188";
34983618 };
34993619 packageRequires = [];
35003620 meta = {
@@ -3704,10 +3824,10 @@
37043824 elpaBuild {
37053825 pname = "wisi";
37063826 ename = "wisi";
3707− version = "3.1.1";
3827+ version = "3.1.3";
37083828 src = fetchurl {
3709− url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar";
3710− sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q";
3829+ url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar";
3830+ sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k";
37113831 };
37123832 packageRequires = [ emacs seq ];
37133833 meta = {
@@ -3724,10 +3844,10 @@
37243844 elpaBuild {
37253845 pname = "wisitoken-grammar-mode";
37263846 ename = "wisitoken-grammar-mode";
3727− version = "1.1.0";
3847+ version = "1.2.0";
37283848 src = fetchurl {
3729− url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar";
3730− sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms";
3849+ url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.2.0.tar";
3850+ sha256 = "0isxmpwys148djjymszdm5nisqjp9xff8kad45l4cpb3c717vsjw";
37313851 };
37323852 packageRequires = [ emacs mmm-mode wisi ];
37333853 meta = {
@@ -3810,16 +3930,16 @@
38103930 license = lib.licenses.free;
38113931 };
38123932 }) {};
3813− xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
3933+ xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
38143934 elpaBuild {
38153935 pname = "xref";
38163936 ename = "xref";
3817− version = "1.0.1";
3937+ version = "1.0.2";
38183938 src = fetchurl {
3819− url = "https://elpa.gnu.org/packages/xref-1.0.1.el";
3820− sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li";
3939+ url = "https://elpa.gnu.org/packages/xref-1.0.2.el";
3940+ sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8";
38213941 };
3822− packageRequires = [ emacs project ];
3942+ packageRequires = [ emacs ];
38233943 meta = {
38243944 homepage = "https://elpa.gnu.org/packages/xref.html";
38253945 license = lib.licenses.free;
pkgs/applications/editors/emacs-modes/org-generated.nix+6−6
@@ -4,10 +4,10 @@
44 elpaBuild {
55 pname = "org";
66 ename = "org";
7− version = "20200511";
7+ version = "20200817";
88 src = fetchurl {
9− url = "https://orgmode.org/elpa/org-20200511.tar";
10− sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c";
9+ url = "https://orgmode.org/elpa/org-20200817.tar";
10+ sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d";
1111 };
1212 packageRequires = [];
1313 meta = {
@@ -19,10 +19,10 @@
1919 elpaBuild {
2020 pname = "org-plus-contrib";
2121 ename = "org-plus-contrib";
22− version = "20200511";
22+ version = "20200817";
2323 src = fetchurl {
24− url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar";
25− sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f";
24+ url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar";
25+ sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba";
2626 };
2727 packageRequires = [];
2828 meta = {
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json+7253−4925

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/updater-emacs.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/emacs/25.nixdeleted−146

This diff is too big to show here.

pkgs/applications/editors/emacs/26.nixnew file+8

This diff is too big to show here.

pkgs/applications/editors/emacs/27.nixnew file+8

This diff is too big to show here.

pkgs/applications/editors/emacs/clean-env-26.patchnew file+15

This diff is too big to show here.

pkgs/applications/editors/emacs/default.nix → pkgs/applications/editors/emacs/generic.nixrenamed+10−10

This diff is too big to show here.

pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patchnew file+14

This diff is too big to show here.

pkgs/applications/editors/jetbrains/default.nix+2−5

This diff is too big to show here.

pkgs/applications/editors/vscode/vscode.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/vscode/vscodium.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/xxe-pe/default.nixnew file+77

This diff is too big to show here.

pkgs/applications/graphics/gnome-photos/default.nix+1−1

This diff is too big to show here.

pkgs/applications/graphics/lightburn/default.nixnew file+49

This diff is too big to show here.

pkgs/applications/graphics/qosmic/default.nixnew file+70

This diff is too big to show here.

pkgs/applications/graphics/runwayml/default.nix+4−5

This diff is too big to show here.

pkgs/applications/kde/default.nix+1

This diff is too big to show here.

pkgs/applications/kde/ksquares.nixnew file+22

This diff is too big to show here.

pkgs/applications/misc/coolreader/default.nixnew file+26

This diff is too big to show here.

pkgs/applications/misc/copyq/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/dbeaver/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/electrum/ltc.nix+6−2

This diff is too big to show here.

pkgs/applications/misc/foot/default.nixnew file+38

This diff is too big to show here.

pkgs/applications/misc/imag/default.nixnew file+63

This diff is too big to show here.

pkgs/applications/misc/keepassx/community.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/lutris/default.nix+4−5

This diff is too big to show here.

pkgs/applications/misc/lutris/chrootenv.nix → pkgs/applications/misc/lutris/fhsenv.nixrenamed

The content is the same.

pkgs/applications/misc/mlterm/default.nix+4−1

This diff is too big to show here.

pkgs/applications/misc/moolticute/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/nnn/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/obsidian/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/pdfpc/default.nix+2−10

This diff is too big to show here.

pkgs/applications/misc/pipr/default.nixnew file+34

This diff is too big to show here.

pkgs/applications/misc/rescuetime/default.nix+7−5

This diff is too big to show here.

pkgs/applications/misc/sidequest/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/taskell/default.nixdeleted−66

This diff is too big to show here.

pkgs/applications/misc/wofi/default.nix+5

This diff is too big to show here.

pkgs/applications/misc/wofi/do_not_follow_symlinks.patchnew file+39

This diff is too big to show here.

pkgs/applications/misc/xmenu/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9

This diff is too big to show here.

pkgs/applications/networking/browsers/eolie/default.nix+13−5

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch+1

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch+1

This diff is too big to show here.

pkgs/applications/networking/browsers/google-chrome/default.nix+6−2

This diff is too big to show here.

pkgs/applications/networking/cluster/atlantis/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/fluxctl/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/cluster/kpt/default.nix+4−8

This diff is too big to show here.

pkgs/applications/networking/cluster/kube3d/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/tanka/default.nix+8−1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/gajim/default.nix+16−14

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/nheko/default.nix+5

This diff is too big to show here.

pkgs/applications/networking/ipfs/default.nix−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/aerc/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/mailreaders/neomutt/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/68.nix+2−9

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/default.nix+2−9

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-68.patch+1

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch+1

This diff is too big to show here.

pkgs/applications/networking/remote/anydesk/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/ssb-patchwork/default.nix+13−13

This diff is too big to show here.

pkgs/applications/networking/syncplay/default.nix+2−2

This diff is too big to show here.

pkgs/applications/office/timeular/default.nixnew file+45

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/applications/science/biology/whisper/default.nixnew file+34

This diff is too big to show here.

pkgs/applications/science/electronics/adms/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/hyp2mat/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/electronics/vhd2vl/default.nixnew file+39

This diff is too big to show here.

pkgs/applications/science/logic/coq/default.nix−2

This diff is too big to show here.

pkgs/applications/science/logic/ltl2ba/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/z3/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/machine-learning/finalfusion-utils/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/machine-learning/labelimg/default.nix+22−11

This diff is too big to show here.

pkgs/applications/science/math/calculix/calculix.patch+9−18

This diff is too big to show here.

pkgs/applications/science/math/calculix/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/qalculate-gtk/default.nix+7−3

This diff is too big to show here.

pkgs/applications/system/glances/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix+12−3

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix+9−13

This diff is too big to show here.

pkgs/applications/version-management/p4/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/version-management/p4v/default.nix+18−11

This diff is too big to show here.

pkgs/applications/video/mpv/scripts/sponsorblock.nixnew file+51

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/applications/video/streamlink-twitch-gui/bin.nixnew file+100

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/video/vokoscreen/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/docker-slim/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nixnew file+58

This diff is too big to show here.

pkgs/applications/virtualization/virt-manager/qt.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/hikari/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/leftwm/default.nix+3−3

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv-bubblewrap/default.nixnew file+123

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv-bubblewrap/env.nixnew file+167

This diff is too big to show here.

pkgs/data/documentation/anarchism/default.nixnew file+45

This diff is too big to show here.

pkgs/data/documentation/scheme-manpages/default.nix+6−6

This diff is too big to show here.

pkgs/data/fonts/kanji-stroke-order-font/default.nix+11−9

This diff is too big to show here.

pkgs/data/fonts/recursive/default.nix+6−6

This diff is too big to show here.

pkgs/data/themes/arc/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/deepin/dde-api/default.nix+1

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/compilers/elm/packages/elm-json.nix−1

This diff is too big to show here.

pkgs/development/compilers/go/1.15.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/go/ssl-cert-file-1.15.patch+8−8

This diff is too big to show here.

pkgs/development/compilers/idris2/default.nix+39−6

This diff is too big to show here.

pkgs/development/compilers/llvm/rocm/clang.nix+1−2

This diff is too big to show here.

pkgs/development/compilers/llvm/rocm/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/mozart/default.nix+1−2

This diff is too big to show here.

pkgs/development/compilers/ocaml/generic.nix+6−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/coq-modules/coq-ext-lib/default.nix+5−4

This diff is too big to show here.

pkgs/development/coq-modules/coqhammer/default.nix+8−4

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/go-modules/generic/default.nix−5

This diff is too big to show here.

pkgs/development/go-modules/generic/old.nixdeleted−229

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-common.nix+50−58

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-head.nix+1

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix.yaml+28−41

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/haskell-modules/generic-builder.nix+35−35

This diff is too big to show here.

pkgs/development/haskell-modules/hackage-packages.nix+1037−729

This diff is too big to show here.

pkgs/development/haskell-modules/with-packages-wrapper.nix+3−2

This diff is too big to show here.

pkgs/development/interpreters/alda/default.nixnew file+27

This diff is too big to show here.

pkgs/development/interpreters/php/default.nix+5−1

This diff is too big to show here.

pkgs/development/interpreters/python/mk-python-derivation.nix+77−77

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/libraries/arrow-cpp/default.nix+37−25

This diff is too big to show here.

pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patchdeleted−11

This diff is too big to show here.

pkgs/development/libraries/draco/default.nixnew file+34

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/libraries/fcft/default.nix+6−1

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/libraries/libunibreak/default.nix+13−7

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-fix-failed-static-assertion.patchnew file+31

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch+41−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch+20

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebengine.nix+29−23

This diff is too big to show here.

pkgs/development/libraries/relibc/default.nix+62−17

This diff is too big to show here.

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

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+3−4

This diff is too big to show here.

pkgs/development/libraries/rocm-opencl-icd/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/rocm-opencl-runtime/default.nix+14−15

This diff is too big to show here.

pkgs/development/libraries/rocm-runtime-ext/default.nixdeleted−42

This diff is too big to show here.

pkgs/development/libraries/rocm-runtime-ext/setup-hook.shdeleted−7

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/libraries/rocm-runtime/rocr-ext-dir.diffdeleted−23

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/math/osqp/default.nixnew file+27

This diff is too big to show here.

pkgs/development/libraries/snap7/default.nixnew file+38

This diff is too big to show here.

pkgs/development/libraries/utf8proc/default.nix+6−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/mobile/androidenv/convertaddons.xsl+6−6

This diff is too big to show here.

pkgs/development/mobile/androidenv/convertpackages.xsl+2−2

This diff is too big to show here.

pkgs/development/mobile/androidenv/convertsystemimages.xsl+1−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/ocaml-modules/genspio/default.nixnew file+32

This diff is too big to show here.

pkgs/development/ocaml-modules/jwto/default.nixnew file+30

This diff is too big to show here.

pkgs/development/ocaml-modules/lablgtk3/default.nix+3−4

This diff is too big to show here.

pkgs/development/ocaml-modules/nonstd/default.nixnew file+24

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/ocaml-modules/sosa/default.nixnew file+30

This diff is too big to show here.

pkgs/development/ocaml-modules/uunf/default.nix+33−5

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/behave/default.nix+15−21

This diff is too big to show here.

pkgs/development/python-modules/buildbot/default.nix+7

This diff is too big to show here.

pkgs/development/python-modules/coloredlogs/default.nix+10−8

This diff is too big to show here.

pkgs/development/python-modules/cucumber-tag-expressions/default.nixnew file+21

This diff is too big to show here.

pkgs/development/python-modules/django-widget-tweaks/default.nixnew file+25

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/geoip2/default.nix+11−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/nbxmpp/default.nix+6−10

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/pytorch-lightning/default.nixnew file+46

This diff is too big to show here.

pkgs/development/python-modules/rdflib-jsonld/default.nixnew file+21

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/sopel/default.nix+15−8

This diff is too big to show here.

pkgs/development/python-modules/spacy/annotation-test/annotate.pynew file+69

This diff is too big to show here.

pkgs/development/python-modules/spacy/annotation-test/default.nixnew file+23

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/spacy/models.nix+2

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/python-modules/xpybutil/default.nixnew file+24

This diff is too big to show here.

pkgs/development/python-modules/zodb/default.nix+6−11

This diff is too big to show here.

pkgs/development/ruby-modules/solargraph/Gemfile.lock+15−11

This diff is too big to show here.

pkgs/development/ruby-modules/solargraph/gemset.nix+37−19

This diff is too big to show here.

pkgs/development/tools/analysis/pmd/default.nix+2−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/tools/buildpack/default.nix+14−7

This diff is too big to show here.

pkgs/development/tools/continuous-integration/gitlab-runner/default.nix+4−4

This diff is too big to show here.

pkgs/development/tools/database/timescaledb-parallel-copy/default.nix+12−16

This diff is too big to show here.

pkgs/development/tools/database/timescaledb-parallel-copy/deps.nixdeleted−21

This diff is too big to show here.

pkgs/development/tools/database/timescaledb-tune/default.nix+9−11

This diff is too big to show here.

pkgs/development/tools/database/timescaledb-tune/deps.nixdeleted−21

This diff is too big to show here.

pkgs/development/tools/go-migrate/default.nixnew file+24

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/tools/godot/dont_clobber_environment.patch+11−9

This diff is too big to show here.

pkgs/development/tools/godot/headless.nixnew file+18

This diff is too big to show here.

pkgs/development/tools/godot/pkg_config_additions.patch+17−14

This diff is too big to show here.

pkgs/development/tools/godot/server.nixnew file+18

This diff is too big to show here.

pkgs/development/tools/haskell/haskell-language-server/default.nix+18−17

This diff is too big to show here.

pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix+12−12

This diff is too big to show here.

pkgs/development/tools/haskell/haskell-language-server/update.sh+1−1

This diff is too big to show here.

pkgs/development/tools/lattice-diamond/default.nix+2−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

pkgs/development/tools/misc/fujprog/default.nixnew file+37

This diff is too big to show here.

pkgs/development/tools/misc/mkrom/default.nixnew file+27

This diff is too big to show here.

pkgs/development/tools/misc/patchelf/unstable.nix+3−3

This diff is too big to show here.

pkgs/development/tools/misc/replacement/default.nixnew file+46

This diff is too big to show here.

pkgs/development/tools/nsis/default.nix+9−4

This diff is too big to show here.

pkgs/development/tools/ocaml/camlp4/default.nix+5

This diff is too big to show here.

pkgs/development/tools/ocaml/ocp-indent/default.nix+2−2

This diff is too big to show here.

pkgs/development/tools/osslsigncode/default.nix+4−5

This diff is too big to show here.

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

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/rebazel/default.nixnew file+21

This diff is too big to show here.

pkgs/development/tools/rust/cargo-make/Cargo.lock+68−108

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/summon/default.nixnew file+35

This diff is too big to show here.

pkgs/development/tools/summon/resolve-paths.patchnew file+39

This diff is too big to show here.

pkgs/development/tools/vend/default.nix+21−11

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/deno/update/common.ts+14−1

This diff is too big to show here.

pkgs/development/web/grails/default.nix+2−2

This diff is too big to show here.

pkgs/development/web/lucky-cli/default.nix+2−2

This diff is too big to show here.

pkgs/games/crawl/crawl_purify.patch+14−29

This diff is too big to show here.

pkgs/games/crawl/default.nix+2−2

This diff is too big to show here.

pkgs/games/dwarf-fortress/dfhack/default.nix+24−5

This diff is too big to show here.

pkgs/games/dwarf-fortress/twbt/default.nix+9−4

This diff is too big to show here.

pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in+1−1

This diff is too big to show here.

pkgs/games/hyperrogue/default.nix+2−2

This diff is too big to show here.

pkgs/games/legendary-gl/default.nixnew file+30

This diff is too big to show here.

pkgs/games/minecraft-server/default.nix+3−3

This diff is too big to show here.

pkgs/games/osu-lazer/default.nix+5−1

This diff is too big to show here.

pkgs/games/sm64ex/default.nixnew file+69

This diff is too big to show here.

pkgs/games/steam/default.nix+3−2

This diff is too big to show here.

pkgs/games/steam/chrootenv.nix → pkgs/games/steam/fhsenv.nixrenamed

The content is the same.

pkgs/misc/cups/drivers/hl1210w/default.nixnew file+62

This diff is too big to show here.

pkgs/misc/flashfocus/default.nixnew file+28

This diff is too big to show here.

pkgs/misc/screensavers/pipes/default.nix+5−2

This diff is too big to show here.

pkgs/misc/vim-plugins/generated.nix+117−117

This diff is too big to show here.

pkgs/misc/vim-plugins/vim-plugin-names+1−1

This diff is too big to show here.

pkgs/os-specific/linux/iputils/default.nix+14−13

This diff is too big to show here.

pkgs/os-specific/linux/kernel/hardened/patches.json+9−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.4.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.4.nix+2−2

This diff is too big to show here.

pkgs/os-specific/linux/kernel/linux-5.7.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/nvidia-x11/default.nix+4−4

This diff is too big to show here.

pkgs/os-specific/linux/rtl8192eu/default.nix+6−4

This diff is too big to show here.

pkgs/os-specific/linux/rtl8821cu/default.nixnew file+37

This diff is too big to show here.

pkgs/servers/atlassian/confluence.nix+2−2

This diff is too big to show here.

pkgs/servers/demoit/default.nix+7−5

This diff is too big to show here.

pkgs/servers/freeradius/default.nix+2−2

This diff is too big to show here.

pkgs/servers/home-assistant/component-packages.nix+1−1

This diff is too big to show here.

pkgs/servers/home-assistant/default.nix+2−2

This diff is too big to show here.

pkgs/servers/http/apache-httpd/2.4.nix−1

This diff is too big to show here.

pkgs/servers/jellyfin/10.5.x.nixnew file+61

This diff is too big to show here.

pkgs/servers/jellyfin/default.nix+4−5

This diff is too big to show here.

pkgs/servers/mattermost/default.nix+3−3

This diff is too big to show here.

pkgs/servers/mautrix-whatsapp/default.nix+1−1

This diff is too big to show here.

pkgs/servers/meguca/default.nixdeleted−50

This diff is too big to show here.

pkgs/servers/meguca/server_deps.nixdeleted−390

This diff is too big to show here.

pkgs/servers/monitoring/grafana/default.nix+7−7

This diff is too big to show here.

pkgs/servers/monitoring/loki/default.nix+2−2

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/default.nix+5−3

This diff is too big to show here.

pkgs/servers/monitoring/prometheus/webui-yarndeps.nix+8−8

This diff is too big to show here.

pkgs/servers/monitoring/timescale-prometheus/default.nix+5−3

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/server.nix+9−2

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/versions.nix+3−3

This diff is too big to show here.

pkgs/servers/monitoring/zabbix/web.nix+1−1

This diff is too big to show here.

pkgs/servers/nosql/rethinkdb/default.nix+6−12

This diff is too big to show here.

pkgs/servers/sickbeard/sickgear.nix+2−2

This diff is too big to show here.

pkgs/servers/sql/postgresql/ext/plpgsql_check.nixnew file+29

This diff is too big to show here.

pkgs/servers/sql/postgresql/packages.nix+2

This diff is too big to show here.

pkgs/servers/unifi/default.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/generic/make-derivation.nix+2−1

This diff is too big to show here.

pkgs/tools/X11/xpra/libfakeXinerama.nix+1−2

This diff is too big to show here.

pkgs/tools/admin/ansible/default.nix+17−12

This diff is too big to show here.

pkgs/tools/admin/chamber/default.nixnew file+28

This diff is too big to show here.

pkgs/tools/admin/exoscale-cli/default.nix+2−2

This diff is too big to show here.

pkgs/tools/admin/google-cloud-sdk/default.nix+3−3

This diff is too big to show here.

pkgs/tools/archivers/bomutils/default.nixnew file+25

This diff is too big to show here.

pkgs/tools/archivers/innoextract/default.nix+2−2

This diff is too big to show here.

pkgs/tools/archivers/maxcso/default.nixnew file+26

This diff is too big to show here.

pkgs/tools/archivers/undmg/default.nix+6−4

This diff is too big to show here.

pkgs/tools/archivers/undmg/setup-hook.sh+1−1

This diff is too big to show here.

pkgs/tools/bluetooth/blueberry/default.nixnew file+96

This diff is too big to show here.

pkgs/tools/compression/lzfse/default.nix+2−4

This diff is too big to show here.

pkgs/tools/filesystems/wiimms-iso-tools/default.nixnew file+37

This diff is too big to show here.

pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diffnew file+12

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/inputmethods/fcitx-engines/fcitx-mozc/default.nix+5−3

This diff is too big to show here.

pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix+4−3

This diff is too big to show here.

pkgs/tools/misc/clpeak/default.nixnew file+25

This diff is too big to show here.

pkgs/tools/misc/fet-sh/default.nixnew file+28

This diff is too big to show here.

pkgs/tools/misc/fzf/default.nix+8−1

This diff is too big to show here.

pkgs/tools/misc/lf/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/mcfly/default.nix+8−4

This diff is too big to show here.

pkgs/tools/misc/mstflint/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/pandoc-plantuml-filter/default.nixnew file+26

This diff is too big to show here.

pkgs/tools/misc/psrecord/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/pubs/default.nix+11−16

This diff is too big to show here.

pkgs/tools/misc/qt5ct/default.nix+2−2

This diff is too big to show here.

pkgs/tools/misc/rargs/default.nixnew file+24

This diff is too big to show here.

pkgs/tools/misc/rockbox-utility/default.nix+8−6

This diff is too big to show here.

pkgs/tools/networking/clash/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/croc/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/dnsproxy/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/mozwire/default.nixnew file+24

This diff is too big to show here.

pkgs/tools/networking/mu/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/shadowsocks-rust/default.nix+3−3

This diff is too big to show here.

pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nixnew file+23

This diff is too big to show here.

pkgs/tools/networking/tridactyl-native/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/wireguard-tools/default.nix+2−2

This diff is too big to show here.

pkgs/tools/networking/wstunnel/default.nix+6−12

This diff is too big to show here.

pkgs/tools/package-management/cargo-release/default.nix+6−5

This diff is too big to show here.

pkgs/tools/package-management/cargo-tree/default.nixdeleted−25

This diff is too big to show here.

pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch → pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v4.1.1.patchrenamed+63−67

This diff is too big to show here.

pkgs/tools/package-management/cargo-update/default.nix+21−7

This diff is too big to show here.

pkgs/tools/security/bitwarden_rs/default.nix+3−1

This diff is too big to show here.

pkgs/tools/security/bitwarden_rs/vault.nix+3−1

This diff is too big to show here.

pkgs/tools/security/doppler/default.nix+2−2

This diff is too big to show here.

pkgs/tools/security/genpass/default.nix+5

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/smartmontools/default.nix+5

This diff is too big to show here.

pkgs/tools/system/storebrowse/default.nixdeleted−44

This diff is too big to show here.

pkgs/tools/text/shfmt/default.nix+9−1

This diff is too big to show here.

pkgs/tools/typesetting/asciidoctorj/default.nix+2−2

This diff is too big to show here.

pkgs/tools/typesetting/lowdown/default.nix+2−2

This diff is too big to show here.

pkgs/tools/typesetting/tex/texlive/default.nix+5−2

This diff is too big to show here.

pkgs/top-level/aliases.nix+6−1

This diff is too big to show here.

pkgs/top-level/all-packages.nix+181−47

This diff is too big to show here.

pkgs/top-level/ocaml-packages.nix+8

This diff is too big to show here.

pkgs/top-level/perl-packages.nix+33

This diff is too big to show here.

pkgs/top-level/python-packages.nix+16

This diff is too big to show here.

pkgs/top-level/release-small.nix+1−1

This diff is too big to show here.