on master help sign in
1115 files changed+13458−12136
since splitsnapshots
unifiedsplit
.github/workflows/build_docs.yaml+4 docs/.vscode/settings.json+8−1 docs/bibl.bib+16−1 docs/default.nix+2−10 docs/nix/sources.json−12 docs/paper.lhs+928−116 docs/pres_2/img/ter.png docs/pres_2/pres.md+52−52 docs/trfrac.sty+193 paper.pdf src/Tix/Builtins.hs+68 src/Tix/Typechecker.hs+90−66 src/Tix/Types.hs+21−10 test/golden/importless/0.1.txt+5−6 test/golden/importless/0.10.txt+1−1 test/golden/importless/0.11.1.txt+11−12 test/golden/importless/0.11.txt+1−1 test/golden/importless/0.12.txt+1−1 test/golden/importless/0.14.1.txt+10−11 test/golden/importless/0.17.1.txt+10−11 test/golden/importless/0.18.0.txt+13−14 test/golden/importless/0.2.txt+1−1 test/golden/importless/0.20.0.txt+10−11 test/golden/importless/0.29.txt+11−14 test/golden/importless/0.3.3.txt+2−2 test/golden/importless/0.5.1.txt+2−2 test/golden/importless/0.61.txt+39−39 test/golden/importless/0.8.5.txt+22−23 test/golden/importless/0.9.5.txt+8−8 test/golden/importless/0.9.6.txt+8−8 test/golden/importless/0.9.txt+12−13 test/golden/importless/1-default.txt+2−2 test/golden/importless/1.0.0.txt+1−1 test/golden/importless/1.0.txt+18−20 test/golden/importless/1.00.37.txt+17−17 test/golden/importless/1.3.txt+53−56 test/golden/importless/1.4.txt+9−10 test/golden/importless/1.5.txt+20−20 test/golden/importless/1.55.txt+2−2 test/golden/importless/1.59.txt+2−2 test/golden/importless/1.60.txt+2−2 test/golden/importless/1.65.txt+2−2 test/golden/importless/1.66.txt+2−2 test/golden/importless/1.67.txt+7−7 test/golden/importless/1.68.txt+2−2 test/golden/importless/1.69.txt+2−2 test/golden/importless/1.70.txt+2−2 test/golden/importless/1.71.txt+2−2 test/golden/importless/1.72.txt+2−2 test/golden/importless/1.8.5.txt+52 test/golden/importless/1.8.txt+32−35 test/golden/importless/1.x.txt+22−23 test/golden/importless/10.5.x.txt+24−25 test/golden/importless/11.1.txt+14−16 test/golden/importless/112.01.01.txt+8−9 test/golden/importless/12.txt+1−1 test/golden/importless/16.1.2.txt+23−27 test/golden/importless/1compat.txt+2−3 test/golden/importless/2.0.0.txt+2−2 test/golden/importless/2.0.txt+8−10 test/golden/importless/2.1.txt+2−2 test/golden/importless/2.10.txt+15−16 test/golden/importless/2.11.txt+15−16 test/golden/importless/2.12.txt+15−16 test/golden/importless/2.13.txt+15−16 test/golden/importless/2.2.txt+2−2 test/golden/importless/2.22.txt+11−13 test/golden/importless/2.26.txt+17−19 test/golden/importless/2.4.0.txt+9−10 test/golden/importless/2.4.txt+79 test/golden/importless/2.5.35.txt+1−2 test/golden/importless/2.5.txt+2−2 test/golden/importless/2.6.1.txt+3−5 test/golden/importless/2.6.13-pre.txt+45 test/golden/importless/2.6.2.txt+18−20 test/golden/importless/2.64.txt+14−15 test/golden/importless/2.7-html.txt+1−1 test/golden/importless/2.7-pdf-a4.txt+1−1 test/golden/importless/2.7-pdf-letter.txt+1−1 test/golden/importless/2.7-text.txt+1−1 test/golden/importless/2.7.7.txt+1−1 test/golden/importless/2.8.txt+2−2 test/golden/importless/2.x.txt+23−24 test/golden/importless/20160331.txt+22−24 test/golden/importless/25.txt+30−36 test/golden/importless/26.txt+25−30 test/golden/importless/2_4.txt+2−2 test/golden/importless/2bwm.txt+5−5 test/golden/importless/3.0.txt+2−2 test/golden/importless/3.0.x.txt+14−15 test/golden/importless/3.08.0.txt+10−10 test/golden/importless/3.1.txt+8−8 test/golden/importless/3.10.0.txt+8−9 test/golden/importless/3.10.txt+1−1 test/golden/importless/3.11.txt+2−2 test/golden/importless/3.12.1.txt+42 test/golden/importless/3.12.txt+1−1 test/golden/importless/3.13.txt+1−1 test/golden/importless/3.5.txt+2−2 test/golden/importless/3.6.txt+1−1 test/golden/importless/3.7-html.txt+1−1 test/golden/importless/3.7-pdf-a4.txt+1−1 test/golden/importless/3.7-pdf-letter.txt+1−1 test/golden/importless/3.7-text.txt+1−1 test/golden/importless/3.7.txt+1−1 test/golden/importless/3.8.txt+1−1 test/golden/importless/3.9.txt+1−1 test/golden/importless/3.txt+20−22 test/golden/importless/3.x.txt+20−21 test/golden/importless/38.txt+6−7 test/golden/importless/3_1.txt+2−2 test/golden/importless/3dovideo.txt+20−20 test/golden/importless/4.01.17.txt+11−12 test/golden/importless/4.1.txt+8−8 test/golden/importless/4.13a.txt+1−1 test/golden/importless/4.2.1.txt+18−20 test/golden/importless/4.3.2.txt+18−21 test/golden/importless/4.4.txt+32−33 test/golden/importless/4.9.9.txt+15−17 test/golden/importless/4.txt+2−2 test/golden/importless/422.txt+15−17 test/golden/importless/44.0.txt+24−24 test/golden/importless/5.1.138.txt+11−11 test/golden/importless/5.41.txt+22−28 test/golden/importless/5.6.txt+19−23 test/golden/importless/5.7.txt+10−12 test/golden/importless/5.7.x.txt+21−24 test/golden/importless/5.txt+1−2 test/golden/importless/6.3.txt+1−1 test/golden/importless/6.txt+1−1 test/golden/importless/60.txt+9−9 test/golden/importless/68.txt+14−14 test/golden/importless/6_qt4.txt+10−13 test/golden/importless/7.3.txt+5−6 test/golden/importless/7.6.6.txt+46 test/golden/importless/78.txt+12−13 test/golden/importless/8.0.x.txt+1−1 test/golden/importless/8.5.txt+2−2 test/golden/importless/8.6.txt+4−4 test/golden/importless/8_0.txt+8−11 test/golden/importless/9.2.txt+27−29 test/golden/importless/9.x.txt+47−49 test/golden/importless/Cargo.txt+30−31 test/golden/importless/R16B02-basho.txt+13−14 test/golden/importless/account-service-util.txt+18−19 test/golden/importless/accountsservice.txt+22−22 test/golden/importless/acpilight.txt+3−3 test/golden/importless/adb.txt+15−15 test/golden/importless/afterstep.txt+5−5 test/golden/importless/ais.txt+5−6 test/golden/importless/alexandria.txt+1−1 test/golden/importless/aliases.txt−217 test/golden/importless/alsamixer.app.txt+18−19 test/golden/importless/alternatives-plugin.txt+16−17 test/golden/importless/amazon-options.txt+6−6 test/golden/importless/amd-microcode.txt+10−10 test/golden/importless/amdgpu-pro.txt+55 test/golden/importless/amdgpu.txt+6−6 test/golden/importless/apcupsd.txt+5−5 test/golden/importless/apeclex.txt+1−1 test/golden/importless/apiextractor.txt+20−21 test/golden/importless/appdaemon.txt+56−54 test/golden/importless/appliance.txt+1−1 test/golden/importless/appstream.txt+7−7 test/golden/importless/archive-version.txt+1−1 test/golden/importless/array-utils.txt+1−1 test/golden/importless/array.txt+6−6 test/golden/importless/asdf-finalizers.txt+1−1 test/golden/importless/asdf-package-system.txt+1−1 test/golden/importless/asdf-system-connections.txt+1−1 test/golden/importless/assets.txt+1−1 test/golden/importless/atd.txt−58 test/golden/importless/ati.txt+19−19 test/golden/importless/atop.txt+4−4 test/golden/importless/attica.txt+14 test/golden/importless/attrsOf-conditional-check.txt+8−7 test/golden/importless/auditd.txt+9−9 test/golden/importless/automake-1.11.x.txt+17−18 test/golden/importless/automake-1.15.x.txt+17−18 test/golden/importless/automake-1.16.x.txt+16−17 test/golden/importless/autorandr.txt+5−5 test/golden/importless/autostart.txt+13−13 test/golden/importless/aws-s3-exporter.txt+1−1 test/golden/importless/azure-agent.txt+48−49 test/golden/importless/b43.txt+10−12 test/golden/importless/backend.txt+3−3 test/golden/importless/baloo-widgets.txt+2−2 test/golden/importless/baloo.txt+2−2 test/golden/importless/bamf.txt+9−9 test/golden/importless/bandwhich.txt+3−3 test/golden/importless/base.txt+2−2 test/golden/importless/bcachefs.txt+16−16 test/golden/importless/bcc-git.txt+1−1 test/golden/importless/bcc.txt+13−13 test/golden/importless/bean-add.txt+3−3 test/golden/importless/berry.txt+5−5 test/golden/importless/beta.txt+24−26 test/golden/importless/bi.txt+6−6 test/golden/importless/bifunctors.txt+2−2 test/golden/importless/binary-tarball.txt+25 test/golden/importless/binary.txt+15−17 test/golden/importless/bladeRF.txt+3−3 test/golden/importless/blivet.txt+6−7 test/golden/importless/blocks-gaps.txt+1−1 test/golden/importless/bloodspilot-client.txt+22−24 test/golden/importless/bloodspilot-server.txt+1−1 test/golden/importless/blueman.txt+3−3 test/golden/importless/bluez-qt.txt+16 test/golden/importless/bolt.txt+14−14 test/golden/importless/boot.txt+5−6 test/golden/importless/bootstrap.txt+18−20 test/golden/importless/breeze-gtk.txt+1−1 test/golden/importless/breeze-icons.txt+2−2 test/golden/importless/brillo.txt+3−3 test/golden/importless/brltty.txt+8−8 test/golden/importless/browserpass.txt+6−6 test/golden/importless/build-rebar3.txt+30−33 test/golden/importless/build-skaware-package.txt+10−11 test/golden/importless/build-solution.txt+1−1 test/golden/importless/build.txt+2−2 test/golden/importless/buildOcamlJane.txt+18−21 test/golden/importless/builder.txt+16−19 test/golden/importless/builds.txt+1−1 test/golden/importless/bytes.txt+2−2 test/golden/importless/calibre-server.txt+20−19 test/golden/importless/camlp4.txt+5−5 test/golden/importless/canto-daemon.txt+3−3 test/golden/importless/canvas.txt+2−2 test/golden/importless/carnix.txt+5−5 test/golden/importless/categories.txt+2−2 test/golden/importless/cde.txt+6−6 test/golden/importless/chacha.txt+12−15 test/golden/importless/check-plugin.txt+1−1 test/golden/importless/chipz.txt+1−1 test/golden/importless/chrome-gnome-shell.txt+14−14 test/golden/importless/chrootenv.txt+20−20 test/golden/importless/cl-aa.txt+1−1 test/golden/importless/cl-anonfun.txt+1−1 test/golden/importless/cl-css.txt+1−1 test/golden/importless/cl-html-parse.txt+1−1 test/golden/importless/cl-jpeg.txt+1−1 test/golden/importless/cl-l10n-cldr.txt+1−1 test/golden/importless/cl-log.txt+1−1 test/golden/importless/cl-markup.txt+1−1 test/golden/importless/cl-paths.txt+1−1 test/golden/importless/cl-unification.txt+1−1 test/golden/importless/cl-utilities.txt+1−1 test/golden/importless/clack-socket.txt+1−1 test/golden/importless/clean-packaging.txt+2−2 test/golden/importless/clfswm.txt+5−5 test/golden/importless/clickhouse.txt+18−17 test/golden/importless/clickshare.txt+17−17 test/golden/importless/client-ip-echo.txt+2−2 test/golden/importless/clientlib.txt+5−6 test/golden/importless/clingo.txt+14−16 test/golden/importless/clipmenu.txt+4−4 test/golden/importless/clippy.txt+26−28 test/golden/importless/clooj.txt+6−6 test/golden/importless/closer-mop.txt+1−1 test/golden/importless/cmake-modules.txt+1−1 test/golden/importless/coda.txt+6−6 test/golden/importless/cohttp.txt+1−1 test/golden/importless/colord.txt+3−3 test/golden/importless/combinators.txt+1−1 test/golden/importless/command-line-arguments.txt+1−1 test/golden/importless/common-path.txt+4−3 test/golden/importless/common.txt+6−6 test/golden/importless/community.txt+88 test/golden/importless/comonad.txt+6−6 test/golden/importless/compiler-rt.txt+43−49 test/golden/importless/compiler.txt+7−7 test/golden/importless/component-packages.txt+671−671 test/golden/importless/composition.txt+6−6 test/golden/importless/configuration-ghc-8.4.x.txt+86 test/golden/importless/configuration-ghc-8.6.x.txt+117 test/golden/importless/configuration-ghc-head.txt+1−1 test/golden/importless/console.txt+6−6 test/golden/importless/container-config.txt+9−9 test/golden/importless/containers.txt+6−6 test/golden/importless/contrib.txt+16−17 test/golden/importless/control.txt+7−9 test/golden/importless/convert.txt+3−3 test/golden/importless/couchpotato.txt+14−13 test/golden/importless/criu.txt+5−5 test/golden/importless/cryptpad.txt+3−3 test/golden/importless/cryptsetup.txt+38 test/golden/importless/css-lite.txt+1−1 test/golden/importless/cstore_fdw.txt+5−5 test/golden/importless/cstruct.txt+1−1 test/golden/importless/cube.txt+6−6 test/golden/importless/curaengine.txt+1−1 test/golden/importless/curry-base.txt+3−3 test/golden/importless/curry-frontend.txt+3−3 test/golden/importless/cursive.txt+21−22 test/golden/importless/cutter.txt+5−5 test/golden/importless/cwm.txt+5−5 test/golden/importless/dante.txt+4−4 test/golden/importless/das_watchdog.txt+8−8 test/golden/importless/data-api.txt+6−6 test/golden/importless/data.txt+1−1 test/golden/importless/db3.txt+1−1 test/golden/importless/dconf2nix.txt+2−2 test/golden/importless/debian-build.txt+29 test/golden/importless/debug-info.txt+8−8 test/golden/importless/declare-attrsOf.txt+5−6 test/golden/importless/declare-coerced-value-unsound.txt+8−10 test/golden/importless/declare-either.txt+6−8 test/golden/importless/declare-enable-nested.txt+2−2 test/golden/importless/declare-enable.txt+2−2 test/golden/importless/declare-int-between-value.txt+3−3 test/golden/importless/declare-int-positive-value-nested.txt+3−3 test/golden/importless/declare-int-positive-value.txt+3−3 test/golden/importless/declare-int-unsigned-value.txt+3−3 test/golden/importless/declare-lazyAttrsOf.txt+4−5 test/golden/importless/declare-oneOf.txt+8−11 test/golden/importless/declare-submoduleWith-path.txt+3−3 test/golden/importless/declare-submoduleWith-special.txt+4−4 test/golden/importless/default-crate-overrides.txt+7−8 test/golden/importless/define-option-dependently-nested.txt+9−6 test/golden/importless/define-option-dependently.txt+7−6 test/golden/importless/define-value-int-negative.txt+1−1 test/golden/importless/define-value-int-positive.txt+1−1 test/golden/importless/define-value-int-zero.txt+1−1 test/golden/importless/define-value-list.txt+1−1 test/golden/importless/dep-overrides.txt+21 test/golden/importless/derive.txt+6−6 test/golden/importless/descncrunch.txt+6−6 test/golden/importless/devmon.txt+3−3 test/golden/importless/dfu-util.txt+1−1 test/golden/importless/dhall-packages.txt+1−1 test/golden/importless/dict.txt+6−6 test/golden/importless/dictd-db.txt+16−16 test/golden/importless/dictd-wiktionary.txt+8−8 test/golden/importless/dictd-wordnet.txt+8−8 test/golden/importless/digimend.txt+12−11 test/golden/importless/disable-bar.txt+1−1 test/golden/importless/disable-declare-enable.txt+1−1 test/golden/importless/disable-define-enable.txt+1−1 test/golden/importless/disable-foo.txt+1−1 test/golden/importless/dispatch.txt+1−1 test/golden/importless/displaylink.txt+15−15 test/golden/importless/dissect.txt+1−1 test/golden/importless/dleyna-renderer.txt+12−12 test/golden/importless/dleyna-server.txt+12−12 test/golden/importless/dmraid.txt+9−10 test/golden/importless/do-agent.txt+3−3 test/golden/importless/dolphin-plugins.txt+2−2 test/golden/importless/dolphin.txt+3−3 test/golden/importless/dom.txt+6−6 test/golden/importless/dotty.txt+1−1 test/golden/importless/dovecot-exporter.txt+1−1 test/golden/importless/dragon.txt+6−6 test/golden/importless/dsseries.txt+12−12 test/golden/importless/dust.txt+17−19 test/golden/importless/dvtm.txt+7−8 test/golden/importless/dwm.txt+5−5 test/golden/importless/eagle.txt+3−4 test/golden/importless/easyfocus.txt+9−9 test/golden/importless/ecryptfs.txt+8−8 test/golden/importless/edit.txt+5−6 test/golden/importless/editor.txt+5−6 test/golden/importless/editors.txt+26−31 test/golden/importless/egg2nix.txt+13−15 test/golden/importless/eggs.txt+14 test/golden/importless/electron.txt+6−6 test/golden/importless/element-desktop.txt+5−5 test/golden/importless/elm-format.txt+2−2 test/golden/importless/elm-instrument.txt+2−2 test/golden/importless/elm-json.txt+1−1 test/golden/importless/elm.txt+2−2 test/golden/importless/elmi-to-json.txt+2−2 test/golden/importless/emergency-mode.txt+6−6 test/golden/importless/emscripten-packages.txt+49 test/golden/importless/emulate-app.txt+1−1 test/golden/importless/emulator.txt+16−25 test/golden/importless/engine.txt+8−9 test/golden/importless/eos.txt+1−1 test/golden/importless/epmd.txt+3−3 test/golden/importless/espanso.txt+3−3 test/golden/importless/esxi.txt+14−15 test/golden/importless/eternal.txt+6−6 test/golden/importless/evilwm.txt+5−5 test/golden/importless/evolution-data-server.txt+22−22 test/golden/importless/exfat.txt+6−6 test/golden/importless/extlinux-conf-builder.txt+1−1 test/golden/importless/extpack.txt−27 test/golden/importless/extra-target-flags.txt+1−2 test/golden/importless/extras.txt+10−11 test/golden/importless/facetimehd.txt+8−8 test/golden/importless/fancontrol.txt+3−3 test/golden/importless/fare-utils.txt+1−1 test/golden/importless/farrp.txt+6−6 test/golden/importless/faust1.txt+60−70 test/golden/importless/faust2.txt+66−77 test/golden/importless/fcitx.txt+23−25 test/golden/importless/fetch-rebar-deps.txt+2−3 test/golden/importless/fetchNodeModules.txt+8−8 test/golden/importless/ffmpegthumbs.txt+3−3 test/golden/importless/filters.txt+34−36 test/golden/importless/firejail.txt+3−3 test/golden/importless/fixed-points.txt+5−9 test/golden/importless/flatpak-builder.txt+1−1 test/golden/importless/flatpak.txt+26−27 test/golden/importless/fluxbox.txt+5−5 test/golden/importless/fontdir.txt+8−8 test/golden/importless/fox-1.6.txt+28−30 test/golden/importless/frameworkintegration.txt+2−2 test/golden/importless/frameworks.txt+60−60 test/golden/importless/free.txt+6−6 test/golden/importless/freeform-nested.txt+2−2 test/golden/importless/freeform-str-dep-unstr.txt+10−11 test/golden/importless/freeform-unstr-dep-str.txt+3−4 test/golden/importless/freeoffice.txt+12−15 test/golden/importless/freetds.txt+13−13 test/golden/importless/frontends.txt+1−2 test/golden/importless/fs.txt+1−1 test/golden/importless/fsm.txt+6−6 test/golden/importless/fstrim.txt+4−4 test/golden/importless/full.txt+1−1 test/golden/importless/fuseki-binary.txt+15−17 test/golden/importless/fvwm.txt+8−8 test/golden/importless/garbage-pools.txt+1−1 test/golden/importless/gateone.txt+34−33 test/golden/importless/gc.txt+2−2 test/golden/importless/gdal-1_11.txt+26−28 test/golden/importless/gdk-pixbuf.txt+5−5 test/golden/importless/gdomap.txt+9−9 test/golden/importless/geary.txt+12−12 test/golden/importless/gemset-beta.txt+36−36 test/golden/importless/gemset_libvirt.txt+15−15 test/golden/importless/generations-dir.txt+18−14 test/golden/importless/generatorrunner.txt+19−20 test/golden/importless/generic-builder.txt+29−33 test/golden/importless/generic-stack-builder.txt+37−40 test/golden/importless/generic-v3.txt+22−27 test/golden/importless/generic.txt+11−12 test/golden/importless/geogebra6.txt+1−1 test/golden/importless/gerbil-crypto.txt+20−20 test/golden/importless/gerbil-ethereum.txt+20−20 test/golden/importless/gerbil-persist.txt+19−19 test/golden/importless/gerbil-poo.txt+18−18 test/golden/importless/gerbil-utils.txt+14−14 test/golden/importless/ghcjs-base.txt+2−2 test/golden/importless/ghostscript.txt+7−7 test/golden/importless/gitlab-ci-pipelines-exporter.txt+1−1 test/golden/importless/glfw.txt+6−6 test/golden/importless/glib-networking.txt+12−12 test/golden/importless/global-vars.txt+1−1 test/golden/importless/gmusic.txt+1−1 test/golden/importless/gnome-initial-setup.txt+20−20 test/golden/importless/gnome-keyring.txt+21−21 test/golden/importless/gnome-online-accounts.txt+16−16 test/golden/importless/gnome-online-miners.txt+20−20 test/golden/importless/gnome-remote-desktop.txt+14−14 test/golden/importless/gnome-user-share.txt+14−14 test/golden/importless/gnu.txt+5−5 test/golden/importless/go-ethereum.txt+9−10 test/golden/importless/go-shadowsocks2.txt+4−4 test/golden/importless/google_oslogin.txt+3−3 test/golden/importless/gphoto2.txt+14−14 test/golden/importless/graphite2.txt+4−5 test/golden/importless/graphql.txt+1−1 test/golden/importless/graphviz-2.0.txt+12−13 test/golden/importless/graphviz.txt+6−6 test/golden/importless/greenclip.txt+6−6 test/golden/importless/gsl-1_16.txt+15−17 test/golden/importless/gsm.txt+5−6 test/golden/importless/gstreamer.txt+1−1 test/golden/importless/gtk-greeter.txt+1−2 test/golden/importless/gtk-icon-cache.txt+11−10 test/golden/importless/gui.txt+21−22 test/golden/importless/gwenview.txt+3−3 test/golden/importless/hamster.txt+12−13 test/golden/importless/hamt.txt+6−6 test/golden/importless/hdaps.txt+3−3 test/golden/importless/helper.txt+1−1 test/golden/importless/herbstluftwm.txt+6−6 test/golden/importless/hezarfen.txt+6−6 test/golden/importless/hg.txt+1−1 test/golden/importless/hidepid.txt+14−14 test/golden/importless/hls-ghcide.txt+2−2 test/golden/importless/hpsa.txt+19−19 test/golden/importless/hrtime.txt+6−6 test/golden/importless/html.txt+6−6 test/golden/importless/http.txt+1−1 test/golden/importless/http4idris.txt+6−6 test/golden/importless/hyperv-guest.txt+22−23 test/golden/importless/i2p.txt+14−13 test/golden/importless/iaia.txt+6−6 test/golden/importless/icewm.txt+5−5 test/golden/importless/icons.txt+14−14 test/golden/importless/idrishighlighter.txt+6−6 test/golden/importless/idrisscript.txt+6−6 test/golden/importless/iftop.txt+3−3 test/golden/importless/iio.txt+12−12 test/golden/importless/illum.txt+3−3 test/golden/importless/imapfilter.txt+7−9 test/golden/importless/indents.txt+2−2 test/golden/importless/info.txt+1−1 test/golden/importless/init-script.txt+14−14 test/golden/importless/integrations-core.txt+12−16 test/golden/importless/intel-2200bg.txt+7−7 test/golden/importless/intel-microcode.txt+11−11 test/golden/importless/introspect-environment.txt+1−1 test/golden/importless/iotop.txt+3−3 test/golden/importless/ipkgparser.txt+2−2 test/golden/importless/iproute2.txt+6−5 test/golden/importless/irqbalance.txt+3−3 test/golden/importless/iterate.txt+1−1 test/golden/importless/iwd.txt+6−7 test/golden/importless/janePackage.txt+14−17 test/golden/importless/janePackage_0_12.txt+13−16 test/golden/importless/janePackage_0_13.txt+13−16 test/golden/importless/java.txt+5−5 test/golden/importless/jdk-darwin-base.txt+10−11 test/golden/importless/jheiling-extras.txt+6−6 test/golden/importless/jheiling-js.txt+6−6 test/golden/importless/js-build-tools.txt+1−1 test/golden/importless/js.txt+6−6 test/golden/importless/json-exporter.txt+1−1 test/golden/importless/json.txt+5−5 test/golden/importless/jwm.txt+5−5 test/golden/importless/kactivities-stats.txt+2−2 test/golden/importless/kactivities.txt+2−2 test/golden/importless/kak-fzf.txt+18−19 test/golden/importless/kalarm.txt+2−2 test/golden/importless/kapidox.txt+2−2 test/golden/importless/karchive.txt+18 test/golden/importless/kate.txt+3−3 test/golden/importless/kbdlight.txt+3−3 test/golden/importless/kbookmarks.txt+2−2 test/golden/importless/kcalc.txt+5−5 test/golden/importless/kcalendarcore.txt+2−2 test/golden/importless/kcharselect.txt+5−5 test/golden/importless/kcodecs.txt+17 test/golden/importless/kcolorchooser.txt+3−3 test/golden/importless/kcompletion.txt+2−2 test/golden/importless/kconfig.txt+15 test/golden/importless/kcontacts.txt+2−2 test/golden/importless/kcoreaddons.txt+16 test/golden/importless/kcrash.txt+2−2 test/golden/importless/kdbusaddons.txt+16 test/golden/importless/kdebugsettings.txt+4−4 test/golden/importless/kdeclarative.txt+2−2 test/golden/importless/kdecoration.txt+15 test/golden/importless/kded.txt+2−2 test/golden/importless/kdegraphics-mobipocket.txt+5−5 test/golden/importless/kdegraphics-thumbnailers.txt+5−5 test/golden/importless/kdenetwork-filesharing.txt+6−7 test/golden/importless/kdenlive.txt+1−1 test/golden/importless/kdesignerplugin.txt+2−2 test/golden/importless/kdevelop-pg-qt.txt+19−20 test/golden/importless/kdf.txt+3−3 test/golden/importless/kdnssd.txt+17 test/golden/importless/kemoticons.txt+2−2 test/golden/importless/kexec.txt+12−13 test/golden/importless/keybase.txt+3−3 test/golden/importless/keylight.txt+5−5 test/golden/importless/kfind.txt+5−5 test/golden/importless/kgeography.txt+2−2 test/golden/importless/kgpg.txt+5−5 test/golden/importless/kguiaddons.txt+16 test/golden/importless/khtml.txt+2−2 test/golden/importless/ki18n.txt+18 test/golden/importless/kidletime.txt+15 test/golden/importless/kimageformats.txt+2−2 test/golden/importless/kio-extras.txt+3−3 test/golden/importless/kipi-plugins.txt+3−3 test/golden/importless/kirigami2.txt+15 test/golden/importless/kitemmodels.txt+14 test/golden/importless/kitemviews.txt+16 test/golden/importless/kitinerary.txt+5−5 test/golden/importless/kjobwidgets.txt+2−2 test/golden/importless/kjs.txt+2−2 test/golden/importless/kjsembed.txt+2−2 test/golden/importless/klogd.txt+16−16 test/golden/importless/kmediaplayer.txt+2−2 test/golden/importless/kmime.txt+3−3 test/golden/importless/kmix.txt+3−3 test/golden/importless/kmod.txt+24−24 test/golden/importless/kmplot.txt+3−3 test/golden/importless/kmrcl.txt+1−1 test/golden/importless/knewstuff.txt+2−2 test/golden/importless/knotifications.txt+2−2 test/golden/importless/knotifyconfig.txt+2−2 test/golden/importless/kodi.txt+5−5 test/golden/importless/kolourpaint.txt+5−5 test/golden/importless/konqueror.txt+1−1 test/golden/importless/kparts.txt+2−2 test/golden/importless/kpeople.txt+2−2 test/golden/importless/kpkpass.txt+5−5 test/golden/importless/kplotting.txt+15 test/golden/importless/kpty.txt+2−2 test/golden/importless/kqtquickcharts.txt+3−3 test/golden/importless/kquickcharts.txt+2−2 test/golden/importless/kross.txt+2−2 test/golden/importless/kruler.txt+3−3 test/golden/importless/krunner.txt+2−2 test/golden/importless/ktexteditor.txt+2−2 test/golden/importless/ktextwidgets.txt+2−2 test/golden/importless/ktouch.txt+5−5 test/golden/importless/kunitconversion.txt+2−2 test/golden/importless/kvm.txt+1−1 test/golden/importless/kwallet.txt+2−2 test/golden/importless/kwayland.txt+19 test/golden/importless/kwidgetsaddons.txt+16 test/golden/importless/kxmlgui.txt+2−2 test/golden/importless/kxmlrpcclient.txt+2−2 test/golden/importless/lack-component.txt+1−1 test/golden/importless/ladspah.txt+11−13 test/golden/importless/layout-manager.txt+23−24 test/golden/importless/ledger.txt+3−3 test/golden/importless/leftwm.txt+5−5 test/golden/importless/legacy.txt+8−10 test/golden/importless/lens.txt+6−6 test/golden/importless/libc++abi.txt+27−31 test/golden/importless/libcroco.txt+1−2 test/golden/importless/libdislocator.txt+13−15 test/golden/importless/libkdcraw.txt+3−3 test/golden/importless/libkexiv2.txt+3−3 test/golden/importless/libkipi.txt+3−3 test/golden/importless/libmaa.txt+1−1 test/golden/importless/libnvc.txt+1−1 test/golden/importless/liboping.txt+3−3 test/golden/importless/library.txt+21−22 test/golden/importless/libtokencap.txt+13−15 test/golden/importless/libtool2.txt+1−1 test/golden/importless/libunwind.txt+14−14 test/golden/importless/libusb1.txt+8−11 test/golden/importless/libxkbcommon_7.txt+6−7 test/golden/importless/libxpdf.txt+3−3 test/golden/importless/licenses.txt+25−37 test/golden/importless/lift.txt+1−1 test/golden/importless/light.txt+3−3 test/golden/importless/lightyear.txt+3−3 test/golden/importless/limesdr.txt+5−6 test/golden/importless/linux-4.14.txt+10−13 test/golden/importless/linux-4.19.txt+10−13 test/golden/importless/linux-4.4.txt+2−2 test/golden/importless/linux-4.9.txt+2−2 test/golden/importless/linux-5.4.txt+10−13 test/golden/importless/linux-5.8.txt+10−13 test/golden/importless/linux-5.9.txt+10−13 test/golden/importless/linux-hardkernel-4.14.txt+11−14 test/golden/importless/linux-testing-bcachefs.txt+18−21 test/golden/importless/linux-testing.txt−23 test/golden/importless/linux-zen.txt+12−15 test/golden/importless/linux.txt+7−8 test/golden/importless/liquidsoap.txt−68 test/golden/importless/lld.txt+14−15 test/golden/importless/lldb.txt+18−22 test/golden/importless/lldpd.txt+5−5 test/golden/importless/llvm.txt+21−24 test/golden/importless/locales.txt+3−3 test/golden/importless/localtime.txt+6−6 test/golden/importless/lock-fancy.txt+23−24 test/golden/importless/lock-kernel-modules.txt+18−18 test/golden/importless/logic.txt+6−6 test/golden/importless/logkeys.txt+3−3 test/golden/importless/logmein-hamachi.txt+3−3 test/golden/importless/ltc.txt+1−1 test/golden/importless/luarocks-nix.txt+1−1 test/golden/importless/lumina.txt+9−11 test/golden/importless/lvm2.txt+12−12 test/golden/importless/lwm.txt+5−5 test/golden/importless/lwt-unix.txt+3−3 test/golden/importless/lxcfs.txt+4−4 test/golden/importless/lxmenu-data.txt+11−12 test/golden/importless/m32edit.txt+9−12 test/golden/importless/machine.txt+1−1 test/golden/importless/macport.txt+1−1 test/golden/importless/macvim.txt+2−2 test/golden/importless/magic-wormhole-mailbox-server.txt+5−5 test/golden/importless/mail-exporter.txt+1−1 test/golden/importless/mailhog.txt+4−4 test/golden/importless/mailpile.txt+21−21 test/golden/importless/mainline.txt+3−2 test/golden/importless/maintainer-list.txt+1490−1705 test/golden/importless/make-channel.txt+8−8 test/golden/importless/make-dbus-conf.txt+2−2 test/golden/importless/make-ext4-fs.txt+15−15 test/golden/importless/make-peer.txt+4−6 test/golden/importless/make-squashfs.txt+1−1 test/golden/importless/malcontent.txt+9−9 test/golden/importless/malloc.txt+3−3 test/golden/importless/man.txt+1−1 test/golden/importless/map-set.txt+1−1 test/golden/importless/mapping.txt+6−6 test/golden/importless/marshal.txt+1−1 test/golden/importless/masq.txt+6−6 test/golden/importless/master.txt−56 test/golden/importless/material-theme.txt+1−1 test/golden/importless/maven-build.txt+24−27 test/golden/importless/mavenPlugins.txt+1−1 test/golden/importless/mcelog.txt+12−12 test/golden/importless/md5.txt+1−1 test/golden/importless/mem.txt+1−1 test/golden/importless/menus.txt+13−13 test/golden/importless/metabang-bind.txt+1−1 test/golden/importless/metacity.txt+5−5 test/golden/importless/metaocaml-3.09.txt+4−4 test/golden/importless/metatilities-base.txt+1−1 test/golden/importless/mhd.txt+6−6 test/golden/importless/mime.txt+16−16 test/golden/importless/minimal.txt+4−4 test/golden/importless/mininet.txt+7−7 test/golden/importless/minion.txt−53 test/golden/importless/misc-extensions.txt+1−1 test/golden/importless/mjpg-streamer.txt+22−21 test/golden/importless/mk-string-metrics.txt+1−1 test/golden/importless/moarvm.txt+8−9 test/golden/importless/mod.txt+20−22 test/golden/importless/modemmanager-qt.txt+15 test/golden/importless/modemmanager.txt+5−5 test/golden/importless/module-list.txt+1−1 test/golden/importless/modules-closure.txt+1−1 test/golden/importless/modules.txt+163−163 test/golden/importless/mom.txt+4−4 test/golden/importless/monit.txt+14−14 test/golden/importless/moodle-utils.txt+16−19 test/golden/importless/mptcp-config.txt+3−3 test/golden/importless/mspdebug.txt+55 test/golden/importless/mstpd.txt+3−3 test/golden/importless/mt19937.txt+1−1 test/golden/importless/mtr.txt+4−4 test/golden/importless/muchsync.txt+14−16 test/golden/importless/mullvad-vpn.txt+6−6 test/golden/importless/multi.txt+12 test/golden/importless/multilib.txt+6−6 test/golden/importless/multipath-tools.txt+10−10 test/golden/importless/munge.txt+3−3 test/golden/importless/mwm.txt+5−5 test/golden/importless/mwprocapture.txt+8−8 test/golden/importless/nabi.txt+7−7 test/golden/importless/nacl.txt+5−6 test/golden/importless/named-readtables.txt+1−1 test/golden/importless/nanonote.txt+10−10 test/golden/importless/neard.txt+10−10 test/golden/importless/net_dot_didierverna_dot_asdf-flv.txt+1−1 test/golden/importless/netboot.txt+23−24 test/golden/importless/networkmanager-qt.txt+15 test/golden/importless/new-api.txt+6−7 test/golden/importless/news-updater.txt+8−9 test/golden/importless/nextcloud-exporter.txt+1−1 test/golden/importless/nginxlog-exporter.txt+1−1 test/golden/importless/nix-generate-from-cpan.txt+6−7 test/golden/importless/nixops-v1_6_1.txt+19−19 test/golden/importless/nixpkgs-lint.txt+9−10 test/golden/importless/nm-applet.txt+10−10 test/golden/importless/no-x-libs.txt+45−35 test/golden/importless/node.txt+7−6 test/golden/importless/notion.txt+5−5 test/golden/importless/novacomd.txt+5−5 test/golden/importless/npm.txt+18−19 test/golden/importless/nscd.txt−62 test/golden/importless/ntfs.txt+6−6 test/golden/importless/nullidentdmod.txt+3−3 test/golden/importless/nvidia-optimus.txt+11−11 test/golden/importless/nw12.txt+43−43 test/golden/importless/oauth2_proxy_nginx.txt+14−15 test/golden/importless/obs-ndi.txt+1−1 test/golden/importless/ocserv.txt+4−4 test/golden/importless/ofono.txt+5−5 test/golden/importless/oidentd.txt+16−16 test/golden/importless/okular.txt+38−38 test/golden/importless/openbox.txt+5−5 test/golden/importless/openfire.txt+19−20 test/golden/importless/openmp.txt+17−18 test/golden/importless/openvpn_learnaddress.txt+17−18 test/golden/importless/org-generated.txt+4−4 test/golden/importless/oroborus.txt+5−5 test/golden/importless/osmosdr.txt+9−10 test/golden/importless/otf.txt+13−15 test/golden/importless/overlay.txt+9−9 test/golden/importless/owamp.txt+3−3 test/golden/importless/oxygen-icons5.txt+5−5 test/golden/importless/pack.txt+1−1 test/golden/importless/packagekit.txt+3−3 test/golden/importless/pacman.txt+2−2 test/golden/importless/pam_usb.txt+9−10 test/golden/importless/parse-declarations-1_dot_0.txt+1−1 test/golden/importless/parse-number.txt+1−1 test/golden/importless/parser.txt+9−9 test/golden/importless/parted.txt+42 test/golden/importless/paste.txt+1−1 test/golden/importless/patricia.txt+6−6 test/golden/importless/pdf_sets.txt+13−13 test/golden/importless/pdnsd.txt+3−3 test/golden/importless/pekwm.txt+5−5 test/golden/importless/perf.txt+10−12 test/golden/importless/periods.txt+7−7 test/golden/importless/permutations.txt+6−6 test/golden/importless/persistenced.txt+10−10 test/golden/importless/pfds.txt+6−6 test/golden/importless/pflogsumm.txt+10−11 test/golden/importless/pg_auto_failover.txt+8−8 test/golden/importless/pg_bigm.txt+6−6 test/golden/importless/pg_cron.txt+5−5 test/golden/importless/pg_ed25519.txt+6−6 test/golden/importless/pg_hll.txt+5−5 test/golden/importless/pg_partman.txt+5−5 test/golden/importless/pg_safeupdate.txt+4−4 test/golden/importless/pg_similarity.txt+13−13 test/golden/importless/pg_topn.txt+5−5 test/golden/importless/pgjwt.txt+5−5 test/golden/importless/pgroonga.txt+5−5 test/golden/importless/pgrouting.txt+6−6 test/golden/importless/pipelinedb.txt+8−8 test/golden/importless/pipes.txt+6−6 test/golden/importless/pk.txt+1−1 test/golden/importless/platform-flags.txt+20−14 test/golden/importless/platform.txt+6−7 test/golden/importless/plotinus.txt+7−7 test/golden/importless/plpgsql_check.txt+6−6 test/golden/importless/plump-lexer.txt+1−1 test/golden/importless/pony-stable.txt+12−14 test/golden/importless/port.txt+59 test/golden/importless/posix.txt+2−2 test/golden/importless/postfix-exporter.txt+1−1 test/golden/importless/postgis.txt+8−9 test/golden/importless/powerdns.txt+7−8 test/golden/importless/powertop.txt+3−3 test/golden/importless/ppx.txt+6−6 test/golden/importless/pre-configure.txt+2−1 test/golden/importless/pressureaudio.txt+1−1 test/golden/importless/print-manager.txt+2−2 test/golden/importless/prison.txt+17 test/golden/importless/process-exporter.txt+1−1 test/golden/importless/protobuf.txt+6−6 test/golden/importless/protocols.txt+14−14 test/golden/importless/prove-asdf.txt+1−1 test/golden/importless/ptester.txt+1−1 test/golden/importless/pure.txt+1−1 test/golden/importless/purpose.txt+2−2 test/golden/importless/pyblock.txt+9−9 test/golden/importless/pykickstart.txt+2−2 test/golden/importless/pyparted.txt+8−10 test/golden/importless/qemu-guest-agent.txt+4−4 test/golden/importless/qemu.txt+49 test/golden/importless/qpaeq.txt+6−6 test/golden/importless/qt-5.txt+16−18 test/golden/importless/qt4.txt+1−1 test/golden/importless/qt5ct.txt+12−12 test/golden/importless/qtModule.txt+38−41 test/golden/importless/qtconnectivity.txt+2−2 test/golden/importless/qtgamepad.txt+1−1 test/golden/importless/qtile.txt+5−5 test/golden/importless/qtlocation.txt+2−2 test/golden/importless/qtspeech.txt+2−1 test/golden/importless/qtwebengine.txt+77−79 test/golden/importless/qtwebview.txt+6−7 test/golden/importless/quantities.txt+5−5 test/golden/importless/rabbitmq-exporter.txt+1−1 test/golden/importless/racoon.txt+3−3 test/golden/importless/raptor.txt+14−16 test/golden/importless/raspberrypi-builder.txt+1−1 test/golden/importless/rasqal.txt+25−27 test/golden/importless/ratbagd.txt+3−3 test/golden/importless/rationals.txt+2−2 test/golden/importless/ratpoison.txt+5−5 test/golden/importless/rdnssd.txt+18−17 test/golden/importless/rds.txt+1−2 test/golden/importless/rebar3-release.txt+25−28 test/golden/importless/recursion_schemes.txt+6−6 test/golden/importless/redis-exporter.txt+1−1 test/golden/importless/redis.txt+2−2 test/golden/importless/redland.txt+13−15 test/golden/importless/refined.txt+6−6 test/golden/importless/repmgr.txt+5−5 test/golden/importless/require_exceptions.txt+8−8 test/golden/importless/rfc2388.txt+1−1 test/golden/importless/rng-mirage.txt+1−1 test/golden/importless/rng.txt+1−1 test/golden/importless/rngd.txt+4−4 test/golden/importless/roboschool-fork.txt+15−17 test/golden/importless/robustirc-bridge.txt+4−4 test/golden/importless/rocs.txt+4−4 test/golden/importless/rofi-pass.txt+23−25 test/golden/importless/rpcbind.txt+16−16 test/golden/importless/rt.txt+1−1 test/golden/importless/rtkit.txt+17−17 test/golden/importless/ruby-packages.txt+253−253 test/golden/importless/ruby-version.txt+1−1 test/golden/importless/rustfmt.txt+20−21 test/golden/importless/rxe.txt+5−5 test/golden/importless/rygel.txt+22−22 test/golden/importless/s-sysdeps.txt+1−1 test/golden/importless/s-xml.txt+1−1 test/golden/importless/sabnzbd.txt+17−16 test/golden/importless/safeeyes.txt+6−6 test/golden/importless/sage-env.txt+1−1 test/golden/importless/sagenb.txt+1−1 test/golden/importless/salza2.txt+1−1 test/golden/importless/samtools_0_1_19.txt+1−1 test/golden/importless/sawfish.txt+5−5 test/golden/importless/sbv-7.13.txt+2−2 test/golden/importless/schema.txt+1−1 test/golden/importless/screen.txt+3−3 test/golden/importless/scripts.txt+14−15 test/golden/importless/sdk-pkgs.txt+26−30 test/golden/importless/sdl.txt+2−2 test/golden/importless/sedutil.txt+3−3 test/golden/importless/semidirect.txt+2−2 test/golden/importless/server.txt+4−4 test/golden/importless/setoids.txt+2−2 test/golden/importless/shadow.txt+24−28 test/golden/importless/share.txt+13−13 test/golden/importless/shared.txt+59−62 test/golden/importless/shiboken.txt+43 test/golden/importless/sickgear.txt+16−17 test/golden/importless/sickrage.txt+14−14 test/golden/importless/singularity.txt+9−8 test/golden/importless/skeinjar.txt+1−1 test/golden/importless/skeinrepo.txt+1−1 test/golden/importless/slock.txt+3−3 test/golden/importless/smallwm.txt+5−5 test/golden/importless/smlar.txt+6−6 test/golden/importless/smproc.txt+6−6 test/golden/importless/snippets.txt+6−6 test/golden/importless/socket.txt+1−1 test/golden/importless/sockets.txt+7−7 test/golden/importless/softmaker_office.txt+12−15 test/golden/importless/software_foundations.txt+2−2 test/golden/importless/solid.txt+20 test/golden/importless/sonnet.txt+16 test/golden/importless/sounds.txt+14−14 test/golden/importless/source-from-head-fun.txt+1−1 test/golden/importless/spago.txt+2−2 test/golden/importless/specdris.txt+2−2 test/golden/importless/spectrwm.txt+5−5 test/golden/importless/spice-vdagentd.txt+3−3 test/golden/importless/spotify.txt+2−2 test/golden/importless/spotifyd.txt+4−4 test/golden/importless/springlobby.txt+1−1 test/golden/importless/sqlite.txt+10−10 test/golden/importless/squeezelite.txt+13−15 test/golden/importless/ssh-keys.txt+3−3 test/golden/importless/ssm-agent.txt+6−6 test/golden/importless/stable.txt+3−2 test/golden/importless/staging.txt+15−17 test/golden/importless/standalone.txt+50−51 test/golden/importless/startx.txt+5−5 test/golden/importless/status.txt+24−25 test/golden/importless/steam-hardware.txt+5−5 test/golden/importless/steam.txt+11−11 test/golden/importless/stellar-core.txt+1−1 test/golden/importless/string-case.txt+1−1 test/golden/importless/stumpwm.txt+7−7 test/golden/importless/sundtek.txt+3−3 test/golden/importless/surfboard.txt+5−5 test/golden/importless/sushi.txt+20−20 test/golden/importless/swank.txt+1−1 test/golden/importless/syndication.txt+2−2 test/golden/importless/syntax-highlighting.txt+16 test/golden/importless/sysdig.txt+13−12 test/golden/importless/sysprof.txt+13−14 test/golden/importless/sysstat.txt+4−4 test/golden/importless/system-config-printer.txt+8−8 test/golden/importless/systemtap.txt+17−16 test/golden/importless/tailscale.txt+8−10 test/golden/importless/tap.txt+6−6 test/golden/importless/tcpcrypt.txt+12−12 test/golden/importless/tds_fdw.txt+8−8 test/golden/importless/teamviewer.txt+3−3 test/golden/importless/telepathy.txt+17−17 test/golden/importless/temporal_tables.txt+5−5 test/golden/importless/terminal-server.txt+6−7 test/golden/importless/tes3mp.txt+1−1 test/golden/importless/tesseract3.txt+17−19 test/golden/importless/tesseract4.txt+17−19 test/golden/importless/test-case.txt+1−1 test/golden/importless/test.txt+1−1 test/golden/importless/tfrandom.txt+6−6 test/golden/importless/threadweaver.txt+14 test/golden/importless/throttled.txt+4−4 test/golden/importless/tiddlywiki.txt+4−4 test/golden/importless/timescaledb.txt+5−5 test/golden/importless/tinywm.txt+5−5 test/golden/importless/tlaps.txt+21−23 test/golden/importless/tlhydra.txt+2−2 test/golden/importless/tls-submodule.txt+5−5 test/golden/importless/tmp.txt+7−8 test/golden/importless/todo.txt+1−1 test/golden/importless/tomladris.txt+6−6 test/golden/importless/tool.txt+21−22 test/golden/importless/toolbox.txt+15−16 test/golden/importless/tools.txt+2−2 test/golden/importless/tor-arm.txt+18−20 test/golden/importless/tp.txt+6−6 test/golden/importless/tparsec.txt+6−6 test/golden/importless/tptp.txt+21−21 test/golden/importless/traceroute.txt+3−3 test/golden/importless/tracker-miners.txt+17−17 test/golden/importless/tracker.txt+17−17 test/golden/importless/transducers.txt+6−6 test/golden/importless/trees.txt+2−2 test/golden/importless/trivial-backtrace.txt+1−1 test/golden/importless/trivial-cltl2.txt+1−1 test/golden/importless/trivial-features.txt+1−1 test/golden/importless/trivial-gray-streams.txt+1−1 test/golden/importless/trivial-indent.txt+1−1 test/golden/importless/trivial-macroexpand-all.txt+1−1 test/golden/importless/trivial-mimes.txt+1−1 test/golden/importless/trivial-types.txt+1−1 test/golden/importless/trivial-utf-8.txt+1−1 test/golden/importless/tsearch_extras.txt+5−5 test/golden/importless/tuxedo-keyboard.txt+9−8 test/golden/importless/tvheadend.txt+16−15 test/golden/importless/twm.txt+7−7 test/golden/importless/tzupdate.txt+3−3 test/golden/importless/udev.txt+1−1 test/golden/importless/udev_rules_type1.txt+10−12 test/golden/importless/udevil.txt+3−3 test/golden/importless/udisks2.txt+13−13 test/golden/importless/uffi.txt+1−1 test/golden/importless/ui.txt+1−1 test/golden/importless/uim.txt+5−6 test/golden/importless/uinput.txt+3−3 test/golden/importless/uiop.txt+1−1 test/golden/importless/union_type.txt+6−6 test/golden/importless/unit-test.txt+1−1 test/golden/importless/unix-odbc-drivers.txt+4−4 test/golden/importless/unix-opts.txt+1−1 test/golden/importless/unix.txt+1−1 test/golden/importless/unstable.txt+22−25 test/golden/importless/unwrapped.txt+3−3 test/golden/importless/updateSettings.txt+12 test/golden/importless/uptimed.txt+14−13 test/golden/importless/urserver.txt+5−7 test/golden/importless/usb-wwan.txt+13−13 test/golden/importless/usbtop.txt+3−3 test/golden/importless/user-account.txt+1−1 test/golden/importless/utils.txt+21−21 test/golden/importless/v10.txt+1−1 test/golden/importless/v12.txt+1−1 test/golden/importless/v14.txt+1−1 test/golden/importless/v3_4.txt+3−3 test/golden/importless/v3_6.txt+4−4 test/golden/importless/v4_0.txt+4−4 test/golden/importless/v4_2.txt+4−4 test/golden/importless/varnish-exporter.txt+6−6 test/golden/importless/vdom.txt+6−6 test/golden/importless/vecspace.txt+2−2 test/golden/importless/vhba.txt+14−15 test/golden/importless/viewer.txt+7−9 test/golden/importless/vim.txt+4−4 test/golden/importless/virtualbox-guest.txt+20−21 test/golden/importless/vnstat.txt+3−3 test/golden/importless/vom.txt+1−1 test/golden/importless/vulkan.txt+23−24 test/golden/importless/wacom.txt+4−4 test/golden/importless/wakeonlan.txt+8−7 test/golden/importless/wavemon.txt+3−3 test/golden/importless/waybar.txt+3−3 test/golden/importless/webgl.txt+6−6 test/golden/importless/wicd.txt+12−12 test/golden/importless/windowlab.txt+5−5 test/golden/importless/windowmaker.txt+5−5 test/golden/importless/winetricks.txt+25−27 test/golden/importless/with-extensions.txt+2−2 test/golden/importless/with-fonts.txt+14−14 test/golden/importless/with-packages.txt+7−8 test/golden/importless/wl-pprint.txt+2−2 test/golden/importless/wmcalclock.txt+20−22 test/golden/importless/wmii.txt+5−5 test/golden/importless/wmsm.app.txt+17−18 test/golden/importless/wmsystemtray.txt+22−24 test/golden/importless/wooting.txt+10−10 test/golden/importless/wyvern.txt+6−6 test/golden/importless/x32edit.txt+9−12 test/golden/importless/xbanish.txt+3−3 test/golden/importless/xe-guest-utilities.txt+3−3 test/golden/importless/xen-domU.txt+1−1 test/golden/importless/xfce4-mailwatch-plugin.txt+1−1 test/golden/importless/xfce4-mpc-plugin.txt+1−1 test/golden/importless/xfce4-timer-plugin.txt+1−1 test/golden/importless/xfce4-windowck-plugin.txt+8−8 test/golden/importless/xfs.txt+16−16 test/golden/importless/xft.txt+8−8 test/golden/importless/xhr.txt+6−6 test/golden/importless/xlib.txt+2−2 test/golden/importless/xmpp-alerts.txt−54 test/golden/importless/xow.txt+4−4 test/golden/importless/xsane.txt+9−12 test/golden/importless/xsubseq.txt+1−1 test/golden/importless/xterm.txt+12−13 test/golden/importless/yacc.txt+1−1 test/golden/importless/yakuake.txt+3−3 test/golden/importless/yaml.txt+6−6 test/golden/importless/yampa.txt+2−2 test/golden/importless/yeahwm.txt+5−5 test/golden/importless/z3.txt+2−2 test/golden/importless/zeitgeist.txt+12−12 test/golden/importless/zmap.txt+3−3 test/golden/importless/zpaqd.txt+18−21 test/golden/importless/zpb-ttf.txt+1−1 test/golden/importless/zsh-autoenv.txt+4−4 test/golden/mine/0.9.txt+1−1 test/golden/mine/curry.txt+1−1 test/golden/mine/define-option-dependently-nested.nix+12 test/golden/mine/define-option-dependently-nested.txt+3 test/golden/mine/inftype.txt+1−1 test/golden/mine/nums.nix+5 test/golden/mine/nums.txt+1 test/golden/mine/other.txt+1−1 test/golden/mine/other_row.txt+3−3 test/golden/mine/polyApply.txt+1−1 test/golden/mine/row.nix−5 test/golden/mine/subsumption.nix+6 test/golden/mine/subsumption.txt+4 test/golden/mine/subsumption_other.nix+5 test/golden/mine/subsumption_other.txt+1 test/golden/mine/unionfs.nix−21 test/golden/mine/variadic.txt+4−1 test/golden/mine/with.txt+1−1
.github/workflows/build_docs.yaml+4
@@ -3,9 +3,13 @@ on:
33 push:
44 branches:
55 - master
6+ paths:
7+ - docs/**
68 pull_request:
79 branches:
810 - master
11+ paths:
12+ - docs/**
913
1014jobs:
1115 linux:
docs/.vscode/settings.json+8−1
@@ -11,5 +11,12 @@
1111 "-A",
1212 "%DOCFILE%"
1313 ],
14− "nixEnvSelector.suggestion": false
14+ "nixEnvSelector.suggestion": false,
15+ "latex-workshop.latexindent.args": [
16+ "-c",
17+ "%DIR%/",
18+ "%TMPFILE%",
19+ "-y=defaultIndent: '%INDENT%'",
20+ "-l"
21+ ]
1522}
docs/bibl.bib+16−1
@@ -1,13 +1,18 @@
11%% This BibTeX bibliography file was created using BibDesk.
22%% https://bibdesk.sourceforge.io/
33
4−%% Created for Ilya at 2021-04-25 18:35:19 +0300
4+%% Created for Ilya at 2021-05-15 17:02:08 +0300
55
66
77%% Saved with string encoding Unicode (UTF-8)
88
99
1010
11+@webpage{github-source,
12+ date-added = {2021-05-15 17:00:09 +0300},
13+ date-modified = {2021-05-15 17:02:05 +0300},
14+ url = {https://github.com/ilyakooo0/tix}}
15+
1116@article{goldberg2000mercury,
1217 author = {Goldberg, Ken and Gentner, Steve and Sutter, Carl and Wiegley, Jeff},
1318 date-added = {2021-04-25 18:35:16 +0300},
@@ -200,3 +205,13 @@
200205 pages = {367--378},
201206 title = {NixOS: A purely functional Linux distribution},
202207 year = {2008}}
208+
209+@article{wand1991type,
210+ author = {Wand, Mitchell},
211+ journal = {Information and Computation},
212+ number = {1},
213+ pages = {1--15},
214+ publisher = {Elsevier},
215+ title = {Type inference for record concatenation and multiple inheritance},
216+ volume = {93},
217+ year = {1991}}
docs/default.nix+2−10
@@ -27,15 +27,7 @@ builtins.listToAttrs (map
2727 # , compressBlanksInIndex ? true
2828 # , packages ? [ ]
2929 texPackages = {
30− myPackages = {
31− pkgs = [
32− (
33− pkgs.runCommand "gost"
34− { passthru = { tlType = "run"; pname = "gost"; }; }
35− "mkdir $out; cp -r ${sources.GOST + "/bibtex"} $out"
36− )
37− ] ++ (builtins.filter (x: x.pname != "gost") pkgs.texlive.scheme-full.pkgs);
38− };
30+ inherit (pkgs.texlive) scheme-medium IEEEtran polytable lazylist multirow;
3931 };
4032 # , copySources ? false
4133 };
@@ -43,6 +35,6 @@ builtins.listToAttrs (map
4335 [
4436 { file = ./tech_spec.tex; }
4537 { file = ./project_proposal.tex; }
46− { file = ./paper.lhs; extraFiles = [ (sources.TechDoc + "/TechDoc.cls") ./bibl.bib ]; }
38+ { file = ./paper.lhs; extraFiles = [ ./bibl.bib ./trfrac.sty ]; }
4739 ]
4840)
docs/nix/sources.json−12
@@ -11,18 +11,6 @@
1111 "url": "https://github.com/kia999/GOST/archive/072a2ef457b5dc9e5ddc6bfeb0b6f81d4147a328.tar.gz",
1212 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313 },
14− "TechDoc": {
15− "branch": "master",
16− "description": "📄🖋️💻 LaTeX document class for technical documents at SE HSE",
17− "homepage": "https://iko.soy/kursach/techDoc",
18− "owner": "ilyakooo0",
19− "repo": "TechDoc",
20− "rev": "ab77f326ffe0ff054308ca48221940ec3809d4db",
21− "sha256": "0m94dwd7pjsgrfk8hra3gyhbd2wxk07xsdxb386vbymmk9cvfxji",
22− "type": "tarball",
23− "url": "https://github.com/ilyakooo0/TechDoc/archive/ab77f326ffe0ff054308ca48221940ec3809d4db.tar.gz",
24− "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25− },
2614 "niv": {
2715 "branch": "master",
2816 "description": "Easy dependency management for Nix projects",
docs/paper.lhs+928−116
@@ -1,57 +1,97 @@
1−\PassOptionsToPackage{main=english,russian}{babel}
1+\documentclass[a4paper,journal,compsoc]{IEEEtran}
22
3−\documentclass[]{TechDoc}
4−
5−\usepackage{float}
3+% \usepackage{float}
64\usepackage{mathtools}
5+\usepackage{hyperref}
6+\usepackage{microtype}
7+\usepackage{trfrac}
8+\usepackage{multirow}
9+\usepackage{textcomp}
10+% \usepackage{caption}
11+% \usepackage[main=english,russian]{babel}
12+
13+% \selectlanguage{english}
714
8−\selectlanguage{english}
15+% \sectionsAreChapters
916
10−\sectionsAreChapters
1117
12−\floatstyle{boxed}
13−\newfloat{Listing}{hbp}{lst}
18+%include polycode.fmt
19+
20+%format forall = "\forall"
21+%format a = "\alpha"
22+%format a'
23+%format b = "\beta"
24+%format b'
25+%format c = "\gamma"
26+%format c'
27+%format d = "\delta"
28+%format d'
29+%format s = "\sigma"
30+%format m = "\mu"
31+%format r = "\psi"
32+%format x = "\eta"
33+%format x'
34+%format y = "\zeta"
35+%format y'
36+%format ^ = " "
37+%format ^^ = "\;"
38+%format !! = "{\;}''\!\!"
39+%format <> = "\diamond"
40+
41+% \floatstyle{boxed}
42+% \newfloat{figure}{hbp}{lst}
1443
1544\newcommand{\parr}[1]{\medskip\textbf{#1}\hspace{0.6cm}}
45+\newcommand{\strOrNum}{(\text{String} || \text{Number})}
1646
17−%include polycode.fmt
1847
19−\year{2021}
48+% \year{2021}
2049\title{Static analyzer for the Nix Expression Language}
21−\author{Student, BSE174}{I. I. Kostyuchenko}
22−\academicTeacher{Associate Professor, PhD}{V. V. Kuliamin}
23−
24−\documentTitle{Explanatory note}
25−\documentCode{RU.17701729.04.05-01 ПЗ 01-1}
50+% \author{Student, BSE174}{I. I. Kostyuchenko}
51+% \academicTeacher{Associate Professor, PhD}{V. V. Kuliamin}
52+
53+% \documentTitle{Explanatory note}
54+% \documentCode{RU.17701729.04.05-01 ПЗ 01-1}
55+
56+\author{
57+ \IEEEauthorblockN{Kostyuchenko Ilya}
58+ \IEEEauthorblockA{
59+ Faculty of Computer Science,\\
60+ Higher School of Economics,\\
61+ Moscow, Russia
62+ }
63+}
2664
2765\begin{document}
2866\maketitle
67+\thispagestyle{plain}
68+\pagestyle{plain}
2969
3070\begin{abstract}
31− Configuring and building even the most straightforward software projects is often not simple -- it requires downloading and installing copious amounts of prerequisite software. This often makes reproducing builds of a project on different machines problematic. The Nix package manager aims to address this problem by providing a unified language for describing software packages in a purely functional way. This language is called the Nix Expression Language. Since all of the complexity of software configuration needs to be expressed in the Nix Expression Language, the expressions themselves often become quite complicated, making it difficult to understand and extend existing expressions without introducing errors. A widespread tool for easing the understandability and correctness of expressions in other languages is static type checking. This paper will explore the techniques that can be used to add static type checking to the Nix Expression Language.
71+ Configuring and building even the most straightforward software projects is often not simple -- it requires downloading and installing copious amounts of prerequisite software. This often makes reproducing builds of a project on different machines problematic. The Nix package manager aims to address this problem by providing a unified language for describing software packages in a purely functional way. This language is called the Nix Expression Language. Since all of the complexity of software configuration needs to be expressed in the Nix Expression Language, the expressions themselves often become pretty complicated, making it difficult to understand and extend existing expressions without introducing errors. A widespread tool for easing the understandability and correctness of expressions in other languages is static type checking. This paper will explore the techniques that can be used to add static type checking to the Nix Expression Language.
3272\end{abstract}
3373
34−\begin{otherlanguage}{russian}
74+% \begin{otherlanguage}{russian}
3575
36−\begin{abstract}
37−Настройка и сборка даже самых простых программных проектов часто бывает непростой задачей -- для этого требуется загрузить и установить большое количество необходимого программного обеспечения. Это часто делает проблематичным воспроизведение сборок проекта на разных компьютерах. Менеджер пакетов Nix стремится решить эту проблему, предоставляя единый язык для описания пакетов программного обеспечения чисто функциональным способом. Этот язык называется языком Nix Expression Language. Поскольку вся сложность конфигурации программного обеспечения должна быть выражена на языке Nix Expression Language, сами выражения часто становятся довольно сложными, что затрудняет понимание и расширение существующих выражений без ошибок. Широко распространенным инструментом для облегчения понимания и проверки корректности выражений на других языках является статическая проверка типов. В этой статье будут рассмотрены методы, которые можно использовать для добавления статической проверки типов в язык выражений Nix Expression Language.
38−\end{abstract}
76+% \begin{abstract}
77+% Настройка и сборка даже самых простых программных проектов часто бывает непростой задачей -- для этого требуется загрузить и установить большое количество необходимого программного обеспечения. Это часто делает проблематичным воспроизведение сборок проекта на разных компьютерах. Менеджер пакетов Nix стремится решить эту проблему, предоставляя единый язык для описания пакетов программного обеспечения чисто функциональным способом. Этот язык называется языком Nix Expression Language. Поскольку вся сложность конфигурации программного обеспечения должна быть выражена на языке Nix Expression Language, сами выражения часто становятся довольно сложными, что затрудняет понимание и расширение существующих выражений без ошибок. Широко распространенным инструментом для облегчения понимания и проверки корректности выражений на других языках является статическая проверка типов. В этой статье будут рассмотрены методы, которые можно использовать для добавления статической проверки типов в язык выражений Nix Expression Language.
78+% \end{abstract}
3979
40−\end{otherlanguage}
80+% \end{otherlanguage}
4181
42−\parr{Source code} \url{https://github.com/ilyakooo0/tix}
82+% \parr{Source code} \url{https://github.com/ilyakooo0/tix}
4383
44−\newpage
84+% \newpage
4585
46−\tableofcontents
86+% \tableofcontents
4787
4888\section*{Introduction}
4989
50−Today developing software is riddled with large amounts of complexity -- newer software is built on top of older software, dragging the whole stack below as dependencies. As a result, building software requires a large number of dependencies to be preinstalled. Modern build systems like Gradle\footnote{\url{https://gradle.org}}, Maven\footnote{\url{https://maven.apache.org}}, and Stack\footnote{\url{https://docs.haskellstack.org/en/stable/README/}} try to mitigate the issue by automatically downloading and installing the required dependencies. However, in most cases, such tools can only manage language-level dependencies, requiring the user to install additional libraries and tools manually.
90+Today developing software is riddled with large amounts of complexity -- newer software is built on top of older software, dragging the whole stack below as dependencies. As a result, building software requires a large number of dependencies to be preinstalled. Modern build systems like Gradle\footnote{\url{https://gradle.org}}, Maven\footnote{\url{https://maven.apache.org}}, and Stack\footnote{\url{https://docs.haskellstack.org/en/stable/README/}} try to mitigate the issue by automatically downloading and installing the required dependencies. However, in most cases, such tools can only manage language-level dependencies, requiring the user to manually install additional libraries and tools.
5191
5292Such manual dependency management leads to several problems. Firstly, when a user wants to work on a project he has not encountered before, he will have to install the required dependencies, leading to additional tedious work. Furthermore, the required versions of project dependencies might conflict with the versions that another project requires. The user will have to manually switch the versions of executables and libraries when switching between projects.
5393
54−This problem is partially solved by so-called virtual environments tools. A virtual environment is a way of restricting and customizing the available external tools (usually compilers) with the ability to dynamically switch between them. The tools can generally be split into one of two categories:
94+So-called virtual environment tools partially solve this problem. A virtual environment is a way of restricting and customizing the available external tools (usually compilers) with the ability to switch between them dynamically. These tools can generally be split into one of two categories:
5595
5696\begin{enumerate}
5797 \item \emph{language-specific tools} which simplify installing and switching between different versions of some tools (usually compilers). Examples of such tools are:
@@ -69,7 +109,7 @@ This problem is partially solved by so-called virtual environments tools. A virt
69109 \end{enumerate}
70110\end{enumerate}
71111
72−Even so, such tools still require explicit user action: the user needs to explicitly switch between (or install) the necessary tools when switching projects in the case of \emph{language-specific tools}, the user needs to explicitly install the required tools in some other way for them to be imported by \emph{general-purpose tools}.
112+Such tools still require explicit user action: the user needs to explicitly switch between (or install) the necessary tools when switching projects in the case of \emph{language-specific tools}, the user needs to explicitly install the required tools in some other way for them to be imported by \emph{general-purpose tools}.
73113
74114Secondly, manual dependency management impedes the reproducibility of the project builds -- building the same project on multiple machines will, in all likelihood, produce different results since the machines will likely differ in many ways that impact the build, such as having slightly different versions\footnote{``Version'' here refers to actual variations on the bit level, and not just version numbers.} of libraries and executables.
75115
@@ -81,19 +121,19 @@ Using a fully-fledged programming language allows the users to reuse common defi
81121
82122Nix Expression Language is a dynamic, lazy, purely functional programming language. The purely functional nature of the language aids in build reproducibility guarantees that Nix aims to provide.
83123
84−Even considering the tremendous benefits that using a programming language for build configuration brings, the dynamic nature of the language often still makes it challenging to understand and reuse existing code. This is in part due to the large amounts of code required to describe real-world systems in all of their complexity fully.\footnote{The standard Nix package repository |nixpkgs| contains 2 million lines of code.}
124+Even considering the tremendous benefits that using a programming language for build configuration brings, the dynamic nature of the language often still makes it challenging to understand and reuse existing code. This is in part due to the large amounts of code required to describe real-world systems in all of their complexity.\footnote{The standard Nix package repository |nixpkgs| contains 2 million lines of code.}
85125
86126Refactoring existing code is also tricky since the generated expressions are only really checked for correctness\footnote{Here, ``correctness'' is used to mean the absence of evaluation-time errors.} at their evaluation time, and the evaluation time of expressions is difficult to predict due to the lazy nature of the language.
87127
88−Static type checking is the process of analyzing the types of expressions and detecting type errors in programs without evaluating them.
128+A widespread tool for easing development and alleviate the aforementioned problems in other languages is static type checking -- the process of analyzing the types of expressions and detecting type errors in programs without evaluating them.
89129
90−Even though static type checking in most mainstream programming languages does not influence the semantics of the programs, it is nonetheless widely used. This is an indication of the usefulness of static type checking during development. Type checking helps detect likely ``incorrect'' programs without evaluating them (very helpful during refactoring), and aids in understanding existing code since types often expose some semantics of expressions (this is especially true for purely functional programs).
130+Even though static type checking in most mainstream programming languages does not influence the semantics of the programs, it is nonetheless widely used. This is an indication of the usefulness of static type checking during development. Type checking helps detect likely ``incorrect'' programs without evaluating them (very helpful during refactoring) and aids in understanding existing code since types often expose some semantics of expressions (this is especially true for purely functional programs).
91131
92132The Nix Expression Language does not currently support static type checking of any kind. Of course, retrofitting a static type checker onto an existing dynamic programming language will reject programs that will not produce errors at runtime. However, this is still a goal worth pursuing because even with all of the situations when the type checker produces false negatives, inferring types for existing expressions, as mentioned above, will aid in understanding existing code and surface potentially problematic areas of code to the developer.
93133
94134\section{Nix Expression Language}
95135
96−In this chapter we will examine the semantics of major terms of the Nix Expression Language. We will from now on abbreviate \emph{Nix Expression Language} as \emph{Nix} as it is in most cases clear from the context what is being referred to: the language or the system as a whole.
136+In this chapter, we will examine the semantics of major terms of the Nix Expression Language. We will, from now on abbreviate \emph{Nix Expression Language} as \emph{Nix} as it is in most cases clear from the context what is being referred to: the language or the system as a whole.
97137
98138\subsection{Atomic types}
99139
@@ -101,8 +141,9 @@ Atomic types are described in table~\ref{tab:atomicTypes}.
101141
102142\begin{table}[hbp]
103143 \centering
104− \begin{tabular}{ ||c||p{6cm}||p{6cm}|| } \hline
105− \textbf{Atomic type} & \textbf{Description} & \textbf{Example terms} \\ \hline
144+ \caption{Table of atomic Nix Expression Language types}
145+ \begin{tabular}{ ||c||p{2cm}||p{4cm}|| } \hline
146+ \textbf{Atomic type} & \textbf{Description} & \textbf{Example terms} \\ \hline \hline
106147 URI & A string literal representing a URI. Does not require quoting. & \texttt{https://example.com} \\ \hline
107148 Path literal & A path literal referring to either a relative or absolute path. Does not require quoting. & \texttt{../../directory/file.txt} \\ \hline
108149 Integer & The current C implementation of Nix allows values of 64-bit signed integers. & \texttt{69} \newline \texttt{-42} \\ \hline
@@ -110,7 +151,6 @@ Atomic types are described in table~\ref{tab:atomicTypes}.
110151 Bool & Boolean values. & \texttt{true} \newline \texttt{false} \\ \hline
111152 Null & A type with a single value. & \texttt{null} \\ \hline
112153 \end{tabular}
113− \caption{Table of atomic Nix Expression Language types}
114154 \label{tab:atomicTypes}
115155\end{table}
116156
@@ -118,9 +158,9 @@ Atomic types are described in table~\ref{tab:atomicTypes}.
118158
119159\subsubsection{Double quoted string literals}
120160
121−Double quoted string literals are string literals just like in many other programming languages. It can contain esaped newline character literals \texttt{\\n} which will be preserved as shown in listing~\ref{lst:newlineString}.
161+Double quoted string literals are string literals, just like in many other programming languages. It can contain escaped newline character literals \texttt{\textbackslash n} which will be preserved as shown in figure~\ref{lst:newlineString}.
122162
123−\begin{Listing}
163+\begin{figure}
124164 \begin{minipage}{\textwidth}
125165 \begin{verbatim}
126166"Sampel\nPalnet"
@@ -128,13 +168,13 @@ Double quoted string literals are string literals just like in many other progra
128168 \end{minipage}
129169 \caption{Nix Expression Language double quoted string literal example}
130170 \label{lst:newlineString}
131−\end{Listing}
171+\end{figure}
132172
133173\subsubsection{Multiline string literals}
134174
135−Multiline string literals are enclosed by pairs of single quotes (\texttt{''} as opposed to \texttt{"}). Newlines are preserved and indentation is stripped from the beginning of the literal. An example multiline string literal is shown in listing~\ref{lst:multilineString}.
175+Multiline string literals are enclosed by pairs of single quotes (\texttt{''} as opposed to \texttt{"}). Newlines are preserved, and indentation is stripped from the beginning of the literal. An example multiline string literal is shown in figure~\ref{lst:multilineString}.
136176
137−\begin{Listing}
177+\begin{figure}
138178 \begin{minipage}{\textwidth}
139179 \begin{verbatim}
140180''
@@ -146,43 +186,43 @@ Palnet''
146186 \end{minipage}
147187 \caption{Nix Expression Language multiline string literal example and an equivalent double quoted string literal}
148188 \label{lst:multilineString}
149−\end{Listing}
189+\end{figure}
150190
151−\subsubsection{String interpolation}
191+% \subsubsection{String interpolation}
152192
153−The Nix Expression Language also allows for arbitrary expressions of the language to be interpolated in string using the following syntax: \texttt{\$\{ <expression> \}} where \texttt{<expression>} is a Nix expression.An example of string interpolation is show in listing~\ref{lst:stringInterpolation}.
193+% The Nix Expression Language also allows for arbitrary expressions of the language to be interpolated in string using the following syntax: \texttt{\$\{ <expression> \}} where \texttt{<expression>} is a Nix expression.An example of string interpolation is show in figure~\ref{lst:stringInterpolation}.
154194
155−\begin{Listing}
156− \begin{minipage}{\textwidth}
157− \begin{verbatim}
158−"one is ${ if 1 == 2 then "equal" else "not equal" } to two."
195+% \begin{figure}
196+% \begin{minipage}{\textwidth}
197+% \begin{verbatim}
198+% "one is ${ if 1 == 2 then "equal" else "not equal" } to two."
159199
160−"one is not equal to two."
161− \end{verbatim}
162− \end{minipage}
163− \caption{Nix Expression Language string interpolation example with the resulting string.}
164− \label{lst:stringInterpolation}
165−\end{Listing}
200+% "one is not equal to two."
201+% \end{verbatim}
202+% \end{minipage}
203+% \caption{Nix Expression Language string interpolation example with the resulting string.}
204+% \label{lst:stringInterpolation}
205+% \end{figure}
166206
167207\subsection{Lists}
168208
169−Nix support a list type. List literals are enclosed by square brackets \texttt{[]} and the elements are separated by whitespace. Examples of list literals are shown in listing~\ref{lst:list}.
209+Nix supports a list type. List literals are enclosed by square brackets \texttt{[]}, and the elements are separated by whitespace. Examples of list literals are shown in figure~\ref{lst:list}.
170210
171−\begin{Listing}
211+\begin{figure}
172212 \begin{minipage}{\textwidth}
173213 \begin{verbatim}
174−[1 2 "hello" ../../file.txt https://example.com]
214+[1 2 "hello" ../../file.txt]
175215 \end{verbatim}
176216 \end{minipage}
177217 \caption{Nix Expression Language List literals.}
178218 \label{lst:list}
179−\end{Listing}
219+\end{figure}
180220
181221\subsection{Attribute sets} \label{sec:attrSet}
182222
183−An attribute set is internally implemented as a hashmap with strings as keys where values can be arbitrary expressions. An example attribute set literal is shown in listing~\ref{lst:attrSet}.
223+An attribute set is internally implemented as a hashmap with strings as keys where values can be arbitrary expressions. An example attribute set literal is shown in figure~\ref{lst:attrSet}.
184224
185−\begin{Listing}
225+\begin{figure}
186226 \begin{minipage}{\textwidth}
187227 \begin{verbatim}
188228{ a = 42;
@@ -194,13 +234,46 @@ An attribute set is internally implemented as a hashmap with strings as keys whe
194234 \end{minipage}
195235 \caption{Nix Expression Language attribute set literals.}
196236 \label{lst:attrSet}
197−\end{Listing}
237+\end{figure}
238+
239+Fields (keys) of an attribute set can be accessed through the \emph{dot} (\texttt{.}) operator, as shown in figure~\ref{lst:attrSetAccess}. Accessing an absent field yields a runtime error.
240+
241+\begin{figure}
242+ \begin{minipage}{\textwidth}
243+ \begin{verbatim}
244+{ a = 42;
245+ b = 6 + 9;
246+}.b
247+
248+15
249+ \end{verbatim}
250+ \end{minipage}
251+ \caption{Nix Expression Language attribute set field accessing.}
252+ \label{lst:attrSetAccess}
253+\end{figure}
254+
255+\subsection{Attribute set updates} \label{sec:update}
256+
257+There is a binary \emph{update} operator that takes two \emph{attribute sets} as operands and ``merges'' them in a shallow manner, preferring values from the right operand. The operator is written as two forward slashes \texttt{//}. This has the effect of updating the left operand with values from the right operand. An example is shown in figure~\ref{lst:update}.
258+
259+\begin{figure}
260+ \begin{minipage}{\textwidth}
261+ \begin{verbatim}
262+{x = {a = 1;}; y = 2;}
263+ // {x = "hello"; z = 1.5;}
264+
265+{ x = "hello"; y = 2; z = 1.5; }
266+ \end{verbatim}
267+ \end{minipage}
268+ \caption{Nix Expression Language attribute set updates.}
269+ \label{lst:update}
270+\end{figure}
198271
199272\subsection{Recursive attribute sets} \label{sec:recAttrSet}
200273
201−While ordinary \emph{attribute sets} from discussed in section~\ref{sec:attrSet} can only reference values defined outside of the attribute set literal, \emph{recursive attribute sets} can also reference values defined in the attribute set literal itself. The keys of the attribute set are essentially available in scope of the attribute set values. An example of \emph{recursive attribute set} are given in listing~\ref{lst:recAttrSet}. Note that it is syntactically distiguished form normal \emph{attribute set} literals by the \texttt{rec} key word at the beginning.
274+While ordinary \emph{attribute sets} discussed in section~\ref{sec:attrSet} can only reference values defined outside of the attribute set literal, \emph{recursive attribute sets} can also reference values defined in the attribute set literal itself. The keys of the attribute set are available in the scopes of the attribute set values. An example \emph{recursive attribute set} is given in figure~\ref{lst:recAttrSet}. Note that it is syntactically distinguished from normal \emph{attribute set} literals by the \texttt{rec} keyword at the beginning.
202275
203−\begin{Listing}
276+\begin{figure}
204277 \begin{minipage}{\textwidth}
205278 \begin{verbatim}
206279rec {
@@ -213,13 +286,13 @@ rec {
213286 \end{minipage}
214287 \caption{Nix Expression Language recursive attribute set literals.}
215288 \label{lst:recAttrSet}
216−\end{Listing}
289+\end{figure}
217290
218291\subsection{Let expressions} \label{sec:let}
219292
220−A \emph{let expression} has two parts: the \emph{declarations} and the \emph{body}. The format can be roughly described like so: \texttt{let <definitions> in <body>}. A \emph{let expression} allows us to define values in the \emph{declarations} that can be reused in the \emph{body} of the expression. Just like \emph{recursive attribute sets} from section~\ref{sec:recAttrSet} all declared values are available in scope in the defined expressions. An example of \emph{let expressions} is available in listing~\ref{lst:let}.
293+A \emph{let expression} has two parts: \emph{declarations} and the \emph{body}. The format can be roughly described like so: \texttt{let <definitions> in <body>}. A \emph{let expression} allows us to define values in the \emph{declarations} that can be reused in the \emph{body} of the expression. Just like \emph{recursive attribute sets} from section~\ref{sec:recAttrSet} all declared values are available in scope in the defined expressions. An example of \emph{let expressions} is available in figure~\ref{lst:let}.
221294
222−\begin{Listing}
295+\begin{figure}
223296 \begin{minipage}{\textwidth}
224297 \begin{verbatim}
225298let
@@ -230,13 +303,13 @@ in d
230303 \end{minipage}
231304 \caption{Nix Expression Language \emph{let} expression literals.}
232305 \label{lst:let}
233−\end{Listing}
306+\end{figure}
234307
235−\subsection{With expression}
308+\subsection{With expression} \label{sec:withExp}
236309
237−\emph{With expressions} are a way to bring all values from an \emph{attribute set} into scope. It is conceptually very similar to \emph{let expressions} discussed in section~\ref{sec:let}. The syntax can be roughly describe like so: \texttt{with <set>; <body>} where \texttt{<set>} is an expression which evaluates to an \emph{attribute set} and all values from the set are available as definitions in the \texttt{<body>} expression. An example of a \emph{with expression} can be found in listing~\ref{lst:with}.
310+\emph{With expressions} are a way of bringing all values from an \emph{attribute set} into scope. It is conceptually very similar to \emph{let expressions} discussed in section~\ref{sec:let}. The syntax can be roughly described like so: \texttt{with <set>; <body>} where \texttt{<set>} is an expression which evaluates to an \emph{attribute set} and all values from the set are available as definitions in the \texttt{<body>} expression. An example of a \emph{with expression} can be found in figure~\ref{lst:with}.
238311
239−\begin{Listing}
312+\begin{figure}
240313 \begin{minipage}{\textwidth}
241314 \begin{verbatim}
242315let
@@ -247,32 +320,34 @@ in d
247320 \end{minipage}
248321 \caption{Nix Expression Language \emph{with} expression literals.}
249322 \label{lst:with}
250−\end{Listing}
323+\end{figure}
251324
252−\section{Existing typecheckers}
325+\section{Existing typecheckers implementations}
253326
254−In this section we will examine existing attempts at developing a typechecker for the Nix Expression Language, determine the features of the implemented type systems and assess how well maintained are the implementations.
327+In this section we will examine existing attempts at developing a typechecker for the Nix Expression Language, determine the features of the implemented type systems and assess how well maintained the implementations are.
255328
256329\subsection{regnat/tix} \label{sec:regnat/tix}
257330
258−regnat/tix\footnote{\url{https://github.com/regnat/tix}} is an implementation of typechecker for the \emph{Nix Expression Language} implemented in \emph{OCaml}\footnote{\url{https://ocaml.org}}. The type checker itself is implemented on a different much simpler language named \emph{Nix Light}. To typecheck a normal \emph{Nix} program(expression) the program need to be first converted to an equivalent \emph{Nix Light} program. The type checker has a row-polymorphism-inspired feature: records are represented as a product of one-row types. In \emph{Nix Light} lists are represented as a single-liked heterogeneous list. The type system does not have support for parametric polymorphism in favour of a gradual typing paradigm.
331+regnat/tix\footnote{\url{https://github.com/regnat/tix}} is an implementation of a typechecker for the \emph{Nix Expression Language} implemented in \emph{OCaml}\footnote{\url{https://ocaml.org}}. The type checker itself is implemented on a different much simpler language named \emph{Nix Light}. To typecheck a normal \emph{Nix} program(expression) the program need to be first converted to an equivalent \emph{Nix Light} program. The type checker has a row-polymorphism-inspired feature: records are represented as a product of one-row types. In \emph{Nix Light} lists are represented as a single-linked heterogeneous list. The type system does not have support for parametric polymorphism in favour of a gradual typing paradigm.
259332
260333\parr{Status} The last commit was published in 2017 and the project is now abandoned in favour of regnat/ptyx which we examin in section~\ref{sec:regnat/ptyx}.
261334
262335\subsection{regnat/ptyx} \label{sec:regnat/ptyx}
263336
264−regnat/ptyx\footnote{\url{https://github.com/regnat/ptyx}} is in essence a reimplementation of regnat/tix in Haskell\footnote{\url{https://www.haskell.org}} which we examined in section~\ref{sec:regnat/tix}. The basic ideas and techniques are the same. In fact, so much so, that the simpler language is also called \emph{Nix Light} and \emph{Nix} expression are also converted to it before type checking. There is still no support for parametric polymorphism.
337+regnat/ptyx\footnote{\url{https://github.com/regnat/ptyx}} is in essence a reimplementation of regnat/tix in Haskell\footnote{\url{https://www.haskell.org}} which we examined in section~\ref{sec:regnat/tix}. The basic ideas and techniques are the same. In fact, so much so, that the simpler language is also called \emph{Nix Light} and \emph{Nix} expressions are also converted to it before type checking. There is still no support for parametric polymorphism.
265338
266339\parr{Status} The last commit was published in 2018. Unsupported language features include lists and attribute sets.
267340
268341\subsection{haskell-nix/hnix}
269342
270−haskell-nix/hnix\footnote{\url{https://github.com/haskell-nix/hnix}} is primarily not a typechecker, but rather the goal of the project is to fully reimplement the \emph{Nix Expression Language} interpreter in \emph{Haskell}. There is, however a number of modules dedicated to a typechecker implementation which was migrated into the project. Contrary to how it may seem, the typechecker is not integrated with the rest of the project in any significant way. The type system itself is based on the Hindley-Milner type system. However, the type system was not extended with additional features to better support the dynamic nature of \emph{Nix}. For instance, there is no support for row-polymorphism which greatly impedes typechecking any code that interacts with \emph{attribute sets} in any way.
343+haskell-nix/hnix\footnote{\url{https://github.com/haskell-nix/hnix}} is primarily not a typechecker, but rather the goal of the project is to fully reimplement the \emph{Nix Expression Language} interpreter in \emph{Haskell}. There is, however, a number of modules dedicated to a typechecker implementation which was migrated into the project. Contrary to how it may seem, the typechecker is not integrated with the rest of the project in any significant way. The type system itself is based on the Hindley-Milner type system. However, the type system was not extended with additional features to better support the dynamic nature of \emph{Nix}. For instance, there is no support for row-polymorphism which greatly impedes typechecking code that interacts with \emph{attribute sets} in any way.
271344
272345\parr{Status} Last time the typechecker was modified in any substantial way was in 2019. It does not appear to be actively developed. Furthermore, there is no description of the implemented type system.
273346
274347
275−\section{Existing Approaches}
348+\section{Existing type system research}
349+
350+In this section we will explore existing techniques used to develop typecheckers, and explore how they can be applicable to our implementation.
276351
277352\subsection{Type System Approach}
278353
@@ -302,7 +377,7 @@ In some cases, this approach will likely yield too little information to be usef
302377
303378The original W inference algorithm is a single-stage inference algorithm, meaning that it attempts to satisfy type constraints as soon as it encounters them. A consequence of this is that errors are reported as soon as they are encountered. Often, the information available about the program at the time the error had occurred is very limited due to not all of the program being processed. This leads to poor error reporting.
304379
305−In contrast to the single-stage algorithm, the two-stage algorithm~\cite{jones2005practical,serrano2016type} collects the type constraints as the first stage of type checking and solves the collected constraints as a second step. This leads to most errors occurring during the second stage when all available type information has already been collected. As a result, better type errors are produced. This is the preferable approach for our goals.
380+In contrast to the single-stage algorithm, the two-stage algorithm~\cite{jones2005practical,serrano2016type} collects the type constraints as the first stage of type checking and solves the collected constraints as a second step. This leads to most errors occurring during the second stage when all available type information has already been collected. As a result, better type errors are produced. This is the more preferable approach for our goals.
306381
307382\subsection{Row-Polymorphism}
308383
@@ -310,25 +385,451 @@ One of the language-level constructs in the Nix Expression Language is the ``att
310385
311386There has been some research conducted in the field of type systems with row-polymorphic records~\cite{morris2019abstracting,leijen2005extensible}. The approach that should be taken in developing a static type checker for the Nix Expression Language is describing row-polymorphic attribute sets with a construct similar\footnote{The way it should be displayed to the user will be distinct, since, unlike in Haskell, the Nix Expression Language does not have constraints as a language construct.} to Haskell constraints~\cite{orchard2010haskell}.
312387
313−\subsection{Message Reporting}
388+% \subsection{Message Reporting}
389+
390+% Displaying errors to the user is not as simple as it might initially seem. For the type checker to be as helpful as possible, error messages should display the encountered issues in the language contexts in which they had occurred. Ideally, the errors should point to the exact terms that are most likely problematic.
391+
392+% Even if all of the information necessary for detailed error messages is collected during type checking, displaying errors to the user is a problem that deserves its own research\footnote{This also relates to how types are laid out when displaying to the user even when no errors have occurred.}. The users might have different screen sizes. The error message should reflow all of the displayed text, code, and type annotations to accommodate the available space.
393+
394+% Hughes introduced a general-purpose algebraic pretty-printer~\cite{hughes1995design}, which was later improved upon~\cite{wadler2003prettier}, to solve precisely this problem. Using one of the pretty-printers based on that research is the industry standard and will be used by our type checker.
395+
396+\section{Our Nix type system}
397+
398+As mentioned above, we have opted to use the Damas-Milner type system as a basis for our implementation. Our goal is not just to add types for the sake of types, but give additional reassurance to the developer, and reject as many potentially ``invalid'' programs as possible. If the developed typechecker processes a program without errors, then the program should have no type errors during execution.
399+
400+\subsection{Polymorphism} \label{sec:polymorphism}
401+
402+Dynamic languages have potentially limitless polymorphism – you can pass anything of any type to any function and it can potentially work without errors – it is in principal possible to check the ``types'' of passed values at runtime. This leads to the fact that there is really no way to know which ``types'' are acceptable in which positions without executing the program.
403+
404+The Nix community, just like with any other language, has developed idiomatic ways of solving problems. Some of these idioms are heavily based on polymorphic behavior at runtime. We should strive to develop a type system which supports as much of idiomatic behavior as possible (and where not possible, similar behavior should be expressible within the type system).
405+
406+Parametric polymorphism has proven to strike a nice balance between strictness, expressiveness and type inference. We feel it will be most useful as a type system for \emph{Nix}.
407+
408+Inferring types with parametric polymorphism implies generalizing the inferred types at certain points in the syntax tree. Generalization is also known as ``closing over type variable'' – it can be though of as explicitly choosing a point where the variable is quantified over. Figure~\ref{fig:closing} is an example of closing over a type variable.
314409
315−Displaying errors to the user is not as simple as it might initially seem. For the type checker to be as helpful as possible, error messages should display the encountered issues in the language contexts in which they had occurred. Ideally, the errors should point to the exact terms that are most likely problematic.
410+Traditionally in languages similar to \emph{simply-typed lambda calculus} generalization is performed in \emph{let} declarations – so-called \emph{let-generalization}. \emph{Nix} has a very similar \emph{let} construct as discussed in section~\ref{sec:let} which is also a great point to perform type generalization.
316411
317−Even if all of the information necessary for detailed error messages is collected during type checking, displaying errors to the user is a problem that deserves its own research\footnote{This also relates to how types are laid out when displaying to the user even when no errors have occurred.}. The users might have different screen sizes. The error message should reflow all of the displayed text, code, and type annotations to accommodate the available space.
412+\begin{figure}
318413
319−Hughes introduced a general-purpose algebraic pretty-printer~\cite{hughes1995design}, which was later improved upon~\cite{wadler2003prettier}, to solve precisely this problem. Using one of the pretty-printers based on that research is the industry standard and will be used by our type checker.
414+ \[
415+ (\alpha \rightarrow \beta \rightarrow \alpha) \xrightarrow{\text{close over } \alpha} (\forall \alpha.\; \alpha \rightarrow \beta \rightarrow \alpha)
416+ \]
417+ \caption{An example of closing over $\protect\alpha$. $\protect\beta$ is considered to be an open type variable.}
418+ \label{fig:closing}
419+\end{figure}
420+
421+Apart from \emph{let expressions} Nix also has \emph{attribute sets} discussed in section~\ref{sec:attrSet}, definitions in which are semantically similar to those in \emph{let expressions}. \emph{Attribute set} definitions also seem like a good point for \emph{generalization}.
320422
321−% \subsection{Language Server Architecture}
423+\subsection{Inferring recursive types} \label{sec:recLet}
322424
323−% A Language Server is a server providing language-specific code analysis. It communicates with various code editors using the Language Server Protocol\footnote{\url{https://microsoft.github.io/language-server-protocol/}}.
425+Recursive definitions pose a challenge for type inference without developer-supplied type annotations (which will be the case for the vast majority of code). There are three major approaches to inferring types of recursive definitions:
324426
325−% Language Servers have received wide adoption across a large variety of programming languages. Integrating the developed type checker into a Language Server with ``go-to-definition'' and ``show types on hover'' support would significantly improve the experience of developing in the Nix Expression Language.
427+\begin{enumerate}
428+ \item Infer all recursive definitions as being monomorphic. This is the approach taken in \emph{Standard ML}~\cite{milner1990definition}. The obvious drawback is the fact that types are monomorphic. This is not something we want as discussed in section~\ref{sec:polymorphism}.
429+ \item Analyze the call graph of recursive definitions, separate the definitions into strongly connected components, topologically sort the components, and infer the types of each strongly connected component separately. This is the approach taken in \emph{Haskell}~\cite{damas1982principal}. While this approach yields polymorphic types, it does not produce the ``most polymorphic'' (principal) types.
430+ \item The last implements a more complicated iteration-based type inference algorithm with a user-configurable number of iterations.~\cite{goldberg2000mercury} If the specified number of iterations is not enough to deduce the type of a recursive definition, it is rejected. The clear upside of this approach is that the inferred type (if it is given enough iterations and succeeds) is the principal (most general, most polymorphic) type of the expression.
431+\end{enumerate}
432+
433+While the last approach would allow us to, in theory, type more programs, we feel that tasking the user with configuring the typechecker would make the barrier to entry higher than it needs to be, and in practice the second approach would be useful enough (and faster), so that is the approach we chose to go with.
434+
435+\subsection{Row polymorphism}
436+
437+Nix has first-class hashmaps with strings as keys called \emph{attribute sets} as discussed in section~\ref{sec:attrSet} which are in practice used as structures in much the same way it is done in JavaScript\footnote{\url{https://www.javascript.com}}. This happens because the languages are dynamic and don't afford the programmer the ability to explicitly define custom structure types. Of course, there is the ability to not only create \emph{attribute sets}, but you can also modify existing \emph{attribute sets} as discussed in section~\ref{sec:update}.
438+
439+Of course, since \emph{attribute sets} are used as structures, their internal structure (keys and types of values) has significance and should be tracked in types just like objects and structures are tracked in most statically typed programming languages. Even though it is in most cases implemented as a mechanism that allows the programmer to introduce new types which correspond to a static set of field names and types, and the type system is presented in terms of those types, this is not significantly different from tracking keys directly. In fact, the \emph{Go}\footnote{\url{https://golang.org}} programming language has a notion of \emph{protocols} which bridges the gap between the two paradigms.
440+
441+This leads to a non-trivial typechecking case where modifying a structure leads to the resulting type depending on the type of the input structure as shown in figure~\ref{lst:update_ex}. The figure shows a lambda expression which receives an \emph{attribute set} as input, and updates the field \texttt{a} with the value of \texttt{1}. It quickly becomes problematic to derive a type for this expression if we decide to track fields at the type level: we can say that the lambda takes a value of type \texttt{\{\}} and returns a value of type \texttt{\{a = Integer;\}} (type of functions will later be written as \texttt{<input type> -> <output type>}). This might seem like a natural type to derive, however it is obviously not correct. Calling it with a values of type \texttt{\{b = String;\}} and \texttt{\{b = Float; a = Bool;\}} would both be very much valid, and would both produce different resulting types: \texttt{\{a = Integer; b = String;\}} and \texttt{\{a = Integer; b = Float;\}}. As stated above, the output type of a lambda expression like this depends on the input type.
442+
443+\begin{figure}
444+ \begin{minipage}{\textwidth}
445+ \begin{verbatim}
446+x: x // {a = 1;}
447+ \end{verbatim}
448+ \end{minipage}
449+ \caption{A lambda expression which updates an input set.}
450+ \label{lst:update_ex}
451+\end{figure}
452+
453+This problem is widely known as \emph{row polymorphism}~\cite{wand1991type} – the term \emph{row} refers to a single key-value type pair. Thus, \emph{row polymorphism} is the polymorphism of key-value pairs. This fields has already received some research attention: a recent paper on the topic was written by Morris and McKinna~\cite{morris2019abstracting}. In the paper the authors introduce the \emph{Rose}\footnote{The name is a pun on ``rows'' referring to row polymorphism.} programming language which supports \emph{row polymorphism}.
454+
455+\subsubsection{Rose} \label{sec:rose}
456+
457+In \emph{Rose} row polymorphism is implemented by introducing two predicates on types. The first one denotes a \emph{combination} of two ``record'' types:
458+
459+\begin{equation} \label{eq:combination}
460+ \alpha \odot \beta \sim \gamma
461+\end{equation}
462+
463+
464+where $\alpha$ and $\beta$ are the two types that are being combined and $\gamma$ is the resulting type. The semantics of what \emph{combination} is depend on the semantics of the language itself. Examples include:
465+
466+\begin{enumerate}
467+ \item The two types can not have overlapping rows (combining types with overlapping rows is considered an error), and the resulting type is the union of the rows from the two types.
468+ \item The two types can have overlapping rows, and the resulting type is either a left-biased or right-biased union of the rows from the two types.
469+\end{enumerate}
326470
327−% One of the actively developed language servers is the Haskell Language Server\footnote{\url{https://github.com/haskell/haskell-language-server}}. To manage the complexities of tracking changes in files and dependencies between them, the Haskell Language Server employs the Shake library~\cite{mitchell2012shake}. It is described as an alternative to Make\footnote{\url{https://www.gnu.org/software/make/}} embedded as a DSL into Haskell with the ability to dynamically update the dependency tree, among other improvements.
471+\def\clt{\mathrel{\mathrlap{\bigcirc}\!<\:}}
328472
329−% As it is already tested as the basis for a Language Server implementation, building our Language Server on top of the Shake library seems like the correct architectural decision.
473+The second predicate is:
330474
331−\section{Architecture}
475+\begin{equation}
476+ \alpha \clt \beta
477+\end{equation}
478+
479+where all rows from $\alpha$ are present in $\beta$. This predicate isn't strictly necessary, and can be expressed through predicate~\ref{eq:combination}:
480+
481+\begin{equation}
482+ \alpha \clt \gamma = \exists \beta. \; \beta \odot \alpha \sim \gamma
483+\end{equation}
484+
485+Nevertheless, this predicate was still introduced as it closely matches the language term syntax and simplifies further processing of type.
486+
487+\subsubsection{Row polymophism in Nix} \label{sec:nixRowPoly}
488+
489+When deciding how to represent row polymorphism in Nix it is helpful to examine the base operators which would conjure row-related predicates during type inference. They include:
490+
491+\begin{enumerate}
492+ \item Attribute set field accessing (the \texttt{.} operator) as discussed in section~\ref{sec:attrSet}
493+ \item Attribute set field accessing with a default value (\texttt{\{a = 1;\}.b or 8})
494+ \item Attribute set field presence check (\texttt{\{a = 1;\} ? a})
495+ \item Attribute set updates (the \texttt{//} operator) as discussed in section~\ref{sec:attrSet}
496+\end{enumerate}
497+
498+In terms of the predicates described in section~\ref{sec:rose} the expression \texttt{x: x.a}, which is a lambda expression which return the field \texttt{a} from the attribute set supplied as the argument, would have the following type:
499+
500+\begin{equation}
501+ \forall \alpha \beta. \; (\{ a = \beta; \} \clt \alpha) \Rightarrow \alpha \rightarrow \beta
502+\end{equation}
503+
504+Analogously, the expression \texttt{x: y: x // {a = y;}}, which returns the attribute set supplied as the argument updated with the field \texttt{a} supplied as the second argument, would have the following type:
505+
506+\begin{equation}
507+ \forall \alpha \beta \gamma. \; (\alpha \odot \{ a = \beta; \} \sim \gamma) \Rightarrow \alpha \rightarrow \beta \rightarrow \gamma
508+\end{equation}
509+
510+The types of the other two expressions are not fully expressible with the predicates from \emph{Rose}. This is due to the \emph{Rose} type system not having support for working with missing (optional) rows as it is very dynamic in nature. Nix, on the other hand, being a dynamic language, has full support for introspecting values at runtime, including branching on the presence of a key in an \emph{attribute set} as mentioned before.
511+
512+\subsubsection{Nix row predicates}
513+
514+When deciding how to model the four base row-related operations we decided to derive the predicates from the operations themselves. This would yield simpler types, and having simpler types for base operations leads to simpler types overall. Furthermore, the type system would in all likelihood be easier for Nix developers to use and understand if it is expressed in terms of familiar operations.
515+
516+We will now describe the row predicates we have chosen for Nix. Note the analogy with the enumeration from section~\ref{sec:nixRowPoly}.
517+
518+\newcommand{\update}{\mathbin{/\!\!/}}
519+\newcommand{\optDot}{.\!?}
520+
521+\paragraph{Attribute set field predicate} \label{sec:attrSetPred}
522+
523+\begin{equation} \label{eq:fieldPred}
524+ \alpha. \text{x} = \beta
525+\end{equation}
526+
527+The type $\alpha$ should be an attribute set and it should contain a field $x$ of the type $\beta$. This predicate arises from the use of the \emph{dot operator} (\texttt{.}) as discussed in section~\ref{sec:attrSet}. The syntax was chosen to be analogous to that of the Nix term syntax.
528+
529+The term \texttt{x: x.y} would yield the following type:
530+
531+\begin{equation} \label{eq:dotExample}
532+ \forall \alpha \beta. \; \alpha.\text{y} = \beta \Rightarrow \alpha \rightarrow \beta
533+\end{equation}
534+
535+\paragraph{Optional attribute set field predicate}
536+
537+\begin{equation} \label{eq:optFieldPred}
538+ \alpha \optDot \text{x} = \beta
539+\end{equation}
540+
541+The type $\alpha$ should be an attribute set and if it contains the field $x$, then the type of the field should be $\beta$. This predicate arises from the combination of the \emph{dot operator} (\texttt{.}) and the \emph{or operator} (\texttt{or}) which is used to supply a fallback value if the attribute set does not contain the required field. The syntax was chosen to be analogous to that of the Nix term syntax.
542+
543+The term \texttt{x: x.y or 1} would yield the following type:
544+
545+\begin{equation} \label{eq:optFieldPredExample}
546+ \forall \alpha. \; \alpha \optDot \text{y} = \text{Number} \Rightarrow \alpha \rightarrow \text{Number}
547+\end{equation}
548+
549+This predicate also arises from the use of the \emph{attribute set field presence check operator} (\texttt{?}). In that case the
550+
551+The term \texttt{x: x ? y} would yield the following type:
552+
553+\begin{equation} \label{eq:optFieldPredExample2}
554+ \forall \alpha \beta. \; \alpha \optDot \text{y} = \beta \Rightarrow \alpha \rightarrow \text{Bool}
555+\end{equation}
556+
557+\paragraph{Record update predicate}
558+
559+\begin{equation} \label{eq:upatePred}
560+ \alpha \update \beta \sim \gamma
561+\end{equation}
562+
563+All $\alpha$, $\beta$ and $\gamma$ should be \emph{attribute sets}. The \emph{attribute set} $\gamma$ should contain all fields from both $\alpha$ and $\beta$, preferring the types from $\beta$ if they happen to overlap. That is, if $\alpha$ and $\beta$ both contain a field with the same name, then $\gamma$ should contain the same field with the type from $\beta$. This behavior matches the way the \emph{update operator} (\texttt{//}) works as discussed in section~\ref{sec:update}.
564+
565+The term \texttt{x: y: x // y} would yield the following type:
566+
567+\begin{equation} \label{eq:updatePredExample}
568+ \forall \alpha \beta \gamma. \; \alpha \update \beta \sim \gamma \Rightarrow \alpha \rightarrow \beta \rightarrow \gamma
569+\end{equation}
570+
571+\subsection{Atomic types}
572+
573+Nix is a dynamic language, and as such, allows dynamic coercions between certain types. This means that we can not use the dynamic types from the interpreter to perform static type checking -- if we did that we would reject \emph{a lot} of valid programs.\footnote{``Valid'' not just in the sense that they would not produce runtime errors, but ``valid'' in the sense that the programmer would judge the program as being ``correct''.}
574+
575+For this reason, we will have to define a smaller set of static types that will be employed in our type system. The static types along with the corresponding dynamic types from table~\ref{tab:atomicTypes} are shown in table~\ref{tbl:staticTypes}.
576+
577+\begin{table}[hbp]
578+ \centering
579+ \caption{Mapping from static types to dynamic types}
580+ \begin{tabular}{ ||c||c|| } \hline
581+ \textbf{Static type} & \textbf{Dynamic types} \\ \hline \hline
582+ \multirow{3}{*}{String} & URI \\ \cline{2-2}
583+ & Path literal \\ \cline{2-2}
584+ & String \\ \hline \hline
585+ \multirow{2}{*}{Number} & Integer \\ \cline{2-2}
586+ & Float \\ \hline \hline
587+ Bool & Bool \\ \hline \hline
588+ Null & Null \\ \hline
589+ \end{tabular}
590+ \label{tbl:staticTypes}
591+\end{table}
592+
593+\begin{table*}[hbp]
594+ \centering
595+ \caption{Table of Nix Expression Language operators and their static types}
596+ \begin{tabular}{||c||c||c||c||} \hline
597+ \textbf{Operator} & \textbf{Operator description} & \textbf{Static type} \\ \hline \hline
598+ \texttt{-} & Numeric negation & $\text{Number} \rightarrow \text{Number}$ \\ \hline
599+ \texttt{!} & Boolean negation & $\text{Bool} \rightarrow \text{Bool}$ \\ \hline
600+ \texttt{++} & List concatenation & $\forall \alpha. \; [\alpha] \rightarrow [\alpha] \rightarrow [\alpha]$ \\ \hline
601+ \texttt{==} & Equality & $\forall \alpha. \; \alpha \rightarrow \alpha \rightarrow \text{Bool}$ \\ \hline
602+ \texttt{!=} & Not equality & $\forall \alpha. \; \alpha \rightarrow \alpha \rightarrow \text{Bool}$ \\ \hline
603+ \texttt{<} & Less than & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Bool}$ \\ \hline
604+ \texttt{<=} & Less than or equal & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Bool}$ \\ \hline
605+ \texttt{>} & Greater than & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Bool}$ \\ \hline
606+ \texttt{>=} & Greater than or equal & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Bool}$ \\ \hline
607+ \texttt{+} & Addition & $\forall \alpha. \; \strOrNum \sim \alpha \Rightarrow \alpha \rightarrow \alpha \rightarrow \alpha$ \\ \hline
608+ \texttt{-} & Subtraction & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Number}$ \\ \hline
609+ \texttt{*} & Multiplication & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Number}$ \\ \hline
610+ \texttt{/} & Division & $\text{Number} \rightarrow \text{Number} \rightarrow \text{Number}$ \\ \hline
611+ \texttt{\&\&} & Boolean ``and'' & $\text{Bool} \rightarrow \text{Bool} \rightarrow \text{Bool}$ \\ \hline
612+ \texttt{||||} & Boolean ``and'' & $\text{Bool} \rightarrow \text{Bool} \rightarrow \text{Bool}$ \\ \hline
613+ \texttt{->} & Implication & $\text{Bool} \rightarrow \text{Bool} \rightarrow \text{Bool}$ \\ \hline
614+ \texttt{//} & Attribute set update & $ \forall \alpha \beta \gamma. \; \alpha \update \beta \sim \gamma \Rightarrow \alpha \rightarrow \beta \rightarrow \gamma$ \\ \hline
615+ \end{tabular}
616+ \label{tbl:allOperators}
617+\end{table*}
618+
619+\subsection{Addition} \label{sec:addition}
620+
621+Among all operators, addition (\texttt{+}) has semantics that stand out from the rest: addition can be applied to either two \texttt{Number} operands or two \texttt{String} operands. All other operands are monomorphic in that they can only be applied to two operands of a predefined type. In that sense addition in polymorphic.
622+
623+Since our current implementation does not support sum types (see section~\ref{sec:sumTypes} for more detail), it is non-trivial to encode the type of addition in our current type system. We wanted to encode the type without having to resort to extending the type system too much (without implementing sum types).
624+
625+The simplest approach is to introduce a simple predicate which is satisfied only if the argument is either of type \texttt{Number} or \texttt{String}:
626+
627+\begin{equation}
628+ \strOrNum \sim \alpha
629+\end{equation}
630+
631+With this predicate the type of the addition operator (\texttt{+}) now becomes:
632+
633+\begin{equation}
634+ \forall \alpha. \; \strOrNum \sim \alpha \Rightarrow \alpha \rightarrow \alpha \rightarrow \alpha
635+\end{equation}
636+
637+\subsection{Typing rules}
638+
639+What follows is a formal description of the developed type system. For brevity we have omitted rules for typing literal constant values described in tables \ref{tab:atomicTypes} and \ref{tbl:staticTypes}, and most operators described in table~\ref{tbl:allOperators} as those rules are trivial.
640+
641+\subsubsection{Lists}
642+
643+After doing an informal analysis of existing Nix codebases we have concluded that it is not idiomatic to have heterogeneous lists in Nix. Thus, we have chosen to enforce homogenous lists in our static type system:
644+
645+\begin{equation}
646+ \trfrac
647+ {\Gamma \vdash e_1:\tau \quad \cdots \quad \Gamma \vdash e_n:\tau}
648+ {\Gamma \vdash [e_1 \; \cdots \; e_n ] : [\tau]}
649+\end{equation}
650+
651+\begin{equation}
652+ \trfrac
653+ {\Gamma \vdash e_1:[\tau] \qquad \Gamma \vdash e_2 : [\tau]}
654+ {\Gamma \vdash (e_1 +\!\!+ \: e_2) : [\tau]}
655+\end{equation}
656+
657+\subsubsection{Lambda abstractions}
658+
659+Typing rules for both lambda abstraction definitions and application is common among type system derived from Hindley-Milner:
660+
661+\begin{equation}
662+ \trfrac
663+ {\Gamma \vdash e_1:\tau_1 \rightarrow \tau_2 \qquad \Gamma \vdash e_2 : \tau_1}
664+ {\Gamma \vdash (e_1 \; e_2) : \tau_2}
665+\end{equation}
666+
667+\begin{equation}
668+ \trfrac
669+ {\Gamma, \text{x}: \tau_1 \vdash e : \tau_2}
670+ {\Gamma \vdash (\text{x: } e) : \tau_1 \rightarrow \tau_2}
671+\end{equation}
672+
673+\subsubsection{Addition}
674+
675+The rationale for having a special case for the addition operator is layed out in section~\ref{sec:addition}:
676+
677+\begin{equation}
678+ \trfrac
679+ {\Gamma \vdash e_1:\tau \qquad \Gamma \vdash e_2 : \tau \qquad \Gamma \vdash (\text{String} || \text{Number}) \sim \tau}
680+ {\Gamma \vdash (e_1 + e_2) : \tau}
681+\end{equation}
682+
683+\subsubsection{Conditional expressions}
684+
685+Conditionals are also very similar to what is described in the Hindley–Milner type system:
686+
687+\begin{equation}
688+ \trfrac
689+ {\Gamma \vdash e_1 : \text{Bool} \qquad \Gamma \vdash e_2 : \tau \qquad \Gamma \vdash e_3 : \tau}
690+ {\Gamma \vdash (\text{if} \; e_1 \; \text{then} \; e_2 \; \text{else} \; e_3) : \tau}
691+\end{equation}
692+
693+\subsubsection{\texttt{let}-generalization}
694+
695+Just like in many functional type systems, our type system will support let-generalization -- constants bound in a \texttt{let} expression are generalized as much as possible. All free type variables that were defined while inferring an expression are closed over.
696+
697+A simple version of rule is as follows:
698+
699+\begin{equation} \label{eq:letGeneralization}
700+ \trfrac
701+ {\Gamma \vdash e_1 : \tau_1 \qquad \Gamma, (\text{x}: \forall \{\text{ftv}(\tau_1) - \text{ftv}(\Gamma)\}. \; \tau_1) \vdash e_2 : \tau_2}
702+ {\Gamma \vdash (\text{let} \; \text{x = } e_1; \; \text{in} \; e_2) : \tau_2}
703+\end{equation}
704+
705+where $\text{fvt}(\alpha)$ is the set of all free variables that occur in $\alpha$.
706+
707+Of course, this does not cover all possible syntactic constructs -- it is only concerned with inferring a single declaration. It is trivially extendable to a series of independent declarations. Inferring recursive declarations is discussed in section~\ref{sec:recLet}.
708+
709+Inferring \emph{let expressions} trivially extends to inferring fields of \emph{attribute sets} and is omitted for brevity.
710+
711+\subsubsection{Instantiation}
712+
713+When using expressions with generalized types, we need to instantiate theme to concrete types:
714+
715+\begin{equation}
716+ \trfrac
717+ {\Gamma \vdash e : \forall \alpha. \; \tau_1}
718+ {\Gamma \vdash e: [\alpha \rightarrow \tau_2] \tau_1}
719+\end{equation}
720+
721+where $[\alpha \rightarrow \beta]\gamma$ denotes the result of substituting all free occurrences of $\alpha$ in $\gamma$ with $\beta$.
722+
723+\subsubsection{Attribute sets}
724+
725+Basic \emph{attribute set} operations are now trivially expressible through the predicate defined in section~\ref{sec:attrSetPred}:
726+
727+\begin{equation}
728+ \trfrac
729+ {\Gamma \vdash e_1 : \tau_1 \qquad \Gamma \vdash e_2 : \tau_2 \qquad \Gamma \vdash \tau_1 \update \tau_2 \sim \tau_3}
730+ {\Gamma \vdash (e_1 \update e_2) : \tau_3}
731+\end{equation}
732+
733+\begin{equation}
734+ \trfrac
735+ {\Gamma \vdash e.\text{x} = \tau}
736+ {\Gamma \vdash (e.\text{x}) : \tau}
737+\end{equation}
738+
739+\begin{equation}
740+ \trfrac
741+ {\Gamma \vdash e_2 : \tau \qquad \Gamma \vdash e_1 \optDot \text{x} = \tau}
742+ {\Gamma \vdash (e.\text{x} \; \text{or} \; e_2) : \tau}
743+\end{equation}
744+
745+\begin{equation}
746+ \trfrac
747+ {\Gamma \vdash e \optDot \text{x} = \tau}
748+ {\Gamma \vdash (e \; \text{?} \; \text{x}) : \text{Bool}}
749+\end{equation}
750+
751+When defining typing rules for \emph{attribute sets} we will use the notion of rows similar to what is used in the \emph{Rose} paper~\cite{morris2019abstracting}: for typing purposes an attribute set will be defined as a product of a set of \emph{rows} – key-value pairs: $\Pi \xi$ where $\xi$ is a set of \emph{rows}.
752+
753+A key-value pair will be denoted as $\text{x} = \alpha$ where `x' is the name of a field and $\alpha$ is the type of the field.
754+
755+Of course, a \emph{set of rows} can not contain multiple \emph{rows} with the same key.
756+
757+With that we can define how those predicate are actually satisfied:
758+
759+\begin{equation}
760+ \trfrac
761+ {(\text{x} = \tau) \in \xi}
762+ {(\Pi \xi).\text{x} = \tau}
763+\end{equation}
764+
765+\begin{equation}
766+ \trfrac
767+ {\text{x} \notin \xi}
768+ {(\Pi \xi) \optDot \text{x} = \tau}
769+\end{equation}
770+
771+\begin{equation}
772+ \trfrac
773+ {\Gamma \vdash \tau_1.\text{x} = \tau_2}
774+ {\Gamma \vdash (\tau_1 \optDot \text{x}) = \tau_2}
775+\end{equation}
776+
777+where $(\text{x} = \tau) \in \xi$ denotes the presence of the \emph{row} $(\text{x} = \tau)$ in the \emph{set} $\xi$, and $\text{x} \notin \xi$ denotes the absence of a \emph{row} with the key `x' in the \emph{set} $\xi$.
778+
779+The definition of the ``update'' predicate uses standard set comprehension notation:
780+
781+\begin{equation}
782+ \trfrac
783+ {}
784+ {\Pi \xi_1 \update \Pi \xi_2 \sim \Pi (\xi_2 \cup \{a = \tau || (a = \tau) \leftarrow \xi_1, a \notin \xi_2\})}
785+\end{equation}
786+
787+\subsubsection{with expressions} \label{sec:withExprType}
788+
789+\emph{with expressions} discussed in section~\ref{sec:withExp} are not difficult to define a typing rule for:
790+
791+\begin{equation}
792+ \trfrac
793+ {\Gamma \vdash e_1: \Pi \xi \qquad \Gamma, \xi \vdash e_2 : \tau}
794+ {\Gamma \vdash (\text{with } e_1\text{; } e_2) : \tau}
795+\end{equation}
796+
797+\emph{with expressions} do, however, pose a particularly hard problem when implementing the type system – we can't always statically know the fields in $e_1$ -- it can be passed in as a function argument. This means that the typing environment of a function can depend on its argument. Implementing this in a wholistic manner would require our type system support a form of dependent types. That is not a direction we want to pursue -- introducing dependent types would greatly complicate the type system to a point where automated type inference would not practical and the type system would be a lot harder to work with.
798+
799+Instead, we opted to define a heuristic which in our testing was proven to cover most practical cases: when encountering a variable in the body of a \emph{with expression}:
800+
801+\begin{enumerate}
802+ \item if a variable was defined in the body of the with expression and is in scope, return that type
803+ \item if the \emph{attribute set} from the \emph{with expression} is statically known and defined a key with the appropriate name then return that types
804+ \item if the \emph{attribute set} from the \emph{with expression} is not statically known and the outer context of the \emph{with expression} contains a variable with the appropriate name, return that type
805+ \item else, create a constraint that the first operand in the \emph{with expression} contains a field with the appropriate name and type
806+\end{enumerate}
807+
808+\section{Implementation} \label{sec:implementation}
809+
810+In this section we will explore the techniques employed in our implementation~\cite{github-source} of our type system. It is implemented in the \emph{Haskell}\footnote{\url{https://www.haskell.org}} programming language.
811+
812+% \subsubsection{Effects}
813+
814+% Our implementation uses the \emph{freer-simple}\footnote{\url{https://github.com/lexi-lambda/freer-simple}} library as the effects system.
815+
816+% The
817+
818+% \begin{code}
819+% type InferEffs =
820+% !! [ Fresh,
821+% Reader SrcSpan,
822+% Writer (SrcSpan, Errors),
823+% Writer PredicateError,
824+% Writer Pred,
825+% State (MKM.Map Pred),
826+% VariableMapEff,
827+% Writer UnifyingError,
828+% Writer InferError,
829+% State Substitution,
830+% TreeTracer
831+% ]
832+% \end{code}
332833
333834\subsection{Effect system}
334835
@@ -336,68 +837,379 @@ Hughes introduced a general-purpose algebraic pretty-printer~\cite{hughes1995des
336837
337838Developing a typechecker requires working with a large amount of non-trivial algorithms which influence each other in complex ways. A widespread way of dealing with such situations is introducing a common computational environment through which different parts of the program can interact (instead of ``manually'' passing state around). A well-established way of handling state in purely functional programming languages is the \emph{Monad} abstraction~\cite{moggi1988computational}.
338839
339−It is natural to want to abstract of the underlying monad – explicitly declare what features a function actually needs the monad to have. Furthermore, it is desireable to decompose the features of the a monad not only in function definitions, but also at the call site – it is desireable to be able to conjure up monads with desireable traits in an as-hoc manner. This has been achieved a while ago with \emph{monad transformers}~\cite{liang1995monad}.
840+It is natural to want to abstract the underlying monad – explicitly declare what features a function actually needs the monad to have. Furthermore, it is desireable to decompose the features of the a monad not only in function definitions, but also at the call site – it is desireable to be able to conjure up monads with desireable traits in an ad-hoc manner. This has been achieved a while ago with \emph{monad transformers}~\cite{liang1995monad}.
340841
341−A drawback of monad transformers is their somewhat rigid nature – every behavior a monad needs to have needs to be defined as a distinct transformer with appropriate instances. The instances need to only implement the desired behavior, but also explicitly ``pass through'' \emph{all} other effects that it might be used in combination with. This means that adding extra behavior leads to a large amount of boilerplate. Furthermore, monads themselves (monad transformers) are not in general composable, leading a whole other set of problems. In addition, it is cumbersome to locally change parts of the underlying implementation of a monad dynamically – it might be useful to tweak some behavior in only part of an algorithm, leaving the rest to the abstract implementation; monad transformers don't really have such capabilities.
842+A drawback of monad transformers is their somewhat rigid nature – every behavior a monad needs to have needs to be defined as a distinct transformer with appropriate instances. The instances need to not only implement the desired behavior, but also explicitly ``pass through'' \emph{all} other effects that it might be used in combination with. This means that adding extra behavior leads to a large amount of boilerplate. Furthermore, monads themselves (monad transformers) are not in general composable, leading to a whole other set of problems. In addition, it is cumbersome to locally change parts of the underlying implementation of a monad dynamically – it might be useful to tweak some behavior in only a part of an algorithm, leaving the rest to the abstract implementation; monad transformers don't really have such capabilities.
342843
343844\subsubsection{Free monad extensible effects}
344845
345−Recently a ne aprproach to effect systems has been getting more attention – \emph{free monads algebraic effects}~\cite{kiselyov2015freer, ploeg2014reflection, kiselyov2013extensible}. This approach solves the problems with monad transformers mentioned above. Rather than being transformers, effects are described as \emph{functors}. The composability problem is resolved due to functors being in general composable. Contrary to how monad transformers operate, effects (or their carriers) in \emph{free monads algebraic effects} (we will from now on refer to them as just \emph{algebraic effects}) don't have any particulare inrpretation of the effect associated with them. Effects are interpreted in an ad-hoc way at the call site. Furthermore this allows us to dynamically modify the behavior of effects without changing the types or implementations of functions we wish to change the behavior of. How we use \emph{algebraic effects} will be discussed in more detail in section~\ref{sec:implementation}.
846+Recently a new approach to effect systems has been getting more attention – \emph{free monads algebraic effects}~\cite{kiselyov2015freer, ploeg2014reflection, kiselyov2013extensible}. This approach solves the problems with monad transformers mentioned above. Rather than being transformers, effects are described as \emph{functors}. The composability problem is resolved due to functors being in general composable. Contrary to how monad transformers operate, effects (or their carriers) in \emph{free monads algebraic effects} (we will from now on refer to them as just \emph{algebraic effects}) don't have any particular interpretation of the effect associated with them. Effects are interpreted in an ad-hoc manner at the call site. Furthermore, this allows us to dynamically modify the behavior of effects without changing the types or implementations of functions we wish to change the behavior of.
847+% How we use \emph{algebraic effects} will be discussed in more detail in section~\ref{sec:implementation}.
346848
347−\subsection{Type system}
849+\subsection{Substitutions}
348850
349−As mentioned above, we have opted to use the Damas-Milner type system as a basis for our implementation. Our goal is not to just add types for the sake of types, but give additional reassurance to the developer, and reject as many potentially ``invalid'' programs as possible. If the developer typechecker processes a program without errors, then the program should have no type errors during execution.
851+\subsubsection{Substitutions in other implementations}
350852
351−\subsection{Polymorphism} \label{sec:polymorphism}
853+In most typechecker implementations a substitution is a mapping from \emph{type variables} to \emph{types}. These substitutions are usually generated during the unification of type constraints and are, in general, applied to types as soon as they are available.
352854
353−Dynamic languages have potenitally limitless polymorphism – you can pass anything of any types to any function and it can potentially work without errors – it is in principal possible to check the ``types'' of passed values at runtime. This leads to the fact that there is really no way to know which ``types'' are acceptable in which positions without executing the program.
855+The notion of substitution composition is usually taken to mean a binary operation which produces a new substitution that when applied (|sub|) to a type would produce the same result as sequentially applying the two source substitutions:
354856
355−The Nix community, just like with any other language, has developed idiomatic ways of solving problems. Some of these idioms are heavily based on polymorphic behavior at runtime. We should strive to develop a type system which supports as much of idiomatic behavior as possible (and where not possible, similar behavior should be expressible within the type system).
857+\begin{code}
858+sub (s1 . s2) = sub s1 . sub s2
859+\end{code}
356860
357−Parametric polymorphism has proven to strike a nice balance between strictness, expressiveness and type inference. We feel it will be most useful as a type system for \emph{Nix}.
861+\subsubsection{Substitutions in our implementation}
358862
359−Inferring types with parametric polymorphism implies generalizing the inferred types at certain points in the program. Generalization is also known as ``closing over type variable'' – it can be though of as explicitly choosing a point where the variable is quantified over. Figure~\ref{fig:closing} is an example of closing for a type variable.
863+In our implementation the application of substitutions is delayed as much as possible. They are applied in exactly two cases:
360864
361−Traditionally in languages similar to \emph{simply-typed lambda calculus} generalization is performed in \emph{let} declarations – so-called \emph{let-generalization}. \emph{Nix} has a very similar \emph{let} construct as discussed in section~\ref{sec:let} which is also a great point to perform type generalization.
865+\begin{enumerate}
866+ \item Right before unifying a constraint
867+ \item Right before closing over a type
868+\end{enumerate}
869+
870+This choice has several implications. Firstly, we can never have conflicting ``keys'' in substitutions (which is not the case in other implementations). Using this information we can define stronger substitution composition:
871+
872+\begin{code}
873+newtype Substitution = Substitution
874+ {unSubstitution :: Map TypeVariable NType}
875+
876+instance Semigroup Substitution where
877+ a'@(Substitution a) <> b'@(Substitution b) =
878+ Substitution $ M.unionWith undefined
879+ (fmap (sub b') a)
880+ (fmap (sub a') b)
881+\end{code}
882+
883+
884+This means that the order of composition does no longer matter, and applying the composition of substitutions yields more information than applying them sequentially.
885+
886+Another consequence of the decision to delay substitutions is that now the role of the |infer| step of typechecking only does the following three things:
887+
888+\begin{enumerate}
889+ \item returns a type variable that represents the type of the expression being inferred
890+ \item emits constraints generated during inferring
891+ \item emits predicates generated during inferring
892+\end{enumerate}
893+
894+\subsection{Typing context}
895+
896+The typing context in our implementation, in essence, consists of two distinct data structures:
897+
898+\begin{enumerate}
899+ \item the types of variables currently in scope
900+ \item the predicates which are applicable to those types
901+\end{enumerate}
902+
903+\subsubsection{Variables in scope}
904+
905+Note that in practice, the ``variables in scope'' data structure only needs to contain type variables since we apply substitutions as late as possible.
906+
907+In actual fact, due to the heuristics described in section~\ref{sec:withExprType}, the types of variables in scope can not be represented as a static data structure but rather is implemented as a scoped effect\footnote{Effects in our case are implemented using the \emph{freer-simple} library: \url{https://github.com/lexi-lambda/freer-simple}}:
908+
909+\begin{code}
910+data VariableMapEff x where
911+ LookupVariable
912+ :: VarName
913+ -> VariableMapEff (Maybe Scheme)
914+
915+lookupVar
916+ :: Member VariableMapEff eff
917+ => VarName -> Eff eff (Maybe Scheme)
918+lookupVar = send . LookupVariable
919+\end{code}
920+
921+This allows us to dynamically redefine what it means to look up a variable in terms of its implementation in the outer context.
922+
923+\subsubsection{Predicates}
924+
925+Predicates can, on the other hand, be stored as a static data structure. The only non-standard behavior is that the set of predicates needs to be queried and manipulated based on the types that they contain rather than on the predicates themselves.
926+
927+For this reason, we have developed a data structure we call ``multi-keyed map''.
928+
929+\begin{code}
930+class (Ord (Key t), Ord t) => Keyable t where
931+ type Key t :: Type
932+ getKeys :: t -> [Key t]
933+
934+data MultiKeyedMap t = MultiKeyedMap
935+ (M.Map (Key t) (S.Set t)) (S.Set t)
936+\end{code}
937+
938+The data structure is the product of two other data structures:
939+
940+\begin{enumerate}
941+ \item A map, mapping possible keys of the stored |t| to a set of values that contain the given key
942+ \item A set that contains the values that don't contain any keys
943+\end{enumerate}
944+
945+The |Keyable| typeclass is used to extract the keys from the values that need to be stored.
946+
947+The union of two maps is defined trivially -- by taking the union of the inner structures:
948+
949+\begin{code}
950+instance (Ord (Key t), Ord t)
951+ => Semigroup (MultiKeyedMap t) where
952+ (MultiKeyedMap x x') <> (MultiKeyedMap y y') =
953+ MultiKeyedMap
954+ (M.unionWith S.union x y) (x' <> y')
955+\end{code}
956+
957+Creating a singleton map from a single values is defined like so:
958+
959+\begin{code}
960+singleton :: Keyable t => t -> MultiKeyedMap t
961+singleton t = case getKeys t of
962+ [] -> MultiKeyedMap M.empty (S.singleton t)
963+ ks@(_ : _) -> MultiKeyedMap
964+ (M.fromList $ fmap (,s) ks) S.empty
965+ where
966+ s = S.singleton t
967+\end{code}
968+
969+With these operations defining the |insert| operation becomes trivial:
970+
971+\begin{code}
972+insert
973+ :: Keyable t
974+ => t -> MultiKeyedMap t -> MultiKeyedMap t
975+insert t m = m <> singleton t
976+\end{code}
977+
978+Now we come to the lookup operation. Note that the algorithmic complexity of querying the predicates by a type they contain is now the cost of an ordinary map lookup -- $O(log(n))$ where $n$ is the number of values contained in the map (in our case the number of all types referenced from within the predicates):
979+
980+\begin{code}
981+lookup
982+ :: Keyable t
983+ => Key t -> MultiKeyedMap t -> S.Set t
984+lookup k (MultiKeyedMap m _) =
985+ fromMaybe S.empty $ M.lookup k m
986+\end{code}
987+
988+\subsection{Closing over type variables}
989+
990+An observation we can make is the following: it only makes sense to close over the type variables that were generated during the inference of the type we are closing over. Any other type variables either:
991+
992+\begin{enumerate}
993+ \item are not present in the type
994+ \item are used in an outer lexical scope (environment)
995+\end{enumerate}
996+
997+This greatly simplifies implementing the typing rule~\ref{eq:letGeneralization} since instead of having to calculate a set of free type variables of the whole context, we only need to obtain a predicate that identifies if a type variable was introduced during the inference of an expression. This is made even easier if type variables are internally represented as integers, as they often are.
998+
999+In our case, this is complicated by the fact that we need to introduce type variables which are fields of an \emph{attribute set} from an outer lexical scope. This is problematic because while the type variable can be defined during inference, it is actually logically defined at the same position as the initial \emph{attribute set}; it has the same lexical scope as the \emph{attribute set}. So, the lexical scope of a type variable can not be derived from the inference context of an expression.
1000+
1001+A solution we came up with is to have two ways a type variable can be constructed -- as an ordinary type variable backed by a single integer or as a sub-type variable that has the same lexical scope as another type variable:
1002+
1003+\begin{code}
1004+data TypeVariable
1005+ = TypeVariable Int
1006+ | SubTypeVariable Int Int
1007+\end{code}
1008+
1009+This way, when applying a predicate to check the lexical scope of a type variable, we can always restrict ourselves to the first integer.
1010+
1011+\section{Evaluation of our implementation}
1012+
1013+In this section, we will examine how our implementation of the typechecker behaves on real input.
1014+
1015+\subsection{Evaluating nixpkgs}
1016+
1017+To evaluate our typechecker implementation~\cite{github-source}, we collected \emph{Nix} source files from the largest \emph{Nix} package repository – \emph{nixpkgs}\footnote{\url{https://github.com/NixOS/nixpkgs}}. Due to our current implementation not supporting file imports (file imports are the responsibility of the system calling the typechecker, not the type checker itself), the files were filtered down to those that do not contain import statements.
1018+
1019+Running our typechecker on the test set of \emph{Nix} source files results in \emph{1963} out of \emph{2948} (67\%) typechecking with no type errors.
1020+
1021+We believe this is a very good result since the files were not prepared in any way and were taken as-is from the package repository. Furthermore, it is important to note that rejecting a portion of ``valid'' programs is an unavoidable property of static typecheckers.
1022+
1023+We would also like to point out that even in those cases when type errors were encountered during typechecking, the typechecker still produces output types that can be useful to the developer and can be used for further typechecking of larger expressions (though providing fewer guarantees).
1024+
1025+\subsection{Evaluating common expressions}
1026+
1027+We will now examine a few language constructs to see how our typechecker handles them and what errors it can detect.
1028+
1029+\subsubsection{Script interpreters}
1030+
1031+In listing~\ref{lst:interpreters} we present a sample script that demonstrates our type inference algorithm.
1032+
1033+The function \texttt{getScriptInterpreters} takes a single ``package'' structure and returns a list of interpreters used in the scripts of the package. Out type inference algorithm correctly infers the following type of the function:
1034+
1035+\begin{equation}
1036+ \forall \alpha \beta \gamma. \; (\alpha. \text{scripts} = [\beta], \beta. \text{interpreter} = \gamma) \Rightarrow \alpha \rightarrow [\gamma]
1037+\end{equation}
1038+
1039+The constant \texttt{package} contains a sample ``package'' structure with three scripts. In real code, the structure would be a lot more complex, but it is simplified for brevity.
1040+
1041+The result of the whole expression (applying \texttt{getScriptInterpreters} to \texttt{package}) is correctly inferred by our type checker to have the type:
1042+
1043+\begin{equation}
1044+ [\text{String}]
1045+\end{equation}
3621046
3631047\begin{figure}
1048+ \begin{minipage}{\textwidth}
1049+ \begin{verbatim}
1050+let getScriptInterpreters = x:
1051+ builtins.map
1052+ (y: y.interpreter)
1053+ x.scripts;
1054+ package = {
1055+ scripts = [
1056+ {interpreter = "bash";}
1057+ {interpreter = "zsh";}
1058+ {interpreter = "fish";}
1059+ ];
1060+ };
1061+in getScriptInterpreters package
1062+\end{verbatim}
1063+ \end{minipage}
1064+ \caption{A sample nix program which gathers all interpreters used by a script in a package.}
1065+ \label{lst:interpreters}
1066+\end{figure}
3641067
365− \[
366− (\alpha \rightarrow \beta \rightarrow \alpha) \xrightarrow{\text{close over } \alpha} (\forall \alpha.\; \alpha \rightarrow \beta \rightarrow \alpha)
367− \]
368− \caption{An example of closing over $\protect\alpha$. $\protect\beta$ is considered to be an open type variable.}
369− \label{fig:closing}
1068+If a programmer makes a certain class of mistakes when developing the program, our typechecker would report an error. For example, the programmer might forget to access the ``scripts'' field of the package and pass the whole package by accident:
1069+
1070+\begin{verbatim}
1071+getScriptInterpreters =
1072+ x: builtins.map (y: y.interpreter) x;
1073+\end{verbatim}
1074+
1075+In that case, when evaluating the whole expression from listing~\ref{lst:interpreters}, he would receive the following error from the typechecker: ``could not match list with type \texttt{\{scripts = [{interpreter = String;}]\}}''. This error is a result of trying to \texttt{map} over an attribute set.
1076+
1077+\subsubsection{Haskell packages}
1078+
1079+In listing~\ref{lst:haskellPackages}, we defined a function \texttt{haskellPackage} that takes parameters for a Haskell package and returns a configuration that might describe how to build the package. Out tool correctly infers the type of the function:
1080+
1081+\begin{equation}
1082+ \begin{aligned}
1083+ \forall \alpha \beta. \; &
1084+ \\ ( & \alpha \optDot \text{compilerFlags} = [\text{String}],
1085+ \\ & \alpha \optDot \text{compilerVersion} = \text{String},
1086+ \\ & \alpha.\text{src} = \beta)
1087+ \\ \Rightarrow & \alpha
1088+ \\ \rightarrow & \{ \text{compiler} = \text{String};
1089+ \\ & \text{compilerFlags} = [\text{String}];
1090+ \\ & \text{src} = \beta; \}
1091+ \end{aligned}
1092+\end{equation}
1093+
1094+By the derived type of the function, we can clearly see that the \texttt{compilerFlags} and \texttt{compilerVersion} fields of the input attribute set are optional.
1095+
1096+The result of the whole expression is a list of applications of the \texttt{haskellPackage} function to multiple configurations. Ou implementation correctly infers the following type:
1097+
1098+\begin{equation}
1099+ [{\text{compiler} = \text{String}; \text{compilerFlags} = [\text{String}]; \text{src} = \text{String};}]
1100+\end{equation}
1101+
1102+\begin{figure}
1103+ \begin{minipage}{\textwidth}
1104+ \begin{verbatim}
1105+let haskellPackage = x: {
1106+ compiler = "ghc" + (x.compilerVersion or "900");
1107+ inherit (x) src;
1108+ compilerFlags = x.compilerFlags or ["-O3" "-j"];
1109+};
1110+in [
1111+ (haskellPackage {
1112+ src = ./project-m36;
1113+ compilerVersion = "865";
1114+ })
1115+ (haskellPackage {
1116+ src = ./pandoc;
1117+ compilerFlags = ["-static"];
1118+ })
1119+]
1120+ \end{verbatim}
1121+ \end{minipage}
1122+ \caption{A sample nix program which defined several haskell packages..}
1123+ \label{lst:haskellPackages}
3701124\end{figure}
3711125
372−Apart from \emph{let expression} Nix also has \emph{attribute sets} discussed in section~\ref{sec:attrSet}, definitions in which are semantically similar to those in \emph{let expressions}. \emph{Attribute set} definitions also seem like a good point for \emph{generalization}.
1126+A mistake that is easy to make here is to forget to quote the \texttt{compilerVersion} field, leading to the type being `Number' instead of `String'. In that case, our implementation will convey exactly that in an error.
3731127
374−\subsection{Inferring recursive types}
1128+Another common mistake is specifying the \texttt{compilerFlags} field as a single `String' instead of a list. In that case, our implementation will emit an appropriate error without the need to execute the expression.
3751129
376−Recursive definitions pose a challenge for type inference without developer-supplied type annotations (which will be the case for the vast majority of code). There are three major approaches to inferring types of recursive definitions:
1130+\section{Possible improvements}
1131+
1132+\subsection{Making predicates more user-friendly}
1133+
1134+\subsubsection{A novel technique}
1135+
1136+The reader might observe that, although the predicates have a parallel with the Nix term syntax, visually parsing predicates and mentally applying them to the specified type variables can be difficult even in such simple examples. Here we will explore a technique that can be used to make these predicates easier for the programmer to work with.
1137+
1138+The technique is based on the fact that a type variable by itself can only convey the following information:
3771139
3781140\begin{enumerate}
379− \item Infer all recursive definitions as being monomorphic. This is the approach taken in \emph{Standard ML}~\cite{milner1990definition}. The obvious drawback is the fact that types are monomorphic. This is not something we want as discussed in section~\ref{sec:polymorphism}.
380− \item Analyze the call graph of recursive definitions, separate the definitions into strongly connected components, topologically sort the components, and infer the types of each strongly connected component separately. This is the approach taken in \emph{Haskell}~\cite{damas1982principal}. While this approach yields polymorphic types, it does not produce the ``most polymorphic'' (principal) types.
381− \item The last implements a more complicated iteration-based type inference algorithm with a user-configurable number of iterations.~\cite{goldberg2000mercury} If the specified number of iterations is not enough to deduce the type of a recursive definition, it is rejected. The clear upside of this approach is that the inferred type (if it is given enough iterations and succeeds) is the principal (most general, most polymorphic) type of the expression.
1141+ \item positional information -- a specific position in a type
1142+ \item identity information -- the type variable is equivalent to other type variables with the same name within the scope where it is declared
3821143\end{enumerate}
3831144
384−While the last approach would allow us to in theory type more programs, we feel that tasking the user with configuring the typechecker would make the barrier to entry higher than it needs, and in practice the second approach would be useful enough (and faster), so that is the approach we chose to go with.
1145+Note that all of what follows is only concerned with syntactic constructs. It does in no way alter the semantic of the predicates described above.
3851146
386−\subsection{Row-polymorphism}
1147+We would like to point out that all of the predicates have an operand which is the ``result'' of the predicate -- a single type variable that is said to be equivalent to a more complex expression. That is $\beta$ in predicates \ref{eq:fieldPred} and \ref{eq:optFieldPred}, and $\gamma$ in predicate \ref{eq:upatePred}.
3871148
388−\section{Implementation} \label{sec:implementation}
1149+The observation we need to make is that \emph{referential transparency}\footnote{\url{https://en.wikipedia.org/wiki/Referential_transparency}} is a natural notion in functional programming languages like Nix, and it is natural to replace variables with their definitions. In some sense, the ``results'' of predicates described above can be interpreted as being ``defined'' by the predicate to be ``equal'' to the combination of the other operands and, as such, can be replaced with their definitions.
1150+
1151+This means that we can syntactically replace \emph{type variables} with a portion of a predicate -- replace the variable with the definition. If we apply this technique to the type~\ref{eq:dotExample}, we get the following type:
1152+
1153+\begin{equation}
1154+ \forall \alpha. \; \alpha \rightarrow \alpha.\text{y}
1155+\end{equation}
1156+
1157+When applied to the type~\ref{eq:updatePredExample}, it yields:
3891158
390−\section{Conclusion}
1159+\begin{equation}
1160+ \forall \alpha \beta. \; \alpha \rightarrow \beta \rightarrow (\alpha \update \beta)
1161+\end{equation}
1162+
1163+We believe the derived types above are a lot easier to understand than their initial counterparts.
1164+
1165+\subsubsection{Implementation notes}
1166+
1167+For practical reasons, when applying the technique, there should be a threshold that limits the syntactic complexity of types that can be ``inlined''. This is due to the types being potentially as big as literals in the source expressions.
1168+
1169+The complexity of types should also be used as a heuristic in cases where there are multiple potential ``definitions'' for the same type variable – it is preferable to use the ``definitions'' with the lowest syntactic complexity as it leads to simpler types.
1170+
1171+\subsubsection{Limitations}
1172+
1173+The technique is not applicable if the ``result'' of a predicate is not a type variable like in type \ref{eq:optFieldPredExample2}.
1174+
1175+Another limitation is that we can not remove predicates if their ``result'' type variable is not present in the head of the type like in type \ref{eq:optFieldPredExample}, since we would be losing typing information by doing so.
1176+
1177+\subsection{Type hints}
1178+
1179+Dynamic types in Nix contain more information than our static type system can convey. A usability improvement to provide more utility to the programmer might be to allow extra information to be tagged onto type information and propagated during type inference. This information would not influence the typechecking algorithm in any way. It would only provide utility to the person reading the resulting types or to external tools.
1180+
1181+Some information that might be useful as type hints:
1182+
1183+\begin{enumerate}
1184+ \item The dynamic type of strings (URI, Path, etc.) – useful information for the programmer
1185+ \item Programmer-supplied annotations. When writing nix expressions, it is common practice to have a program in some other programming language embedded in Nix as a string literal. It would be useful to propagate information about the underlying programming language to aid IDEs -- they could enable special syntax highlighting and linting based on the programming language.
1186+\end{enumerate}
1187+
1188+\subsection{Sum types} \label{sec:sumTypes}
1189+
1190+In our static type system, we introduced a ``special case'' for the \emph{addition operator} as it could be applied to a number of different types.
1191+
1192+The idea of this improvement is to generalize the case and allow the type system to handle arbitrary sums of arbitrary types. This can be implemented as a predicate stating that a type variable can be a certain type:
1193+
1194+\begin{equation}
1195+ \alpha \lessdot \beta
1196+\end{equation}
1197+
1198+where $\beta$ can be the type $\alpha$. With this predicate, our ``String or Number'' predicate can be expressed like so:
1199+
1200+\begin{equation}
1201+ \strOrNum \sim \alpha = (\text{String} \lessdot \alpha, \text{Number} \lessdot \alpha)
1202+\end{equation}
3911203
392−Nix is a rapidly growing ecosystem. At the time of writing, nixpkgs, the Nix package registry, contains over 60000 packages\footnote{\url{https://github.com/NixOS/nixpkgs}} that can be either installed or used as dependencies in other projects. There is much interest in the approach used by Nix, and making the ever-growing codebase of configurations easier to manage and extend would be a welcome development.
1204+\section*{Conclusion}
3931205
394−Even though the developed type checker will need to check code for an existing dynamic language, and no type checker can cover all of the valid cases, producing false negatives, covering most of the cases encountered in practice would be useful enough to be worth using. Furthermore, plenty of research has already been conducted on which the Nix Expression Language type checker can be based.
1206+In this paper, we have examined the existing approaches which have been used in developing type systems for functional programming languages. We have then adapted the existing approaches and developed a new static type system for the Nix Expression Language. We have also developed a preliminary implementation of our type system, which we tested on an existing codebase. We have also outlined further practical improvements to our implementation, which could improve the developer experience.
3951207
3961208\newpage
3971209
398−\bibliographystyle{gost2008}
1210+\bibliographystyle{IEEEtran}
3991211\bibliography{bibl}
4001212
401−\registrationList
1213+% \registrationList
4021214
4031215\end{document}
docs/pres_2/img/ter.png

Binary file not shown.

docs/pres_2/pres.md+52−52
@@ -20,8 +20,9 @@ _Supervisor:_ Victor Kuliamin, Associate Professor, PhD
2020
2121---
2222
23−> Nix is a powerful package manager that makes package management reliable and reproducible.
24−-- [nixos.org](https://nixos.org)
23+## Nix is a powerful package manager that makes package management reliable and reproducible.
24+
25+#### – [nixos.org](https://nixos.org)
2526
2627---
2728
@@ -65,10 +66,12 @@ in derivation {
6566
6667---
6768
68−[.text: text-scale(0.75)]
69+[.text: text-scale(0.55)]
6970
7071# Terms and definitions
7172
73+**Type** – an attribute of data which tells the compiler or interpreter how the programmer intends to use the data
74+
7275**Type system** – a logical system comprising a set of rules that assigns a property called a type to the various constructs of a computer program
7376
7477**Type checking** – the process of verifying and enforcing the constraints of types.
@@ -102,14 +105,14 @@ Adding static typing would:
102105- Increase reliability of code
103106- Lower costs of development (resolving issue earlier is cheaper)
104107
105−_The typechecker should help find issues in existing code_
108+<!-- _The typechecker should help find issues in existing code_ -->
106109
107110---
108111
109112# The goal
110113
111−1. Develop a type static system for the existing Nix expression language
112−2. Develop a type checker for this type system
114+1. Develop a static type system for the existing Nix expression language
115+2. Develop a type checker for this static type system
113116
114117---
115118
@@ -129,31 +132,48 @@ The Hindley–Milner type system_[1]_ is a simple, but well-studied type system
129132
130133---
131134
132−# Functional requirements
135+# Methods and algorithms
133136
134−- The system should perform type checking on expression.
137+The developed type system is heavily influenced by the Hindley–Milner_[1]_ type system.
135138
136−- The system should analyze the types and presence of attributes in attribute sets.
137139
138−- The system should report encountered typechecking.
140+---
139141
140−- The system should report the use of undefined terms.
142+# Methods and algorithms
141143
142−- The system should report the resulting types of expressions to the user.
144+The developed type system supports parametric polymorphism to support code that does not require a specific type.
143145
144−---
146+```nix
147+x: y: x ++ y
148+```
145149
146−[.text: text-scale(0.85)]
150+```
151+∀ α. [α] -> [α] -> [α]
152+```
153+
154+---
147155
148156# Methods and algorithms
149157
150−The type system will be heavily influenced by the Hindley–Milner_[1]_ type system.
158+The developed type system implements row polymorphism to work with attribute sets.
159+
160+```nix
161+x: x.v + 69
162+```
163+
164+```
165+∀ α. (α.v = Number) => α -> Number
166+```
151167
152−The type system will implement parametric polymorphism to support code that does not require a specific type.
168+<br />
153169
154−The type system will implement arbitrary-ranked polymorphism_[3]_ with deep instantiation to disambiguate types in existing untyped code.
170+```nix
171+x: x // {v = "hello";}
172+```
155173
156−The type system will implement row polymorphism to work with attribute sets.
174+```
175+∀ α β. (α // {v = String;} ~ β) => α -> β
176+```
157177
158178---
159179
@@ -177,49 +197,28 @@ The typechecker is implemented in a two-step architecture:
177197
178198---
179199
180−# Current results
200+# Results
181201
182−A typechecker executable that successfully typechecks _most_ of the selected files from _nixpkgs_.
202+- Theoretical
203+ - A static type system for the Nix Expression Language
183204
184−The typechecker currently has some support for all language constructs.
205+- Practical
185206
186−![.right .fit](img/ter.png)
187−
188−---
207+ - A typechecker executable that successfully typechecks _most_ of the selected files from _nixpkgs_.
189208
190−[.build-lists: false]
209+ - The typechecker supports all language constructs.
191210
192−# Current results
193−
194−## Paper status
195−
196−1. Nix Expression Language (80%)
197−2. Existing typecheckers (100%)
198−3. Existing approaches (100%)
199−4. Architecture (20%)
200−5. Implementation (0%)
201−6. Conclusion (60%)
202−
203−![.right .fit](img/paper.png)
204−
205−---
206−
207−# What is left
208−
209−- Better type rendering (predicates)
210−- Subsumption
211−- A lot of minor big fixes in type inference
212−- Add type information about built-in functions
211+![.right .fit](img/ter.png)
213212
214213---
215214
216215# Potential future developments
217216
218217- Add support for user-supplied type annotations.
219− - Fork parser
220− - Bidirectional type inference_[4]_
221218- Type holes
222219- Language Server Integration
220+- Better type rendering
221+- Sum types
223222
224223---
225224
@@ -228,9 +227,10 @@ The typechecker currently has some support for all language constructs.
228227
229228# References
230229
231−1. Damas L., Milner R. Principal type-schemes for functional programs //Proceedings of the 9th ACM SIGPLAN-SIGACT symposium on Principles of programming languages. – 1982. – С. 207-212.
232−2. Jones S. P. et al. Practical type inference for arbitrary-rank types //Journal of functional programming. – 2007. – Т. 17. – №. 1. – С. 1-82. MLA
233−3. Stuckey P. J., Sulzmann M., Wazny J. Improved inference for checking type annotations //arXiv preprint cs/0507036. – 2005. MLA
230+1. L. Damas and R. Milner, “Principal type-schemes for functional pro- grams,” in Proceedings of the 9th ACM SIGPLAN-SIGACT symposium on Principles of programming languages, 1982, pp. 207–212.
231+2. E. Dolstra and A. Loh, “Nixos: A purely functional linux distribution,” in Proceedings of the 13th ACM SIGPLAN international conference on Functional programming, 2008, pp. 367–378.
232+3. J. G. Morris and J. McKinna, “Abstracting extensible data types: or, rows by any other name,” Proceedings of the ACM on Programming Languages, vol. 3, no. POPL, pp. 1–28, 2019.
233+4. D. Leijen, “Extensible records with scoped labels.” Trends in Functional Programming, vol. 6, pp. 179–194, 2005.
234234
235235---
236236
@@ -347,7 +347,7 @@ let f = x: x.a; in f {b = "hello";}
347347```
348348
349349```
350−Error: key "a" NotPresent in { b = String; }
350+Error: key "a" not present in { b = String; }
351351```
352352
353353---
docs/trfrac.stynew file+193
@@ -0,0 +1,193 @@
1+%%
2+%% This is file `trfrac.sty',
3+%% generated with the docstrip utility.
4+%%
5+%% The original source files were:
6+%%
7+%% trfrac.dtx (with options: `file')
8+%%
9+%% This is a generated file.
10+%%
11+%% Copyright (C) 2009 by Kevin W. Hamlen
12+%%
13+%% This file may be distributed and/or modified under the conditions of
14+%% the LaTeX Project Public License, either version 1.3a of this license
15+%% or (at your option) any later version. The latest version of this
16+%% license is in:
17+%%
18+%% http://www.latex-project.org/lppl.txt
19+%%
20+%% and version 1.3a or later is part of all distributions of LaTeX version
21+%% 2004/10/01 or later.
22+%%
23+\newdimen\trtopgap\trtopgap\z@
24+\newdimen\trbotgap\trbotgap\z@
25+\newcommand\TRF@startp{31415926}
26+\newcommand\TRF@endp{27182818}
27+\newif\ifTRF@first
28+\newif\ifTRF@outer\TRF@outertrue
29+\newif\ifTRF@derivok\TRF@derivoktrue
30+\newdimen\TRF@lhang\TRF@lhang\z@
31+\newdimen\TRF@rhang\TRF@rhang\z@
32+\newdimen\TRF@lsave
33+\newdimen\TRF@ni
34+\newdimen\TRF@bi
35+\newdimen\TRF@bw
36+\newbox\TRF@numbox
37+\newbox\TRF@denombox
38+\newbox\TRF@eqbox
39+\newcommand\TRF@trfrac[3]{%
40+ \begingroup%
41+ \ifnum\lastpenalty=\TRF@startp\relax%
42+ \TRF@firsttrue%
43+ \else%
44+ \TRF@firstfalse%
45+ \fi%
46+ \TRF@lsave\TRF@lhang%
47+ \setbox\TRF@eqbox\hbox{\TRF@derivokfalse#1}%
48+ \ifdim\wd\TRF@eqbox>\z@%
49+ \setbox\TRF@eqbox\hbox{\kern\p@\unhbox\TRF@eqbox}%
50+ \fi%
51+ \TRF@lhang\z@%
52+ \setbox\TRF@numbox\hbox{%
53+ \TRF@outerfalse%
54+ \m@th$\strut%
55+ \penalty\TRF@startp\relax%
56+ #2%
57+ \ifnum\lastpenalty=\TRF@endp\relax\else%
58+ \global\TRF@rhang\z@%
59+ \fi%
60+ $%
61+ }%
62+ \setbox\TRF@denombox\hbox{%
63+ \TRF@derivokfalse%
64+ \m@th$\strut#3$%
65+ }%
66+ \dimen@\wd\TRF@numbox%
67+ \advance\dimen@-\TRF@rhang%
68+ \TRF@bw\dimen@%
69+ \advance\TRF@bw-\TRF@lhang%
70+ \ifdim\wd\TRF@denombox>\TRF@bw\TRF@bw\wd\TRF@denombox\fi%
71+ \advance\dimen@\TRF@lhang%
72+ \advance\dimen@-\wd\TRF@denombox%
73+ \TRF@ni\ifdim\dimen@>\z@\z@\else-.5\dimen@\fi%
74+ \TRF@bi\TRF@ni%
75+ \advance\TRF@bi\TRF@lhang%
76+ \TRF@lhang\ifdim\dimen@<\z@\z@\else.5\dimen@\fi%
77+ \ifdim\TRF@bi>\TRF@lhang\TRF@bi\TRF@lhang\fi%
78+ \TRF@rhang\TRF@ni%
79+ \advance\TRF@rhang\wd\TRF@numbox%
80+ \dimen@\TRF@bi%
81+ \advance\dimen@\TRF@bw%
82+ \advance\dimen@\wd\TRF@eqbox%
83+ \ifdim\dimen@>\TRF@rhang\TRF@rhang\dimen@\fi%
84+ \advance\TRF@rhang-\TRF@lhang%
85+ \advance\TRF@rhang-\wd\TRF@denombox%
86+ \global\TRF@rhang\TRF@rhang%
87+ \mathinner{%
88+ \ifTRF@outer%
89+ \raise\fontdimen22\textfont\tw@\vtop%
90+ \else%
91+ \vbox%
92+ \fi%
93+ {%
94+ \offinterlineskip%
95+ \hbox{%
96+ \vbox{%
97+ \dimen@\fontdimen8\textfont\tw@%
98+ \advance\dimen@-\fontdimen22\textfont\tw@%
99+ \advance\dimen@-.5\fontdimen8\textfont\thr@@%
100+ \advance\dimen@-\dp\TRF@numbox%
101+ \ifdim\dimen@<3\fontdimen8\textfont\thr@@%
102+ \dimen@3\fontdimen8\textfont\thr@@%
103+ \fi%
104+ \advance\dimen@\trtopgap%
105+ \hbox{\kern\TRF@ni\unhbox\TRF@numbox}%
106+ \kern\dimen@%
107+ \hbox{%
108+ \kern\TRF@bi%
109+ \vrule\@width\TRF@bw%
110+ \@height.5\fontdimen8\textfont\thr@@%
111+ \@depth.5\fontdimen8\textfont\thr@@%
112+ \vbox{%
113+ \dimen@.5\ht\TRF@eqbox%
114+ \advance\dimen@.5\dp\TRF@eqbox%
115+ \kern-\dimen@%
116+ \box\TRF@eqbox%
117+ \kern-\dimen@%
118+ }%
119+ }%
120+ }%
121+ }%
122+ \dimen@\fontdimen11\textfont\tw@%
123+ \advance\dimen@\fontdimen22\textfont\tw@%
124+ \advance\dimen@-.5\fontdimen8\textfont\thr@@%
125+ \advance\dimen@-\ht\TRF@denombox%
126+ \ifdim\dimen@<3\fontdimen8\textfont\thr@@%
127+ \dimen@3\fontdimen8\textfont\thr@@%
128+ \fi%
129+ \advance\dimen@\trbotgap%
130+ \kern\dimen@%
131+ \hbox{\kern\TRF@lhang\box\TRF@denombox}%
132+ }%
133+ }%
134+ \ifTRF@outer\else%
135+ \penalty\TRF@endp\relax%
136+ \fi%
137+ \global\TRF@lhang\ifTRF@first\TRF@lhang\else\TRF@lsave\fi%
138+ \endgroup%
139+}
140+\newcommand\trfrac[3][]{%
141+ \ifTRF@derivok%
142+ \ifmmode%
143+ \TRF@trfrac{#1}{#2}{#3}%
144+ \else%
145+ \TRF@mmerr%
146+ \fi%
147+ \else%
148+ \TRF@derr%
149+ \fi%
150+}
151+\newcommand\TRF@mmerr{%
152+ \PackageError{trfrac}{\protect\trfrac\space%
153+ only allowed in math mode}%
154+ {I encountered a \protect\trfrac\space%
155+ macro without first encountering a begin-math token.}%
156+}
157+\newcommand\TRF@derr{%
158+ \PackageError{trfrac}{\protect\trfrac\space%
159+ not allowed in the consequent of another \protect\trfrac}%
160+ {\protect\trfrac\space can only appear in the premise (numerator%
161+ ) of another \protect\trfrac, not in the consequent (denominator%
162+ ) of a \protect\trfrac.}%
163+}
164+\newcommand\TRF@next{}
165+\newcommand\TRF@sep{\futurelet\TRF@next\TRF@@sep}
166+\newcommand\TRF@@sep{%
167+ \ifx[\TRF@next%
168+ \let\TRF@next\TRF@separg%
169+ \else%
170+ \let\TRF@next\TRF@sepnoarg%
171+ \fi%
172+ \TRF@next%
173+}
174+\newcommand\TRF@separg{}
175+\def\TRF@separg[#1]{\cr\noalign{\kern#1}}
176+\newcommand\TRF@sepnoarg{\cr}
177+\newenvironment{trgather}{%
178+ \vbox\bgroup%
179+ \let\\\TRF@sep%
180+ \ialign\bgroup\hfil{\m@th$##$}\hfil\cr%
181+}{%
182+ \crcr\egroup\egroup%
183+}
184+\newenvironment{tralign}{%
185+ \vbox\bgroup%
186+ \let\\\TRF@sep%
187+ \ialign\bgroup\hfil{\m@th$##\null$}&{\m@th$\null##$}\hfil\cr%
188+}{%
189+ \crcr\egroup\egroup%
190+}
191+\endinput
192+%%
193+%% End of file `trfrac.sty'.
paper.pdfnew file

Binary file not shown.

src/Tix/Builtins.hsnew file+68
@@ -0,0 +1,68 @@
1+module Tix.Builtins (builtins) where
2+
3+import Data.Map (Map)
4+import qualified Data.Map as M
5+import Data.Text (Text)
6+import Tix.Types
7+
8+builtins :: Map Text Scheme
9+builtins =
10+ M.fromList
11+ [ ( "builtins",
12+ scheme $
13+ NAttrSet $
14+ M.fromList
15+ [ ("abort", scheme $ NAtomic String :-> deBruijn 0 0),
16+ ("add", [StringOrNumber $ deBruijn 2 0] :=> (deBruijn 3 0 :-> (deBruijn 4 0 :-> deBruijn 4 0))),
17+ ("all", [] :=> ((deBruijn 4 0 :-> NAtomic Bool) :-> (List (deBruijn 5 0) :-> NAtomic Bool))),
18+ ("any", [] :=> ((deBruijn 4 0 :-> NAtomic Bool) :-> (List (deBruijn 5 0) :-> NAtomic Bool))),
19+ ("attrNames", [] :=> (deBruijn 3 0 :-> List (NAtomic String))),
20+ ("attrValues", [] :=> (deBruijn 3 0 :-> List (deBruijn 0 0))),
21+ ("baseNameOf", [] :=> (NAtomic String :-> NAtomic String)),
22+ ("bitAnd", [] :=> (NAtomic Number :-> (NAtomic Number :-> NAtomic Number))),
23+ ("bitXor", [] :=> (NAtomic Number :-> (NAtomic Number :-> NAtomic Number))),
24+ ("bitOr", [] :=> (NAtomic Number :-> (NAtomic Number :-> NAtomic Number))),
25+ ("ceil", [] :=> (NAtomic Number :-> NAtomic Number)),
26+ ("compareVersions", [] :=> (NAtomic String :-> (NAtomic String :-> NAtomic Number))),
27+ ("concatLists", [] :=> (List (List (deBruijn 5 0)) :-> List (deBruijn 4 0))),
28+ ("concatMap", [] :=> ((deBruijn 4 0 :-> List (deBruijn 5 1)) :-> (List (deBruijn 5 0) :-> List (deBruijn 5 1)))),
29+ ("map", [] :=> ((deBruijn 4 0 :-> deBruijn 4 1) :-> (List (deBruijn 5 0) :-> List (deBruijn 5 1)))),
30+ ("catAttrs", [] :=> (NAtomic String :-> (List (deBruijn 0 0) :-> List (deBruijn 0 0))))
31+ ]
32+ ),
33+ ( "derivation",
34+ [ deBruijn 2 0
35+ // attrSet
36+ [ ("all", scheme $ List (deBruijn 5 1)),
37+ ("drvAttrs", scheme $ deBruijn 4 0),
38+ ("drvPath", string),
39+ ("out", scheme $ deBruijn 4 1),
40+ ("outPath", string),
41+ ("outputName", string),
42+ ("type", string)
43+ ]
44+ $ deBruijn 2 1,
45+ deBruijn 2 0 .! ("name", string),
46+ deBruijn 2 0 .! ("builder", string),
47+ deBruijn 2 0 .! ("system", string),
48+ deBruijn 2 0 .? ("args", scheme $ List (NAtomic String)),
49+ deBruijn 2 0 .? ("outputs", scheme $ List (NAtomic String))
50+ ]
51+ :=> (deBruijn 3 0 :-> deBruijn 3 1)
52+ )
53+ ]
54+
55+string :: Scheme
56+string = scheme $ NAtomic String
57+
58+deBruijn :: Int -> Int -> NType
59+deBruijn a b = NBruijn $ DeBruijn a b
60+
61+attrSet :: [(Text, Scheme)] -> NType
62+attrSet = NAttrSet . M.fromList
63+
64+(.!) :: NType -> (Text, Scheme) -> Pred
65+(.!) = HasField RequiredField
66+
67+(.?) :: NType -> (Text, Scheme) -> Pred
68+(.?) = HasField OptionalField
src/Tix/Typechecker.hs+90−66
@@ -52,6 +52,7 @@ import Data.Traversable
5252import Nix.Atoms
5353import Nix.Expr
5454import Nix.Pretty
55+import Tix.Builtins (builtins)
5556import Tix.Types
5657import Prelude as P
5758
@@ -63,6 +64,7 @@ getType r =
6364 . evalState @(MKM.Map Pred) mempty
6465 . interpret @(Writer Pred) (\(Tell x) -> modify (<> MKM.singleton x))
6566 . runVariableMapEff
67+ . localVariablesMap builtins
6668 . evalState @Substitution mempty
6769 . runState @[(TypeVariable, SrcSpan)] []
6870 . interpret @(Writer (TypeVariable, SrcSpan)) (\(Tell x) -> modify (x :))
@@ -143,10 +145,12 @@ instance Free NType where
143145instance Free Pred where
144146 free = \case
145147 Update x y z -> free x <> free y <> free z
146− x `HasField` (_, y) -> free x <> free y
148+ HasField _ x (_, y) -> free x <> free y
149+ StringOrNumber x -> free x
147150 sub s = \case
148151 Update x y z -> Update (sub s x) (sub s y) (sub s z)
149− HasField t (f, v) -> HasField (sub s t) (f, sub s v)
152+ HasField r t (f, v) -> HasField r (sub s t) (f, sub s v)
153+ StringOrNumber x -> StringOrNumber $ sub s x
150154
151155instance Free Scheme where
152156 free (x :=> y) = free x <> free y
@@ -183,7 +187,7 @@ prettySubstitution :: Substitution -> A.Value
183187prettySubstitution = A.toJSON . M.mapKeysMonotonic (TL.pack . show) . fmap renderPretty . unSubstitution
184188
185189instance Semigroup Substitution where
186− x'@(Substitution x) <> y'@(Substitution y) = Substitution (M.unionWithKey (error "invariant") (fmap (sub y') x) (fmap (sub x') y))
190+ x'@(Substitution x) <> y'@(Substitution y) = Substitution (M.unionWith (error "invariant") (fmap (sub y') x) (fmap (sub x') y))
187191
188192instance Monoid Substitution where
189193 mempty = Substitution mempty
@@ -275,6 +279,7 @@ data UnifyingError
275279data PredicateError
276280 = KeyNotPresent Text NType
277281 | NotAnAttributeSet NType
282+ | NotAddable NType
278283 deriving stock (Eq, Show)
279284
280285data InferError
@@ -358,13 +363,13 @@ instantiate s = do
358363infer :: NExprLoc -> InferM' NType
359364infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
360365 NConstant a -> return . NAtomic $ case a of
361− NURI {} -> URI
362− NInt {} -> Integer
363− NFloat {} -> Float
366+ NURI {} -> String
367+ NInt {} -> Number
368+ NFloat {} -> Number
364369 NBool {} -> Bool
365370 NNull {} -> Null
366− NLiteralPath {} -> return . NAtomic $ Path
367− NEnvPath {} -> return . NAtomic $ Path
371+ NLiteralPath {} -> return . NAtomic $ String
372+ NEnvPath {} -> return . NAtomic $ String
368373 NStr {} -> return $ NAtomic String
369374 NSym var ->
370375 lookupVar var
@@ -374,17 +379,16 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
374379 xs' <- traverse infer xs
375380 traverse_ tell . fmap (uncurry (:~)) $ zip xs' (tail xs')
376381 case xs' of
377− [] -> NTypeVariable <$> fresh
382+ [] -> List . NTypeVariable <$> fresh
378383 y : _ -> return $ List y
379384 NUnary NNeg y -> do
380385 t <- infer y
381− -- TODO: Infer either Float or Integer
382− -- tell $ t :~ (normalType . NAtomic $ )
383− return t
386+ t ~~ NAtomic Number
387+ return $ NAtomic Number
384388 NUnary NNot y -> do
385389 t <- infer y
386390 t ~~ NAtomic Bool
387− return t
391+ return $ NAtomic Bool
388392 NBinary NUpdate lhs rhs -> do
389393 lhsT <- infer lhs
390394 rhsT <- infer rhs
@@ -404,14 +408,19 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
404408 let listt = List t
405409 lhst ~~ listt
406410 rhst ~~ listt
407− return $ listt
411+ return listt
408412 NBinary NEq lhs rhs -> equality lhs rhs
409413 NBinary NNEq lhs rhs -> equality lhs rhs
410414 NBinary NLt lhs rhs -> comparison lhs rhs
411415 NBinary NLte lhs rhs -> comparison lhs rhs
412416 NBinary NGt lhs rhs -> comparison lhs rhs
413417 NBinary NGte lhs rhs -> comparison lhs rhs
414− NBinary NPlus lhs rhs -> math lhs rhs
418+ NBinary NPlus lhs rhs -> do
419+ lhst <- infer lhs
420+ rhst <- infer rhs
421+ lhst ~~ rhst
422+ tell $ StringOrNumber lhst
423+ return lhst
415424 NBinary NMinus lhs rhs -> math lhs rhs
416425 NBinary NMult lhs rhs -> math lhs rhs
417426 NBinary NDiv lhs rhs -> math lhs rhs
@@ -421,16 +430,16 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
421430 NSelect r path' def -> do
422431 setT <- infer r
423432 let path = getPath path'
433+ strictness = case def of
434+ Nothing -> RequiredField
435+ Just _ -> OptionalField
424436 resT <-
425437 NTypeVariable <$> case path of
426− Just p -> do
427− (_, var) <- lookupAttrSet setT p
428− return var
438+ Just p -> lookupAttrSet strictness setT p
429439 Nothing -> fresh
430440 case def of
431441 Nothing -> return ()
432442 Just defR -> do
433− -- this should infer optional type
434443 defT <- infer defR
435444 defT ~~ resT
436445 return resT
@@ -441,8 +450,10 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
441450 localVariablesMap bindingsT $ infer body
442451 NHasAttr attrSet path -> do
443452 setT <- infer attrSet
444− -- this should infer optional type
445− return setT
453+ case getPath path of
454+ Just p -> void $ lookupAttrSet OptionalField setT p
455+ Nothing -> pure ()
456+ return $ NAtomic Bool
446457 NAbs param body -> do
447458 (paramT, varMap :: VariableMap) <- case param of
448459 Param name -> do
@@ -456,7 +467,10 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
456467 setBindings <-
457468 M.fromList <$> set
458469 `for` ( \(name, def) -> do
459− (_, NTypeVariable -> t) <- lookupAttrSet setT (pure name)
470+ let r = case def of
471+ Nothing -> RequiredField
472+ Just _ -> OptionalField
473+ (NTypeVariable -> t) <- lookupAttrSet r setT (pure name)
460474 case def of
461475 Nothing -> pure ()
462476 Just def' -> infer def' >>= (t ~~)
@@ -492,28 +506,9 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
492506 lookupVar var >>= \case
493507 Just t -> pure $ Just t
494508 Nothing -> do
495− (_, res) <- lookupAttrSet other (pure var)
509+ res <- lookupAttrSet RequiredField other (pure var)
496510 pure $ Just . scheme $ NTypeVariable res
497−
498511 f $ infer body
499− -- -- TODO: implement fallback variable lookup -> specify that the set should have the key.
500− -- setT <- infer set
501− -- vars <- expectAttrSet setT
502− -- withBindings vars $ infer body
503− -- where
504− -- -- Deprecated
505− -- expectAttrSet ::
506− -- Members '[Reader SrcSpan, Writer (SrcSpan, Errors)] r =>
507− -- Scheme ->
508− -- Eff r VariableMap
509− -- expectAttrSet (_ :=> NAttrSet x) = return x
510− -- expectAttrSet g = do
511− -- throwSrc
512− -- UnexpectedType
513− -- { expected = scheme $ NAttrSet M.empty,
514− -- got = g
515− -- }
516− -- return M.empty
517512 NAssert cond body -> do
518513 condT <- infer cond
519514 condT ~~ NAtomic Bool
@@ -528,21 +523,23 @@ infer (Fix (Compose (Ann src x))) = local (const src) $ case x of
528523 comparison lhs rhs = do
529524 lhst <- infer lhs
530525 rhst <- infer rhs
531− -- TODO: Infer lhst and rhst are either Integer or Double or String
526+ tell (StringOrNumber lhst)
532527 lhst ~~ rhst
533528 return $ NAtomic Bool
534529 math lhs rhs = do
535530 lhst <- infer lhs
536531 rhst <- infer rhs
537− -- TODO: Infer lhst and rhst are either Integer or Double
538− lhst ~~ rhst
539− return lhst
532+ let t = NAtomic Number
533+ lhst ~~ t
534+ rhst ~~ t
535+ return t
540536 logic lhs rhs = do
541537 lhst <- infer lhs
542538 rhst <- infer rhs
543− rhst ~~ NAtomic Bool
544− lhst ~~ NAtomic Bool
545− return $ NAtomic Bool
539+ let t = NAtomic Bool
540+ rhst ~~ t
541+ lhst ~~ t
542+ return t
546543
547544type NormalizedBinding' = F.Free (Map VarName)
548545
@@ -802,6 +799,7 @@ solveAndClose range (cs :=> t) = evalState @Substitution mempty $ do
802799 solveAndClose newRange $ sub s $ (collectedPreds <> solvedPreds) :=> t
803800
804801solveConstraints ::
802+ forall effs.
805803 Members
806804 '[ Fresh,
807805 Writer Pred,
@@ -816,30 +814,55 @@ solveConstraints ::
816814 Eff effs [Pred]
817815solveConstraints _ [] = pure []
818816solveConstraints range (p : ps) = case p of
819− HasField (NAttrSet ts) (f, t) -> case M.lookup f ts of
817+ -- StringOrNumber
818+ StringOrNumber (NTypeVariable _) -> (p :) <$> solveConstraints range ps
819+ StringOrNumber t -> do
820+ case t of
821+ NAtomic String -> pure ()
822+ NAtomic Number -> pure ()
823+ other -> tell $ NotAddable other
824+ solveConstraints range ps
825+ -- HasField
826+ HasField r (NAttrSet ts) (f, t) -> case M.lookup f ts of
820827 Nothing -> do
821− tell $ KeyNotPresent f (NAttrSet ts)
828+ case r of
829+ OptionalField -> pure ()
830+ RequiredField -> tell $ KeyNotPresent f (NAttrSet ts)
822831 solveConstraints range ps
823832 Just t' -> do
824833 x <- instantiate t
825834 y <- instantiate t'
826835 x ~~ y
827836 solveConstraints range ps
828− HasField tv@(NTypeVariable _) (k, v) -> do
829− let sameAttrSet :: Pred -> Either Scheme Pred
837+ HasField r tv@(NTypeVariable _) (k, v) -> do
838+ let sameAttrSet :: Pred -> Either (FieldStrictness, Scheme) Pred
830839 sameAttrSet = \case
831− HasField t (k', v') | t == tv, k == k' -> Left v'
840+ HasField r' t (k', v') | t == tv, k == k' -> Left (r', v')
832841 x -> Right x
833− (same, different) = partitionWith sameAttrSet ps
834− (unifyScheme range v) `traverse_` same
835− (p :) <$> solveConstraints range different
836− HasField t _ -> do
842+ raiseStrictness :: FieldStrictness -> FieldStrictness -> FieldStrictness
843+ raiseStrictness RequiredField _ = RequiredField
844+ raiseStrictness _ RequiredField = RequiredField
845+ raiseStrictness OptionalField OptionalField = OptionalField
846+ (unzip -> (strictnesses, same), different) = partitionWith sameAttrSet ps
847+ strictness = foldr raiseStrictness r strictnesses
848+ unifyScheme range v `traverse_` same
849+ (HasField strictness tv (k, v) :) <$> solveConstraints range different
850+ HasField _ t _ -> do
837851 tell $ NotAnAttributeSet t
838852 solveConstraints range ps
853+ -- Update
839854 (Update (NAttrSet a) (NAttrSet b) t) -> do
840855 (NAttrSet $ b <> a) ~~ t
841856 solveConstraints range ps
842− _ -> (p :) <$> solveConstraints range ps
857+ (Update a b _) -> do
858+ allGood <- check `traverse` ([a, b] :: [NType])
859+ (if and allGood then (p :) else id) <$> solveConstraints range ps
860+ where
861+ check :: NType -> Eff effs Bool
862+ check = \case
863+ NTypeVariable _ -> pure True
864+ NAttrSet _ -> pure True
865+ other -> tell (NotAnAttributeSet other) >> pure False
843866
844867partitionWith :: (a -> Either b c) -> [a] -> ([b], [c])
845868partitionWith f = partitionEithers . map f
@@ -921,19 +944,20 @@ lookupAttrSet ::
921944 Fresh
922945 ]
923946 r =>
947+ FieldStrictness ->
924948 NType ->
925949 AttrSetPath ->
926− Eff r (NType, TypeVariable)
927−lookupAttrSet n = \case
950+ Eff r TypeVariable
951+lookupAttrSet r n = \case
928952 (NESingle p) -> do
929953 var <- getSubTV n
930− tell (HasField n (p, scheme . NTypeVariable $ var))
931− return (n, var)
954+ tell (HasField r n (p, scheme . NTypeVariable $ var))
955+ return var
932956 (p :|| ps) -> do
933− (innerSet, var) <- lookupAttrSet n ps
934957 set <- NTypeVariable <$> getSubTV n
935− tell $ HasField set (p, scheme innerSet)
936− return (set, var)
958+ var <- lookupAttrSet r set ps
959+ tell $ HasField r n (p, scheme set)
960+ return var
937961 where
938962 getSubTV (NTypeVariable tv) = freshSub tv
939963 getSubTV _ = fresh
src/Tix/Types.hs+21−10
@@ -1,5 +1,6 @@
11module Tix.Types
22 ( NType (..),
3+ FieldStrictness (..),
34 AtomicType (..),
45 DeBruijn (..),
56 TypeVariable (..),
@@ -38,7 +39,13 @@ data Pred
3839 -- ^ y
3940 !NType
4041 -- ^ z
41− | !NType `HasField` !(Text, Scheme)
42+ -- | 'x.a ~ y'
43+ | HasField !FieldStrictness !NType !(Text, Scheme)
44+ | -- | supports '+' operator (strings and numbers)
45+ StringOrNumber !NType
46+ deriving stock (Eq, Ord, Show, Generic)
47+
48+data FieldStrictness = OptionalField | RequiredField
4249 deriving stock (Eq, Ord, Show, Generic)
4350
4451instance MKM.Keyable Pred where
@@ -101,13 +108,14 @@ instance TraversableNTypes Scheme where
101108
102109instance TraversableNTypes Pred where
103110 traverseNTypesWith ctx f = \case
104− (HasField t (k, h)) ->
105− HasField <$> traverseNTypesWith ctx f t <*> ((k,) <$> traverseNTypesWith ctx f h)
111+ (HasField r t (k, h)) ->
112+ HasField r <$> traverseNTypesWith ctx f t <*> ((k,) <$> traverseNTypesWith ctx f h)
106113 (Update x y z) ->
107114 Update
108115 <$> traverseNTypesWith ctx f x
109116 <*> traverseNTypesWith ctx f y
110117 <*> traverseNTypesWith ctx f z
118+ (StringOrNumber x) -> StringOrNumber <$> traverseNTypesWith ctx f x
111119 {-# INLINE traverseNTypesWith #-}
112120
113121traverseNTypes :: TraversableNTypes s => Traversal' s TerminalNType
@@ -124,13 +132,10 @@ data NType
124132 deriving stock (Eq, Ord, Show, Generic)
125133
126134data AtomicType
127− = Integer
128− | Float
135+ = Number
129136 | Bool
130137 | String
131− | Path
132138 | Null
133− | URI
134139 deriving stock (Eq, Ord, Show, Generic)
135140
136141instance Pretty AtomicType where
@@ -236,15 +241,21 @@ prettyScheme u@(cs :=> t) = do
236241 return $ group $ foralls <> cs' <> t'
237242 where
238243 prettyPred :: Pred -> PrettyM (Doc ann)
239− prettyPred (h `HasField` (k, v)) = do
244+ prettyPred (HasField r h (k, v)) = do
240245 h' <- prettyNType False h
241246 v' <- prettyScheme v
242− return $ group $ group (h' <> nest 2 (line' <> "." <> pretty k <+> "=")) <> nest 2 (line <> v')
247+ let dotOp = case r of
248+ OptionalField -> ".?"
249+ RequiredField -> "."
250+ return $ group $ group (h' <> nest 2 (line' <> dotOp <> pretty k <+> "=")) <> nest 2 (line <> v')
243251 prettyPred (Update x y z) = do
244252 x' <- prettyNType False x
245253 y' <- prettyNType False y
246254 z' <- prettyNType False z
247− return $ group $ paren x' <+> "//" <> line <> paren y' <+> "~" <> line <> paren z'
255+ return $ group $ x' <+> "//" <> line <> y' <+> "~" <> line <> z'
256+ prettyPred (StringOrNumber x) = do
257+ x' <- prettyNType False x
258+ return $ "(String | Number)" <+> "~" <+> x'
248259 paren = bracketed "(" ")"
249260
250261-- | Returns the set of all De Bruijn type variables relative to the outermost
test/golden/importless/0.1.txt+5−6
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο.
2−( α.isMusl = β,
2+( α.hostPlatform = β,
33 α.lib = γ,
44 α.mkDerivation =
55 { buildInputs = [δ];
@@ -21,11 +21,10 @@
2121 version = String;
2222 } ->
2323 κ,
24− α.optional = β -> Path -> θ,
25− λ.lib = α,
26− μ.hostPlatform = α,
27− γ.licenses = ν,
28− γ.platforms = ξ,
24+ γ.optional = λ -> String -> θ,
25+ β.isMusl = λ,
26+ μ.licenses = ν,
27+ μ.platforms = ξ,
2928 ν.lgpl2Plus = ε,
3029 ξ.unix = ζ
3130) =>
test/golden/importless/0.10.txt+1−1
@@ -14,7 +14,7 @@
1414 nativeBuildInputs = [θ];
1515 pname = String;
1616 preConfigure = String;
17− pythonPath = ∀ α. α;
17+ pythonPath = ∀ α. [α];
1818 src = ι;
1919 version = String;
2020 } ->
test/golden/importless/0.11.1.txt+11−12
@@ -1,19 +1,18 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.lgpl21 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 enableParallelBuilding = Bool;
76 meta =
8− {description = String; homepage = String; license = γ; platforms = β;};
7+ {description = String; homepage = String; license = δ; platforms = ε;};
98 name = String;
10− patches = [Path];
11− src = ε;
9+ patches = [String];
10+ src = ζ;
1211 } ->
13− ζ,
14− η.licenses = α,
15− θ.lib = η,
16− ι.platforms = α,
17− κ.lib = ι
12+ η,
13+ β.licenses = θ,
14+ θ.lgpl21 = δ,
15+ ι.platforms = κ,
16+ κ.all = ε
1817) =>
19−{fetchurl = {sha256 = String; url = String;} -> ε; gmp = δ; stdenv = α;} -> ζ
18+{fetchurl = {sha256 = String; url = String;} -> ζ; gmp = γ; stdenv = α;} -> η
test/golden/importless/0.11.txt+1−1
@@ -1 +1 @@
1−∀ α. {callPackage = Path -> {sha256 = String; version = String;} -> α;} -> α
1+∀ α. {callPackage = String -> {sha256 = String; version = String;} -> α;} -> α
test/golden/importless/0.12.txt+1−1
@@ -1 +1 @@
1−∀ α. {callPackage = Path -> {sha256 = String; version = String;} -> α;} -> α
1+∀ α. {callPackage = String -> {sha256 = String; version = String;} -> α;} -> α
test/golden/importless/0.14.1.txt+10−11
@@ -1,18 +1,17 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.lgpl21 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 enableParallelBuilding = Bool;
76 meta =
8− {description = String; homepage = String; license = γ; platforms = β;};
7+ {description = String; homepage = String; license = δ; platforms = ε;};
98 name = String;
10− src = ε;
9+ src = ζ;
1110 } ->
12− ζ,
13− η.licenses = α,
14− θ.lib = η,
15− ι.platforms = α,
16− κ.lib = ι
11+ η,
12+ β.licenses = θ,
13+ θ.lgpl21 = δ,
14+ ι.platforms = κ,
15+ κ.all = ε
1716) =>
18−{fetchurl = {sha256 = String; url = String;} -> ε; gmp = δ; stdenv = α;} -> ζ
17+{fetchurl = {sha256 = String; url = String;} -> ζ; gmp = γ; stdenv = α;} -> η
test/golden/importless/0.17.1.txt+10−11
@@ -1,18 +1,17 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.lgpl21 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 enableParallelBuilding = Bool;
76 meta =
8− {description = String; homepage = String; license = γ; platforms = β;};
7+ {description = String; homepage = String; license = δ; platforms = ε;};
98 name = String;
10− src = ε;
9+ src = ζ;
1110 } ->
12− ζ,
13− η.licenses = α,
14− θ.lib = η,
15− ι.platforms = α,
16− κ.lib = ι
11+ η,
12+ β.licenses = θ,
13+ θ.lgpl21 = δ,
14+ ι.platforms = κ,
15+ κ.all = ε
1716) =>
18−{fetchurl = {sha256 = String; url = String;} -> ε; gmp = δ; stdenv = α;} -> ζ
17+{fetchurl = {sha256 = String; url = String;} -> ζ; gmp = γ; stdenv = α;} -> η
test/golden/importless/0.18.0.txt+13−14
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
2−( α.gpl2Plus = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 configureFlags = [String];
@@ -8,24 +8,23 @@
88 meta =
99 { description = String;
1010 homepage = String;
11− license = β;
11+ license = δ;
1212 longDescription = String;
13− platforms = δ;
13+ platforms = ε;
1414 };
1515 name = String;
16− propagatedBuildInputs = [ε];
17− src = ζ;
16+ propagatedBuildInputs = [ζ];
17+ src = η;
1818 } ->
19− η,
20− α.unix = δ,
21− θ.licenses = α,
22− ι.lib = θ,
23− κ.platforms = α,
24− λ.lib = κ
19+ θ,
20+ β.licenses = ι,
21+ ι.gpl2Plus = δ,
22+ κ.platforms = λ,
23+ λ.unix = ε
2524) =>
26−{ fetchurl = {sha256 = String; url = String;} -> ζ;
25+{ fetchurl = {sha256 = String; url = String;} -> η;
2726 gmp = γ;
28− isl = ε;
27+ isl = ζ;
2928 stdenv = α;
3029} ->
31−η
30+θ
test/golden/importless/0.2.txt+1−1
@@ -42,7 +42,7 @@
4242 gst_all_1 = μ;
4343 libjack2 = ε;
4444 libva = ε;
45− makeFontsConf = {fontDirectories = ∀ α. α;} -> δ;
45+ makeFontsConf = {fontDirectories = ∀ α. [α];} -> δ;
4646 meson = ι;
4747 ninja = ι;
4848 pkgconfig = ι;
test/golden/importless/0.20.0.txt+10−11
@@ -1,18 +1,17 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.lgpl21 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 enableParallelBuilding = Bool;
76 meta =
8− {description = String; homepage = String; license = γ; platforms = β;};
7+ {description = String; homepage = String; license = δ; platforms = ε;};
98 name = String;
10− src = ε;
9+ src = ζ;
1110 } ->
12− ζ,
13− η.licenses = α,
14− θ.lib = η,
15− ι.platforms = α,
16− κ.lib = ι
11+ η,
12+ β.licenses = θ,
13+ θ.lgpl21 = δ,
14+ ι.platforms = κ,
15+ κ.all = ε
1716) =>
18−{fetchurl = {sha256 = String; url = String;} -> ε; gmp = δ; stdenv = α;} -> ζ
17+{fetchurl = {sha256 = String; url = String;} -> ζ; gmp = γ; stdenv = α;} -> η
test/golden/importless/0.29.txt+11−14
@@ -1,11 +1,10 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
2−( α.enableFeature = Bool -> String -> β,
3− α.isDarwin = γ,
4− α.lib = δ,
2+( α.isDarwin = β,
3+ α.lib = γ,
54 α.mkDerivation =
65 { buildInputs = [Null];
7− checkInputs = [ε];
8− configureFlags = [β];
6+ checkInputs = [δ];
7+ configureFlags = [ε];
98 doCheck = Bool;
109 meta =
1110 {description = String; homepage = String; license = ζ; platforms = η;};
@@ -17,24 +16,22 @@
1716 version = String;
1817 } ->
1918 λ,
20− α.optional = Bool -> Null -> [Null],
21− α.withFeature = Bool -> String -> β,
22− δ.optionals = γ -> [Path] -> ι,
19+ γ.optionals = β -> [String] -> ι,
2320 μ.licenses = ν,
2421 μ.platforms = ξ,
2522 ν.lgpl2 = ζ,
2623 ξ.unix = η,
27− ο.lib = α,
28− π.lib = α,
29− ρ.lib = α,
30− σ.lib = α,
31− τ.lib = α
24+ ο.enableFeature = Bool -> String -> ε,
25+ π.enableFeature = Bool -> String -> ε,
26+ ρ.withFeature = Bool -> String -> ε,
27+ σ.withFeature = Bool -> String -> ε,
28+ τ.optional = Bool -> Null -> [Null]
3229) =>
3330{ compressionSupport = Bool;
3431 fetchurl = {sha256 = String; url = String;} -> κ;
3532 libxml2 = Null;
3633 openssl = Null;
37− perl = ε;
34+ perl = δ;
3835 pkgconfig = θ;
3936 shared = Bool;
4037 sslSupport = Bool;
test/golden/importless/0.3.3.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({patches = [Path]; sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {patches = [String]; sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/0.5.1.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ.
2−( (α) // ({prePatch = String; src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {prePatch = String; src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β
55) =>
66α -> δ
test/golden/importless/0.61.txt+39−39
@@ -1,55 +1,55 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
2−( α.isClang = β,
2+( α.cc = β,
3+ α.lib = γ,
34 α.mkDerivation =
4− { CXXFLAGS = γ;
5− buildInputs = [δ];
5+ { CXXFLAGS = δ;
6+ buildInputs = [ε];
67 cmakeFlags = [String];
78 meta =
89 { description = String;
910 homepage = String;
10− license = ε;
11+ license = ζ;
1112 longDescription = String;
12− maintainers = [ζ];
13− platforms = η;
13+ maintainers = [η];
14+ platforms = θ;
1415 };
1516 name = String;
16− nativeBuildInputs = [θ];
17+ nativeBuildInputs = [ι];
1718 outputs = [String];
18− patches = [Path];
19− propagatedBuildInputs = [ι];
20− src = κ;
19+ patches = [String];
20+ propagatedBuildInputs = [κ];
21+ src = λ;
2122 } ->
22− λ,
23− α.optionalString = β -> String -> γ,
24− μ.licenses = ν,
25− μ.maintainers = ξ,
26− μ.optional = Bool -> Null -> [ι],
27− μ.optionals = Bool -> [ο] -> [ι],
28− μ.platforms = π,
29− μ.ttuegel = ζ,
30− ρ.lib = α,
31− σ.cc = α,
32− ν.gpl2 = ε,
33− π.all = η
23+ μ,
24+ ν.licenses = ξ,
25+ ν.maintainers = ο,
26+ ν.optional = Bool -> Null -> [κ],
27+ ν.optionals = Bool -> [π] -> [κ],
28+ ν.platforms = ρ,
29+ ν.ttuegel = η,
30+ γ.optionalString = σ -> String -> δ,
31+ β.isClang = σ,
32+ ξ.gpl2 = ζ,
33+ ρ.all = θ
3434) =>
35−{ cairo = ο;
36− cmake = θ;
37− curl = ο;
38− fetchpatch = {name = String; sha256 = String; url = String;} -> Path;
39− fetchurl = {sha256 = String; url = String;} -> κ;
40− fontconfig = ι;
41− freetype = ι;
35+{ cairo = π;
36+ cmake = ι;
37+ curl = π;
38+ fetchpatch = {name = String; sha256 = String; url = String;} -> String;
39+ fetchurl = {sha256 = String; url = String;} -> λ;
40+ fontconfig = κ;
41+ freetype = κ;
4242 gobject-introspection = Null;
4343 introspectionSupport = Bool;
44− lcms = ο;
45− lib = μ;
46− libiconv = δ;
47− libintl = δ;
48− libjpeg = ι;
44+ lcms = π;
45+ lib = ν;
46+ libiconv = ε;
47+ libintl = ε;
48+ libjpeg = κ;
4949 minimal = Bool;
50− ninja = θ;
51− openjpeg = ι;
52− pkgconfig = θ;
50+ ninja = ι;
51+ openjpeg = κ;
52+ pkgconfig = ι;
5353 poppler_data = τ;
5454 qt5Support = Bool;
5555 qtbase = Null;
@@ -57,6 +57,6 @@
5757 suffix = String;
5858 utils = Bool;
5959 withData = Bool;
60− zlib = ι;
60+ zlib = κ;
6161} ->
62−λ
62+μ
test/golden/importless/0.8.5.txt+22−23
@@ -1,34 +1,33 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.lgpl21 = β,
3− α.maggesi = γ,
4− α.mkDerivation =
5− { buildInputs = [δ];
2+( α.?meta = β,
3+ β.?platforms = [γ],
4+ δ.lib = ε,
5+ δ.mkDerivation =
6+ { buildInputs = [α];
67 createFindlibDestdir = Bool;
78 meta =
89 { description = String;
910 homepage = String;
10− license = β;
11− maintainers = [γ];
12− platforms = ε;
11+ license = ζ;
12+ maintainers = [η];
13+ platforms = [γ];
1314 };
14− patches = [ζ];
15+ patches = [θ];
1516 pname = String;
16− src = η;
17+ src = ι;
1718 version = String;
1819 } ->
19− θ,
20− δ.platforms = ε,
21− ι.licenses = α,
22− κ.lib = ι,
23− λ.maintainers = α,
24− μ.lib = λ,
25− ν.meta = δ
20+ κ,
21+ ε.licenses = λ,
22+ λ.lgpl21 = ζ,
23+ μ.maintainers = ν,
24+ ν.maggesi = η
2625) =>
27−{ camlp4 = δ;
28− fetchpatch = {sha256 = String; url = String;} -> ζ;
29− fetchurl = {sha256 = String; url = String;} -> η;
30− findlib = δ;
31− ocaml = δ;
32− stdenv = α;
26+{ camlp4 = α;
27+ fetchpatch = {sha256 = String; url = String;} -> θ;
28+ fetchurl = {sha256 = String; url = String;} -> ι;
29+ findlib = α;
30+ ocaml = α;
31+ stdenv = δ;
3332} ->
34−θ
33+κ
test/golden/importless/0.9.5.txt+8−8
@@ -1,18 +1,18 @@
11∀ α β γ δ ε ζ η.
2−( α.asl20 = β,
2+( α.lib = β,
33 γ.buildPythonPackage =
44 { doCheck = Bool;
5− meta = {description = String; homepage = String; license = β;};
5+ meta = {description = String; homepage = String; license = δ;};
66 pname = String;
7− src = δ;
7+ src = ε;
88 version = String;
99 } ->
10− ε,
11− ζ.licenses = α,
12− η.lib = ζ
10+ ζ,
11+ β.licenses = η,
12+ η.asl20 = δ
1313) =>
14−{ fetchurl = {sha256 = String; url = String;} -> δ;
14+{ fetchurl = {sha256 = String; url = String;} -> ε;
1515 python2Packages = γ;
1616 stdenv = α;
1717} ->
18−ε
18+ζ
test/golden/importless/0.9.6.txt+8−8
@@ -1,18 +1,18 @@
11∀ α β γ δ ε ζ η.
2−( α.asl20 = β,
2+( α.lib = β,
33 γ.buildPythonPackage =
44 { doCheck = Bool;
5− meta = {description = String; homepage = String; license = β;};
5+ meta = {description = String; homepage = String; license = δ;};
66 pname = String;
7− src = δ;
7+ src = ε;
88 version = String;
99 } ->
10− ε,
11− ζ.licenses = α,
12− η.lib = ζ
10+ ζ,
11+ β.licenses = η,
12+ η.asl20 = δ
1313) =>
14−{ fetchurl = {sha256 = String; url = String;} -> δ;
14+{ fetchurl = {sha256 = String; url = String;} -> ε;
1515 python2Packages = γ;
1616 stdenv = α;
1717} ->
18−ε
18+ζ
test/golden/importless/0.9.txt+12−13
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.mit = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 buildPhase = String;
@@ -10,27 +10,26 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = β;
14− maintainers = [δ];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
17− patches = [Path];
17+ patches = [String];
1818 postPatch = String;
19− src = ε;
19+ src = ζ;
2020 version = String;
2121 } ->
22− ζ,
23− α.roconnor = δ,
24− η.licenses = α,
25− θ.lib = η,
26− ι.maintainers = α,
27− κ.lib = ι
22+ η,
23+ β.licenses = θ,
24+ θ.mit = δ,
25+ ι.maintainers = κ,
26+ κ.roconnor = ε
2827) =>
2928{ expat = γ;
30− fetchurl = {sha256 = String; url = String;} -> ε;
29+ fetchurl = {sha256 = String; url = String;} -> ζ;
3130 findlib = γ;
3231 ocaml = γ;
3332 ounit = γ;
3433 stdenv = α;
3534} ->
36−ζ
35+η
test/golden/importless/1-default.txt+2−2
@@ -7,13 +7,13 @@
77 { broken = Bool;
88 description = String;
99 homepage = String;
10− hydraPlatforms = ∀ α. α;
10+ hydraPlatforms = ∀ α. [α];
1111 license = [ε];
1212 platforms = ζ;
1313 };
1414 name = String;
1515 nativeBuildInputs = [η];
16− patches = [Path];
16+ patches = [String];
1717 postPatch = String;
1818 preConfigure = String;
1919 src = θ;
test/golden/importless/1.0.0.txt+1−1
@@ -8,7 +8,7 @@
88 { description = String;
99 homepage = String;
1010 license = ε;
11− maintainers = ∀ α. α;
11+ maintainers = ∀ α. [α];
1212 platforms = ζ;
1313 };
1414 nativeBuildInputs = [η];
test/golden/importless/1.0.txt+18−20
@@ -1,36 +1,34 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.getVersion = β -> γ,
3− α.lib = δ,
4− α.mkDerivation =
5− { buildInputs = [β];
2+( α.?meta = β,
3+ β.?platforms = [γ],
4+ δ.lib = ε,
5+ δ.mkDerivation =
6+ { buildInputs = [α];
67 createFindlibDestdir = Bool;
78 makeFlags = [String];
89 meta =
910 { description = String;
1011 homepage = String;
11− license = ε;
12− maintainers = [ζ];
13− platforms = η;
12+ license = ζ;
13+ maintainers = [η];
14+ platforms = [γ];
1415 };
1516 name = String;
1617 preBuild = String;
1718 src = θ;
1819 } ->
1920 ι,
20− α.versionAtLeast = γ -> String -> Bool,
21− β.platforms = η,
22− κ.lib = α,
23− λ.lib = α,
24− δ.licenses = μ,
25− δ.maintainers = ν,
26− μ.bsd3 = ε,
27− ν.vbgl = ζ,
28− ξ.meta = β
21+ ε.versionAtLeast = κ -> String -> Bool,
22+ λ.getVersion = α -> κ,
23+ μ.licenses = ν,
24+ μ.maintainers = ξ,
25+ ν.bsd3 = ζ,
26+ ξ.vbgl = η
2927) =>
30−{ easy-format = β;
28+{ easy-format = α;
3129 fetchurl = {sha256 = String; url = String;} -> θ;
32− findlib = β;
33− ocaml = β;
34− stdenv = α;
30+ findlib = α;
31+ ocaml = α;
32+ stdenv = δ;
3533} ->
3634ι
test/golden/importless/1.00.37.txt+17−17
@@ -1,7 +1,8 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.lib = β,
2+( α.hostPlatform = β,
3+ α.lib = γ,
34 α.mkDerivation =
4− { buildInputs = [γ];
5+ { buildInputs = [δ];
56 dontPatchELF = Bool;
67 dontStrip = Bool;
78 installPhase = String;
@@ -9,26 +10,25 @@
910 { description = String;
1011 downloadPage = String;
1112 homepage = String;
12− license = δ;
13− platforms = ε;
13+ license = ε;
14+ platforms = ζ;
1415 };
1516 pname = String;
1617 preFixup = String;
17− src = ζ;
18+ src = η;
1819 version = String;
1920 } ->
20− η,
21− α.system = String,
22− θ.hostPlatform = α,
23− β.licenses = ι,
24− β.platforms = κ,
25− ι.unfree = δ,
26− κ.linux = ε
21+ θ,
22+ β.system = String,
23+ γ.licenses = ι,
24+ γ.platforms = κ,
25+ ι.unfree = ε,
26+ κ.linux = ζ
2727) =>
28−{ cups = γ;
29− fetchurl = {sha256 = String; url = String;} -> ζ;
30− libusb-compat-0_1 = γ;
31− libxml2 = γ;
28+{ cups = δ;
29+ fetchurl = {sha256 = String; url = String;} -> η;
30+ libusb-compat-0_1 = δ;
31+ libxml2 = δ;
3232 stdenv = α;
3333} ->
34−η
34+θ
test/golden/importless/1.3.txt+53−56
@@ -1,12 +1,13 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.
2−( β.arch = String,
2+( β.?hostPlatform = γ,
3+ γ.?platform = δ,
4+ δ.?gcc = ε,
5+ ε.?arch = String,
36 β.isDarwin = Bool,
4− β.lib = γ,
5− β.maintainers = δ,
6− β.mit = ε,
7+ β.lib = ζ,
78 β.mkDerivation =
8− { LD_LIBRARY_PATH = ζ;
9− buildInputs = [η];
9+ { LD_LIBRARY_PATH = η;
10+ buildInputs = [θ];
1011 checkTarget = String;
1112 doCheck = Bool;
1213 enableParallelBuilding = Bool;
@@ -15,76 +16,72 @@
1516 { broken = Bool;
1617 description = String;
1718 homepage = String;
18− license = ε;
19− maintainers = [θ];
19+ license = ι;
20+ maintainers = [κ];
2021 platforms = [String];
2122 };
22− nativeBuildInputs = [ι];
23+ nativeBuildInputs = [λ];
2324 passthru =
2425 { maintenanceVersion = String;
2526 majorVersion = String;
2627 minorVersion = String;
2728 site = String;
2829 };
29− patches = [Path];
30+ patches = [String];
3031 pname = String;
3132 postInstall = String;
3233 postPatch = String;
3334 preBuild = String;
3435 preCheck = String;
3536 prePatch = String;
36− src = κ;
37+ src = μ;
3738 version = ∀ α. α;
3839 } ->
39− λ,
40− β.optionals = μ -> [ν] -> [η],
40+ ν,
4141 β.system = ξ,
42− η.dev = η,
43− η.isILP64 = Bool,
44− γ.garrison = θ,
45− γ.head = ο -> π,
46− γ.makeLibraryPath = [η] -> ζ,
47− γ.raskin = θ,
48− γ.rob = θ,
49− γ.splitString = String -> ξ -> ο,
50− γ.throw = String -> ρ,
51− σ.licenses = β,
52− τ.lib = σ,
53− υ.lib = β,
54− φ.gcc = β,
55− χ.platform = φ,
56− ψ.hostPlatform = χ,
57− ω.lib = β
42+ θ.dev = θ,
43+ θ.isILP64 = Bool,
44+ ζ.garrison = κ,
45+ ζ.head = ο -> π,
46+ ζ.makeLibraryPath = [θ] -> η,
47+ ζ.raskin = κ,
48+ ζ.rob = κ,
49+ ζ.splitString = String -> ξ -> ο,
50+ ζ.throw = String -> ρ,
51+ σ.licenses = τ,
52+ τ.mit = ι,
53+ υ.maintainers = φ,
54+ χ.optionals = ψ -> [ω] -> [θ]
5855) =>
59−{ ApplicationServices = ν;
60− CoreServices = ν;
61− arpack = η;
62− blas = η;
56+{ ApplicationServices = ω;
57+ CoreServices = ω;
58+ arpack = θ;
59+ blas = θ;
6360 cmake = α1;
64− curl = ι;
61+ curl = λ;
6562 fetchFromGitHub = β1;
6663 fetchurl = γ1;
67− fetchzip = {sha256 = String; url = String;} -> κ;
68− fftw = η;
69− fftwSinglePrec = η;
70− gfortran = ι;
71− gmp = η;
72− lapack = η;
73− libgit2 = η;
74− libunwind = η;
75− m4 = ι;
76− makeWrapper = ι;
77− mpfr = η;
78− openlibm = η;
79− openspecfun = η;
80− patchelf = ι;
81− pcre2 = η;
82− perl = ι;
83− python2 = ι;
84− readline = η;
64+ fetchzip = {sha256 = String; url = String;} -> μ;
65+ fftw = θ;
66+ fftwSinglePrec = θ;
67+ gfortran = λ;
68+ gmp = θ;
69+ lapack = θ;
70+ libgit2 = θ;
71+ libunwind = θ;
72+ m4 = λ;
73+ makeWrapper = λ;
74+ mpfr = θ;
75+ openlibm = θ;
76+ openspecfun = θ;
77+ patchelf = λ;
78+ pcre2 = θ;
79+ perl = λ;
80+ python2 = λ;
81+ readline = θ;
8582 stdenv = β;
86− utf8proc = η;
87− which = ι;
88− zlib = η;
83+ utf8proc = θ;
84+ which = λ;
85+ zlib = θ;
8986} ->
90−λ
87+ν
test/golden/importless/1.4.txt+9−10
@@ -1,17 +1,16 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.linux = β,
3− α.mit = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { installPhase = String;
65 meta =
7− {description = String; homepage = String; license = γ; platforms = β;};
6+ {description = String; homepage = String; license = γ; platforms = δ;};
87 name = String;
9− src = δ;
8+ src = ε;
109 } ->
11− ε,
12− ζ.licenses = α,
13− η.lib = ζ,
14− θ.platforms = α,
15− ι.lib = θ
10+ ζ,
11+ β.licenses = η,
12+ η.mit = γ,
13+ θ.platforms = ι,
14+ ι.linux = δ
1615) =>
17−{fetchurl = {sha256 = String; url = String;} -> δ; stdenv = α;} -> ε
16+{fetchurl = {sha256 = String; url = String;} -> ε; stdenv = α;} -> ζ
test/golden/importless/1.5.txt+20−20
@@ -1,7 +1,9 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
2−( α.lib = β,
3− α.mkDerivation =
4− { buildInputs = [γ];
2+( α.?meta = β,
3+ β.?platforms = [γ],
4+ δ.lib = ε,
5+ δ.mkDerivation =
6+ { buildInputs = [α];
57 buildPhase = String;
68 checkPhase = String;
79 configurePhase = String;
@@ -11,25 +13,23 @@
1113 meta =
1214 { description = String;
1315 homepage = String;
14− license = δ;
15− maintainers = [ε];
16− platforms = ζ;
16+ license = ζ;
17+ maintainers = [η];
18+ platforms = [γ];
1719 };
1820 name = String;
19− src = η;
21+ src = θ;
2022 } ->
21− θ,
22− γ.platforms = ζ,
23− β.licenses = ι,
24− β.maintainers = κ,
25− ι.lgpl21 = δ,
26− κ.vbgl = ε,
27− λ.meta = γ
23+ ι,
24+ ε.licenses = κ,
25+ ε.maintainers = λ,
26+ κ.lgpl21 = ζ,
27+ λ.vbgl = η
2828) =>
29−{ fetchzip = {sha256 = String; url = String;} -> η;
30− findlib = γ;
31− ocaml = γ;
32− ocamlbuild = γ;
33− stdenv = α;
29+{ fetchzip = {sha256 = String; url = String;} -> θ;
30+ findlib = α;
31+ ocaml = α;
32+ ocamlbuild = α;
33+ stdenv = δ;
3434} ->
35−θ
35+ι
test/golden/importless/1.55.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ.
2−( (α) // ({patches = [Path]; src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {patches = [String]; src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β
55) =>
66α -> δ
test/golden/importless/1.59.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.stdenv = ε
66) =>
test/golden/importless/1.60.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.stdenv = ε
66) =>
test/golden/importless/1.65.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.stdenv = ε
66) =>
test/golden/importless/1.66.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.stdenv = ε
66) =>
test/golden/importless/1.67.txt+7−7
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η θ ι.
2−( (α) // ({patches = [β]; src = γ; version = String;}) ~ (δ),
3− α.callPackage = Path -> δ -> ε,
4− α.fetchpatch = {sha256 = String; stripLen = Integer; url = String;} -> β,
2+( α // {patches = [β]; src = γ; version = String;} ~ δ,
3+ α.callPackage = String -> δ -> ε,
4+ α.fetchpatch = {sha256 = String; stripLen = Number; url = String;} -> β,
55 α.fetchurl = {sha256 = String; url = String;} -> γ,
66 α.stdenv = ζ,
7− ζ.isClang = η,
8− ζ.optionals = η -> [β] -> [β],
9− θ.lib = ζ,
10− ι.cc = ζ
7+ ζ.cc = η,
8+ ζ.lib = θ,
9+ θ.optionals = ι -> [β] -> [β],
10+ η.isClang = ι
1111) =>
1212α -> ε
test/golden/importless/1.68.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchpatch = ε,
55 α.fetchurl = {sha256 = String; url = String;} -> β,
66 α.stdenv = ζ
test/golden/importless/1.69.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchpatch = ε,
55 α.fetchurl = {sha256 = String; url = String;} -> β,
66 α.stdenv = ζ
test/golden/importless/1.70.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchpatch = ε,
55 α.fetchurl = {sha256 = String; url = String;} -> β,
66 α.stdenv = ζ
test/golden/importless/1.71.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchpatch = ε,
55 α.fetchurl = {sha256 = String; urls = [String];} -> β,
66 α.stdenv = ζ
test/golden/importless/1.72.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchpatch = ε,
55 α.fetchurl = {sha256 = String; urls = [String];} -> β,
66 α.stdenv = ζ
test/golden/importless/1.8.5.txtnew file+52
@@ -0,0 +1,52 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ.
2+( α.hostPlatform = β,
3+ α.isAarch32 = γ,
4+ α.isAarch64 = δ,
5+ α.lib = ε,
6+ α.mkDerivation =
7+ { buildInputs = [ζ];
8+ configureFlags = [String];
9+ doCheck = Bool;
10+ enableParallelBuilding = Bool;
11+ meta =
12+ { broken = δ;
13+ description = String;
14+ homepage = String;
15+ maintainers = [η];
16+ platforms = θ;
17+ };
18+ nativeBuildInputs = [ι];
19+ patchFlags = [String];
20+ patches = [κ];
21+ pname = String;
22+ postPatch = String;
23+ postUnpack = String;
24+ preBuild = String;
25+ preCheck = String;
26+ preConfigure = String;
27+ propagatedBuildInputs = [λ];
28+ src = μ;
29+ version = String;
30+ } ->
31+ ν,
32+ ξ.optional = γ -> ο -> [ι],
33+ ε.optionals = Bool -> [String] -> [String],
34+ β.system = String,
35+ π.maintainers = ρ,
36+ π.platforms = σ,
37+ ρ.goibhniu = η,
38+ σ.linux = θ,
39+ τ.optionals = υ -> [String] -> [κ]
40+) =>
41+{ autoconf213 = ο;
42+ fetchpatch = {name = String; sha256 = String; url = String;} -> κ;
43+ fetchurl = {sha256 = String; url = String;} -> μ;
44+ lib = ξ;
45+ nspr = λ;
46+ perl = ζ;
47+ pkgconfig = ι;
48+ python2 = ζ;
49+ stdenv = α;
50+ zip = ζ;
51+} ->
52+ν
test/golden/importless/1.8.txt+32−35
@@ -1,57 +1,54 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ.
22( α.buildPlatform = β,
33 α.hostPlatform = β,
4− α.lgpl2Plus = γ,
5− α.ludo = δ,
4+ α.lib = γ,
65 α.mkDerivation =
7− { buildInputs = [ε];
6+ { buildInputs = [δ];
87 configureFlags = [String];
9− depsBuildBuild = [ζ];
8+ depsBuildBuild = [ε];
109 doCheck = Bool;
1110 doInstallCheck = Bool;
1211 meta =
1312 { description = String;
1413 homepage = String;
15− license = γ;
14+ license = ζ;
1615 longDescription = String;
17− maintainers = [δ];
18− platforms = η;
16+ maintainers = [η];
17+ platforms = θ;
1918 };
2019 name = String;
21− nativeBuildInputs = [θ];
20+ nativeBuildInputs = [ι];
2221 outputs = [String];
23− patches = [Path];
22+ patches = [String];
2423 postInstall = String;
2524 preBuild = String;
26− propagatedBuildInputs = [ε];
25+ propagatedBuildInputs = [δ];
2726 setOutputFlags = Bool;
28− setupHook = Path;
29− src = ι;
27+ setupHook = String;
28+ src = κ;
3029 } ->
31− κ,
32− α.optional = Bool -> λ -> [ζ],
33− α.unix = η,
34− μ.guile_1_8 = λ,
35− ν.cc = ζ,
36− ξ.licenses = α,
37− ο.lib = ξ,
38− π.maintainers = α,
39− ρ.lib = π,
40− σ.platforms = α,
41− τ.lib = σ,
42− υ.lib = α,
43− φ.lib = α,
44− χ.stdenv = ν
30+ λ,
31+ μ.guile_1_8 = ν,
32+ ξ.stdenv = ο,
33+ γ.licenses = π,
34+ π.lgpl2Plus = ζ,
35+ ρ.maintainers = σ,
36+ σ.ludo = η,
37+ τ.platforms = υ,
38+ υ.unix = θ,
39+ φ.optional = Bool -> ν -> [ε],
40+ χ.optional = Bool -> String -> [String],
41+ ο.cc = ε
4542) =>
46−{ buildPackages = ν;
47− fetchurl = {sha256 = String; url = String;} -> ι;
48− gawk = θ;
49− gmp = ε;
50− libtool = ε;
51− makeWrapper = θ;
52− pkgconfig = θ;
43+{ buildPackages = ξ;
44+ fetchurl = {sha256 = String; url = String;} -> κ;
45+ gawk = ι;
46+ gmp = δ;
47+ libtool = δ;
48+ makeWrapper = ι;
49+ pkgconfig = ι;
5350 pkgsBuildBuild = μ;
54− readline = ε;
51+ readline = δ;
5552 stdenv = α;
5653} ->
57−κ
54+λ
test/golden/importless/1.x.txt+22−23
@@ -1,37 +1,36 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.lib = β,
3− α.optionals = Bool -> [γ] -> δ,
4− ε.buildPythonApplication =
3+ γ.buildPythonApplication =
54 { doCheck = Bool;
65 meta =
76 { description = String;
87 homepage = String;
9− license = ζ;
8+ license = δ;
109 longDescription = String;
11− maintainers = [η];
12− platforms = θ;
10+ maintainers = [ε];
11+ platforms = ζ;
1312 };
1413 pname = String;
15− propagatedBuildInputs = δ;
16− src = ι;
14+ propagatedBuildInputs = η;
15+ src = θ;
1716 version = String;
1817 } ->
19− κ,
20− ε.flup = γ,
21− ε.isPy3k = Bool,
22− ε.ldap = γ,
23− ε.sqlalchemy = γ,
24− λ.lib = α,
25− β.edwtjo = η,
26− β.licenses = μ,
27− β.maintainers = ν,
28− β.pSub = η,
29− β.platforms = ξ,
30− μ.gpl3Plus = ζ,
31− ξ.all = θ
18+ ι,
19+ γ.flup = κ,
20+ γ.isPy3k = Bool,
21+ γ.ldap = κ,
22+ γ.sqlalchemy = κ,
23+ β.optionals = Bool -> [κ] -> η,
24+ λ.edwtjo = ε,
25+ λ.licenses = μ,
26+ λ.maintainers = ν,
27+ λ.pSub = ε,
28+ λ.platforms = ξ,
29+ μ.gpl3Plus = δ,
30+ ξ.all = ζ
3231) =>
33−{ fetchurl = {sha256 = String; url = String;} -> ι;
34− pythonPackages = ε;
32+{ fetchurl = {sha256 = String; url = String;} -> θ;
33+ pythonPackages = γ;
3534 stdenv = α;
3635} ->
37−κ
36+ι
test/golden/importless/10.5.x.txt+24−25
@@ -1,50 +1,49 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
22( α.hostPlatform = β,
33 α.isDarwin = Bool,
4− α.isMusl = γ,
5− α.lib = δ,
4+ α.lib = γ,
65 α.mkDerivation =
7− { buildInputs = [ε];
6+ { buildInputs = [δ];
87 installPhase = String;
98 meta =
109 { description = String;
1110 homepage = String;
12− license = ζ;
13− maintainers = [η];
11+ license = ε;
12+ maintainers = [ζ];
1413 };
15− passthru = {tests = {smoke-test = θ;};};
14+ passthru = {tests = {smoke-test = η;};};
1615 pname = String;
1716 preferLocalBuild = Bool;
18− propagatedBuildInputs = [ι];
19− src = κ;
17+ propagatedBuildInputs = [θ];
18+ src = ι;
2019 version = String;
2120 } ->
22− λ,
23− μ.optionalString = γ -> String -> ν,
24− μ.warn = String -> String -> String,
25− ξ.aspnetcore_3_1 = ι,
26− ο.jellyfin = θ,
21+ κ,
22+ λ.optionalString = μ -> String -> ν,
23+ λ.warn = String -> String -> String,
24+ ξ.aspnetcore_3_1 = θ,
25+ ο.jellyfin = η,
2726 β.isAarch32 = Bool,
2827 β.isAarch64 = Bool,
2928 β.isx86_32 = Bool,
3029 β.isx86_64 = Bool,
31− π.hostPlatform = α,
32− δ.licenses = ρ,
33− δ.maintainers = σ,
34− δ.minijackson = η,
35− δ.nyanloutre = η,
36− ρ.gpl2 = ζ
30+ π.isMusl = μ,
31+ γ.licenses = ρ,
32+ γ.maintainers = σ,
33+ γ.minijackson = ζ,
34+ γ.nyanloutre = ζ,
35+ ρ.gpl2 = ε
3736) =>
3837{ dotnetCorePackages = ξ;
39− fetchurl = {sha256 = String; url = String;} -> κ;
38+ fetchurl = {sha256 = String; url = String;} -> ι;
4039 ffmpeg = τ;
4140 fontconfig = υ;
4241 freetype = φ;
43− lib = μ;
44− makeWrapper = ε;
42+ lib = λ;
43+ makeWrapper = δ;
4544 nixosTests = ο;
46− sqlite = ι;
45+ sqlite = θ;
4746 stdenv = α;
48− unzip = ε;
47+ unzip = δ;
4948} ->
50−λ
49+κ
test/golden/importless/11.1.txt+14−16
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.linux = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { NIX_CFLAGS_COMPILE = String;
55 buildInputs = [γ];
@@ -9,28 +9,26 @@
99 homepage = String;
1010 license = δ;
1111 maintainers = [ε];
12− platforms = β;
12+ platforms = ζ;
1313 };
1414 name = String;
15− nativeBuildInputs = [ζ];
15+ nativeBuildInputs = [η];
1616 preConfigure = String;
17− src = η;
17+ src = θ;
1818 } ->
19− θ,
20− α.raskin = ε,
21− α.zlib = δ,
22− ι.licenses = α,
23− κ.lib = ι,
24− λ.maintainers = α,
25− μ.lib = λ,
26− ν.platforms = α,
27− ξ.lib = ν
19+ ι,
20+ β.licenses = κ,
21+ κ.zlib = δ,
22+ λ.maintainers = μ,
23+ μ.raskin = ε,
24+ ν.platforms = ξ,
25+ ξ.linux = ζ
2826) =>
2927{ SDL2 = γ;
3028 autoconf = γ;
3129 automake = γ;
3230 fetchFromBitbucket =
33− {owner = String; repo = String; rev = String; sha256 = String;} -> η;
31+ {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
3432 freetype = γ;
3533 libGL = γ;
3634 libGLU = γ;
@@ -44,8 +42,8 @@
4442 mpg123 = γ;
4543 openal = γ;
4644 physfs = γ;
47− pkgconfig = ζ;
45+ pkgconfig = η;
4846 stdenv = α;
4947 which = γ;
5048} ->
51−θ
49+ι
test/golden/importless/112.01.01.txt+8−9
@@ -1,18 +1,17 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.asl20 = β,
3− α.maintainers = γ,
4− δ.licenses = α,
5− ε.lib = δ,
6− γ.ericbmerritt = ζ,
7− γ.maggesi = ζ,
8− η.lib = α
2+( α.lib = β,
3+ β.licenses = γ,
4+ γ.asl20 = δ,
5+ ε.maintainers = ζ,
6+ ζ.ericbmerritt = η,
7+ ζ.maggesi = η
98) =>
109{ buildOcaml =
1110 { meta =
1211 { description = String;
1312 homepage = String;
14− license = β;
15− maintainers = [ζ];
13+ license = δ;
14+ maintainers = [η];
1615 };
1716 minimumSupportedOcamlVersion = String;
1817 name = String;
test/golden/importless/12.txt+1−1
@@ -9,7 +9,7 @@
99 description = String;
1010 homepage = String;
1111 license = ε;
12− maintainers = ∀ α. α;
12+ maintainers = ∀ α. [α];
1313 platforms = ζ;
1414 };
1515 name = String;
test/golden/importless/16.1.2.txt+23−27
@@ -1,51 +1,47 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
2−( α.mit = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 configureFlags = [String];
66 hardeningDisable = [String];
77 meta =
88 { description = String;
9− license = β;
10− maintainers = [δ];
11− platforms = ε;
9+ license = δ;
10+ maintainers = [ε];
11+ platforms = ζ;
1212 version = String;
1313 };
1414 name = String;
15− patches = [Path];
15+ patches = [String];
1616 postInstall = String;
17− propagatedBuildInputs = [ζ];
18− src = η;
17+ propagatedBuildInputs = [η];
18+ src = θ;
1919 version = String;
2020 } ->
21− θ,
22− α.optional = Bool -> String -> [String],
23− α.optionals = Bool -> [Null] -> [ζ],
24− α.raskin = δ,
25− α.unix = ε,
26− ι.lib = α,
27− κ.lib = α,
28− λ.licenses = α,
29− μ.lib = λ,
30− ν.maintainers = α,
31− ξ.lib = ν,
32− ο.platforms = α,
33− π.lib = ο
21+ ι,
22+ β.optionals = Bool -> [Null] -> [η],
23+ κ.optional = Bool -> String -> [String],
24+ λ.licenses = μ,
25+ μ.mit = δ,
26+ ν.maintainers = ξ,
27+ ξ.raskin = ε,
28+ ο.platforms = π,
29+ π.unix = ζ
3430) =>
3531{ autoconf = γ;
3632 automake = γ;
3733 boehmgc = Null;
38− fetchpatch = {name = String; sha256 = String; url = String;} -> Path;
39− fetchurl = {sha256 = String; url = String;} -> η;
40− gcc = ζ;
41− gmp = ζ;
42− libffi = ζ;
34+ fetchpatch = {name = String; sha256 = String; url = String;} -> String;
35+ fetchurl = {sha256 = String; url = String;} -> θ;
36+ gcc = η;
37+ gmp = η;
38+ libffi = η;
4339 libtool = γ;
4440 makeWrapper = γ;
45− mpfr = ζ;
41+ mpfr = η;
4642 noUnicode = Bool;
4743 stdenv = α;
4844 threadSupport = Bool;
4945 useBoehmgc = Bool;
5046} ->
51−θ
47+ι
test/golden/importless/1compat.txt+2−3
@@ -1,9 +1,8 @@
11∀ β γ δ ε ζ η θ ι.
2−( (β) // ({description = String; priority = Integer;}) ~ (γ),
2+( β // {description = String; priority = Number;} ~ γ,
33 δ.mkDerivation = {builder = ε; meta = ∀ α. α; name = String;} -> ζ,
4− η.description = String,
54 η.meta = β,
6− θ.meta = η
5+ θ.description = String
76) =>
87{coreutils = ι; gnupg = η; stdenv = δ; writeScript = String -> String -> ε;} ->
98ζ
test/golden/importless/2.0.0.txt+2−2
@@ -9,11 +9,11 @@
99 { description = String;
1010 homepage = String;
1111 license = ε;
12− maintainers = ∀ α. α;
12+ maintainers = ∀ α. [α];
1313 platforms = ζ;
1414 };
1515 nativeBuildInputs = [η];
16− patches = [Path];
16+ patches = [String];
1717 pname = String;
1818 postPatch = String;
1919 src = θ;
test/golden/importless/2.0.txt+8−10
@@ -5,14 +5,13 @@
55 α.qt4 = β,
66 α.stdenv = δ,
77 α.xorg = ε,
8− δ.gpl2 = ζ,
9− δ.maintainers = η,
8+ δ.lib = ζ,
109 δ.mkDerivation =
1110 { buildInputs = [β];
1211 meta =
1312 { description = String;
1413 homepage = String;
15− license = ζ;
14+ license = η;
1615 maintainers = [θ];
1716 platforms = ι;
1817 };
@@ -21,13 +20,12 @@
2120 version = String;
2221 } ->
2322 κ,
24− δ.platforms = λ,
2523 ε.libXtst = β,
26− μ.licenses = δ,
27− ν.lib = μ,
28− η.qknight = θ,
29− ξ.lib = δ,
30− λ.linux = ι,
31− ο.lib = δ
24+ ζ.licenses = λ,
25+ λ.gpl2 = η,
26+ μ.maintainers = ν,
27+ ν.qknight = θ,
28+ ξ.platforms = ο,
29+ ο.linux = ι
3230) =>
3331α -> κ
test/golden/importless/2.1.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/2.10.txt+15−16
@@ -1,32 +1,31 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.all = β,
3− α.bsd3 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { branch = String;
98 description = String;
109 homepage = String;
11− license = γ;
10+ license = δ;
1211 longDescription = String;
13− platforms = β;
12+ platforms = ε;
1413 };
1514 name = String;
16− propagatedBuildInputs = [ε];
17− src = ζ;
15+ propagatedBuildInputs = [ζ];
16+ src = η;
1817 } ->
19− η,
20− θ.licenses = α,
21− ι.lib = θ,
22− κ.platforms = α,
23− λ.lib = κ
18+ θ,
19+ β.licenses = ι,
20+ ι.bsd3 = δ,
21+ κ.platforms = λ,
22+ λ.all = ε
2423) =>
2524{ coreutils = μ;
26− fetchurl = {sha256 = String; url = String;} -> ζ;
25+ fetchurl = {sha256 = String; url = String;} -> η;
2726 gnugrep = ν;
28− jre = ε;
29− makeWrapper = δ;
27+ jre = ζ;
28+ makeWrapper = γ;
3029 stdenv = α;
3130} ->
32−η
31+θ
test/golden/importless/2.11.txt+15−16
@@ -1,32 +1,31 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.all = β,
3− α.bsd3 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { branch = String;
98 description = String;
109 homepage = String;
11− license = γ;
10+ license = δ;
1211 longDescription = String;
13− platforms = β;
12+ platforms = ε;
1413 };
1514 name = String;
16− propagatedBuildInputs = [ε];
17− src = ζ;
15+ propagatedBuildInputs = [ζ];
16+ src = η;
1817 } ->
19− η,
20− θ.licenses = α,
21− ι.lib = θ,
22− κ.platforms = α,
23− λ.lib = κ
18+ θ,
19+ β.licenses = ι,
20+ ι.bsd3 = δ,
21+ κ.platforms = λ,
22+ λ.all = ε
2423) =>
2524{ coreutils = μ;
26− fetchurl = {sha256 = String; url = String;} -> ζ;
25+ fetchurl = {sha256 = String; url = String;} -> η;
2726 gnugrep = ν;
28− jre = ε;
29− makeWrapper = δ;
27+ jre = ζ;
28+ makeWrapper = γ;
3029 stdenv = α;
3130} ->
32−η
31+θ
test/golden/importless/2.12.txt+15−16
@@ -1,31 +1,30 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.all = β,
3− α.bsd3 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { description = String;
98 homepage = String;
10− license = γ;
9+ license = δ;
1110 longDescription = String;
12− platforms = β;
11+ platforms = ε;
1312 };
1413 name = String;
15− propagatedBuildInputs = [ε];
16− src = ζ;
14+ propagatedBuildInputs = [ζ];
15+ src = η;
1716 } ->
18− η,
19− θ.licenses = α,
20− ι.lib = θ,
21− κ.platforms = α,
22− λ.lib = κ
17+ θ,
18+ β.licenses = ι,
19+ ι.bsd3 = δ,
20+ κ.platforms = λ,
21+ λ.all = ε
2322) =>
2423{ coreutils = μ;
25− fetchurl = {sha256 = String; url = String;} -> ζ;
24+ fetchurl = {sha256 = String; url = String;} -> η;
2625 gnugrep = ν;
27− jre = ε;
28− makeWrapper = δ;
26+ jre = ζ;
27+ makeWrapper = γ;
2928 stdenv = α;
3029} ->
31−η
30+θ
test/golden/importless/2.13.txt+15−16
@@ -1,31 +1,30 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.all = β,
3− α.bsd3 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { description = String;
98 homepage = String;
10− license = γ;
9+ license = δ;
1110 longDescription = String;
12− platforms = β;
11+ platforms = ε;
1312 };
1413 name = String;
15− propagatedBuildInputs = [ε];
16− src = ζ;
14+ propagatedBuildInputs = [ζ];
15+ src = η;
1716 } ->
18− η,
19− θ.licenses = α,
20− ι.lib = θ,
21− κ.platforms = α,
22− λ.lib = κ
17+ θ,
18+ β.licenses = ι,
19+ ι.bsd3 = δ,
20+ κ.platforms = λ,
21+ λ.all = ε
2322) =>
2423{ coreutils = μ;
25− fetchurl = {sha256 = String; url = String;} -> ζ;
24+ fetchurl = {sha256 = String; url = String;} -> η;
2625 gnugrep = ν;
27− jre = ε;
28− makeWrapper = δ;
26+ jre = ζ;
27+ makeWrapper = γ;
2928 stdenv = α;
3029} ->
31−η
30+θ
test/golden/importless/2.2.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/2.22.txt+11−13
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.linux = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 meta =
@@ -9,24 +9,22 @@
99 homepage = String;
1010 license = δ;
1111 maintainers = [ε];
12− platforms = β;
12+ platforms = ζ;
1313 version = String;
1414 };
1515 name = String;
1616 postBuild = String;
1717 postInstall = String;
1818 preConfigure = String;
19− src = ζ;
19+ src = η;
2020 version = String;
2121 } ->
22− η,
23− α.raskin = ε,
24− α.zlib = δ,
25− θ.licenses = α,
26− ι.lib = θ,
27− κ.maintainers = α,
28− λ.lib = κ,
29− μ.platforms = α,
30− ν.lib = μ
22+ θ,
23+ β.licenses = ι,
24+ ι.zlib = δ,
25+ κ.maintainers = λ,
26+ λ.raskin = ε,
27+ μ.platforms = ν,
28+ ν.linux = ζ
3129) =>
32−{fetchurl = {sha256 = String; url = String;} -> ζ; stdenv = α; unzip = γ;} -> η
30+{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = γ;} -> θ
test/golden/importless/2.26.txt+17−19
@@ -1,34 +1,32 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.linux = β,
3− α.mit = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 buildPhase = String;
76 installPhase = String;
87 meta =
98 { description = String;
10− license = γ;
9+ license = δ;
1110 maintainers = [ε];
12− platforms = β;
11+ platforms = ζ;
1312 version = String;
1413 };
1514 name = String;
16− src = ζ;
15+ src = η;
1716 version = String;
1817 } ->
19− η,
20− α.raskin = ε,
21− θ.licenses = α,
22− ι.lib = θ,
23− κ.maintainers = α,
24− λ.lib = κ,
25− μ.platforms = α,
26− ν.lib = μ
18+ θ,
19+ β.licenses = ι,
20+ ι.mit = δ,
21+ κ.maintainers = λ,
22+ λ.raskin = ε,
23+ μ.platforms = ν,
24+ ν.linux = ζ
2725) =>
28−{ fetchurl = {sha256 = String; url = String;} -> ζ;
29− perl = δ;
26+{ fetchurl = {sha256 = String; url = String;} -> η;
27+ perl = γ;
3028 stdenv = α;
31− texLive = δ;
32− texinfo = δ;
29+ texLive = γ;
30+ texinfo = γ;
3331} ->
34−η
32+θ
test/golden/importless/2.4.0.txt+9−10
@@ -1,18 +1,17 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.asl20 = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 installPhase = String;
66 meta =
7− {description = String; homepage = String; license = β; platforms = δ;};
7+ {description = String; homepage = String; license = δ; platforms = ε;};
88 name = String;
9− src = ε;
9+ src = ζ;
1010 } ->
11− ζ,
12− α.unix = δ,
13− η.licenses = α,
14− θ.lib = η,
15− ι.platforms = α,
16− κ.lib = ι
11+ η,
12+ β.licenses = θ,
13+ θ.asl20 = δ,
14+ ι.platforms = κ,
15+ κ.unix = ε
1716) =>
18−{fetchurl = {sha256 = String; url = String;} -> ε; stdenv = α; unzip = γ;} -> ζ
17+{fetchurl = {sha256 = String; url = String;} -> ζ; stdenv = α; unzip = γ;} -> η
test/golden/importless/2.4.txtnew file+79
@@ -0,0 +1,79 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1.
2+( α.isDarwin = Bool,
3+ α.lib = β,
4+ α.mkDerivation =
5+ { NIX_LDFLAGS = γ;
6+ buildInputs = [δ];
7+ configureFlags = [String];
8+ enableParallelBuilding = Bool;
9+ meta =
10+ { description = String;
11+ homepage = String;
12+ license = ε;
13+ maintainers = [ζ];
14+ platforms = [η];
15+ };
16+ outputs = [String];
17+ passthru =
18+ { apr = θ;
19+ aprutil = ι;
20+ ldapSupport = Bool;
21+ proxySupport = Bool;
22+ sslSupport = Bool;
23+ };
24+ pname = String;
25+ postInstall = String;
26+ prePatch = String;
27+ setOutputFlags = Bool;
28+ src = κ;
29+ stripDebugList = [String];
30+ version = String;
31+ } ->
32+ λ,
33+ ι.ldapSupport = Bool,
34+ ι.sslSupport = Bool,
35+ β.optional = Bool -> Null -> [δ],
36+ μ.licenses = ν,
37+ μ.lovek323 = ζ,
38+ μ.maintainers = ξ,
39+ μ.peti = ζ,
40+ ν.asl20 = ε,
41+ ο.platforms = π,
42+ π.linux = [η],
43+ ρ.platforms = σ,
44+ σ.darwin = [η],
45+ τ.enableFeature = Bool -> String -> String,
46+ υ.enableFeature = Bool -> String -> String,
47+ φ.withFeatureAs = Bool -> String -> String -> String,
48+ χ.enableFeature = Bool -> String -> String,
49+ ψ.withFeatureAs = Bool -> String -> Null -> String,
50+ ω.enableFeature = Bool -> String -> String,
51+ α1.withFeature = Bool -> String -> String,
52+ β1.enableFeature = Bool -> String -> String,
53+ γ1.withFeatureAs = Bool -> String -> δ1 -> String,
54+ ε1.optionalString = Bool -> String -> γ
55+) =>
56+{ apr = θ;
57+ aprutil = ι;
58+ brotli = Null;
59+ brotliSupport = Bool;
60+ fetchurl = {sha256 = String; url = String;} -> κ;
61+ http2Support = Bool;
62+ ldapSupport = Bool;
63+ libiconv = Null;
64+ libxml2 = Null;
65+ libxml2Support = Bool;
66+ lua5 = δ1;
67+ luaSupport = Bool;
68+ lynx = ζ1;
69+ nghttp2 = Null;
70+ openldap = Null;
71+ openssl = Null;
72+ pcre = η1;
73+ perl = δ;
74+ proxySupport = Bool;
75+ sslSupport = Bool;
76+ stdenv = α;
77+ zlib = θ1;
78+} ->
79+λ
test/golden/importless/2.5.35.txt+1−2
@@ -19,12 +19,11 @@
1919 src = ι;
2020 } ->
2121 κ,
22− α.optionals = Bool -> [String] -> η,
2322 γ.licenses = λ,
2423 γ.platforms = μ,
2524 λ.bsd2 = δ,
2625 μ.unix = ε,
27− ν.lib = α
26+ ν.optionals = Bool -> [String] -> η
2827) =>
2928{ autoreconfHook = ζ;
3029 bison = ζ;
test/golden/importless/2.5.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ.
2−( (α) // ({src = β; version = String;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β; version = String;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β
55) =>
66α -> δ
test/golden/importless/2.6.1.txt+3−5
@@ -16,15 +16,13 @@
1616 src = κ;
1717 } ->
1818 λ,
19− α.optionalString = Bool -> String -> η,
20− α.optionals = Bool -> [String] -> θ,
2119 γ.licenses = μ,
2220 γ.platforms = ν,
2321 μ.bsd2 = ε,
2422 ν.unix = ζ,
25− ξ.lib = α,
26− ο.lib = α,
27− π.lib = α
23+ ξ.optionalString = Bool -> String -> η,
24+ ο.optionalString = Bool -> String -> String,
25+ π.optionals = Bool -> [String] -> θ
2826) =>
2927{ bison = δ;
3028 fetchurl = {sha256 = String; url = String;} -> κ;
test/golden/importless/2.6.13-pre.txtnew file+45
@@ -0,0 +1,45 @@
1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
2+( β.cc = γ,
3+ δ.?libc = ε,
4+ β.lib = ζ,
5+ β.mkDerivation =
6+ { buildInputs = [η];
7+ configureFlags = [String];
8+ hardeningDisable = [String];
9+ meta = {description = String; maintainers = [θ]; platforms = ι;};
10+ patches = ∀ α. [α];
11+ pname = String;
12+ postPatch = String;
13+ sourceRoot = String;
14+ src = κ;
15+ version = String;
16+ } ->
17+ λ,
18+ μ.isGNU = Bool,
19+ ν.libc = Null,
20+ ζ.maintainers = ξ,
21+ ξ.raskin = θ,
22+ ο.platforms = π,
23+ π.linux = ι
24+) =>
25+{ binutils = η;
26+ emacs = η;
27+ fetchgit = {rev = String; sha256 = String; url = String;} -> κ;
28+ gmp = η;
29+ libX11 = η;
30+ libXaw = η;
31+ libXext = η;
32+ libXi = η;
33+ libXmu = η;
34+ libXt = η;
35+ m4 = η;
36+ mpfr = η;
37+ readline = η;
38+ stdenv = β;
39+ strace = η;
40+ texinfo = η;
41+ which = η;
42+ xorgproto = η;
43+ zlib = η;
44+} ->
45+λ
test/golden/importless/2.6.2.txt+18−20
@@ -1,33 +1,31 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( α.free = β,
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
2+( α.hostPlatform = β,
33 α.isDarwin = γ,
4+ α.lib = δ,
45 α.mkDerivation =
5− { NIX_CFLAGS_COMPILE = δ;
6+ { NIX_CFLAGS_COMPILE = ε;
67 buildPhase = String;
78 checkPhase = String;
89 doCheck = Bool;
910 hardeningDisable = [String];
1011 installPhase = String;
1112 meta =
12− {description = String; homepage = String; license = β; platforms = ε;};
13− nativeBuildInputs = [ζ];
14− patches = [Path];
13+ {description = String; homepage = String; license = ζ; platforms = η;};
14+ nativeBuildInputs = [θ];
15+ patches = [String];
1516 pname = String;
1617 preConfigure = String;
17− src = η;
18+ src = ι;
1819 version = String;
1920 } ->
20− θ,
21− α.optionalString = γ -> String -> δ,
22− α.sharedLibrary = ι,
23− α.unix = ε,
24− κ.extensions = α,
25− λ.hostPlatform = κ,
26− μ.lib = α,
27− ν.lib = α,
28− ξ.licenses = α,
29− ο.lib = ξ,
30− π.platforms = α,
31− ρ.lib = π
21+ κ,
22+ β.extensions = λ,
23+ λ.sharedLibrary = μ,
24+ δ.optionalString = γ -> String -> ε,
25+ ν.optionalString = ξ -> String -> String,
26+ ο.licenses = π,
27+ π.free = ζ,
28+ ρ.platforms = σ,
29+ σ.unix = η
3230) =>
33−{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = ζ;} -> θ
31+{fetchurl = {sha256 = String; url = String;} -> ι; stdenv = α; unzip = θ;} -> κ
test/golden/importless/2.64.txt+14−15
@@ -1,8 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.gpl2Plus = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 doCheck = Bool;
76 doInstallCheck = Bool;
87 dontPatchShebangs = Bool;
@@ -10,23 +9,23 @@
109 meta =
1110 { description = String;
1211 homepage = String;
13− license = γ;
12+ license = δ;
1413 longDescription = String;
15− platforms = β;
14+ platforms = ε;
1615 };
1716 name = String;
1817 preCheck = String;
19− src = ε;
18+ src = ζ;
2019 } ->
21− ζ,
22− η.licenses = α,
23− θ.lib = η,
24− ι.platforms = α,
25− κ.lib = ι
20+ η,
21+ β.licenses = θ,
22+ θ.gpl2Plus = δ,
23+ ι.platforms = κ,
24+ κ.all = ε
2625) =>
27−{ fetchurl = {sha256 = String; url = String;} -> ε;
28− m4 = δ;
29− perl = δ;
26+{ fetchurl = {sha256 = String; url = String;} -> ζ;
27+ m4 = γ;
28+ perl = γ;
3029 stdenv = α;
3130} ->
32−ζ
31+η
test/golden/importless/2.7-html.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/2.7-pdf-a4.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/2.7-pdf-letter.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/2.7-text.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/2.7.7.txt+1−1
@@ -11,7 +11,7 @@
1111 };
1212 name = String;
1313 nativeBuildInputs = [ζ];
14− patches = [Path];
14+ patches = [String];
1515 src = η;
1616 } ->
1717 θ,
test/golden/importless/2.8.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( ({branch = String; sha256 = String; version = String;}) // (α) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( {branch = String; sha256 = String; version = String;} // α ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/2.x.txt+23−24
@@ -1,40 +1,39 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.lib = β,
3− γ.buildPythonApplication =
4− { checkInputs = [δ];
3+ γ.pkgs = δ,
4+ β.aneeshusa = ε,
5+ β.edwtjo = ε,
6+ β.infinisil = ε,
7+ β.licenses = ζ,
8+ β.maintainers = η,
9+ β.pSub = ε,
10+ ζ.gpl3Plus = θ,
11+ δ.buildPythonApplication =
12+ { checkInputs = [ι];
513 meta =
614 { description = String;
715 homepage = String;
8− license = ε;
16+ license = θ;
917 longDescription = String;
10− maintainers = [ζ];
18+ maintainers = [ε];
1119 };
1220 pname = String;
1321 postPatch = String;
14− propagatedBuildInputs = [η];
15− src = θ;
22+ propagatedBuildInputs = [κ];
23+ src = λ;
1624 version = String;
1725 } ->
18− ι,
19− γ.pkgs = κ,
20− β.aneeshusa = ζ,
21− β.edwtjo = ζ,
22− β.infinisil = ζ,
23− β.licenses = λ,
24− β.maintainers = μ,
25− β.pSub = ζ,
26− λ.gpl3Plus = ε,
27− ν.pkgs = γ,
28− κ.passlib = η,
29− κ.python-dateutil = η,
30− κ.setuptools = η,
31− κ.vobject = η,
32− ξ.pytest = δ,
33− ξ.pytestrunner = δ
26+ μ,
27+ ν.passlib = κ,
28+ ν.python-dateutil = κ,
29+ ν.setuptools = κ,
30+ ν.vobject = κ,
31+ ξ.pytest = ι,
32+ ξ.pytestrunner = ι
3433) =>
3534{ fetchFromGitHub =
36− {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
35+ {owner = String; repo = String; rev = String; sha256 = String;} -> λ;
3736 python3 = γ;
3837 stdenv = α;
3938} ->
40−ι
39+μ
test/golden/importless/20160331.txt+22−24
@@ -1,38 +1,36 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.lgpl21Plus = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 meta =
76 { description = String;
8− license = β;
7+ license = δ;
98 maintainers = [ε];
10− platforms = γ;
9+ platforms = ζ;
1110 version = String;
1211 };
13− nativeBuildInputs = [ζ];
12+ nativeBuildInputs = [η];
1413 pname = String;
15− src = η;
14+ src = θ;
1615 version = String;
1716 } ->
18− θ,
19− α.raskin = ε,
20− ι.licenses = α,
21− κ.lib = ι,
22− λ.maintainers = α,
23− μ.lib = λ,
24− ν.platforms = α,
25− ξ.lib = ν
17+ ι,
18+ β.licenses = κ,
19+ κ.lgpl21Plus = δ,
20+ λ.maintainers = μ,
21+ μ.raskin = ε,
22+ ν.platforms = ξ,
23+ ξ.linux = ζ
2624) =>
27−{ autoconf = ζ;
28− automake = ζ;
29− autoreconfHook = ζ;
25+{ autoconf = η;
26+ automake = η;
27+ autoreconfHook = η;
3028 fetchFromGitHub =
31− {owner = String; repo = String; rev = String; sha256 = String;} -> η;
32− gettext = ζ;
33− gmp = δ;
34− libtool = ζ;
35− mpfr = δ;
29+ {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
30+ gettext = η;
31+ gmp = γ;
32+ libtool = η;
33+ mpfr = γ;
3634 stdenv = α;
3735} ->
38−θ
36+ι
test/golden/importless/25.txt+30−36
@@ -1,40 +1,34 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
2−( α.optional = Bool -> [β] -> [γ],
3− α.unfree = δ,
4− ε.freetype = β,
5− ε.glibc = β,
6− ε.lib = β,
7− ε.libGL = β,
8− ε.libX11 = β,
9− ε.libXdamage = β,
10− ε.libXext = β,
11− ε.libXfixes = β,
12− ε.libXrender = β,
13− ε.libpulseaudio = β,
14− ε.libxcb = β,
15− ε.ncurses5 = β,
16− ε.zlib = β,
17− ζ.fontconfig = β,
18− ζ.freetype = β,
19− ζ.glibc = β,
20− ζ.libX11 = β,
21− ζ.libXrender = β,
22− ζ.zlib = β,
23− η.licenses = α,
24− θ.xlibs = ε,
25− ι.xlibs = ε,
26− κ.xlibs = ε,
27− λ.xlibs = ε,
28− μ.xlibs = ε,
29− ν.xlibs = ε,
30− ξ.fontconfig = ε,
31− ο.xlibs = ζ,
32− π.xlibs = ζ
2+( α.licenses = β,
3+ α.optional = Bool -> [γ] -> [δ],
4+ ε.fontconfig = ζ,
5+ ε.freetype = γ,
6+ ε.glibc = γ,
7+ ε.libGL = γ,
8+ ε.libpulseaudio = γ,
9+ ε.ncurses5 = γ,
10+ ε.xlibs = η,
11+ ε.zlib = γ,
12+ θ.fontconfig = γ,
13+ θ.freetype = γ,
14+ θ.glibc = γ,
15+ θ.xlibs = ι,
16+ θ.zlib = γ,
17+ β.unfree = κ,
18+ η.libX11 = γ,
19+ λ.libXext = γ,
20+ μ.libXdamage = γ,
21+ ν.libxcb = γ,
22+ ξ.libXfixes = γ,
23+ ο.libXrender = γ,
24+ ζ.lib = γ,
25+ ι.libX11 = γ,
26+ π.libXrender = γ
3327) =>
34−{ autoPatchelfHook = γ;
28+{ autoPatchelfHook = δ;
3529 deployAndroidPackage =
36− { buildInputs = [γ];
37− meta = {licenses = δ;};
30+ { buildInputs = [δ];
31+ meta = {licenses = κ;};
3832 name = String;
3933 os = String;
4034 package = ρ;
@@ -42,11 +36,11 @@
4236 } ->
4337 σ;
4438 lib = α;
45− makeWrapper = γ;
39+ makeWrapper = δ;
4640 os = String;
4741 package = ρ;
4842 pkgs = ε;
49− pkgs_i686 = ζ;
43+ pkgs_i686 = θ;
5044 postInstall = String;
5145} ->
5246σ
test/golden/importless/26.txt+25−30
@@ -1,34 +1,29 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( α.optional = Bool -> [β] -> [γ],
3− α.unfree = δ,
4− ε.fontconfig = β,
5− ε.freetype = β,
6− ε.glibc = β,
7− ε.lib = β,
8− ε.libX11 = β,
9− ε.libXext = β,
10− ε.libXrender = β,
11− ζ.freetype = β,
12− ζ.glibc = β,
13− ζ.lib = β,
14− ζ.libX11 = β,
15− ζ.libXext = β,
16− ζ.libXrender = β,
17− ζ.zlib = β,
18− η.licenses = α,
19− θ.xlibs = ε,
20− ι.xlibs = ε,
21− κ.xlibs = ε,
22− λ.fontconfig = ε,
23− μ.xlibs = ζ,
24− ν.xlibs = ζ,
25− ξ.xlibs = ζ,
26− ο.fontconfig = ζ
2+( α.licenses = β,
3+ α.optional = Bool -> [γ] -> [δ],
4+ ε.fontconfig = γ,
5+ ε.freetype = γ,
6+ ε.glibc = γ,
7+ ε.xlibs = ζ,
8+ η.fontconfig = θ,
9+ η.freetype = γ,
10+ η.glibc = γ,
11+ η.xlibs = ι,
12+ η.zlib = γ,
13+ β.unfree = κ,
14+ ζ.libX11 = γ,
15+ λ.libXrender = γ,
16+ μ.libXext = γ,
17+ ν.lib = γ,
18+ ι.libX11 = γ,
19+ ξ.libXrender = γ,
20+ ο.libXext = γ,
21+ θ.lib = γ
2722) =>
28−{ autoPatchelfHook = γ;
23+{ autoPatchelfHook = δ;
2924 deployAndroidPackage =
30− { buildInputs = [γ];
31− meta = {licenses = δ;};
25+ { buildInputs = [δ];
26+ meta = {licenses = κ;};
3227 name = String;
3328 os = String;
3429 package = π;
@@ -36,11 +31,11 @@
3631 } ->
3732 ρ;
3833 lib = α;
39− makeWrapper = γ;
34+ makeWrapper = δ;
4035 os = String;
4136 package = π;
4237 pkgs = ε;
43− pkgs_i686 = ζ;
38+ pkgs_i686 = η;
4439 postInstall = String;
4540} ->
4641ρ
test/golden/importless/2_4.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/2bwm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.2bwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ._2bwm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.2bwm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/3.0.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/3.0.x.txt+14−15
@@ -1,27 +1,26 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.gpl3Plus = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { meta =
55 { description = String;
66 homepage = String;
7− license = β;
7+ license = γ;
88 longDescription = String;
9− platforms = γ;
9+ platforms = δ;
1010 };
1111 name = String;
12− nativeBuildInputs = [δ];
13− patches = [Path];
14− src = ε;
12+ nativeBuildInputs = [ε];
13+ patches = [String];
14+ src = ζ;
1515 } ->
16− ζ,
17− α.unix = γ,
18− η.licenses = α,
19− θ.lib = η,
20− ι.platforms = α,
21− κ.lib = ι
16+ η,
17+ β.licenses = θ,
18+ θ.gpl3Plus = γ,
19+ ι.platforms = κ,
20+ κ.unix = δ
2221) =>
23−{ autoreconfHook = δ;
24− fetchurl = {sha256 = String; url = String;} -> ε;
22+{ autoreconfHook = ε;
23+ fetchurl = {sha256 = String; url = String;} -> ζ;
2524 stdenv = α;
2625} ->
27−ζ
26+η
test/golden/importless/3.08.0.txt+10−10
@@ -1,23 +1,23 @@
11∀ α β γ δ ε ζ.
2−( α.linux = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildFlags = [String];
5− builder = Path;
5+ builder = String;
66 checkTarget = [String];
77 configureFlags = [String];
8− configureScript = Path;
8+ configureScript = String;
99 dontAddPrefix = String;
10− meta = {platforms = β;};
10+ meta = {platforms = γ;};
1111 pname = String;
12− src = γ;
12+ src = δ;
1313 version = String;
1414 } ->
15− δ,
16− ε.platforms = α,
17− ζ.lib = ε
15+ ε,
16+ β.platforms = ζ,
17+ ζ.linux = γ
1818) =>
19−{ fetchurl = {sha256 = String; url = String;} -> γ;
19+{ fetchurl = {sha256 = String; url = String;} -> δ;
2020 stdenv = α;
2121 xlibsWrapper = String;
2222} ->
23−δ
23+ε
test/golden/importless/3.1.txt+8−8
@@ -1,14 +1,14 @@
11∀ α β γ δ ε ζ η.
2−( α.mkDerivation =
2+( α.lib = β,
3+ α.mkDerivation =
34 { dontUnpack = Bool;
45 installPhase = String;
5− meta = {platforms = β;};
6+ meta = {platforms = γ;};
67 name = String;
7− nativeBuildInputs = [γ];
8+ nativeBuildInputs = [δ];
89 } ->
9− δ,
10− α.unix = β,
11− ε.platforms = α,
12− ζ.lib = ε
10+ ε,
11+ β.platforms = ζ,
12+ ζ.unix = γ
1313) =>
14−{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = γ;} -> δ
14+{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = δ;} -> ε
test/golden/importless/3.10.0.txt+8−9
@@ -1,6 +1,5 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.licenses = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { buildFlags = [String];
65 buildInputs = [String];
@@ -9,8 +8,8 @@
98 meta =
109 { description = String;
1110 homepage = String;
12− license = [δ];
13− platforms = γ;
11+ license = [γ];
12+ platforms = δ;
1413 };
1514 patchPhase = String;
1615 pname = String;
@@ -20,11 +19,11 @@
2019 version = String;
2120 } ->
2221 ζ,
23− β.lgpl2 = δ,
24− β.qpl = δ,
25− η.lib = α,
26− θ.platforms = α,
27− ι.lib = θ
22+ β.licenses = η,
23+ η.lgpl2 = γ,
24+ η.qpl = γ,
25+ θ.platforms = ι,
26+ ι.linux = δ
2827) =>
2928{ fetchurl = {sha256 = String; url = String;} -> ε;
3029 ncurses = String;
test/golden/importless/3.10.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.11.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/3.12.1.txtnew file+42
@@ -0,0 +1,42 @@
1+∀ α β γ δ ε ζ η θ ι κ.
2+( α.isAarch32 = Bool,
3+ α.isDarwin = Bool,
4+ α.isMips = Bool,
5+ α.lib = β,
6+ α.mkDerivation =
7+ { buildFlags = [String];
8+ buildInputs = [String];
9+ configureFlags = [String];
10+ installTargets = String;
11+ meta =
12+ { branch = String;
13+ description = String;
14+ homepage = String;
15+ license = [γ];
16+ longDescription = String;
17+ platforms = δ;
18+ };
19+ passthru = {nativeCompilers = Bool;};
20+ patches = [String];
21+ pname = String;
22+ postBuild = String;
23+ preConfigure = String;
24+ prefixKey = String;
25+ src = ε;
26+ version = String;
27+ } ->
28+ ζ,
29+ β.optionals = Bool -> [String] -> [String],
30+ η.optionalString = Bool -> String -> String,
31+ θ.lgpl2 = γ,
32+ θ.licenses = ι,
33+ θ.linux = δ,
34+ θ.platforms = κ,
35+ θ.qpl = γ
36+) =>
37+{ fetchurl = {sha256 = String; url = String;} -> ε;
38+ ncurses = String;
39+ stdenv = α;
40+ xlibsWrapper = String;
41+} ->
42+ζ
test/golden/importless/3.12.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.13.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.5.txt+2−2
@@ -1,7 +1,7 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β; version = String;}) ~ (γ),
2+( α // {src = β; version = String;} ~ γ,
33 α.autoreconfHook = δ,
4− α.callPackage = Path -> γ -> ε,
4+ α.callPackage = String -> γ -> ε,
55 α.fetchFromGitHub =
66 {owner = String; repo = String; rev = String; sha256 = String;} -> β
77) =>
test/golden/importless/3.6.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.7-html.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/3.7-pdf-a4.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/3.7-pdf-letter.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/3.7-text.txt+1−1
@@ -1,7 +1,7 @@
11∀ β γ δ ε.
22( β.mkDerivation =
33 { installPhase = String;
4− meta = {maintainers = ∀ α. α;};
4+ meta = {maintainers = ∀ α. [α];};
55 name = String;
66 src = γ;
77 } ->
test/golden/importless/3.7.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.8.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.9.txt+1−1
@@ -1,2 +1,2 @@
11∀ α β.
2−(α.callPackage = Path -> {sha256 = String; version = String;} -> β) => α -> β
2+(α.callPackage = String -> {sha256 = String; version = String;} -> β) => α -> β
test/golden/importless/3.txt+20−22
@@ -1,35 +1,33 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.cecill-b = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 meta =
76 { description = String;
8− license = β;
7+ license = δ;
98 maintainers = [ε];
10− platforms = γ;
9+ platforms = ζ;
1110 version = String;
1211 };
13− nativeBuildInputs = [ζ];
12+ nativeBuildInputs = [η];
1413 pname = String;
15− src = η;
14+ src = θ;
1615 version = String;
1716 } ->
18− θ,
19− α.raskin = ε,
20− ι.licenses = α,
21− κ.lib = ι,
22− λ.maintainers = α,
23− μ.lib = λ,
24− ν.platforms = α,
25− ξ.lib = ν
17+ ι,
18+ β.licenses = κ,
19+ κ.cecill-b = δ,
20+ λ.maintainers = μ,
21+ μ.raskin = ε,
22+ ν.platforms = ξ,
23+ ξ.linux = ζ
2624) =>
27−{ autoconf = δ;
28− automake = δ;
29− autoreconfHook = ζ;
30− fetchurl = {sha256 = String; url = String;} -> η;
31− gmpxx = δ;
32− libtool = δ;
25+{ autoconf = γ;
26+ automake = γ;
27+ autoreconfHook = η;
28+ fetchurl = {sha256 = String; url = String;} -> θ;
29+ gmpxx = γ;
30+ libtool = γ;
3331 stdenv = α;
3432} ->
35−θ
33+ι
test/golden/importless/3.x.txt+20−21
@@ -2,8 +2,10 @@
22( α.dotlambda = β,
33 α.licenses = γ,
44 α.maintainers = δ,
5− ε.buildPythonApplication =
6− { checkInputs = [ζ];
5+ ε.pkgs = ζ,
6+ γ.gpl3Plus = η,
7+ ζ.buildPythonApplication =
8+ { checkInputs = [θ];
79 meta =
810 { description = String;
911 homepage = String;
@@ -11,29 +13,26 @@
1113 maintainers = [β];
1214 };
1315 pname = String;
14− propagatedBuildInputs = [θ];
15− src = ι;
16+ propagatedBuildInputs = [ι];
17+ src = κ;
1618 version = String;
1719 } ->
18− κ,
19− ε.pkgs = λ,
20− γ.gpl3Plus = η,
21− μ.pkgs = ε,
22− λ.defusedxml = θ,
23− λ.passlib = θ,
24− λ.python-dateutil = θ,
25− λ.setuptools = θ,
26− λ.vobject = θ,
27− ν.pytest = ζ,
28− ν.pytest-flake8 = ζ,
29− ν.pytest-isort = ζ,
30− ν.pytestcov = ζ,
31− ν.pytestrunner = ζ,
32− ν.waitress = ζ
20+ λ,
21+ μ.defusedxml = ι,
22+ μ.passlib = ι,
23+ μ.python-dateutil = ι,
24+ μ.setuptools = ι,
25+ μ.vobject = ι,
26+ ν.pytest = θ,
27+ ν.pytest-flake8 = θ,
28+ ν.pytest-isort = θ,
29+ ν.pytestcov = θ,
30+ ν.pytestrunner = θ,
31+ ν.waitress = θ
3332) =>
3433{ fetchFromGitHub =
35− {owner = String; repo = String; rev = String; sha256 = String;} -> ι;
34+ {owner = String; repo = String; rev = String; sha256 = String;} -> κ;
3635 lib = α;
3736 python3 = ε;
3837} ->
39−κ
38+λ
test/golden/importless/38.txt+6−7
@@ -6,7 +6,7 @@
66 β.mkDerivation =
77 { buildInputs = [ζ];
88 configureFlags = [String];
9− configurePlatforms = ∀ α. α;
9+ configurePlatforms = ∀ α. [α];
1010 depsBuildBuild = [η];
1111 enableParallelBuilding = Bool;
1212 meta =
@@ -24,22 +24,21 @@
2424 version = String;
2525 } ->
2626 μ,
27− β.optional = δ -> ν -> [ζ],
28− ξ.cc = η,
27+ ν.stdenv = ξ,
2928 ε.maintainers = ο,
3029 ε.optionals = Bool -> [String] -> [String],
3130 ε.platforms = π,
3231 ο.abbradar = θ,
3332 π.unix = ι,
34− ρ.lib = β,
35− σ.stdenv = ξ
33+ ρ.optional = δ -> σ -> [ζ],
34+ ξ.cc = η
3635) =>
37−{ buildPackages = ξ;
36+{ buildPackages = ν;
3837 fetchurl = {sha256 = String; url = String;} -> λ;
3938 gnused_422 = κ;
4039 icu = ζ;
4140 libffi = ζ;
42− libobjc = ν;
41+ libobjc = σ;
4342 perl = κ;
4443 pkgconfig = κ;
4544 python2 = κ;
test/golden/importless/3_1.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ.
2−( (α) // ({sha256 = String; version = String;}) ~ (β),
3− α.callPackage = Path -> β -> γ
2+( α // {sha256 = String; version = String;} ~ β,
3+ α.callPackage = String -> β -> γ
44) =>
55α -> γ
test/golden/importless/3dovideo.txt+20−20
@@ -1,35 +1,35 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
2−( α.bsd3 = β,
3− α.lib = γ,
4− α.mkDerivation = {buildCommand = String; name = String; src = δ;} -> ε,
5− γ.base = ζ,
6− γ.binary = ζ,
7− γ.bytestring = ζ,
8− γ.concatMapStrings = (η -> String) -> θ -> String,
9− γ.filepath = ζ,
10− γ.lessThan = η -> Integer -> ι,
11− γ.mkDerivation =
12− { buildDepends = [ζ];
2+( α.lib = β,
3+ α.mkDerivation = {buildCommand = String; name = String; src = γ;} -> δ,
4+ β.base = ε,
5+ β.binary = ε,
6+ β.bytestring = ε,
7+ β.concatMapStrings = (ζ -> String) -> η -> String,
8+ β.filepath = ε,
9+ β.lessThan = ζ -> Number -> θ,
10+ β.mkDerivation =
11+ { buildDepends = [ε];
1312 description = String;
1413 isExecutable = Bool;
1514 isLibrary = Bool;
16− license = β;
15+ license = ι;
1716 pname = String;
1817 src = κ;
1918 version = String;
2019 } ->
2120 λ,
22− γ.optionalString = ι -> String -> μ,
23− γ.range = Integer -> Integer -> θ,
24− γ.tar = ζ,
25− γ.toString = η -> μ,
26− ν.licenses = α,
27− ξ.lib = ν
21+ β.optionalString = θ -> String -> μ,
22+ β.range = Number -> Number -> η,
23+ β.tar = ε,
24+ β.toString = ζ -> μ,
25+ ν.licenses = ξ,
26+ ξ.bsd3 = ι,
27+ (String | Number) ~ μ
2828) =>
2929{ fetchurl = {sha256 = String; url = String;} -> κ;
3030 haskellPackages = ο;
31− requireFile = {message = String; name = String; sha256 = String;} -> δ;
31+ requireFile = {message = String; name = String; sha256 = String;} -> γ;
3232 stdenv = α;
3333 writeText = String -> String -> π;
3434} ->
35−ε
35+δ
test/golden/importless/4.01.17.txt+11−12
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.lib = β,
3− α.makeLibraryPath = [γ] -> String,
2+( α.hostPlatform = β,
3+ α.lib = γ,
44 α.mkDerivation =
55 { dontPatchELF = Bool;
66 dontStrip = Bool;
@@ -17,20 +17,19 @@
1717 version = String;
1818 } ->
1919 θ,
20− α.system = String,
21− ι.lib = α,
22− κ.hostPlatform = α,
23− λ.hostPlatform = α,
24− β.joko = ε,
25− β.licenses = μ,
26− β.maintainers = ν,
27− β.platforms = ξ,
20+ γ.makeLibraryPath = [ι] -> String,
21+ β.system = String,
22+ κ.system = String,
23+ λ.joko = ε,
24+ λ.licenses = μ,
25+ λ.maintainers = ν,
26+ λ.platforms = ξ,
2827 μ.unfree = δ,
2928 ξ.linux = ζ
3029) =>
31−{ cups = γ;
30+{ cups = ι;
3231 fetchurl = {sha256 = String; url = String;} -> η;
33− libusb-compat-0_1 = γ;
32+ libusb-compat-0_1 = ι;
3433 stdenv = α;
3534} ->
3635θ
test/golden/importless/4.1.txt+8−8
@@ -1,14 +1,14 @@
11∀ α β γ δ ε ζ η.
2−( α.mkDerivation =
2+( α.lib = β,
3+ α.mkDerivation =
34 { dontUnpack = Bool;
45 installPhase = String;
5− meta = {platforms = β;};
6+ meta = {platforms = γ;};
67 name = String;
7− nativeBuildInputs = [γ];
8+ nativeBuildInputs = [δ];
89 } ->
9− δ,
10− α.unix = β,
11− ε.platforms = α,
12− ζ.lib = ε
10+ ε,
11+ β.platforms = ζ,
12+ ζ.unix = γ
1313) =>
14−{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = γ;} -> δ
14+{fetchurl = {sha256 = String; url = String;} -> η; stdenv = α; unzip = δ;} -> ε
test/golden/importless/4.13a.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι.
2−( (β) // ({branch = String;}) ~ (γ),
2+( β // {branch = String;} ~ γ,
33 δ.mkDerivation =
44 { buildInputs = [ε];
55 meta = ∀ α. α;
test/golden/importless/4.2.1.txt+18−20
@@ -1,34 +1,32 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.gpl2 = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 configureScript = String;
76 meta =
87 { description = String;
98 homepage = String;
10− license = β;
9+ license = δ;
1110 maintainers = [ε];
12− platforms = γ;
11+ platforms = ζ;
1312 };
1413 name = String;
15− nativeBuildInputs = [ζ];
16− passthru = {libdvdread = δ;};
14+ nativeBuildInputs = [η];
15+ passthru = {libdvdread = γ;};
1716 preConfigure = String;
18− src = η;
17+ src = θ;
1918 } ->
20− θ,
21− α.wmertens = ε,
22− ι.licenses = α,
23− κ.lib = ι,
24− λ.maintainers = α,
25− μ.lib = λ,
26− ν.platforms = α,
27− ξ.lib = ν
19+ ι,
20+ β.licenses = κ,
21+ κ.gpl2 = δ,
22+ λ.maintainers = μ,
23+ μ.wmertens = ε,
24+ ν.platforms = ξ,
25+ ξ.linux = ζ
2826) =>
29−{ fetchurl = {sha256 = String; url = String;} -> η;
30− libdvdread = δ;
31− pkgconfig = ζ;
27+{ fetchurl = {sha256 = String; url = String;} -> θ;
28+ libdvdread = γ;
29+ pkgconfig = η;
3230 stdenv = α;
3331} ->
34−θ
32+ι
test/golden/importless/4.3.2.txt+18−21
@@ -1,8 +1,6 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( β.all = γ,
3− β.enableFeature = Bool -> String -> δ,
4− β.isDarwin = Bool,
5− β.lgpl3Plus = ε,
2+( β.isDarwin = Bool,
3+ β.lib = γ,
64 β.mkDerivation =
75 { configureFlags = [δ];
86 doCheck = Bool;
@@ -13,29 +11,28 @@
1311 homepage = String;
1412 license = ε;
1513 longDescription = String;
16− maintainers = ∀ α. α;
17− platforms = γ;
14+ maintainers = ∀ α. [α];
15+ platforms = ζ;
1816 };
1917 name = String;
20− nativeBuildInputs = [ζ];
18+ nativeBuildInputs = [η];
2119 outputs = [String];
22− passthru = {static = η;};
20+ passthru = {static = θ;};
2321 preConfigure = String;
24− src = θ;
22+ src = ι;
2523 } ->
26− ι,
27− β.optionals = κ -> [String] -> [δ],
28− ι.out = λ,
29− μ.licenses = β,
30− ν.lib = μ,
31− ξ.platforms = β,
32− ο.lib = ξ,
33− π.lib = β,
34− ρ.lib = β
24+ κ,
25+ κ.out = λ,
26+ γ.licenses = μ,
27+ μ.lgpl3Plus = ε,
28+ ν.platforms = ξ,
29+ ξ.all = ζ,
30+ ο.enableFeature = Bool -> String -> δ,
31+ π.optionals = ρ -> [String] -> [δ]
3532) =>
3633{ cxx = Bool;
37− fetchurl = {sha256 = String; url = String;} -> θ;
38− m4 = ζ;
34+ fetchurl = {sha256 = String; url = String;} -> ι;
35+ m4 = η;
3936 stdenv = β;
4037} ->
41−ι
38+κ
test/golden/importless/4.4.txt+32−33
@@ -1,47 +1,46 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
2−( α.isDarwin = β,
3− α.lib = γ,
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ.
2+( α.hostPlatform = β,
3+ α.isDarwin = γ,
4+ α.lib = δ,
45 α.mkDerivation =
5− { NIX_CFLAGS_COMPILE = δ;
6− buildInputs = [ε];
6+ { NIX_CFLAGS_COMPILE = ε;
7+ buildInputs = [ζ];
78 makeFlags = [String];
89 meta =
910 { description = String;
1011 homepage = String;
11− license = [ζ];
12− maintainers = [η];
13− platforms = θ;
12+ license = [η];
13+ maintainers = [θ];
14+ platforms = ι;
1415 };
1516 name = String;
16− nativeBuildInputs = [ι];
17+ nativeBuildInputs = [κ];
1718 postInstall = String;
1819 preConfigure = String;
19− src = κ;
20+ src = λ;
2021 } ->
21− λ,
22− α.optionalString = β -> String -> δ,
23− α.sharedLibrary = μ,
24− ε.isILP64 = Bool,
25− ν.extensions = α,
26− ξ.hostPlatform = ν,
27− ο.lib = α,
28− γ.bsd2 = ζ,
29− γ.gpl2Plus = ζ,
30− γ.lgpl21Plus = ζ,
31− γ.licenses = π,
32− γ.maintainers = ρ,
33− γ.platforms = σ,
34− γ.ttuegel = η,
35− γ.unix = θ,
36− τ.lib = α,
37− υ.lib = α
22+ μ,
23+ ζ.isILP64 = Bool,
24+ β.extensions = ν,
25+ ν.sharedLibrary = ξ,
26+ δ.optionalString = γ -> String -> ε,
27+ ο.bsd2 = η,
28+ ο.gpl2Plus = η,
29+ ο.lgpl21Plus = η,
30+ ο.licenses = π,
31+ ο.maintainers = ρ,
32+ ο.platforms = σ,
33+ ο.ttuegel = θ,
34+ ο.unix = ι,
35+ τ.optionalString = υ -> String -> String,
36+ φ.optionalString = Bool -> String -> String
3837) =>
39−{ blas = ε;
40− cudatoolkit = φ;
38+{ blas = ζ;
39+ cudatoolkit = χ;
4140 enableCuda = Bool;
42− fetchurl = {sha256 = String; url = String;} -> κ;
43− gfortran = ι;
44− lapack = ε;
41+ fetchurl = {sha256 = String; url = String;} -> λ;
42+ gfortran = κ;
43+ lapack = ζ;
4544 stdenv = α;
4645} ->
47−λ
46+μ
test/golden/importless/4.9.9.txt+15−17
@@ -1,31 +1,29 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.gpl2 = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { NIX_LDFLAGS = String;
6− buildInputs = [δ];
5+ buildInputs = [γ];
76 meta =
87 { description = String;
98 homepage = String;
10− license = β;
9+ license = δ;
1110 maintainers = [ε];
12− platforms = γ;
11+ platforms = ζ;
1312 };
1413 name = String;
1514 postInstall = String;
16− src = ζ;
15+ src = η;
1716 } ->
18− η,
19− α.wmertens = ε,
20− θ.licenses = α,
21− ι.lib = θ,
22− κ.maintainers = α,
23− λ.lib = κ,
24− μ.platforms = α,
25− ν.lib = μ
17+ θ,
18+ β.licenses = ι,
19+ ι.gpl2 = δ,
20+ κ.maintainers = λ,
21+ λ.wmertens = ε,
22+ μ.platforms = ν,
23+ ν.linux = ζ
2624) =>
27−{ fetchurl = {sha256 = String; url = String;} -> ζ;
28− libdvdcss = δ;
25+{ fetchurl = {sha256 = String; url = String;} -> η;
26+ libdvdcss = γ;
2927 stdenv = α;
3028} ->
31−η
29+θ
test/golden/importless/4.txt+2−2
@@ -1,10 +1,10 @@
11∀ α β γ.
22{ Foundation = α;
33 callPackage =
4− Path ->
4+ String ->
55 { Foundation = α;
66 enableParallelBuilding = Bool;
7− extraPatches = [Path];
7+ extraPatches = [String];
88 libobjc = β;
99 sha256 = String;
1010 version = String;
test/golden/importless/422.txt+15−17
@@ -1,28 +1,26 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( β.all = γ,
3− β.gpl3Plus = δ,
4− β.isMinGW = ε,
2+( β.hostPlatform = γ,
3+ β.lib = δ,
54 β.mkDerivation =
6− { configureFlags = ζ;
5+ { configureFlags = ε;
76 meta =
87 { description = String;
98 homepage = String;
10− license = δ;
9+ license = ζ;
1110 longDescription = String;
12− maintainers = ∀ α. α;
13− platforms = γ;
11+ maintainers = ∀ α. [α];
12+ platforms = η;
1413 };
1514 name = String;
1615 outputs = [String];
17− src = η;
16+ src = θ;
1817 } ->
19− θ,
20− β.optional = ε -> String -> ζ,
21− ι.lib = β,
22− κ.hostPlatform = β,
23− λ.licenses = β,
24− μ.lib = λ,
25− ν.platforms = β,
26− ξ.lib = ν
18+ ι,
19+ δ.optional = κ -> String -> ε,
20+ γ.isMinGW = κ,
21+ λ.licenses = μ,
22+ μ.gpl3Plus = ζ,
23+ ν.platforms = ξ,
24+ ξ.all = η
2725) =>
28−{fetchurl = {sha256 = String; url = String;} -> η; stdenv = β;} -> θ
26+{fetchurl = {sha256 = String; url = String;} -> θ; stdenv = β;} -> ι
test/golden/importless/44.0.txt+24−24
@@ -1,20 +1,20 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
2−( β.isWindows = Bool,
3− β.lib = γ,
2+( β.hostPlatform = γ,
3+ β.lib = δ,
44 β.mkDerivation =
5− {buildPhase = String; installPhase = String; name = String; src = δ;} -> ε,
6− ζ.platforms = η,
7− θ.optionalString = Bool -> String -> ι,
8− κ.override = {pip = Null;} -> λ,
9− μ.override = {setuptools = Null; wheel = Null;} -> λ,
10− ν.hostPlatform = β,
11− γ.licenses = ξ,
12− γ.psfl = ο,
13− γ.zpl20 = ο,
14− π.meta = ζ,
15− ρ.strings = θ
5+ {buildPhase = String; installPhase = String; name = String; src = ε;} -> ζ,
6+ η.meta = θ,
7+ ι.strings = κ,
8+ λ.override = {pip = Null;} -> μ,
9+ ν.override = {setuptools = Null; wheel = Null;} -> μ,
10+ γ.isWindows = Bool,
11+ δ.licenses = ξ,
12+ δ.psfl = ο,
13+ δ.zpl20 = ο,
14+ θ.platforms = π,
15+ κ.optionalString = Bool -> String -> ρ
1616) =>
17−{ bootstrapped-pip = λ;
17+{ bootstrapped-pip = μ;
1818 buildPythonPackage =
1919 { catchConflicts = Bool;
2020 doCheck = Bool;
@@ -23,14 +23,14 @@
2323 { description = String;
2424 homepage = String;
2525 license = [ο];
26− platforms = η;
27− priority = Integer;
26+ platforms = π;
27+ priority = Number;
2828 };
29− nativeBuildInputs = [λ];
29+ nativeBuildInputs = [μ];
3030 pipInstallFlags = [String];
3131 pname = ∀ α. α;
32− preBuild = ι;
33− src = ε;
32+ preBuild = ρ;
33+ src = ζ;
3434 version = ∀ α. α;
3535 } ->
3636 σ;
@@ -42,11 +42,11 @@
4242 rev = String;
4343 sha256 = String;
4444 } ->
45− δ;
46− lib = θ;
47− pipInstallHook = κ;
48− python = ζ;
49− setuptoolsBuildHook = μ;
45+ ε;
46+ lib = ι;
47+ pipInstallHook = λ;
48+ python = η;
49+ setuptoolsBuildHook = ν;
5050 stdenv = β;
5151 unzip = υ;
5252 wrapPython = φ;
test/golden/importless/5.1.138.txt+11−11
@@ -1,20 +1,20 @@
11∀ α β γ δ ε ζ η.
2−( α.mkDerivation =
3− { buildInputs = [β];
2+( α.lib = β,
3+ α.mkDerivation =
4+ { buildInputs = [γ];
45 installPhase = String;
5− meta = {description = String; homepage = String; license = γ;};
6+ meta = {description = String; homepage = String; license = δ;};
67 phases = [String];
78 pname = String;
8− src = δ;
9+ src = ε;
910 version = String;
1011 } ->
11− ε,
12− α.unfree = γ,
13− ζ.licenses = α,
14− η.lib = ζ
12+ ζ,
13+ β.licenses = η,
14+ η.unfree = δ
1515) =>
16−{ b43FirmwareCutter = β;
17− fetchurl = {sha256 = String; url = String;} -> δ;
16+{ b43FirmwareCutter = γ;
17+ fetchurl = {sha256 = String; url = String;} -> ε;
1818 stdenv = α;
1919} ->
20−ε
20+ζ
test/golden/importless/5.41.txt+22−28
@@ -1,46 +1,40 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ.
2−( α.filter = (Null -> Bool) -> [Null] -> β,
3− α.gpl2 = γ,
4− α.makeBinPath = β -> δ,
2+( α.lib = β,
53 α.mkDerivation =
6− { buildInputs = ε;
4+ { buildInputs = γ;
75 doCheck = Bool;
86 enableParallelBuilding = Bool;
97 meta =
108 { description = String;
119 homepage = String;
12− license = γ;
10+ license = δ;
1311 longDescription = String;
14− maintainers = [ζ];
15− platforms = η;
12+ maintainers = [ε];
13+ platforms = ζ;
1614 };
1715 name = String;
18− patches = [Path];
16+ patches = [String];
1917 postInstall = String;
20− src = θ;
18+ src = η;
2119 version = String;
2220 } ->
23− ι,
24− α.optionalString = Bool -> String -> String,
25− α.optionals = Bool -> [Path] -> [Path],
26− α.peti = ζ,
27− α.unix = η,
28− κ.lib = α,
29− λ.lib = α,
30− μ.lib = α,
31− ν.licenses = α,
32− ξ.lib = ν,
33− ο.maintainers = α,
34− π.lib = ο,
35− ρ.platforms = α,
36− σ.lib = ρ,
37− τ.lib = α,
38− υ.lib = α
21+ θ,
22+ β.makeBinPath = ι -> κ,
23+ λ.filter = (Null -> Bool) -> [Null] -> ι,
24+ μ.filter = (Null -> Bool) -> [Null] -> γ,
25+ ν.licenses = ξ,
26+ ξ.gpl2 = δ,
27+ ο.maintainers = π,
28+ π.peti = ε,
29+ ρ.platforms = σ,
30+ σ.unix = ζ,
31+ τ.optionals = Bool -> [String] -> [String],
32+ υ.optionalString = Bool -> String -> String
3933) =>
4034{ ecl = Null;
4135 ecl-fasl = Bool;
42− fetchpatch = {sha256 = String; url = String;} -> Path;
43− fetchurl = {sha256 = String; url = String;} -> θ;
36+ fetchpatch = {sha256 = String; url = String;} -> String;
37+ fetchurl = {sha256 = String; url = String;} -> η;
4438 gnuplot = Null;
4539 makeWrapper = Null;
4640 perl = Null;
@@ -51,4 +45,4 @@
5145 texinfo = Null;
5246 tk = Null;
5347} ->
54−ι
48+θ
test/golden/importless/5.6.txt+19−23
@@ -1,37 +1,33 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
22( α.isDarwin = β,
3− α.lgpl21 = γ,
4− α.maggesi = δ,
3+ α.lib = γ,
54 α.mkDerivation =
6− { buildInputs = ε;
5+ { buildInputs = δ;
76 meta =
87 { description = String;
98 homepage = String;
10− license = γ;
9+ license = ε;
1110 longDescription = String;
12− maintainers = [δ];
13− platforms = ζ;
11+ maintainers = [ζ];
12+ platforms = η;
1413 };
1514 pname = String;
16− prePatch = η;
17− src = θ;
15+ prePatch = θ;
16+ src = ι;
1817 version = String;
1918 } ->
20− ι,
21− α.optional = β -> κ -> ε,
22− α.optionalString = λ -> String -> η,
23− α.platforms = μ,
24− ν.lib = α,
25− ξ.licenses = α,
26− ο.lib = ξ,
27− π.maintainers = α,
28− ρ.lib = π,
29− μ.linux = ζ,
30− σ.lib = α,
31− τ.lib = α
19+ κ,
20+ γ.optional = β -> λ -> δ,
21+ μ.licenses = ν,
22+ ν.lgpl21 = ε,
23+ ξ.maintainers = ο,
24+ ο.maggesi = ζ,
25+ π.platforms = ρ,
26+ ρ.linux = η,
27+ σ.optionalString = τ -> String -> θ
3228) =>
33−{ autoreconfHook = κ;
34− fetchurl = {sha256 = String; url = String;} -> θ;
29+{ autoreconfHook = λ;
30+ fetchurl = {sha256 = String; url = String;} -> ι;
3531 stdenv = α;
3632} ->
37−ι
33+κ
test/golden/importless/5.7.txt+10−12
@@ -13,26 +13,24 @@
1313 platforms = [η];
1414 };
1515 nativeBuildInputs = θ;
16− patches = [Path];
16+ patches = [String];
1717 pname = String;
1818 prePatch = ι;
1919 src = κ;
2020 version = String;
2121 } ->
2222 λ,
23− α.optional = μ -> ν -> θ,
24− α.optionalString = β -> String -> ι,
25− ξ.lib = α,
26− ο.lib = α,
27− γ.darwin = [η],
28− γ.licenses = π,
29− γ.linux = [η],
30− γ.maggesi = ζ,
31− γ.maintainers = ρ,
32− γ.platforms = σ,
23+ γ.optionalString = β -> String -> ι,
24+ μ.optional = ν -> ξ -> θ,
25+ ο.darwin = [η],
26+ ο.licenses = π,
27+ ο.linux = [η],
28+ ο.maggesi = ζ,
29+ ο.maintainers = ρ,
30+ ο.platforms = σ,
3331 π.lgpl21 = ε
3432) =>
35−{ autoreconfHook = ν;
33+{ autoreconfHook = ξ;
3634 fetchFromGitHub =
3735 {owner = String; repo = String; rev = String; sha256 = String;} -> κ;
3836 gmp = δ;
test/golden/importless/5.7.x.txt+21−24
@@ -25,40 +25,37 @@
2525 version = String;
2626 } ->
2727 κ,
28− α.optional = β -> String -> λ,
29− α.optionalString = γ -> String -> ε,
30− α.optionals = ν -> [ξ] -> [ζ],
31− ο.lib = α,
32− δ.artistic1 = η,
33− δ.bsd0 = η,
34− δ.bsd2 = η,
35− δ.bsd3 = η,
36− δ.bsdOriginal = η,
37− δ.gpl2 = η,
38− δ.lgpl2 = η,
39− δ.lgpl21 = η,
40− δ.licenses = π,
41− δ.mit = η,
42− δ.platforms = ρ,
43− δ.publicDomain = η,
44− σ.zlib = η,
45− ρ.unix = θ,
46− τ.lib = α,
47− υ.lib = α
28+ δ.optional = β -> String -> λ,
29+ ν.artistic1 = η,
30+ ν.bsd0 = η,
31+ ν.bsd2 = η,
32+ ν.bsd3 = η,
33+ ν.bsdOriginal = η,
34+ ν.gpl2 = η,
35+ ν.lgpl2 = η,
36+ ν.lgpl21 = η,
37+ ν.licenses = ξ,
38+ ν.mit = η,
39+ ν.platforms = ο,
40+ ν.publicDomain = η,
41+ π.zlib = η,
42+ ο.unix = θ,
43+ ρ.optionals = σ -> [τ] -> [ζ],
44+ υ.optionalString = γ -> String -> ε
4845) =>
49−{ CoreServices = ξ;
46+{ CoreServices = τ;
5047 bison = ι;
5148 boost = ζ;
52− cctools = ξ;
49+ cctools = τ;
5350 cmake = ι;
54− developer_cmds = ξ;
51+ developer_cmds = τ;
5552 fetchurl = {sha256 = String; url = String;} -> μ;
5653 libedit = ζ;
5754 libevent = ζ;
5855 lz4 = ζ;
5956 ncurses = ζ;
6057 openssl = ζ;
61− perl = ξ;
58+ perl = τ;
6259 pkgconfig = ι;
6360 protobuf = ζ;
6461 readline = ζ;
test/golden/importless/5.txt+1−2
@@ -18,14 +18,13 @@
1818 version = String;
1919 } ->
2020 κ,
21− α.optional = β -> String -> ε,
2221 γ.licenses = λ,
2322 γ.maintainers = μ,
2423 γ.platforms = ν,
2524 λ.gpl2Plus = ζ,
2625 μ.raskin = η,
2726 ν.linux = θ,
28− ξ.lib = α
27+ ξ.optional = β -> String -> ε
2928) =>
3029{allegro = δ; fetchurl = {sha256 = String; url = String;} -> ι; stdenv = α;} ->
3130κ
test/golden/importless/6.3.txt+1−1
@@ -8,7 +8,7 @@
88 { description = String;
99 homepage = String;
1010 license = ζ;
11− maintainers = ∀ α. α;
11+ maintainers = ∀ α. [α];
1212 };
1313 nativeBuildInputs = [θ];
1414 pname = String;
test/golden/importless/6.txt+1−1
@@ -1,7 +1,7 @@
11∀ α β γ.
22{ Foundation = α;
33 callPackage =
4− Path ->
4+ String ->
55 { Foundation = α;
66 enableParallelBuilding = Bool;
77 libobjc = β;
test/golden/importless/60.txt+9−9
@@ -5,7 +5,7 @@
55 β.mkDerivation =
66 { buildInputs = [ε];
77 configureFlags = [String];
8− configurePlatforms = ∀ α. α;
8+ configurePlatforms = ∀ α. [α];
99 depsBuildBuild = [ζ];
1010 enableParallelBuilding = Bool;
1111 meta =
@@ -26,15 +26,15 @@
2626 version = String;
2727 } ->
2828 ν,
29− ξ.cc = ζ,
30− δ.licenses = ο,
31− δ.maintainers = π,
29+ ξ.stdenv = ο,
30+ δ.licenses = π,
31+ δ.maintainers = ρ,
3232 δ.optionals = Bool -> [String] -> [String],
33− δ.platforms = ρ,
34− ο.gpl2 = η,
35− π.abbradar = θ,
36− ρ.linux = ι,
37− σ.stdenv = ξ
33+ δ.platforms = σ,
34+ π.gpl2 = η,
35+ ρ.abbradar = θ,
36+ σ.linux = ι,
37+ ο.cc = ζ
3838) =>
3939{ autoconf213 = κ;
4040 buildPackages = ξ;
test/golden/importless/68.txt+14−14
@@ -5,7 +5,7 @@
55 β.mkDerivation =
66 { buildInputs = [ε];
77 configureFlags = [String];
8− configurePlatforms = ∀ α. α;
8+ configurePlatforms = ∀ α. [α];
99 depsBuildBuild = [ζ];
1010 enableParallelBuilding = Bool;
1111 meta =
@@ -25,19 +25,19 @@
2525 version = String;
2626 } ->
2727 μ,
28− ν.cc = ζ,
29− ν.withPackages = (ξ -> [ο]) -> π,
30− ρ.llvm = κ,
31− ξ.six = ο,
32− δ.licenses = σ,
33− δ.maintainers = τ,
28+ ν.python3 = ξ,
29+ ν.stdenv = ο,
30+ π.llvm = κ,
31+ ρ.six = σ,
32+ δ.licenses = τ,
33+ δ.maintainers = υ,
3434 δ.optionals = Bool -> [String] -> [String],
35− δ.platforms = υ,
36− σ.gpl2 = η,
37− τ.abbradar = θ,
38− υ.linux = ι,
39− φ.python3 = ν,
40− χ.stdenv = ν
35+ δ.platforms = φ,
36+ τ.gpl2 = η,
37+ υ.abbradar = θ,
38+ φ.linux = ι,
39+ ξ.withPackages = (ρ -> [σ]) -> χ,
40+ ο.cc = ζ
4141) =>
4242{ autoconf213 = κ;
4343 buildPackages = ν;
@@ -45,7 +45,7 @@
4545 fetchpatch = ψ;
4646 fetchurl = {sha256 = String; url = String;} -> λ;
4747 icu = ε;
48− llvmPackages = ρ;
48+ llvmPackages = π;
4949 perl = κ;
5050 pkgconfig = κ;
5151 python2 = κ;
test/golden/importless/6_qt4.txt+10−13
@@ -20,20 +20,17 @@
2020 src = κ;
2121 } ->
2222 λ,
23− α.optionalString = β -> String -> ι,
24− α.optionals = μ -> [ν] -> [δ],
25− α.qwt = ε,
26− ξ.lib = α,
27− γ.maintainers = ο,
28− γ.platforms = π,
29− ρ.licenses = α,
30− σ.lib = ρ,
31− ο.bjornfor = ζ,
32− π.linux = [η],
33− τ.darwin = [η],
34− υ.lib = α
23+ γ.optionalString = β -> String -> ι,
24+ μ.maintainers = ν,
25+ μ.platforms = ξ,
26+ ο.licenses = π,
27+ π.qwt = ε,
28+ ν.bjornfor = ζ,
29+ ξ.linux = [η],
30+ ρ.darwin = [η],
31+ σ.optionals = τ -> [υ] -> [δ]
3532) =>
36−{ AGL = ν;
33+{ AGL = υ;
3734 fetchurl = {sha256 = String; url = String;} -> κ;
3835 qmake4Hook = θ;
3936 qt4 = δ;
test/golden/importless/7.3.txt+5−6
@@ -17,20 +17,19 @@
1717 version = String;
1818 } ->
1919 κ,
20− α.optional = β -> λ -> [δ],
21− μ.Cocoa = λ,
20+ λ.apple_sdk = μ,
2221 γ.amiloradovsky = ζ,
2322 γ.licenses = ν,
2423 γ.maintainers = ξ,
2524 γ.platforms = ο,
2625 ν.lgpl21 = ε,
2726 ο.all = η,
28− π.lib = α,
29− ρ.frameworks = μ,
30− σ.apple_sdk = ρ
27+ π.optional = β -> ρ -> [δ],
28+ μ.frameworks = σ,
29+ σ.Cocoa = ρ
3130) =>
3231{ cmake = θ;
33− darwin = μ;
32+ darwin = λ;
3433 fetchpatch = τ;
3534 fetchurl = {name = String; sha256 = String; url = String;} -> ι;
3635 libGL = δ;
test/golden/importless/7.6.6.txtnew file+46
@@ -0,0 +1,46 @@
1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
2+( β.optional = γ -> String -> [δ],
3+ ε.buildPlatform = ζ,
4+ ε.hostPlatform = η,
5+ ε.isLinux = θ,
6+ ε.lib = ι,
7+ ε.mkDerivation =
8+ { buildInputs = [κ];
9+ configureFlags = [String];
10+ doCheck = Bool;
11+ dontStrip = Bool;
12+ enableParallelBuilding = Bool;
13+ meta =
14+ { description = String;
15+ homepage = String;
16+ license = String;
17+ longDescription = String;
18+ maintainers = ∀ α. [α];
19+ platforms = λ;
20+ };
21+ nativeBuildInputs = [μ];
22+ outputs = [String];
23+ patches = [δ];
24+ pname = String;
25+ preConfigure = ν;
26+ separateDebugInfo = θ;
27+ src = ξ;
28+ version = String;
29+ } ->
30+ ο,
31+ ι.optionalString = Bool -> String -> ν,
32+ η.libc = String,
33+ π.isRiscV = γ,
34+ ρ.platforms = σ,
35+ σ.all = λ,
36+ τ.libc = String
37+) =>
38+{ enableLargeConfig = Bool;
39+ fetchpatch = {sha256 = String; url = String;} -> δ;
40+ fetchurl = {sha256 = String; urls = [String];} -> ξ;
41+ lib = β;
42+ libatomic_ops = κ;
43+ pkgconfig = μ;
44+ stdenv = ε;
45+} ->
46+ο
test/golden/importless/78.txt+12−13
@@ -5,7 +5,7 @@
55 β.mkDerivation =
66 { buildInputs = [ε];
77 configureFlags = [String];
8− configurePlatforms = ∀ α. α;
8+ configurePlatforms = ∀ α. [α];
99 depsBuildBuild = [ζ];
1010 enableParallelBuilding = Bool;
1111 meta =
@@ -26,17 +26,16 @@
2626 version = String;
2727 } ->
2828 ν,
29− β.optionals = Bool -> [String] -> [String],
30− ξ.cc = ζ,
31− ο.llvm = κ,
32− δ.licenses = π,
33− δ.maintainers = ρ,
34− δ.platforms = σ,
35− π.gpl2 = η,
36− ρ.abbradar = θ,
37− σ.linux = ι,
38− τ.lib = β,
39− υ.stdenv = ξ
29+ ξ.stdenv = ο,
30+ π.llvm = κ,
31+ δ.licenses = ρ,
32+ δ.maintainers = σ,
33+ δ.platforms = τ,
34+ ρ.gpl2 = η,
35+ σ.abbradar = θ,
36+ τ.linux = ι,
37+ υ.optionals = Bool -> [String] -> [String],
38+ ο.cc = ζ
4039) =>
4140{ autoconf213 = κ;
4241 buildPackages = ξ;
@@ -44,7 +43,7 @@
4443 fetchpatch = {sha256 = String; url = String;} -> λ;
4544 fetchurl = {sha256 = String; url = String;} -> μ;
4645 icu67 = ε;
47− llvmPackages = ο;
46+ llvmPackages = π;
4847 nspr = ε;
4948 perl = κ;
5049 pkgconfig = κ;
test/golden/importless/8.0.x.txt+1−1
@@ -20,7 +20,7 @@
2020 outputs = [String];
2121 passthru =
2222 {client = ξ; connector-c = ξ; mysqlVersion = String; server = ξ;};
23− patches = [Path];
23+ patches = [String];
2424 pname = String;
2525 postInstall = String;
2626 src = ο;
test/golden/importless/8.5.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−( (α) // ({src = β;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {src = β;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.tcl = ε
66) =>
test/golden/importless/8.6.txt+4−4
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η θ.
2−( (α) // ({patches = [Path]; src = β;}) ~ (γ),
3− α.callPackage = Path -> γ -> δ,
2+( α // {patches = [String]; src = β;} ~ γ,
3+ α.callPackage = String -> γ -> δ,
44 α.fetchurl = {sha256 = String; url = String;} -> β,
55 α.stdenv = ε,
66 α.tcl = ζ,
77 ε.isDarwin = η,
8− ε.optionals = η -> [Path] -> [Path],
9− θ.lib = ε
8+ ε.lib = θ,
9+ θ.optionals = η -> [String] -> [String]
1010) =>
1111α -> δ
test/golden/importless/8_0.txt+8−11
@@ -1,14 +1,11 @@
11∀ α β γ.
2−( ( α
3− ) //
4− ( { extraPatches = [Path];
5− extraPostInstall = String;
6− sha256 = String;
7− version = String;
8− }
9− ) ~
10− ( β
11− ),
12− α.callPackage = Path -> β -> γ
2+( α //
3+ { extraPatches = [String];
4+ extraPostInstall = String;
5+ sha256 = String;
6+ version = String;
7+ } ~
8+ β,
9+ α.callPackage = String -> β -> γ
1310) =>
1411α -> γ
test/golden/importless/9.2.txt+27−29
@@ -1,19 +1,17 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
2−( β.gpl2 = γ,
3− β.linux = δ,
4− β.maintainers = ε,
5− ζ.mkDerivation =
6− { alt_wrapper = Path;
7− buildInputs = [η];
8− builder = Path;
9− cctools_port = θ;
10− ldid = θ;
2+( β.lib = γ,
3+ δ.mkDerivation =
4+ { alt_wrapper = String;
5+ buildInputs = [ε];
6+ builder = String;
7+ cctools_port = ζ;
8+ ldid = ζ;
119 meta =
1210 { description = String;
13− hydraPlatforms = ∀ α. α;
14− license = γ;
15− maintainers = [ι];
16− platforms = δ;
11+ hydraPlatforms = ∀ α. [α];
12+ license = η;
13+ maintainers = [θ];
14+ platforms = ι;
1715 };
1816 name = String;
1917 sdk = String;
@@ -21,25 +19,25 @@
2119 version = String;
2220 } ->
2321 λ,
24− μ.licenses = β,
25− ν.lib = μ,
26− ε.fxfactorial = ι,
27− ξ.lib = β,
28− ο.platforms = β,
29− π.lib = ο
22+ γ.licenses = μ,
23+ μ.gpl2 = η,
24+ ν.maintainers = ξ,
25+ ξ.fxfactorial = θ,
26+ ο.platforms = π,
27+ π.linux = ι
3028) =>
31−{ autoconf = η;
32− automake = η;
33− clang = η;
34− clangStdenv = ζ;
29+{ autoconf = ε;
30+ automake = ε;
31+ clang = ε;
32+ clangStdenv = δ;
3533 fetchFromGitHub =
36− {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
37− git = η;
38− gnutar = η;
39− libtool = η;
40− openssl = η;
34+ {owner = String; repo = String; rev = String; sha256 = String;} -> ζ;
35+ git = ε;
36+ gnutar = ε;
37+ libtool = ε;
38+ openssl = ε;
4139 requireFile = {message = String; name = String; sha256 = String;} -> κ;
4240 stdenv = β;
43− xz = η;
41+ xz = ε;
4442} ->
4543λ
test/golden/importless/9.x.txt+47−49
@@ -1,69 +1,67 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1.
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.
22( α.isDarwin = β,
33 α.isLinux = γ,
44 α.lib = δ,
5− α.optionalString = ε,
6− α.optionals = β -> [ζ] -> η,
7− δ.licenses = θ,
8− δ.maintainers = ι,
9− δ.optional = Bool -> [Null] -> [κ],
5+ δ.licenses = ε,
6+ δ.maintainers = ζ,
7+ δ.optional = Bool -> [Null] -> [η],
108 δ.optionals = Bool -> [String] -> [String],
11− δ.platforms = λ,
12− δ.tfmoraes = μ,
13− δ.unix = ν,
14− ξ.lib = α,
15− ο.lib = α,
16− π.lib = α,
17− θ.bsd3 = ρ
9+ δ.platforms = θ,
10+ δ.tfmoraes = ι,
11+ δ.unix = κ,
12+ λ.optionalString = μ,
13+ ν.optionals = β -> [ξ] -> ο,
14+ π.optionalString = ρ -> String -> σ,
15+ ε.bsd3 = τ
1816) =>
19−{ ApplicationServices = σ;
20− CFNetwork = σ;
21− Cocoa = σ;
22− CoreServices = σ;
23− CoreText = σ;
24− DiskArbitration = σ;
25− GLUT = σ;
26− IOKit = σ;
27− IOSurface = σ;
28− ImageIO = σ;
29− OpenGL = σ;
30− Security = σ;
31− cmake = τ;
17+{ ApplicationServices = υ;
18+ CFNetwork = υ;
19+ Cocoa = υ;
20+ CoreServices = υ;
21+ CoreText = υ;
22+ DiskArbitration = υ;
23+ GLUT = υ;
24+ IOKit = υ;
25+ IOSurface = υ;
26+ ImageIO = υ;
27+ OpenGL = υ;
28+ Security = υ;
29+ cmake = φ;
3230 enablePython = Bool;
3331 enableQt = Bool;
34− fetchpatch = υ;
35− fetchurl = {sha256 = String; url = String;} -> φ;
36− libGL = χ;
37− libGLU = χ;
38− libX11 = χ;
39− libXt = χ;
40− libobjc = ζ;
41− libtiff = κ;
32+ fetchpatch = χ;
33+ fetchurl = {sha256 = String; url = String;} -> ψ;
34+ libGL = ω;
35+ libGLU = ω;
36+ libX11 = ω;
37+ libXt = ω;
38+ libobjc = ξ;
39+ libtiff = η;
4240 mkDerivation =
43− { buildInputs = [κ];
41+ { buildInputs = [η];
4442 cmakeFlags = [String];
4543 enableParallelBuilding = Bool;
4644 meta =
4745 { description = String;
4846 homepage = String;
49− license = ρ;
50− maintainers = [μ];
51− platforms = ν;
47+ license = τ;
48+ maintainers = [ι];
49+ platforms = κ;
5250 };
5351 name = String;
54− nativeBuildInputs = [τ];
55− postPatch = ψ;
52+ nativeBuildInputs = [φ];
53+ postPatch = σ;
5654 preBuild = String;
57− propagatedBuildInputs = η;
58− src = φ;
55+ propagatedBuildInputs = ο;
56+ src = ψ;
5957 } ->
60− ω;
58+ α1;
6159 python = Null;
62− qtbase = α1;
63− qttools = α1;
64− qtx11extras = α1;
60+ qtbase = β1;
61+ qttools = β1;
62+ qtx11extras = β1;
6563 stdenv = α;
66− xorgproto = χ;
67− xpc = σ;
64+ xorgproto = ω;
65+ xpc = υ;
6866} ->
69−ω
67+α1
test/golden/importless/Cargo.txt+30−31
@@ -1,9 +1,8 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
22( α.isDarwin = β,
33 α.lib = γ,
4− α.optionals = β -> [δ] -> [ε],
5− ζ.buildRustPackage =
6− { RUSTC_BOOTSTRAP = Integer;
4+ δ.buildRustPackage =
5+ { RUSTC_BOOTSTRAP = Number;
76 buildAndTestSubdir = String;
87 buildInputs = [ε];
98 cargoVendorDir = String;
@@ -13,44 +12,44 @@
1312 meta =
1413 { description = String;
1514 homepage = String;
16− license = [η];
17− maintainers = [θ];
18− platforms = ι;
15+ license = [ζ];
16+ maintainers = [η];
17+ platforms = θ;
1918 };
2019 name = String;
21− nativeBuildInputs = [κ];
22− passthru = {rustc = λ;};
20+ nativeBuildInputs = [ι];
21+ passthru = {rustc = κ;};
2322 postInstall = String;
24− src = μ;
25− version = ν;
23+ src = λ;
24+ version = μ;
2625 } ->
27− ξ,
28− λ.src = μ,
29− λ.version = ν,
30− ο.lib = α,
31− γ.licenses = π,
32− γ.maintainers = ρ,
33− γ.platforms = σ,
34− γ.retrry = θ,
35− π.mit = η,
36− τ.asl20 = η,
37− σ.unix = ι
26+ ν,
27+ κ.src = λ,
28+ κ.version = μ,
29+ γ.optionals = β -> [ξ] -> [ε],
30+ ο.licenses = π,
31+ ο.maintainers = ρ,
32+ ο.platforms = σ,
33+ ο.retrry = η,
34+ π.mit = ζ,
35+ τ.asl20 = ζ,
36+ σ.unix = θ
3837) =>
39−{ CoreFoundation = δ;
40− Security = δ;
38+{ CoreFoundation = ξ;
39+ Security = ξ;
4140 cacert = ε;
42− cmake = κ;
41+ cmake = ι;
4342 curl = ε;
4443 file = ε;
45− installShellFiles = κ;
46− libiconv = δ;
47− makeWrapper = κ;
44+ installShellFiles = ι;
45+ libiconv = ξ;
46+ makeWrapper = ι;
4847 openssl = ε;
49− pkgconfig = κ;
48+ pkgconfig = ι;
5049 python3 = ε;
51− rustPlatform = ζ;
52− rustc = λ;
50+ rustPlatform = δ;
51+ rustc = κ;
5352 stdenv = α;
5453 zlib = ε;
5554} ->
56−ξ
55+ν
test/golden/importless/R16B02-basho.txt+13−14
@@ -1,15 +1,14 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ.
2−( α.asl20 = β,
3− α.fetchFromGitHub =
4− {owner = String; repo = String; rev = String; sha256 = String;} -> γ,
5− α.fetchurl = {sha256 = String; url = String;} -> δ,
6− α.maintainers = ε,
7− ζ.licenses = α,
8− η.lib = ζ,
9− θ.stdenv = η,
10− ε.mdaiter = ι,
11− κ.lib = α,
12− λ.stdenv = κ
2+( α.fetchFromGitHub =
3+ {owner = String; repo = String; rev = String; sha256 = String;} -> β,
4+ α.fetchurl = {sha256 = String; url = String;} -> γ,
5+ α.stdenv = δ,
6+ δ.lib = ε,
7+ ε.licenses = ζ,
8+ ζ.asl20 = η,
9+ θ.lib = ι,
10+ ι.maintainers = κ,
11+ κ.mdaiter = λ
1312) =>
1413{ mkDerivation =
1514 { baseName = String;
@@ -19,14 +18,14 @@
1918 { description = String;
2019 homepage = String;
2120 knownVulnerabilities = [String];
22− license = β;
21+ license = η;
2322 longDescription = String;
24− maintainers = [ι];
23+ maintainers = [λ];
2524 platforms = [String];
2625 };
2726 postInstall = String;
2827 preConfigure = String;
29− src = γ;
28+ src = β;
3029 version = String;
3130 } ->
3231 μ;
test/golden/importless/account-service-util.txt+18−19
@@ -1,29 +1,28 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.buildPythonApplication =
3− { buildInputs = [β];
2+( α.pkgs = β,
3+ γ.maintainers = δ,
4+ γ.worldofpeace = ε,
5+ β.buildPythonApplication =
6+ { buildInputs = [ζ];
47 dontUnpack = Bool;
58 format = String;
69 installPhase = String;
7− meta = {maintainers = [γ];};
10+ meta = {maintainers = [ε];};
811 name = String;
9− nativeBuildInputs = [δ];
10− propagatedBuildInputs = [ε];
11− src = Path;
12+ nativeBuildInputs = [η];
13+ propagatedBuildInputs = [θ];
14+ src = String;
1215 strictDeps = Bool;
1316 } ->
14− ζ,
15− α.pkgs = η,
16− θ.maintainers = ι,
17− θ.worldofpeace = γ,
18− κ.pkgs = α,
19− η.ordered-set = ε,
20− η.pygobject3 = ε
17+ ι,
18+ κ.ordered-set = θ,
19+ κ.pygobject3 = θ
2120) =>
22−{ accountsservice = β;
23− glib = β;
24− gobject-introspection = δ;
25− lib = θ;
21+{ accountsservice = ζ;
22+ glib = ζ;
23+ gobject-introspection = η;
24+ lib = γ;
2625 python3 = α;
27− wrapGAppsHook = δ;
26+ wrapGAppsHook = η;
2827} ->
29−ζ
28+ι
test/golden/importless/accountsservice.txt+22−22
@@ -2,31 +2,31 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− β.mutableUsers = Bool,
5+ β.services = ε,
6+ β.users = ζ,
77 γ.mkIf =
8− ε ->
9− { environment = {pathsToLink = [String]; systemPackages = [ζ];};
10− services = {dbus = {packages = [η];};};
11− systemd = {packages = [θ]; services = {accounts-daemon = ι;};};
8+ η ->
9+ { environment = {pathsToLink = [String]; systemPackages = [θ];};
10+ services = {dbus = {packages = [ι];};};
11+ systemd = {packages = [κ]; services = {accounts-daemon = λ;};};
1212 } ->
13− κ,
14− γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
15− γ.optionalAttrs = Bool -> {environment = {NIXOS_USERS_PURE = String;};} -> ν,
13+ μ,
14+ γ.mkOption = {default = Bool; description = String; type = ν;} -> ξ,
15+ γ.optionalAttrs = Bool -> {environment = {NIXOS_USERS_PURE = String;};} -> ο,
1616 γ.recursiveUpdate =
17− {environment = {XDG_DATA_DIRS = String;}; wantedBy = [String];} -> ν -> ι,
18− γ.teams = ξ,
19− γ.types = ο,
20− δ.accountsservice = ζ,
21− π.accounts-daemon = β,
22− ρ.services = π,
23− σ.users = β,
24− ξ.members = τ,
25− υ.freedesktop = ξ,
26− ο.bool = λ
17+ {environment = {XDG_DATA_DIRS = String;}; wantedBy = [String];} -> ο -> λ,
18+ γ.teams = π,
19+ γ.types = ρ,
20+ δ.accountsservice = θ,
21+ ε.accounts-daemon = σ,
22+ σ.enable = η,
23+ ζ.mutableUsers = Bool,
24+ π.freedesktop = τ,
25+ τ.members = υ,
26+ ρ.bool = ν
2727) =>
2828α ->
29−{ config = κ;
30− meta = {maintainers = τ;};
31− options = {services = {accounts-daemon = {enable = μ;};};};
29+{ config = μ;
30+ meta = {maintainers = υ;};
31+ options = {services = {accounts-daemon = {enable = ξ;};};};
3232}
test/golden/importless/acpilight.txt+3−3
@@ -2,13 +2,13 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.acpilight = ε,
5+ β.hardware = ε,
66 γ.acpilight = ζ,
77 γ.mkIf = η -> {services = {udev = {packages = [ζ];};};} -> θ,
88 γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
99 γ.types = λ,
10− ε.enable = η,
11− μ.hardware = β,
10+ ε.acpilight = μ,
11+ μ.enable = η,
1212 λ.bool = ι
1313) =>
1414α -> {config = θ; options = {hardware = {acpilight = {enable = κ;};};};}
test/golden/importless/adb.txt+15−15
@@ -2,29 +2,29 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.programs = ε,
66 γ.lowPrio = ζ -> η,
77 γ.maintainers = θ,
88 γ.mkIf =
9− ε ->
9+ ι ->
1010 { environment = {systemPackages = [η];};
11− services = {udev = {packages = [ι];};};
11+ services = {udev = {packages = [κ];};};
1212 users = {groups = {adbusers = {};};};
1313 } ->
14− κ,
15− γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
16− γ.types = ν,
17− δ.android-udev-rules = ι,
18− δ.platform-tools = ζ,
19− ξ.adb = β,
20− ο.programs = ξ,
21− π.androidPkgs_9_0 = δ,
22− ρ.androidenv = π,
14+ λ,
15+ γ.mkOption = {default = Bool; description = String; type = μ;} -> ν,
16+ γ.types = ξ,
17+ δ.android-udev-rules = κ,
18+ δ.androidenv = ο,
19+ ε.adb = π,
20+ π.enable = ι,
21+ ο.androidPkgs_9_0 = ρ,
22+ ρ.platform-tools = ζ,
2323 θ.mic92 = σ,
24− ν.bool = λ
24+ ξ.bool = μ
2525) =>
2626α ->
27−{ config = κ;
27+{ config = λ;
2828 meta = {maintainers = [σ];};
29− options = {programs = {adb = {enable = μ;};};};
29+ options = {programs = {adb = {enable = ν;};};};
3030}
test/golden/importless/afterstep.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.afterstep = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.afterstep = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.afterstep = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/ais.txt+5−6
@@ -17,12 +17,11 @@
1717 version = String;
1818 } ->
1919 ι,
20− α.optionals = Bool -> [Null] -> [γ],
21− κ.lib = α,
22− β.licenses = λ,
23− β.maintainers = μ,
24− β.mog = ε,
25− β.platforms = ν,
20+ β.optionals = Bool -> [Null] -> [γ],
21+ κ.licenses = λ,
22+ κ.maintainers = μ,
23+ κ.mog = ε,
24+ κ.platforms = ν,
2625 λ.gpl3Plus = δ,
2726 ν.linux = [ζ],
2827 ξ.darwin = [ζ]
test/golden/importless/alexandria.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/aliases.txtdeleted−217
@@ -1,217 +0,0 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1
2−λ1 μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1 υ1 φ1 χ1 ψ1 ω1 α2 β2 γ2 δ2 ε2 ζ2 η2 θ2 ι2 κ2 λ2 μ2 ν2
3−ξ2 ο2 π2 ρ2 σ2 τ2 υ2 φ2 χ2 ψ2 ω2 α3 β3 γ3 δ3 ε3 ζ3 η3 θ3 ι3 κ3 λ3 μ3 ν3 ξ3 ο3 π3
4−ρ3 σ3 τ3 υ3 φ3 χ3 ψ3 ω3 α4 β4 γ4 δ4 ε4 ζ4 η4 θ4 ι4 κ4 λ4 μ4 ν4 ξ4 ο4 π4 ρ4 σ4
5−τ4.
6−( ( { BufOnly = α;
7− CSApprox = β;
8− Colour_Sampler_Pack = γ;
9− Cosco = δ;
10− Gist = ε;
11− Gundo = ζ;
12− Hoogle = η;
13− Solarized = θ;
14− Supertab = ι;
15− Syntastic = κ;
16− SyntaxRange = λ;
17− Tabular = μ;
18− Tagbar = ν;
19− The_NERD_Commenter = ξ;
20− The_NERD_tree = ο;
21− UltiSnips = π;
22− WebAPI = ρ;
23− Yankring = σ;
24− airline = τ;
25− alternative = υ;
26− bats = φ;
27− calendar = χ;
28− caw = ψ;
29− coffee-script = ω;
30− coffeeScript = α1;
31− colors-solarized = β1;
32− colorsamplerpack = γ1;
33− command_T = δ1;
34− commentary = ε1;
35− committia = ζ1;
36− concealedyank = η1;
37− context-filetype = θ1;
38− css_color_5056 = ι1;
39− csv = κ1;
40− ctrlp = λ1;
41− cute-python = μ1;
42− denite = ν1;
43− easy-align = ξ1;
44− easygit = ο1;
45− easymotion = π1;
46− echodoc = ρ1;
47− eighties = σ1;
48− extradite = τ1;
49− fugitive = υ1;
50− ghc-mod-vim = φ1;
51− ghcmod = χ1;
52− gitgutter = ψ1;
53− goyo = ω1;
54− gundo = α2;
55− haskellConceal = β2;
56− haskellConcealPlus = γ2;
57− haskellconceal = δ2;
58− hier = ε2;
59− hlint-refactor = ζ2;
60− hoogle = η2;
61− ipython = θ2;
62− latex-live-preview = ι2;
63− maktaba = κ2;
64− multiple-cursors = λ2;
65− necoGhc = μ2;
66− neocomplete = ν2;
67− neoinclude = ξ2;
68− neomru = ο2;
69− neosnippet = π2;
70− open-browser = ρ2;
71− pathogen = σ2;
72− polyglot = τ2;
73− prettyprint = υ2;
74− quickrun = φ2;
75− rainbow_parentheses = χ2;
76− repeat = ψ2;
77− rhubarb = ω2;
78− riv = α3;
79− sensible = β3;
80− signature = γ3;
81− sleuth = δ3;
82− snipmate = ε3;
83− solarized = ζ3;
84− solidity = η3;
85− sourcemap = θ3;
86− sourcemap.vim = ι3;
87− stylish-haskell = κ3;
88− stylishHaskell = λ3;
89− surround = μ3;
90− table-mode = ν3;
91− tabpagebuffer = ξ3;
92− tabpagecd = ο3;
93− taglist = π3;
94− thumbnail = ρ3;
95− tlib = σ3;
96− tmux-navigator = τ3;
97− tmuxNavigator = υ3;
98− tslime = φ3;
99− unite = χ3;
100− vim-addon-vim2nix = ψ3;
101− vimproc = ω3;
102− vimshell = α4;
103− vinegar = β4;
104− watchdogs = γ4;
105− wombat256 = δ4;
106− xterm-color-table = ε4;
107− yankring = ζ4;
108− zeavim = η4;
109− }
110− ) //
111− ( θ4
112− ) ~
113− ( ι4
114− ),
115− κ4.mapAttrs = (λ4 -> μ4 -> μ4) -> ι4 -> ν4,
116− ξ4.BufOnly-vim = α,
117− ξ4.Colour-Sampler-Pack = γ,
118− ξ4.YankRing-vim = σ,
119− ξ4.a-vim = υ,
120− ξ4.bats-vim = φ,
121− ξ4.builtins = ο4,
122− ξ4.calendar-vim = χ,
123− ξ4.caw-vim = ψ,
124− ξ4.command-t = δ1,
125− ξ4.committia-vim = ζ1,
126− ξ4.concealedyank-vim = η1,
127− ξ4.context_filetype-vim = θ1,
128− ξ4.cosco-vim = δ,
129− ξ4.csapprox = β,
130− ξ4.csv-vim = κ1,
131− ξ4.ctrlp-vim = λ1,
132− ξ4.denite-nvim = ν1,
133− ξ4.dontDistribute = μ4 -> μ4,
134− ξ4.echodoc-vim = ρ1,
135− ξ4.ghcmod-vim = φ1,
136− ξ4.goyo-vim = ω1,
137− ξ4.gundo-vim = ζ,
138− ξ4.hlint-refactor-vim = ζ2,
139− ξ4.isDerivation = μ4 -> Bool,
140− ξ4.neco-ghc = μ2,
141− ξ4.neocomplete-vim = ν2,
142− ξ4.neoinclude-vim = ξ2,
143− ξ4.neomru-vim = ο2,
144− ξ4.neosnippet-vim = π2,
145− ξ4.nerdcommenter = ξ,
146− ξ4.nerdtree = ο,
147− ξ4.open-browser-vim = ρ2,
148− ξ4.rainbow_parentheses-vim = χ2,
149− ξ4.removeAttrs = μ4 -> [String] -> μ4,
150− ξ4.riv-vim = α3,
151− ξ4.sourcemap-vim = θ3,
152− ξ4.supertab = ι,
153− ξ4.syntastic = κ,
154− ξ4.tabpagebuffer-vim = ξ3,
155− ξ4.tabular = μ,
156− ξ4.tagbar = ν,
157− ξ4.taglist-vim = π3,
158− ξ4.throw = String -> μ4,
159− ξ4.thumbnail-vim = ρ3,
160− ξ4.tlib_vim = σ3,
161− ξ4.tslime-vim = φ3,
162− ξ4.ultisnips = π,
163− ξ4.unite-vim = χ3,
164− ξ4.vim-SyntaxRange = λ,
165− ξ4.vim-airline = τ,
166− ξ4.vim-coffee-script = ω,
167− ξ4.vim-colors-solarized = θ,
168− ξ4.vim-commentary = ε1,
169− ξ4.vim-css-color = ι1,
170− ξ4.vim-cute-python = μ1,
171− ξ4.vim-easy-align = ξ1,
172− ξ4.vim-easygit = ο1,
173− ξ4.vim-easymotion = π1,
174− ξ4.vim-eighties = σ1,
175− ξ4.vim-extradite = τ1,
176− ξ4.vim-fugitive = υ1,
177− ξ4.vim-gist = ε,
178− ξ4.vim-gitgutter = ψ1,
179− ξ4.vim-haskellConcealPlus = γ2,
180− ξ4.vim-haskellconceal = β2,
181− ξ4.vim-hier = ε2,
182− ξ4.vim-hoogle = η,
183− ξ4.vim-ipython = θ2,
184− ξ4.vim-latex-live-preview = ι2,
185− ξ4.vim-maktaba = κ2,
186− ξ4.vim-multiple-cursors = λ2,
187− ξ4.vim-pathogen = σ2,
188− ξ4.vim-polyglot = τ2,
189− ξ4.vim-prettyprint = υ2,
190− ξ4.vim-quickrun = φ2,
191− ξ4.vim-repeat = ψ2,
192− ξ4.vim-rhubarb = ω2,
193− ξ4.vim-sensible = β3,
194− ξ4.vim-signature = γ3,
195− ξ4.vim-sleuth = δ3,
196− ξ4.vim-snipmate = ε3,
197− ξ4.vim-solidity = η3,
198− ξ4.vim-stylish-haskell = κ3,
199− ξ4.vim-surround = μ3,
200− ξ4.vim-table-mode = ν3,
201− ξ4.vim-tabpagecd = ο3,
202− ξ4.vim-tmux-navigator = τ3,
203− ξ4.vim-vinegar = β4,
204− ξ4.vim-watchdogs = γ4,
205− ξ4.vim2nix = ψ3,
206− ξ4.vimproc-vim = ω3,
207− ξ4.vimshell-vim = α4,
208− ξ4.webapi-vim = ρ,
209− ξ4.wombat256-vim = δ4,
210− ξ4.xterm-color-table-vim = ε4,
211− ξ4.zeavim-vim = η4,
212− μ4.recurseForDerivations = Bool,
213− ο4.hasAttr = λ4 -> ξ4 -> Bool,
214− π4.fromJSON = ρ4 -> σ4,
215− τ4.readFile = Path -> ρ4
216−) =>
217−κ4 -> ξ4 -> ν4
test/golden/importless/alsamixer.app.txt+18−19
@@ -1,32 +1,31 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
2−( α.bstrik = β,
3− α.gpl2 = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { description = String;
98 homepage = String;
10− license = γ;
11− maintainers = [β];
9+ license = δ;
10+ maintainers = [ε];
1211 };
1312 name = String;
14− nativeBuildInputs = [ε];
13+ nativeBuildInputs = [ζ];
1514 postUnpack = String;
16− src = ζ;
15+ src = η;
1716 } ->
18− η,
19− θ.licenses = α,
20− ι.lib = θ,
21− κ.maintainers = α,
22− λ.lib = κ
17+ θ,
18+ β.licenses = ι,
19+ ι.gpl2 = δ,
20+ κ.maintainers = λ,
21+ λ.bstrik = ε
2322) =>
24−{ alsaLib = δ;
25− fetchgit = {rev = String; sha256 = String; url = String;} -> ζ;
26− libX11 = δ;
27− libXext = δ;
28− libXpm = δ;
29− pkgconfig = ε;
23+{ alsaLib = γ;
24+ fetchgit = {rev = String; sha256 = String; url = String;} -> η;
25+ libX11 = γ;
26+ libXext = γ;
27+ libXpm = γ;
28+ pkgconfig = ζ;
3029 stdenv = α;
3130} ->
32−η
31+θ
test/golden/importless/alternatives-plugin.txt+16−17
@@ -1,30 +1,29 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
2−( α.aszlig = β,
3− α.mit = γ,
4− δ.buildPythonApplication =
2+( α.lib = β,
3+ γ.buildPythonApplication =
54 { checkPhase = String;
65 meta =
76 { description = String;
87 homepage = String;
9− license = γ;
10− maintainers = [β];
8+ license = δ;
9+ maintainers = [ε];
1110 };
12− nativeBuildInputs = [ε];
11+ nativeBuildInputs = [ζ];
1312 pname = String;
14− src = ζ;
13+ src = η;
1514 version = String;
1615 } ->
17− η,
18− δ.nose = ε,
19− θ.licenses = α,
20− ι.lib = θ,
21− κ.maintainers = α,
22− λ.lib = κ
16+ θ,
17+ γ.nose = ζ,
18+ β.licenses = ι,
19+ ι.mit = δ,
20+ κ.maintainers = λ,
21+ λ.aszlig = ε
2322) =>
24−{ beets = ε;
23+{ beets = ζ;
2524 fetchFromGitHub =
26− {owner = String; repo = String; rev = String; sha256 = String;} -> ζ;
27− pythonPackages = δ;
25+ {owner = String; repo = String; rev = String; sha256 = String;} -> η;
26+ pythonPackages = γ;
2827 stdenv = α;
2928} ->
30−η
29+θ
test/golden/importless/amazon-options.txt+6−6
@@ -2,12 +2,12 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.stateVersion = ε,
5+ β.system = ε,
66 γ.mkOption = {default = ζ; description = String; internal = Bool;} -> η,
7− γ.versionAtLeast = ε -> String -> θ,
8− δ.isAarch64 = ζ,
9− ι.hostPlatform = δ,
10− κ.stdenv = ι,
11− λ.system = β
7+ γ.versionAtLeast = θ -> String -> ι,
8+ δ.stdenv = κ,
9+ κ.hostPlatform = λ,
10+ λ.isAarch64 = ζ,
11+ ε.stateVersion = θ
1212) =>
1313α -> {options = {ec2 = {efi = η; hvm = μ;};};}
test/golden/importless/amd-microcode.txt+10−10
@@ -2,15 +2,15 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.updateMicrocode = ε,
6− γ.mkIf = ε -> {boot = {initrd = {prepend = ζ;};};} -> η,
7− γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
8− γ.mkOrder = Integer -> [String] -> ζ,
9− γ.types = κ,
10− λ.amd = β,
11− μ.cpu = λ,
12− ν.hardware = μ,
13− κ.bool = θ
5+ β.hardware = ε,
6+ γ.mkIf = ζ -> {boot = {initrd = {prepend = η;};};} -> θ,
7+ γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
8+ γ.mkOrder = Number -> [String] -> η,
9+ γ.types = λ,
10+ ε.cpu = μ,
11+ μ.amd = ν,
12+ ν.updateMicrocode = ζ,
13+ λ.bool = ι
1414) =>
1515α ->
16−{config = η; options = {hardware = {cpu = {amd = {updateMicrocode = ι;};};};};}
16+{config = θ; options = {hardware = {cpu = {amd = {updateMicrocode = κ;};};};};}
test/golden/importless/amdgpu-pro.txtnew file+55
@@ -0,0 +1,55 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.
2+( α.config = β,
3+ α.lib = γ,
4+ α.pkgs = δ,
5+ β.boot = ε,
6+ β.hardware = ζ,
7+ β.lib = η,
8+ β.services = θ,
9+ γ.elem = String -> ι -> κ,
10+ γ.isYes = String -> λ,
11+ γ.mkIf =
12+ κ ->
13+ { boot =
14+ { blacklistedKernelModules = [String];
15+ extraModulePackages = [String];
16+ kernelPackages = μ;
17+ };
18+ environment =
19+ { etc =
20+ { amd/amdapfxx.blb = {source = String;};
21+ amd/amdrc = {source = String;};
22+ gbm/gbm.conf = {source = String;};
23+ };
24+ };
25+ hardware =
26+ { firmware = [String];
27+ opengl = {package = String; package32 = ν; setLdLibraryPath = Bool;};
28+ };
29+ nixpkgs = {config = {xorg = {abiCompat = String;};};};
30+ services = {xserver = {drivers = ξ;};};
31+ system =
32+ { activationScripts = {setup-amdgpu-pro = String;};
33+ requiredKernelConfig = [λ];
34+ };
35+ } ->
36+ ο,
37+ γ.optionalString = π -> String -> String,
38+ γ.singleton = {display = Bool; modules = [String]; name = String;} -> ξ,
39+ δ.linuxPackagesFor = ρ -> σ,
40+ δ.linux_4_9 = τ,
41+ δ.pkgsi686Linux = υ,
42+ δ.recurseIntoAttrs = σ -> μ,
43+ υ.linuxPackages = φ,
44+ φ.amdgpu-pro = χ,
45+ χ.override = {kernel = Null; libsOnly = Bool;} -> ν,
46+ ε.kernelPackages = ψ,
47+ ψ.amdgpu-pro = String,
48+ ζ.opengl = ω,
49+ ω.driSupport32Bit = π,
50+ τ.override = {extraConfig = String;} -> ρ,
51+ θ.xserver = α1,
52+ α1.videoDrivers = ι,
53+ η.kernelConfig = β1
54+) =>
55+α -> {config = ο;}
test/golden/importless/amdgpu.txt+6−6
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ η θ.
22( α.config = β,
33 α.lib = γ,
4− β.videoDrivers = δ,
5− γ.elem = String -> δ -> ε,
6− γ.mkIf = ε -> {boot = {blacklistedKernelModules = [String];};} -> ζ,
7− η.xserver = β,
8− θ.services = η
4+ β.services = δ,
5+ γ.elem = String -> ε -> ζ,
6+ γ.mkIf = ζ -> {boot = {blacklistedKernelModules = [String];};} -> η,
7+ δ.xserver = θ,
8+ θ.videoDrivers = ε
99) =>
10−α -> {config = ζ;}
10+α -> {config = η;}
test/golden/importless/apcupsd.txt+5−5
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.apcupsd = β,
2+( α.services = β,
33 γ.mkOption = {default = String; description = String; type = δ;} -> ε,
44 γ.types = ζ,
5− η.exporters = α,
6− θ.prometheus = η,
7− ι.services = θ,
5+ β.prometheus = η,
6+ η.exporters = θ,
7+ θ.apcupsd = ι,
88 ζ.str = δ,
99 κ.enum = [String] -> λ
1010) =>
1111{config = α; lib = γ; options = μ; pkgs = ν;} ->
1212{ extraOpts = {apcupsdAddress = ε; apcupsdNetwork = ξ;};
13− port = Integer;
13+ port = Number;
1414 serviceOpts = {serviceConfig = {ExecStart = String;};};
1515}
test/golden/importless/apeclex.txt+1−1
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ η.
22(α.lib = β, β.licenses = γ, γ.lgpl3 = δ, ε.gpl3 = δ) => { attemptoClex = ζ;
33 callPackage =
4− Path ->
4+ String ->
55 { description = String;
66 lexiconPath = String;
77 license = [δ];
test/golden/importless/apiextractor.txt+20−21
@@ -1,33 +1,32 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( β.all = γ,
3− β.gpl2 = δ,
2+( β.lib = γ,
43 β.mkDerivation =
5− { buildInputs = [ε];
4+ { buildInputs = [δ];
65 enableParallelBuilding = Bool;
76 meta =
87 { description = String;
98 homepage = String;
10− license = δ;
11− maintainers = ∀ α. α;
12− platforms = γ;
9+ license = ε;
10+ maintainers = ∀ α. [α];
11+ platforms = ζ;
1312 };
1413 name = String;
15− src = ζ;
14+ src = η;
1615 } ->
17− η,
18− θ.withPackages = (ι -> [κ]) -> ε,
19− ι.sphinx = κ,
20− λ.licenses = β,
21− μ.lib = λ,
22− ν.platforms = β,
23− ξ.lib = ν
16+ θ,
17+ ι.withPackages = (κ -> [λ]) -> δ,
18+ κ.sphinx = λ,
19+ γ.licenses = μ,
20+ μ.gpl2 = ε,
21+ ν.platforms = ξ,
22+ ξ.all = ζ
2423) =>
25−{ cmake = ε;
26− fetchurl = {sha256 = String; url = String;} -> ζ;
27− libxml2 = ε;
28− libxslt = ε;
29− python2 = θ;
30− qt4 = ε;
24+{ cmake = δ;
25+ fetchurl = {sha256 = String; url = String;} -> η;
26+ libxml2 = δ;
27+ libxslt = δ;
28+ python2 = ι;
29+ qt4 = δ;
3130 stdenv = β;
3231} ->
33−η
32+θ
test/golden/importless/appdaemon.txt+56−54
@@ -1,69 +1,71 @@
1−∀ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1 λ1.
2−( ω.dotlambda = α1,
3− ω.licenses = β1,
4− ω.maintainers = γ1,
5− ω.peterhoeg = α1,
6− δ1.override =
1+∀ γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1 λ1 μ1 ν1 ξ1.
2+( γ1.dotlambda = δ1,
3+ γ1.licenses = ε1,
4+ γ1.maintainers = ζ1,
5+ γ1.peterhoeg = δ1,
6+ η1.override =
77 { packageOverrides =
8− ∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ.
9− ( α.overridePythonAttrs = (β -> {src = γ; version = String;}) -> δ,
10− β.override = ε,
11− ζ.override = η,
12− θ.override = ι,
13− κ.override = λ,
14− μ.aiohttp-jinja2 = α,
15− ν.bcrypt = α,
16− ξ.jinja2 = α,
17− ο.yarl = α,
18− π.src = β,
19− ρ.src = ζ,
20− σ.src = θ,
21− τ.src = κ
8+ ∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.
9+ ( α.aiohttp-jinja2 = β,
10+ α.bcrypt = γ,
11+ α.jinja2 = δ,
12+ α.yarl = ε,
13+ ζ.src = η,
14+ θ.src = ι,
15+ κ.src = λ,
16+ μ.src = ν,
17+ β.overridePythonAttrs = (ζ -> {src = ξ; version = String;}) -> ο,
18+ γ.overridePythonAttrs = (θ -> {src = π; version = String;}) -> ρ,
19+ δ.overridePythonAttrs = (κ -> {src = σ; version = String;}) -> τ,
20+ ε.overridePythonAttrs = (μ -> {src = υ; version = String;}) -> φ,
21+ η.override = χ,
22+ ι.override = ψ,
23+ λ.override = ω,
24+ ν.override = α1
2225 ) =>
23− υ -> α -> {aiohttp-jinja2 = δ; bcrypt = φ; jinja2 = χ; yarl = ψ;};
26+ β1 -> α -> {aiohttp-jinja2 = ο; bcrypt = ρ; jinja2 = τ; yarl = φ;};
2427 } ->
25− ε1,
26− ε1.buildPythonApplication =
28+ θ1,
29+ θ1.pkgs = ι1,
30+ ε1.mit = κ1,
31+ ι1.buildPythonApplication =
2732 { doCheck = Bool;
2833 meta =
2934 { description = String;
3035 homepage = String;
31− license = ζ1;
32− maintainers = [α1];
36+ license = κ1;
37+ maintainers = [δ1];
3338 };
3439 pname = String;
3540 postPatch = String;
36− propagatedBuildInputs = [η1];
37− src = θ1;
41+ propagatedBuildInputs = [λ1];
42+ src = μ1;
3843 version = String;
3944 } ->
40− ι1,
41− ε1.pkgs = κ1,
42− β1.mit = ζ1,
43− λ1.pkgs = ε1,
44− κ1.aiohttp = η1,
45− κ1.aiohttp-jinja2 = η1,
46− κ1.astral = η1,
47− κ1.bcrypt = η1,
48− κ1.daemonize = η1,
49− κ1.dateutil = η1,
50− κ1.deepdiff = η1,
51− κ1.feedparser = η1,
52− κ1.iso8601 = η1,
53− κ1.jinja2 = η1,
54− κ1.paho-mqtt = η1,
55− κ1.pid = η1,
56− κ1.python-socketio = η1,
57− κ1.pyyaml = η1,
58− κ1.requests = η1,
59− κ1.setuptools = η1,
60− κ1.voluptuous = η1,
61− κ1.websocket_client = η1,
62− κ1.yarl = η1
45+ ν1,
46+ ξ1.aiohttp = λ1,
47+ ξ1.aiohttp-jinja2 = λ1,
48+ ξ1.astral = λ1,
49+ ξ1.bcrypt = λ1,
50+ ξ1.daemonize = λ1,
51+ ξ1.dateutil = λ1,
52+ ξ1.deepdiff = λ1,
53+ ξ1.feedparser = λ1,
54+ ξ1.iso8601 = λ1,
55+ ξ1.jinja2 = λ1,
56+ ξ1.paho-mqtt = λ1,
57+ ξ1.pid = λ1,
58+ ξ1.python-socketio = λ1,
59+ ξ1.pyyaml = λ1,
60+ ξ1.requests = λ1,
61+ ξ1.setuptools = λ1,
62+ ξ1.voluptuous = λ1,
63+ ξ1.websocket_client = λ1,
64+ ξ1.yarl = λ1
6365) =>
6466{ fetchFromGitHub =
65− {owner = String; repo = String; rev = String; sha256 = String;} -> θ1;
66− lib = ω;
67− python3 = δ1;
67+ {owner = String; repo = String; rev = String; sha256 = String;} -> μ1;
68+ lib = γ1;
69+ python3 = η1;
6870} ->
69−ι1
71+ν1
test/golden/importless/appliance.txt+1−1
@@ -1,6 +1,6 @@
11∀ β.
22{ fetchzip =
3− { meta = {hydraPlatforms = ∀ α. α;};
3+ { meta = {hydraPlatforms = ∀ α. [α];};
44 name = String;
55 sha256 = String;
66 url = String;
test/golden/importless/appstream.txt+7−7
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.config = β,
33 α.lib = γ,
4− β.enable = δ,
5− γ.mkIf = δ -> {environment = {pathsToLink = [String];};} -> ε,
6− γ.mkOption = {default = Bool; description = String; type = ζ;} -> η,
7− γ.types = θ,
8− ι.appstream = β,
9− θ.bool = ζ
4+ β.appstream = δ,
5+ γ.mkIf = ε -> {environment = {pathsToLink = [String];};} -> ζ,
6+ γ.mkOption = {default = Bool; description = String; type = η;} -> θ,
7+ γ.types = ι,
8+ δ.enable = ε,
9+ ι.bool = η
1010) =>
11−α -> {config = ε; options = {appstream = {enable = η;};};}
11+α -> {config = ζ; options = {appstream = {enable = θ;};};}
test/golden/importless/archive-version.txt+1−1
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
22( α.concatMapStrings = β -> γ -> String,
3− α.fixedWidthNumber = Integer -> β,
3+ α.fixedWidthNumber = Number -> β,
44 α.head = δ -> String,
55 α.splitVersion = ε -> δ,
66 α.tail = δ -> γ
test/golden/importless/array-utils.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/array.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = γ;
12− maintainers = [β];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/asdf-finalizers.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/asdf-package-system.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/asdf-system-connections.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/assets.txt+1−1
@@ -7,7 +7,7 @@
77 meta =
88 { description = String;
99 homepage = String;
10− hydraPlatforms = ∀ α. α;
10+ hydraPlatforms = ∀ α. [α];
1111 license = δ;
1212 maintainers = [ε];
1313 };
test/golden/importless/atd.txtdeleted−58
@@ -1,58 +0,0 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1.
2−( α.config = β,
3− α.lib = γ,
4− α.pkgs = δ,
5− β.atd = ε,
6− γ.builtins = ζ,
7− γ.map =
8− ( η ->
9− { name = String;
10− value =
11− { group = String;
12− owner = String;
13− setgid = Bool;
14− setuid = Bool;
15− source = String;
16− };
17− }
18− ) ->
19− [String] -> θ,
20− γ.mkIf =
21− ι ->
22− { environment = {systemPackages = [κ];};
23− security = {pam = {services = {atd = {};};}; wrappers = λ;};
24− systemd =
25− { services =
26− { atd =
27− { description = String;
28− path = [κ];
29− preStart = String;
30− script = String;
31− serviceConfig = {Type = String;};
32− wantedBy = [String];
33− };
34− };
35− };
36− users =
37− { groups = {atd = {gid = μ;};};
38− users = {atd = {description = String; home = String; uid = ν;};};
39− };
40− } ->
41− ξ,
42− γ.mkOption = {default = Bool; description = String; type = ο;} -> π,
43− γ.types = ρ,
44− δ.at = κ,
45− ε.enable = ι,
46− σ.services = β,
47− ζ.listToAttrs = θ -> λ,
48− τ.gids = β,
49− υ.ids = τ,
50− φ.uids = β,
51− χ.ids = φ,
52− ρ.bool = ο,
53− ψ.bool = ω
54−) =>
55−α ->
56−{ config = ξ;
57− options = {services = {atd = {allowEveryone = π; enable = α1;};};};
58−}
test/golden/importless/ati.txt+19−19
@@ -2,27 +2,27 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.ati_drivers_x11 = ε,
6− β.videoDrivers = ζ,
7− γ.elem = String -> ζ -> η,
5+ β.boot = ε,
6+ β.services = ζ,
7+ γ.elem = String -> η -> θ,
88 γ.mkIf =
9− η ->
10− { boot = {blacklistedKernelModules = [String]; extraModulePackages = [ε];};
11− environment = {etc = {ati = {source = String;};}; systemPackages = [ε];};
9+ θ ->
10+ { boot = {blacklistedKernelModules = [String]; extraModulePackages = [ι];};
11+ environment = {etc = {ati = {source = String;};}; systemPackages = [ι];};
1212 hardware =
13− {opengl = {package = ε; package32 = θ; setLdLibraryPath = Bool;};};
13+ {opengl = {package = ι; package32 = κ; setLdLibraryPath = Bool;};};
1414 nixpkgs = {config = {xorg = {abiCompat = String;};};};
15− services = {xserver = {drivers = ι;};};
15+ services = {xserver = {drivers = λ;};};
1616 } ->
17− κ,
18− γ.singleton = {display = Bool; modules = [ε]; name = String;} -> ι,
19− δ.override = {kernel = Null; libsOnly = Bool;} -> θ,
20− λ.xserver = β,
21− μ.services = λ,
22− ν.kernelPackages = β,
23− ξ.boot = ν,
24− ο.ati_drivers_x11 = δ,
25− π.linuxPackages = ο,
26− ρ.pkgsi686Linux = π
17+ μ,
18+ γ.singleton = {display = Bool; modules = [ι]; name = String;} -> λ,
19+ δ.pkgsi686Linux = ν,
20+ ζ.xserver = ξ,
21+ ξ.videoDrivers = η,
22+ ε.kernelPackages = ο,
23+ ο.ati_drivers_x11 = ι,
24+ ν.linuxPackages = π,
25+ π.ati_drivers_x11 = ρ,
26+ ρ.override = {kernel = Null; libsOnly = Bool;} -> κ
2727) =>
28−α -> {config = κ;}
28+α -> {config = μ;}
test/golden/importless/atop.txt+4−4
@@ -1,20 +1,20 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.config = β,
33 α.lib = γ,
4− β.atop = δ,
4+ β.programs = δ,
55 γ.concatStrings = ε -> ζ,
66 γ.mapAttrsToList = (η -> θ -> String) -> ι -> ε,
77 γ.mkIf = Bool -> {environment = {etc = {atoprc = {text = ζ;};};};} -> κ,
88 γ.mkOption =
99 { default = {};
1010 description = String;
11− example = {flags = String; interval = Integer;};
11+ example = {flags = String; interval = Number;};
1212 type = λ;
1313 } ->
1414 μ,
1515 γ.types = ν,
16− δ.settings = {},
17− ξ.programs = β,
16+ δ.atop = ξ,
17+ ξ.settings = {},
1818 ν.attrs = λ
1919) =>
2020α -> {config = κ; options = {programs = {atop = {settings = μ;};};};}
test/golden/importless/attica.txtnew file+14
@@ -0,0 +1,14 @@
1+∀ α β γ δ ε ζ η.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [γ];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ outputs = [String];
10+ } ->
11+ η;
12+ qtbase = γ;
13+} ->
14+η
test/golden/importless/attrsOf-conditional-check.txt+8−7
@@ -1,8 +1,9 @@
1−∀ α β γ δ ε.
2−( α.config = β,
3− α.lib = γ,
4− γ.mkIf = Bool -> String -> δ,
5− γ.mkOption = {default = Bool;} -> ε,
6− β.value = Bool
1+∀ α β γ δ ε ζ η.
2+( α.?foo = β,
3+ γ.config = δ,
4+ γ.lib = ε,
5+ ε.mkIf = Bool -> String -> ζ,
6+ ε.mkOption = {default = Bool;} -> η,
7+ δ.value = α
78) =>
8−α -> {config = {value = {foo = δ;};}; options = {conditionalWorks = ε;};}
9+γ -> {config = {value = {foo = ζ;};}; options = {conditionalWorks = η;};}
test/golden/importless/auditd.txt+9−9
@@ -2,17 +2,17 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.security = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { boot = {kernelParams = [String];};
10− environment = {systemPackages = [η];};
10+ environment = {systemPackages = [θ];};
1111 systemd =
1212 { services =
1313 { auditd =
1414 { description = String;
15− path = [θ];
15+ path = [ι];
1616 serviceConfig = {ExecStart = String; ExecStartPre = String;};
1717 unitConfig =
1818 { ConditionSecurity = [String];
@@ -24,9 +24,9 @@
2424 };
2525 };
2626 } ->
27− ι,
28− δ.audit = η,
29− κ.auditd = β,
30− λ.security = κ
27+ κ,
28+ δ.audit = θ,
29+ ε.auditd = λ,
30+ λ.enable = η
3131) =>
32−α -> {config = ι; options = {security = {auditd = {enable = ζ;};};};}
32+α -> {config = κ; options = {security = {auditd = {enable = ζ;};};};}
test/golden/importless/automake-1.11.x.txt+17−18
@@ -1,9 +1,8 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.gpl2Plus = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
6− builder = Path;
4+ { buildInputs = [γ];
5+ builder = String;
76 doCheck = Bool;
87 dontPatchShebangs = Bool;
98 enableParallelBuilding = Bool;
@@ -11,25 +10,25 @@
1110 { branch = String;
1211 description = String;
1312 homepage = String;
14− license = γ;
13+ license = δ;
1514 longDescription = String;
16− platforms = β;
15+ platforms = ε;
1716 };
1817 name = String;
19− patches = [Path];
18+ patches = [String];
2019 preCheck = String;
21− setupHook = Path;
22− src = ε;
20+ setupHook = String;
21+ src = ζ;
2322 } ->
24− ζ,
25− η.licenses = α,
26− θ.lib = η,
27− ι.platforms = α,
28− κ.lib = ι
23+ η,
24+ β.licenses = θ,
25+ θ.gpl2Plus = δ,
26+ ι.platforms = κ,
27+ κ.all = ε
2928) =>
30−{ autoconf = δ;
31− fetchurl = {sha256 = String; url = String;} -> ε;
32− perl = δ;
29+{ autoconf = γ;
30+ fetchurl = {sha256 = String; url = String;} -> ζ;
31+ perl = γ;
3332 stdenv = α;
3433} ->
35−ζ
34+η
test/golden/importless/automake-1.15.x.txt+17−18
@@ -1,8 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.gpl2Plus = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 doCheck = Bool;
76 doInstallCheck = Bool;
87 dontPatchShebangs = Bool;
@@ -11,26 +10,26 @@
1110 { branch = String;
1211 description = String;
1312 homepage = String;
14− license = γ;
13+ license = δ;
1514 longDescription = String;
16− platforms = β;
15+ platforms = ε;
1716 };
1817 name = String;
19− nativeBuildInputs = [δ];
20− patches = [Path];
18+ nativeBuildInputs = [γ];
19+ patches = [String];
2120 preCheck = String;
22− setupHook = Path;
23− src = ε;
21+ setupHook = String;
22+ src = ζ;
2423 } ->
25− ζ,
26− η.licenses = α,
27− θ.lib = η,
28− ι.platforms = α,
29− κ.lib = ι
24+ η,
25+ β.licenses = θ,
26+ θ.gpl2Plus = δ,
27+ ι.platforms = κ,
28+ κ.all = ε
3029) =>
31−{ autoconf = δ;
32− fetchurl = {sha256 = String; url = String;} -> ε;
33− perl = δ;
30+{ autoconf = γ;
31+ fetchurl = {sha256 = String; url = String;} -> ζ;
32+ perl = γ;
3433 stdenv = α;
3534} ->
36−ζ
35+η
test/golden/importless/automake-1.16.x.txt+16−17
@@ -1,8 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.all = β,
3− α.gpl2Plus = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 doCheck = Bool;
76 doInstallCheck = Bool;
87 dontPatchShebangs = Bool;
@@ -11,25 +10,25 @@
1110 { branch = String;
1211 description = String;
1312 homepage = String;
14− license = γ;
13+ license = δ;
1514 longDescription = String;
16− platforms = β;
15+ platforms = ε;
1716 };
1817 name = String;
19− nativeBuildInputs = [δ];
18+ nativeBuildInputs = [γ];
2019 preCheck = String;
21− setupHook = Path;
22− src = ε;
20+ setupHook = String;
21+ src = ζ;
2322 } ->
24− ζ,
25− η.licenses = α,
26− θ.lib = η,
27− ι.platforms = α,
28− κ.lib = ι
23+ η,
24+ β.licenses = θ,
25+ θ.gpl2Plus = δ,
26+ ι.platforms = κ,
27+ κ.all = ε
2928) =>
30−{ autoconf = δ;
31− fetchurl = {sha256 = String; url = String;} -> ε;
32− perl = δ;
29+{ autoconf = γ;
30+ fetchurl = {sha256 = String; url = String;} -> ζ;
31+ perl = γ;
3332 stdenv = α;
3433} ->
35−ζ
34+η
test/golden/importless/autorandr.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.autorandr = ε,
5+ β.services = ε,
66 γ.gnidorah = ζ,
77 γ.maintainers = η,
88 γ.mkEnableOption = String -> θ,
@@ -18,8 +18,8 @@
1818 serviceConfig =
1919 { ExecStart = String;
2020 RemainAfterExit = Bool;
21− StartLimitBurst = Integer;
22− StartLimitInterval = Integer;
21+ StartLimitBurst = Number;
22+ StartLimitInterval = Number;
2323 Type = String;
2424 };
2525 wantedBy = [String];
@@ -31,8 +31,8 @@
3131 γ.mkOption = {default = String; description = String; type = ν;} -> ξ,
3232 γ.types = ο,
3333 δ.autorandr = κ,
34− ε.enable = ι,
35− π.services = β,
34+ ε.autorandr = π,
35+ π.enable = ι,
3636 ο.str = ν
3737) =>
3838α ->
test/golden/importless/autostart.txt+13−13
@@ -1,19 +1,19 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.config = β,
33 α.lib = γ,
4− β.enable = δ,
5− γ.mkIf = δ -> {environment = {pathsToLink = [String];};} -> ε,
6− γ.mkOption = {default = Bool; description = String; type = ζ;} -> η,
7− γ.teams = θ,
8− γ.types = ι,
9− κ.autostart = β,
10− λ.xdg = κ,
11− θ.members = μ,
12− ν.freedesktop = θ,
13− ι.bool = ζ
4+ β.xdg = δ,
5+ γ.mkIf = ε -> {environment = {pathsToLink = [String];};} -> ζ,
6+ γ.mkOption = {default = Bool; description = String; type = η;} -> θ,
7+ γ.teams = ι,
8+ γ.types = κ,
9+ δ.autostart = λ,
10+ λ.enable = ε,
11+ ι.freedesktop = μ,
12+ μ.members = ν,
13+ κ.bool = η
1414) =>
1515α ->
16−{ config = ε;
17− meta = {maintainers = μ;};
18− options = {xdg = {autostart = {enable = η;};};};
16+{ config = ζ;
17+ meta = {maintainers = ν;};
18+ options = {xdg = {autostart = {enable = θ;};};};
1919}
test/golden/importless/aws-s3-exporter.txt+1−1
@@ -7,7 +7,7 @@
77) =>
88{ buildGoPackage =
99 { doCheck = Bool;
10− goDeps = Path;
10+ goDeps = String;
1111 goPackagePath = String;
1212 meta =
1313 { description = String;
test/golden/importless/azure-agent.txt+48−49
@@ -2,32 +2,32 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.agent = ε,
6− β.enable = Bool,
7− γ.coreutils = ζ,
8− γ.findutils = ζ,
9− γ.gawk = ζ,
10− γ.gnugrep = ζ,
11− γ.makeWrapper = η,
5+ β.networking = ε,
6+ β.virtualisation = ζ,
7+ γ.coreutils = η,
8+ γ.findutils = η,
9+ γ.gawk = η,
10+ γ.gnugrep = η,
11+ γ.makeWrapper = θ,
1212 γ.mkIf =
13− θ ->
13+ ι ->
1414 { assertions = [{assertion = Bool; message = String;}];
1515 boot = {initrd = {kernelModules = [String];};};
1616 environment = {etc = {waagent.conf = {text = String;};};};
1717 networking =
1818 { dhcpcd = {persistent = Bool;};
19− firewall = {allowedUDPPorts = [Integer];};
19+ firewall = {allowedUDPPorts = [Number];};
2020 };
2121 services =
2222 { logrotate = {config = String; enable = Bool;};
23− udev = {packages = [ι];};
23+ udev = {packages = [κ];};
2424 };
2525 systemd =
2626 { services =
2727 { consume-hypervisor-entropy =
2828 { before = [String];
2929 description = String;
30− path = [κ];
30+ path = [λ];
3131 script = String;
3232 serviceConfig =
3333 { RemainAfterExit = Bool;
@@ -40,7 +40,7 @@
4040 waagent =
4141 { after = [String];
4242 description = String;
43− path = [λ];
43+ path = [μ];
4444 serviceConfig = {ExecStart = String; Type = String;};
4545 unitConfig = {ConditionPathExists = String;};
4646 wantedBy = [String];
@@ -50,55 +50,54 @@
5050 targets = {provisioned = {description = String;};};
5151 };
5252 } ->
53− μ,
54− γ.mkOption = {default = Bool; description = String;} -> ν,
55− γ.nettools = ζ,
56− γ.openssh = ζ,
57− γ.openssl = ζ,
58− γ.parted = ζ,
59− γ.procps = ζ,
60− γ.python = η,
61− γ.pythonPackages = ξ,
62− γ.shadow = ζ,
63− γ.stdenv = ο,
64− γ.utillinux = ζ,
65− δ.bash = λ,
66− δ.coreutils = κ,
67− δ.e2fsprogs = λ,
53+ ν,
54+ γ.mkOption = {default = Bool; description = String;} -> ξ,
55+ γ.nettools = η,
56+ γ.openssh = η,
57+ γ.openssl = η,
58+ γ.parted = η,
59+ γ.procps = η,
60+ γ.python = θ,
61+ γ.pythonPackages = ο,
62+ γ.shadow = η,
63+ γ.stdenv = π,
64+ γ.utillinux = η,
65+ δ.bash = μ,
66+ δ.coreutils = λ,
67+ δ.e2fsprogs = μ,
6868 δ.fetchFromGitHub =
69− {owner = String; repo = String; rev = String; sha256 = String;} -> π,
70− δ.isi686 = Bool,
71− δ.isx86_64 = Bool,
72− δ.writeScript = String -> String -> ρ,
73− ο.mkDerivation =
74− { buildInputs = [η];
69+ {owner = String; repo = String; rev = String; sha256 = String;} -> ρ,
70+ δ.stdenv = σ,
71+ δ.writeScript = String -> String -> τ,
72+ π.mkDerivation =
73+ { buildInputs = [θ];
7574 buildPhase = Bool;
7675 configurePhase = Bool;
7776 installPhase = String;
7877 name = String;
79− patches = [Path];
80− pythonPath = [σ];
81− runtimeDeps = [ζ];
82− src = π;
78+ patches = [String];
79+ pythonPath = [υ];
80+ runtimeDeps = [η];
81+ src = ρ;
8382 } ->
84− ι,
85− ξ.pyasn1 = σ,
86− τ.wrapPython = η,
87− ε.enable = θ,
88− υ.azure = β,
89− φ.virtualisation = υ,
90− χ.stdenv = δ,
91− ψ.stdenv = δ,
92− ω.networkmanager = β,
93− α1.networking = ω
83+ κ,
84+ ο.pyasn1 = υ,
85+ φ.wrapPython = θ,
86+ ζ.azure = χ,
87+ χ.agent = ψ,
88+ ψ.enable = ι,
89+ σ.isi686 = Bool,
90+ ω.isx86_64 = Bool,
91+ ε.networkmanager = α1,
92+ α1.enable = Bool
9493) =>
9594α ->
96−{ config = μ;
95+{ config = ν;
9796 options =
9897 { virtualisation =
9998 { azure =
10099 { agent =
101− {enable = ν; mountResourceDisk = β1; verboseLogging = γ1;};
100+ {enable = ξ; mountResourceDisk = β1; verboseLogging = γ1;};
102101 };
103102 };
104103 };
test/golden/importless/b43.txt+10−12
@@ -1,21 +1,19 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ.
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enableB43Firmware = ε,
6− β.version = ζ,
7− γ.builtins = η,
8− γ.lessThan = Integer -> θ -> ι,
9− γ.mkIf = ε -> {assertions = κ; hardware = {firmware = [λ];};} -> μ,
5+ β.boot = ε,
6+ β.networking = ζ,
7+ γ.lessThan = Number -> η -> θ,
8+ γ.mkIf = ι -> {assertions = κ; hardware = {firmware = [λ];};} -> μ,
109 γ.mkOption = {default = Bool; description = String; type = ν;} -> ξ,
11− γ.singleton = {assertion = ι; message = String;} -> κ,
10+ γ.singleton = {assertion = θ; message = String;} -> κ,
1211 γ.types = ο,
1312 δ.b43Firmware_5_1_138 = λ,
14− π.kernel = β,
15− ρ.kernelPackages = π,
16− σ.boot = ρ,
17− τ.networking = β,
18− η.compareVersions = ζ -> String -> θ,
13+ ε.kernelPackages = π,
14+ π.kernel = ρ,
15+ ρ.version = σ,
16+ ζ.enableB43Firmware = ι,
1917 ο.bool = ν
2018) =>
2119α -> {config = μ; options = {networking = {enableB43Firmware = ξ;};};}
test/golden/importless/backend.txt+3−3
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.gpl3Plus = β,
2+( α.licenses = β,
33 α.maintainers = γ,
44 δ.gtk3 = ε,
55 δ.poppler_gi = ε,
6− ζ.licenses = α,
6+ β.gpl3Plus = ζ,
77 γ.aszlig = η,
88 γ.symphorien = η
99) =>
@@ -12,7 +12,7 @@
1212 meta =
1313 { description = String;
1414 homepage = String;
15− license = β;
15+ license = ζ;
1616 maintainers = [η];
1717 };
1818 patchPhase = String;
test/golden/importless/baloo-widgets.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−(α.lgpl21 = β, α.ttuegel = γ, δ.licenses = α, ε.maintainers = α) => { baloo = ζ;
2+(α.licenses = β, α.maintainers = γ, β.lgpl21 = δ, γ.ttuegel = ε) => { baloo = ζ;
33 extra-cmake-modules = η;
44 kconfig = ζ;
55 kdelibs4support = ζ;
@@ -10,7 +10,7 @@
1010 kservice = ζ;
1111 lib = α;
1212 mkDerivation =
13− { meta = {license = [β]; maintainers = [γ];};
13+ { meta = {license = [δ]; maintainers = [ε];};
1414 name = String;
1515 nativeBuildInputs = [η];
1616 outputs = [String];
test/golden/importless/baloo.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kauth = ε;
44 kconfig = ε;
55 kcoreaddons = ζ;
@@ -13,7 +13,7 @@
1313 lmdb = ε;
1414 mkDerivation =
1515 { buildInputs = [ε];
16− meta = {maintainers = [β];};
16+ meta = {maintainers = [γ];};
1717 name = String;
1818 nativeBuildInputs = [δ];
1919 propagatedBuildInputs = [ζ];
test/golden/importless/bamf.txt+9−9
@@ -2,19 +2,19 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.maintainers = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
9− ε ->
10− {services = {dbus = {packages = [θ];};}; systemd = {packages = [ι];};} -> κ,
11− γ.worldofpeace = λ,
12− δ.bamf = θ,
13− μ.bamf = β,
14− ν.services = μ
9+ θ ->
10+ {services = {dbus = {packages = [ι];};}; systemd = {packages = [κ];};} -> λ,
11+ γ.worldofpeace = μ,
12+ δ.bamf = ι,
13+ ε.bamf = ν,
14+ ν.enable = θ
1515) =>
1616α ->
17−{ config = κ;
18− meta = {maintainers = [λ];};
17+{ config = λ;
18+ meta = {maintainers = [μ];};
1919 options = {services = {bamf = {enable = η;};};};
2020}
test/golden/importless/bandwhich.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.bandwhich = ε,
5+ β.programs = ε,
66 γ.bandwhich = ζ,
77 γ.filalex77 = η,
88 γ.maintainers = θ,
@@ -15,8 +15,8 @@
1515 κ,
1616 γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
1717 γ.types = ν,
18− ε.enable = ι,
19− ξ.programs = β,
18+ ε.bandwhich = ξ,
19+ ξ.enable = ι,
2020 ν.bool = λ
2121) =>
2222α ->
test/golden/importless/base.txt+2−2
@@ -2,7 +2,6 @@
22( α.lib = β,
33 α.pkgs = γ,
44 β.mkDefault = String -> δ,
5− γ.bin = ε,
65 γ.ccrypt = ε,
76 γ.cryptsetup = ε,
87 γ.ddrescue = ε,
@@ -31,8 +30,9 @@
3130 γ.usbutils = ε,
3231 γ.vim = ε,
3332 γ.w3m-nographics = ε,
33+ γ.xfsprogs = ζ,
3434 γ.zip = ε,
35− ζ.xfsprogs = γ
35+ ζ.bin = ε
3636) =>
3737α ->
3838{ boot = {supportedFilesystems = [String];};
test/golden/importless/bcachefs.txt+16−16
@@ -1,26 +1,26 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1.
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
55 α.utils = ε,
66 ζ.fsType = η,
77 θ.device = ι,
8− β.fileSystems = κ,
9− β.supportedFilesystems = λ,
8+ β.boot = κ,
9+ β.fileSystems = λ,
1010 γ.concatStrings = μ -> String,
11− γ.elem = String -> λ -> ν,
12− γ.filterAttrs = (ξ -> ζ -> Bool) -> κ -> {},
13− γ.head = ο -> π,
14− γ.mapAttrsToList = (ρ -> θ -> String) -> {} -> μ,
15− γ.mkIf = ν -> σ -> τ,
11+ γ.elem = String -> ν -> ξ,
12+ γ.filterAttrs = (ο -> ζ -> Bool) -> λ -> {},
13+ γ.head = π -> ρ,
14+ γ.mapAttrsToList = (σ -> θ -> String) -> {} -> μ,
15+ γ.mkIf = ξ -> τ -> υ,
1616 γ.mkMerge =
17− [{boot = {kernelPackages = υ;}; system = {fsPackages = [φ];};}] -> σ,
18− γ.splitString = String -> χ -> ο,
19− δ.bcachefs-tools = φ,
20− δ.linuxPackages_testing_bcachefs = υ,
17+ [{boot = {kernelPackages = φ;}; system = {fsPackages = [χ];};}] -> τ,
18+ γ.splitString = String -> ψ -> π,
19+ δ.bcachefs-tools = χ,
20+ δ.linuxPackages_testing_bcachefs = φ,
2121 ε.fsNeededForBoot = ζ -> Bool,
22− ψ.boot = β,
23− ω.initrd = β,
24− α1.boot = ω
22+ κ.supportedFilesystems = ν,
23+ ω.initrd = α1,
24+ α1.supportedFilesystems = β1
2525) =>
26−α -> {config = τ;}
26+α -> {config = υ;}
test/golden/importless/bcc-git.txt+1−1
@@ -11,7 +11,7 @@
1111 maintainers = [δ];
1212 };
1313 name = String;
14− patches = [Path];
14+ patches = [String];
1515 src = ε;
1616 } ->
1717 ζ,
test/golden/importless/bcc.txt+13−13
@@ -1,20 +1,20 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.config = β,
33 α.lib = γ,
4− β.bcc = δ,
5− β.enable = ε,
4+ β.boot = δ,
5+ β.programs = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
9− { boot = {extraModulePackages = [δ];};
10− environment = {systemPackages = [η];};
8+ η ->
9+ { boot = {extraModulePackages = [θ];};
10+ environment = {systemPackages = [ι];};
1111 } ->
12− θ,
13− ι.bcc = β,
14− κ.programs = ι,
15− λ.kernelPackages = β,
16− μ.boot = λ,
17− ν.kernelPackages = β,
18− ξ.boot = ν
12+ κ,
13+ ε.bcc = λ,
14+ λ.enable = η,
15+ δ.kernelPackages = μ,
16+ μ.bcc = θ,
17+ ν.kernelPackages = ξ,
18+ ξ.bcc = ι
1919) =>
20−α -> {config = θ; options = {programs = {bcc = {enable = ζ;};};};}
20+α -> {config = κ; options = {programs = {bcc = {enable = ζ;};};};}
test/golden/importless/bean-add.txt+3−3
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−( α.maintainers = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { installPhase = String;
55 meta = {description = String; homepage = String; maintainers = [γ];};
@@ -9,8 +9,8 @@
99 } ->
1010 ζ,
1111 η.python = δ,
12− β.matthiasbeyer = γ,
13− θ.lib = α
12+ β.maintainers = θ,
13+ θ.matthiasbeyer = γ
1414) =>
1515{ fetchFromGitHub =
1616 {owner = String; repo = String; rev = String; sha256 = String;} -> ε;
test/golden/importless/berry.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.berry = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.berry = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.berry = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/beta.txt+24−26
@@ -1,44 +1,42 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.gpl2 = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { NIX_LDFLAGS = String;
6− buildInputs = [δ];
5+ buildInputs = [γ];
76 makeFlags = [String];
87 meta =
98 { description = String;
109 downloadPage = String;
11− license = β;
10+ license = δ;
1211 maintainers = [ε];
13− platforms = γ;
12+ platforms = ζ;
1413 version = String;
1514 };
16− nativeBuildInputs = [ζ];
15+ nativeBuildInputs = [η];
1716 pname = String;
1817 preConfigure = String;
1918 setSourceRoot = String;
20− src = η;
19+ src = θ;
2120 version = String;
2221 } ->
23− θ,
24− α.raskin = ε,
25− ι.licenses = α,
26− κ.lib = ι,
27− λ.maintainers = α,
28− μ.lib = λ,
29− ν.platforms = α,
30− ξ.lib = ν
22+ ι,
23+ β.licenses = κ,
24+ κ.gpl2 = δ,
25+ λ.maintainers = μ,
26+ μ.raskin = ε,
27+ ν.platforms = ξ,
28+ ξ.linux = ζ
3129) =>
32−{ autoconf = ζ;
33− automake = ζ;
34− fetchgit = {rev = String; sha256 = String; url = String;} -> η;
35− libGL = δ;
36− libGLU = δ;
37− libX11 = δ;
38− perl = δ;
39− python2 = δ;
30+{ autoconf = η;
31+ automake = η;
32+ fetchgit = {rev = String; sha256 = String; url = String;} -> θ;
33+ libGL = γ;
34+ libGLU = γ;
35+ libX11 = γ;
36+ perl = γ;
37+ python2 = γ;
4038 stdenv = α;
41− wxGTK = δ;
42− zlib = δ;
39+ wxGTK = γ;
40+ zlib = γ;
4341} ->
44−θ
42+ι
test/golden/importless/bi.txt+6−6
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
@@ -10,8 +10,8 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = γ;
14− maintainers = [β];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
1717 src = η;
test/golden/importless/bifunctors.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−(α.brainrape = β, γ.maintainers = α) => { build-idris-package =
3− { meta = {description = String; homepage = String; maintainers = [β];};
2+(α.maintainers = β, β.brainrape = γ) => { build-idris-package =
3+ { meta = {description = String; homepage = String; maintainers = [γ];};
44 name = String;
55 src = δ;
66 version = String;
test/golden/importless/binary-tarball.txtnew file+25
@@ -0,0 +1,25 @@
1+∀ β γ δ ε ζ η.
2+( β //
3+ { distPhase = String;
4+ doDist = Bool;
5+ finalPhase = String;
6+ meta = ∀ α. α;
7+ name = String;
8+ postHook = String;
9+ } ~
10+ γ,
11+ { doCheck = Bool;
12+ postPhases = String;
13+ prefix = String;
14+ showBuildStats = Bool;
15+ } //
16+ γ ~
17+ δ,
18+ β.meta = {},
19+ β.?name = String,
20+ ε.version = String,
21+ β.src = ε,
22+ β.stdenv = ζ,
23+ ζ.mkDerivation = δ -> η
24+) =>
25+β -> η
test/golden/importless/binary.txt+15−17
@@ -1,36 +1,34 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.asl20 = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { description = String;
98 downloadPage = String;
109 downloadURLRegexp = String;
1110 homepage = String;
12− license = β;
11+ license = δ;
1312 maintainers = [ε];
14− platforms = γ;
13+ platforms = ζ;
1514 updateWalker = Bool;
1615 version = String;
1716 };
1817 name = String;
19− src = ζ;
18+ src = η;
2019 version = String;
2120 } ->
22− η,
23− α.raskin = ε,
24− θ.licenses = α,
25− ι.lib = θ,
26− κ.maintainers = α,
27− λ.lib = κ,
28− μ.platforms = α,
29− ν.lib = μ
21+ θ,
22+ β.licenses = ι,
23+ ι.asl20 = δ,
24+ κ.maintainers = λ,
25+ λ.raskin = ε,
26+ μ.platforms = ν,
27+ ν.linux = ζ
3028) =>
31−{ fetchurl = {sha256 = String; url = String;} -> ζ;
29+{ fetchurl = {sha256 = String; url = String;} -> η;
3230 java = ξ;
33− makeWrapper = δ;
31+ makeWrapper = γ;
3432 stdenv = α;
3533} ->
36−η
34+θ
test/golden/importless/bladeRF.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.bladeRF = ε,
5+ β.hardware = ε,
66 γ.mkIf =
77 ζ ->
88 { services = {udev = {packages = [η];};};
@@ -12,8 +12,8 @@
1212 γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
1313 γ.types = λ,
1414 δ.libbladeRF = η,
15− ε.enable = ζ,
16− μ.hardware = β,
15+ ε.bladeRF = μ,
16+ μ.enable = ζ,
1717 λ.bool = ι
1818) =>
1919α -> {config = θ; options = {hardware = {bladeRF = {enable = κ;};};};}
test/golden/importless/blivet.txt+6−7
@@ -1,11 +1,10 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.lib = β,
3− α.optional = Bool -> Null -> [γ],
4− δ.lib = α,
5− β.gpl2Plus = ε,
6− β.lgpl21Plus = ε,
7− β.licenses = ζ,
8− β.platforms = η,
3+ β.optional = Bool -> Null -> [γ],
4+ δ.gpl2Plus = ε,
5+ δ.lgpl21Plus = ε,
6+ δ.licenses = ζ,
7+ δ.platforms = η,
98 η.linux = θ
109) =>
1110{ buildPythonApplication =
@@ -16,7 +15,7 @@
1615 license = [ε];
1716 platforms = θ;
1817 };
19− patches = [Path];
18+ patches = [String];
2019 pname = String;
2120 postPatch = String;
2221 propagatedBuildInputs = [γ];
test/golden/importless/blocks-gaps.txt+1−1
@@ -20,7 +20,7 @@
2020 ι,
2121 β.carlsverre = ε,
2222 β.intersectLists = [String] -> [String] -> κ,
23− β.length = κ -> Integer,
23+ β.length = κ -> Number,
2424 β.licenses = λ,
2525 β.maintainers = μ,
2626 β.optional = Bool -> ν -> γ,
test/golden/importless/bloodspilot-client.txt+22−24
@@ -1,38 +1,36 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.gpl2Plus = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { NIX_LDFLAGS = String;
6− buildInputs = [δ];
5+ buildInputs = [γ];
76 meta =
87 { description = String;
98 homepage = String;
10− license = β;
9+ license = δ;
1110 maintainers = [ε];
12− platforms = γ;
11+ platforms = ζ;
1312 };
1413 pname = String;
15− src = ζ;
14+ src = η;
1615 version = String;
1716 } ->
18− η,
19− α.raskin = ε,
20− θ.licenses = α,
21− ι.lib = θ,
22− κ.maintainers = α,
23− λ.lib = κ,
24− μ.platforms = α,
25− ν.lib = μ
17+ θ,
18+ β.licenses = ι,
19+ ι.gpl2Plus = δ,
20+ κ.maintainers = λ,
21+ λ.raskin = ε,
22+ μ.platforms = ν,
23+ ν.linux = ζ
2624) =>
27−{ SDL = δ;
28− SDL_image = δ;
29− SDL_ttf = δ;
30− expat = δ;
31− fetchurl = {sha256 = String; url = String;} -> ζ;
32− libGL = δ;
33− libGLU = δ;
34− libX11 = δ;
25+{ SDL = γ;
26+ SDL_image = γ;
27+ SDL_ttf = γ;
28+ expat = γ;
29+ fetchurl = {sha256 = String; url = String;} -> η;
30+ libGL = γ;
31+ libGLU = γ;
32+ libX11 = γ;
3533 stdenv = α;
36− zlib = δ;
34+ zlib = γ;
3735} ->
38−η
36+θ
test/golden/importless/bloodspilot-server.txt+1−1
@@ -9,7 +9,7 @@
99 maintainers = [ε];
1010 platforms = ζ;
1111 };
12− patches = [Path];
12+ patches = [String];
1313 pname = String;
1414 src = η;
1515 version = String;
test/golden/importless/blueman.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.blueman = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,7 +12,7 @@
1212 } ->
1313 λ,
1414 δ.blueman = θ,
15− ε.enable = η,
16− μ.services = β
15+ ε.blueman = μ,
16+ μ.enable = η
1717) =>
1818α -> {config = λ; options = {services = {blueman = {enable = ζ;};};};}
test/golden/importless/bluez-qt.txtnew file+16
@@ -0,0 +1,16 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ preConfigure = String;
10+ propagatedBuildInputs = [γ];
11+ } ->
12+ θ;
13+ qtbase = γ;
14+ qtdeclarative = η;
15+} ->
16+θ
test/golden/importless/bolt.txt+14−14
@@ -2,21 +2,21 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkIf =
7− ε ->
8− { environment = {systemPackages = [ζ];};
9− services = {udev = {packages = [η];};};
10− systemd = {packages = [θ];};
7+ ζ ->
8+ { environment = {systemPackages = [η];};
9+ services = {udev = {packages = [θ];};};
10+ systemd = {packages = [ι];};
1111 } ->
12− ι,
13− γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
14− γ.types = μ,
15− δ.bolt = ζ,
16− ν.bolt = β,
17− ξ.hardware = ν,
18− ο.services = ξ,
19− μ.bool = κ
12+ κ,
13+ γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
14+ γ.types = ν,
15+ δ.bolt = η,
16+ ε.hardware = ξ,
17+ ξ.bolt = ο,
18+ ο.enable = ζ,
19+ ν.bool = λ
2020) =>
2121α ->
22−{config = ι; options = {services = {hardware = {bolt = {enable = λ;};};};};}
22+{config = κ; options = {services = {hardware = {bolt = {enable = μ;};};};};}
test/golden/importless/boot.txt+5−6
@@ -1,16 +1,15 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.darwin = β,
3− α.maintainers = γ,
2+( α.lib = β,
3+ β.maintainers = γ,
44 γ.gridaphobe = δ,
5− ε.lib = α,
6− ζ.platforms = α,
7− η.lib = ζ
5+ ε.platforms = ζ,
6+ ζ.darwin = η
87) =>
98{ appleDerivation =
109 { buildInputs = [θ];
1110 buildPhase = String;
1211 installPhase = String;
13− meta = {maintainers = [δ]; platforms = β;};
12+ meta = {maintainers = [δ]; platforms = η;};
1413 nativeBuildInputs = [θ];
1514 outputs = [String];
1615 patchPhase = String;
test/golden/importless/bootstrap.txt+18−20
@@ -1,37 +1,35 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.darwin = β,
3− α.free = γ,
4− α.jwiegley = δ,
2+( α.lib = β,
53 α.mkDerivation =
6− { buildInputs = [ε];
4+ { buildInputs = [γ];
75 buildPhase = String;
86 installPhase = String;
97 meta =
108 { description = String;
119 homepage = String;
12− license = γ;
13− maintainers = [δ];
14− platforms = β;
10+ license = δ;
11+ maintainers = [ε];
12+ platforms = ζ;
1513 };
1614 pname = String;
1715 postInstall = String;
18− src = ζ;
16+ src = η;
1917 unpackPhase = String;
2018 version = String;
2119 } ->
22− η,
23− θ.licenses = α,
24− ι.lib = θ,
25− κ.maintainers = α,
26− λ.lib = κ,
27− μ.platforms = α,
28− ν.lib = μ
20+ θ,
21+ β.licenses = ι,
22+ ι.free = δ,
23+ κ.maintainers = λ,
24+ λ.jwiegley = ε,
25+ μ.platforms = ν,
26+ ν.darwin = ζ
2927) =>
30−{ cpio = ε;
31− fetchurl = {sha256 = String; url = String;} -> ζ;
32− makeWrapper = ε;
33− rsync = ε;
28+{ cpio = γ;
29+ fetchurl = {sha256 = String; url = String;} -> η;
30+ makeWrapper = γ;
31+ rsync = γ;
3432 stdenv = α;
3533 xar = ξ;
3634} ->
37−η
35+θ
test/golden/importless/breeze-gtk.txt+1−1
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.getLib = β, γ.pycairo = γ, δ.pkgs = γ) => { breeze-qt5 = γ;
2+(α.getLib = β, γ.pkgs = δ, δ.pycairo = γ) => { breeze-qt5 = γ;
33 extra-cmake-modules = γ;
44 gtk2 = ε;
55 lib = α;
test/golden/importless/breeze-icons.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 gtk3 = δ;
44 hicolor-icon-theme = ε;
55 lib = α;
66 mkDerivation =
77 { buildInputs = [ζ];
88 dontDropIconThemeCache = Bool;
9− meta = {maintainers = [β];};
9+ meta = {maintainers = [γ];};
1010 name = String;
1111 nativeBuildInputs = [δ];
1212 outputs = [String];
test/golden/importless/brillo.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.brillo = ε,
5+ β.hardware = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -11,7 +11,7 @@
1111 } ->
1212 κ,
1313 δ.brillo = θ,
14− ε.enable = η,
15− λ.hardware = β
14+ ε.brillo = λ,
15+ λ.enable = η
1616) =>
1717α -> {config = κ; options = {hardware = {brillo = {enable = ζ;};};};}
test/golden/importless/brltty.txt+8−8
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.brltty = ε,
5+ β.services = ε,
66 γ.mkIf =
77 ζ ->
88 { systemd =
@@ -13,15 +13,15 @@
1313 description = String;
1414 serviceConfig =
1515 { ExecStart = String;
16− Nice = Integer;
17− OOMScoreAdjust = Integer;
16+ Nice = Number;
17+ OOMScoreAdjust = Number;
1818 ProtectHome = String;
1919 ProtectSystem = String;
2020 Restart = String;
21− RestartSec = Integer;
21+ RestartSec = Number;
2222 SystemCallArchitectures = String;
23− TimeoutStartSec = Integer;
24− TimeoutStopSec = Integer;
23+ TimeoutStartSec = Number;
24+ TimeoutStopSec = Number;
2525 Type = String;
2626 };
2727 unitConfig =
@@ -38,8 +38,8 @@
3838 η,
3939 γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
4040 γ.types = κ,
41− ε.enable = ζ,
42− λ.services = β,
41+ ε.brltty = λ,
42+ λ.enable = ζ,
4343 κ.bool = θ
4444) =>
4545α -> {config = η; options = {services = {brltty = {enable = ι;};};};}
test/golden/importless/browserpass.txt+6−6
@@ -2,10 +2,10 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.programs = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { environment =
1010 { etc =
1111 { chromium/native-messaging-hosts/ = {source = String;};
@@ -20,8 +20,8 @@
2020 };
2121 nixpkgs = {config = {firefox = {enableBrowserpass = Bool;};};};
2222 } ->
23− η,
24− θ.browserpass = β,
25− ι.programs = θ
23+ θ,
24+ ε.browserpass = ι,
25+ ι.enable = η
2626) =>
27−α -> {config = η; options = {programs = {browserpass = {enable = ζ;};};};}
27+α -> {config = θ; options = {programs = {browserpass = {enable = ζ;};};};}
test/golden/importless/build-rebar3.txt+30−33
@@ -1,43 +1,40 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
2−( (β) // (γ) ~ ({buildInputs = [δ]; name = String;}),
3− ( { buildInputs = [ε];
4− buildPhase = String;
5− buildPlugins = [ζ];
6− compilePorts = Bool;
7− configurePhase = String;
8− dontStrip = Bool;
9− installPhase = String;
10− meta = ∀ α. α;
11− name = String;
12− passthru = {beamDeps = [ζ]; env = η; packageName = θ;};
13− postPatch = String;
14− propagatedBuildInputs = ι;
15− setupHook = κ;
16− src = λ;
17− version = μ;
18− }
19− ) //
20− ( ν
21− ) ~
22− ( γ
23− ),
2+( β // γ ~ {buildInputs = [δ]; name = String;},
3+ { buildInputs = [ε];
4+ buildPhase = String;
5+ buildPlugins = [ζ];
6+ compilePorts = Bool;
7+ configurePhase = String;
8+ dontStrip = Bool;
9+ installPhase = String;
10+ meta = ∀ α. α;
11+ name = String;
12+ passthru = {beamDeps = [ζ]; env = η; packageName = θ;};
13+ postPatch = String;
14+ propagatedBuildInputs = ι;
15+ setupHook = κ;
16+ src = λ;
17+ version = μ;
18+ } //
19+ ν ~
20+ γ,
21+ β.?beamDeps = [ζ],
22+ β.?buildInputs = [ε],
23+ β.?buildPhase = Null,
24+ β.?buildPlugins = [ζ],
25+ β.?compilePorts = Bool,
26+ β.?configurePhase = Null,
27+ β.?enableDebugInfo = Bool,
28+ β.?installPhase = Null,
29+ β.?meta = {},
30+ β.?postPatch = String,
31+ β.?setupHook = Null,
2432 ξ.lib = ο,
2533 ξ.mkDerivation = {buildInputs = [δ]; name = String;} -> η,
2634 ε.debugInfo = Bool,
2735 ε.meta = π,
2836 ρ.optionalString = Bool -> String -> σ,
29− β.beamDeps = [ζ],
30− β.buildInputs = [ε],
31− β.buildPhase = Null,
32− β.buildPlugins = [ζ],
33− β.compilePorts = Bool,
34− β.configurePhase = Null,
35− β.enableDebugInfo = Bool,
36− β.installPhase = Null,
37− β.meta = {},
3837 β.name = θ,
39− β.postPatch = String,
40− β.setupHook = Null,
4138 β.src = λ,
4239 β.version = μ,
4340 ο.filterAttrs =
test/golden/importless/build-skaware-package.txt+10−11
@@ -1,15 +1,14 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
22( α.isDarwin = Bool,
3− α.isc = β,
4− α.lib = γ,
3+ α.lib = β,
54 α.mkDerivation =
65 { configureFlags = [String];
76 dontDisableStatic = Bool;
87 enableParallelBuilding = Bool;
98 meta =
10− { description = δ;
9+ { description = γ;
1110 homepage = String;
12− license = β;
11+ license = δ;
1312 maintainers = [ε];
1413 platforms = ζ;
1514 };
@@ -21,12 +20,12 @@
2120 version = ι;
2221 } ->
2322 κ,
24− γ.all = ζ,
25− γ.maintainers = λ,
26− γ.optional = μ -> String -> [String],
27− ν.platforms = γ,
28− ξ.licenses = α,
29− ο.lib = ξ,
23+ β.maintainers = λ,
24+ β.optional = μ -> String -> [String],
25+ β.platforms = ν,
26+ ν.all = ζ,
27+ ξ.licenses = ο,
28+ ο.isc = δ,
3029 λ.Profpatsch = ε,
3130 λ.pmahoney = ε
3231) =>
@@ -35,7 +34,7 @@
3534 stdenv = α;
3635} ->
3736{ configureFlags = [String];
38− description = δ;
37+ description = γ;
3938 maintainers = [ε];
4039 outputs = [String];
4140 platforms = ζ;
test/golden/importless/build-solution.txt+1−1
@@ -10,7 +10,7 @@
1010 ε
1111) =>
1212{dotnetfx = β; stdenv = α;} ->
13−{ assemblyInputs = ζ;
13+{ assemblyInputs = [ζ];
1414 baseDir = String;
1515 mainClassFile = Null;
1616 modifyPublicMain = Bool;
test/golden/importless/build.txt+2−2
@@ -12,7 +12,7 @@
1212 platforms = ζ;
1313 };
1414 nativeBuildInputs = [η];
15− patches = θ;
15+ patches = [θ];
1616 pname = String;
1717 postInstall = String;
1818 postPatch = String;
@@ -39,7 +39,7 @@
3939 libxslt = γ;
4040 makeWrapper = γ;
4141 pango = γ;
42− patches = θ;
42+ patches = [θ];
4343 pkgconfig = η;
4444 rev = ο;
4545 sha256 = π;
test/golden/importless/buildOcamlJane.txt+18−21
@@ -1,25 +1,22 @@
11∀ α β γ δ ε ζ.
2−( ( α
3− ) //
4− ( { buildInputs = [β];
5− buildPhase = String;
6− configurePhase = String;
7− dontAddPrefix = Bool;
8− hasSharedObjects = Bool;
9− installPhase = String;
10− minimumSupportedOcamlVersion = String;
11− name = γ;
12− src = δ;
13− version = String;
14− }
15− ) ~
16− ( ε
17− ),
18− α.buildInputs = [β],
19− α.hash = String,
20− α.minimumSupportedOcamlVersion = String,
21− α.name = γ,
22− α.version = String
2+( α //
3+ { buildInputs = [β];
4+ buildPhase = String;
5+ configurePhase = String;
6+ dontAddPrefix = Bool;
7+ hasSharedObjects = Bool;
8+ installPhase = String;
9+ minimumSupportedOcamlVersion = String;
10+ name = γ;
11+ src = δ;
12+ version = String;
13+ } ~
14+ ε,
15+ α.?buildInputs = [β],
16+ α.?hash = String,
17+ α.?minimumSupportedOcamlVersion = String,
18+ α.?version = String,
19+ α.name = γ
2320) =>
2421{ buildOcaml = ε -> ζ;
2522 fetchurl = {sha256 = String; url = String;} -> δ;
test/golden/importless/builder.txt+16−19
@@ -1,26 +1,23 @@
11∀ α β γ δ ε ζ η θ.
2−( ( α
3− ) //
4− ( { buildPhase = String;
5− checkPhase = String;
6− configurePhase = String;
7− installPhase = String;
8− modRoot = String;
9− passthru = {forCurses = Bool; forTiles = Bool;};
10− pname = String;
11− }
12− ) ~
13− ( β
14− ),
2+( α //
3+ { buildPhase = String;
4+ checkPhase = String;
5+ configurePhase = String;
6+ installPhase = String;
7+ modRoot = String;
8+ passthru = {forCurses = Bool; forTiles = Bool;};
9+ pname = String;
10+ } ~
11+ β,
12+ α.?buildPhase = String,
13+ α.?checkPhase = String,
14+ α.?configurePhase = String,
15+ α.?installPhase = String,
16+ α.?modRoot = String,
17+ α.?pname = String,
1518 γ.mkDerivation = β -> δ,
1619 ε.elem = String -> [String] -> Bool,
17− α.buildPhase = String,
18− α.checkPhase = String,
19− α.configurePhase = String,
20− α.installPhase = String,
2120 α.modName = ζ,
22− α.modRoot = String,
23− α.pname = String,
2421 α.src = η,
2522 α.version = θ
2623) =>
test/golden/importless/builds.txt+1−1
@@ -22,7 +22,7 @@
2222 maintainers = [ζ];
2323 };
2424 nativeBuildInputs = ε;
25− patches = [Path];
25+ patches = [String];
2626 pname = String;
2727 postInstall = String;
2828 preBuild = String;
test/golden/importless/bytes.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−(α.brainrape = β, γ.maintainers = α) => { build-idris-package =
3− { meta = {description = String; homepage = String; maintainers = [β];};
2+(α.maintainers = β, β.brainrape = γ) => { build-idris-package =
3+ { meta = {description = String; homepage = String; maintainers = [γ];};
44 name = String;
55 src = δ;
66 version = String;
test/golden/importless/calibre-server.txt+20−19
@@ -2,11 +2,12 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.calibre-server = ε,
6− γ.mkEnableOption = String -> ζ,
5+ β.ids = ε,
6+ β.services = ζ,
7+ γ.mkEnableOption = String -> η,
78 γ.mkIf =
8− η ->
9− { environment = {systemPackages = [θ];};
9+ θ ->
10+ { environment = {systemPackages = [ι];};
1011 systemd =
1112 { services =
1213 { calibre-server =
@@ -19,23 +20,23 @@
1920 };
2021 };
2122 users =
22− { groups = {calibre-server = {gid = ι;};};
23− users = {calibre-server = {group = String; uid = κ;};};
23+ { groups = {calibre-server = {gid = κ;};};
24+ users = {calibre-server = {group = String; uid = λ;};};
2425 };
2526 } ->
26− λ,
27− γ.mkOption = {description = String; type = μ;} -> ν,
28− γ.types = ξ,
29− δ.calibre = θ,
30− ε.enable = η,
31− ο.services = β,
32− π.gids = β,
33− ρ.ids = π,
34− σ.uids = β,
35− τ.ids = σ,
36− ξ.path = μ
27+ μ,
28+ γ.mkOption = {description = String; type = ν;} -> ξ,
29+ γ.types = ο,
30+ δ.calibre = ι,
31+ ζ.calibre-server = π,
32+ π.enable = θ,
33+ ε.gids = ρ,
34+ ρ.calibre-server = κ,
35+ σ.uids = τ,
36+ τ.calibre-server = λ,
37+ ο.path = ν
3738) =>
3839α ->
39−{ config = λ;
40− options = {services = {calibre-server = {enable = ζ; libraryDir = ν;};};};
40+{ config = μ;
41+ options = {services = {calibre-server = {enable = η; libraryDir = ξ;};};};
4142}
test/golden/importless/camlp4.txt+5−5
@@ -1,14 +1,14 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.lgpl21 = β,
3− α.vbgl = γ,
2+( α.licenses = β,
3+ α.maintainers = γ,
44 δ.meta = ε,
5− ζ.licenses = α,
6− η.maintainers = α,
5+ β.lgpl21 = ζ,
6+ γ.vbgl = η,
77 ε.homepage = θ
88) =>
99{ buildDunePackage =
1010 { meta =
11− {description = String; homepage = θ; license = β; maintainers = [γ];};
11+ {description = String; homepage = θ; license = ζ; maintainers = [η];};
1212 minimumOCamlVersion = String;
1313 pname = String;
1414 preBuild = String;
test/golden/importless/canto-daemon.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.canto-daemon = ε,
5+ β.services = ε,
66 γ.mkIf =
77 ζ ->
88 { systemd =
@@ -21,8 +21,8 @@
2121 η,
2222 γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
2323 γ.types = κ,
24− ε.enable = ζ,
25− λ.services = β,
24+ ε.canto-daemon = λ,
25+ λ.enable = ζ,
2626 κ.bool = θ
2727) =>
2828α -> {config = η; options = {services = {canto-daemon = {enable = ι;};};};}
test/golden/importless/canvas.txt+2−2
@@ -1,7 +1,7 @@
11∀ α β γ δ ε.
2−(α.brainrape = β, γ.maintainers = α) => { build-idris-package =
2+(α.maintainers = β, β.brainrape = γ) => { build-idris-package =
33 { ipkgName = String;
4− meta = {description = String; homepage = String; maintainers = [β];};
4+ meta = {description = String; homepage = String; maintainers = [γ];};
55 name = String;
66 src = δ;
77 version = String;
test/golden/importless/carnix.txt+5−5
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.attrsets = β,
33 α.lists = γ,
4− δ.0.10.0 = {aho_corasick = {0.6.10 = {memchr = String;};};} -> {} -> ε,
4+ δ.crates = ε,
55 β.recursiveUpdate = ζ,
66 γ.fold = η,
7− θ.carnix = δ,
8− ι.crates = θ
7+ ε.carnix = θ,
8+ θ.0.10.0 = {aho_corasick = {0.6.10 = {memchr = String;};};} -> {} -> ι
99) =>
1010{ buildPlatform = κ;
1111 buildRustCrate = λ;
@@ -14,8 +14,8 @@
1414 fetchgit = ν;
1515 lib = α;
1616} ->
17−{ __all = [ε];
18− carnix = {} -> ε;
17+{ __all = [ι];
18+ carnix = {} -> ι;
1919 crates = δ;
2020 deps =
2121 { aho_corasick = {0.6.10 = {memchr = String;};};
test/golden/importless/categories.txt+2−2
@@ -1,6 +1,6 @@
11∀ α β γ δ ε.
2−(α.brainrape = β, γ.maintainers = α) => { build-idris-package =
3− { meta = {description = String; homepage = String; maintainers = [β];};
2+(α.maintainers = β, β.brainrape = γ) => { build-idris-package =
3+ { meta = {description = String; homepage = String; maintainers = [γ];};
44 name = String;
55 src = δ;
66 version = String;
test/golden/importless/cde.txt+6−6
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.xserver = ε,
5+ β.services = ε,
66 γ.bitmap = ζ,
77 γ.listOf = η -> θ,
88 γ.literalExample = String -> ι,
@@ -49,12 +49,12 @@
4949 γ.xwininfo = ζ,
5050 γ.xwud = ζ,
5151 δ.xorg = π,
52− ε.cde = ρ,
53− ε.enable = Bool,
54− σ.services = β,
52+ ε.xserver = ρ,
53+ ρ.desktopManager = σ,
5554 ρ.enable = Bool,
56− ρ.extraPackages = μ,
57− τ.desktopManager = ε,
55+ σ.cde = τ,
56+ τ.enable = Bool,
57+ τ.extraPackages = μ,
5858 κ.gnidorah = υ
5959) =>
6060α ->
test/golden/importless/chacha.txt+12−15
@@ -1,8 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.cstrahan = β,
3− α.lib = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = δ;
4+ { buildInputs = γ;
65 configureFlags = [String];
76 configureScript = String;
87 enableParallelBuilding = Bool;
@@ -10,10 +9,10 @@
109 meta =
1110 { description = String;
1211 homepage = String;
13− license = ε;
14− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1514 platforms = [String];
16− priority = Integer;
15+ priority = Number;
1716 };
1817 nativeBuildInputs = [ζ];
1918 outputs = [String];
@@ -25,16 +24,14 @@
2524 version = String;
2625 } ->
2726 θ,
28− α.optional = Bool -> ι -> δ,
29− α.optionals = Bool -> [String] -> [String],
30− γ.licenses = κ,
31− λ.lib = α,
32− μ.lib = α,
33− κ.openssl = ε,
34− ν.maintainers = α,
35− ξ.lib = ν
27+ β.licenses = ι,
28+ κ.optional = Bool -> λ -> γ,
29+ μ.optionals = Bool -> [String] -> [String],
30+ ι.openssl = δ,
31+ ν.maintainers = ξ,
32+ ξ.cstrahan = ε
3633) =>
37−{ cryptodev = ι;
34+{ cryptodev = λ;
3835 fetchFromGitHub =
3936 {owner = String; repo = String; rev = String; sha256 = String;} -> η;
4037 perl = ζ;
test/golden/importless/check-plugin.txt+1−1
@@ -11,7 +11,7 @@
1111 };
1212 name = String;
1313 nativeBuildInputs = [η];
14− patches = [Path];
14+ patches = [String];
1515 prePatch = String;
1616 propagatedBuildInputs = [δ];
1717 src = θ;
test/golden/importless/chipz.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/chrome-gnome-shell.txt+14−14
@@ -2,10 +2,10 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { environment =
1010 { etc =
1111 { chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json =
@@ -13,22 +13,22 @@
1313 opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json =
1414 {source = String;};
1515 };
16− systemPackages = [η];
16+ systemPackages = [θ];
1717 };
1818 nixpkgs = {config = {firefox = {enableGnomeExtensions = Bool;};};};
19− services = {dbus = {packages = [θ];};};
19+ services = {dbus = {packages = [ι];};};
2020 } ->
21− ι,
22− γ.teams = κ,
23− δ.chrome-gnome-shell = η,
24− λ.chrome-gnome-shell = β,
25− μ.gnome3 = λ,
26− ν.services = μ,
27− κ.members = ξ,
28− ο.gnome = κ
21+ κ,
22+ γ.teams = λ,
23+ δ.chrome-gnome-shell = θ,
24+ ε.gnome3 = μ,
25+ μ.chrome-gnome-shell = ν,
26+ ν.enable = η,
27+ λ.gnome = ξ,
28+ ξ.members = ο
2929) =>
3030α ->
31−{ config = ι;
32− meta = {maintainers = ξ;};
31+{ config = κ;
32+ meta = {maintainers = ο;};
3333 options = {services = {gnome3 = {chrome-gnome-shell = {enable = ζ;};};};};
3434}
test/golden/importless/chrootenv.txt+20−20
@@ -18,19 +18,19 @@
1818 multiPkgs =
1919 ∀ α β γ δ ε ζ η.
2020 ( α.git = β,
21− α.override =
21+ α.python3 = γ,
22+ α.zlib = β,
23+ β.pkgs = δ,
24+ γ.override =
2225 { packageOverrides =
23− (γ.callPackage = Path -> {} -> δ) => γ ->
24− ε -> {platformio = δ;};
26+ (ε.callPackage = String -> {} -> ζ) => ε ->
27+ η -> {platformio = ζ;};
2528 } ->
2629 β,
27− α.zlib = β,
28− β.pkgs = ζ,
29− ζ.bottle = β,
30− ζ.pip = β,
31− ζ.platformio = β,
32− ζ.setuptools = β,
33− η.python3 = α
30+ δ.bottle = β,
31+ δ.pip = β,
32+ δ.platformio = β,
33+ δ.setuptools = β
3434 ) =>
3535 α -> [β];
3636 name = String;
@@ -38,19 +38,19 @@
3838 targetPkgs =
3939 ∀ α β γ δ ε ζ η.
4040 ( α.git = β,
41− α.override =
41+ α.python3 = γ,
42+ α.zlib = β,
43+ β.pkgs = δ,
44+ γ.override =
4245 { packageOverrides =
43− (γ.callPackage = Path -> {} -> δ) => γ ->
44− ε -> {platformio = δ;};
46+ (ε.callPackage = String -> {} -> ζ) => ε ->
47+ η -> {platformio = ζ;};
4548 } ->
4649 β,
47− α.zlib = β,
48− β.pkgs = ζ,
49− ζ.bottle = β,
50− ζ.pip = β,
51− ζ.platformio = β,
52− ζ.setuptools = β,
53− η.python3 = α
50+ δ.bottle = β,
51+ δ.pip = β,
52+ δ.platformio = β,
53+ δ.setuptools = β
5454 ) =>
5555 α -> [β];
5656 } ->
test/golden/importless/cl-aa.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-anonfun.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-css.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-html-parse.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-jpeg.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-l10n-cldr.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-log.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-markup.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-paths.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-unification.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cl-utilities.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/clack-socket.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/clean-packaging.txt+2−2
@@ -1,6 +1,6 @@
11∀ γ δ ε ζ η θ ι.
2−( γ.concatMapStringsSep = String -> (δ -> String) -> ε -> ζ,
3− η.lib = γ
2+( γ.lib = δ,
3+ δ.concatMapStringsSep = String -> (ε -> String) -> ζ -> η
44) =>
55{file = θ; stdenv = γ; writeScript = String -> String -> ι;} ->
66{ checkForRemainingFiles = ι;
test/golden/importless/clfswm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.clfswm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.clfswm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.clfswm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/clickhouse.txt+18−17
@@ -2,17 +2,18 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.clickhouse = ε,
6− γ.mkDefault = String -> ζ,
7− γ.mkEnableOption = String -> η,
5+ β.ids = ε,
6+ β.services = ζ,
7+ γ.mkDefault = String -> η,
8+ γ.mkEnableOption = String -> θ,
89 γ.mkIf =
9− θ ->
10+ ι ->
1011 { environment =
1112 { etc =
1213 { clickhouse-server/config.xml = {source = String;};
1314 clickhouse-server/users.xml = {source = String;};
1415 };
15− systemPackages = [ι];
16+ systemPackages = [κ];
1617 };
1718 systemd =
1819 { services =
@@ -31,22 +32,22 @@
3132 };
3233 };
3334 };
34− time = {timeZone = ζ;};
35+ time = {timeZone = η;};
3536 users =
36− { groups = {clickhouse = {gid = κ;};};
37+ { groups = {clickhouse = {gid = λ;};};
3738 users =
3839 { clickhouse =
39− {description = String; group = String; name = String; uid = λ;};
40+ {description = String; group = String; name = String; uid = μ;};
4041 };
4142 };
4243 } ->
43− μ,
44− δ.clickhouse = ι,
45− ε.enable = θ,
46− ν.services = β,
47− ξ.gids = β,
48− ο.ids = ξ,
49− π.uids = β,
50− ρ.ids = π
44+ ν,
45+ δ.clickhouse = κ,
46+ ζ.clickhouse = ξ,
47+ ξ.enable = ι,
48+ ε.gids = ο,
49+ ο.clickhouse = λ,
50+ π.uids = ρ,
51+ ρ.clickhouse = μ
5152) =>
52−α -> {config = μ; options = {services = {clickhouse = {enable = η;};};};}
53+α -> {config = ν; options = {services = {clickhouse = {enable = θ;};};};}
test/golden/importless/clickshare.txt+17−17
@@ -2,25 +2,25 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− γ.mkEnableOption = String -> ζ,
7− γ.mkIf =
8− ε ->
9− { environment = {systemPackages = [η];};
10− services = {udev = {packages = [θ];};};
5+ β.programs = ε,
6+ γ.maintainers = ζ,
7+ γ.modules = η,
8+ γ.options = θ,
9+ δ.clickshare-csc1 = ι,
10+ η.mkIf =
11+ κ ->
12+ { environment = {systemPackages = [ι];};
13+ services = {udev = {packages = [λ];};};
1114 users = {groups = {clickshare = {};};};
1215 } ->
13− ι,
14− γ.yarny = κ,
15− δ.clickshare-csc1 = η,
16− λ.modules = γ,
17− μ.clickshare-csc1 = β,
18− ν.programs = μ,
19− ξ.maintainers = γ,
20− ο.options = γ
16+ μ,
17+ ε.clickshare-csc1 = ν,
18+ ν.enable = κ,
19+ ζ.yarny = ξ,
20+ θ.mkEnableOption = String -> ο
2121) =>
2222α ->
23−{ config = ι;
24− meta = {maintainers = [κ];};
25− options = {programs = {clickshare-csc1 = {enable = ζ;};};};
23+{ config = μ;
24+ meta = {maintainers = [ξ];};
25+ options = {programs = {clickshare-csc1 = {enable = ο;};};};
2626}
test/golden/importless/client-ip-echo.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.lgpl3 = β, γ.licenses = α, δ.lib = γ) => { base = ε;
2+(α.lib = β, β.licenses = γ, γ.lgpl3 = δ) => { base = ε;
33 bytestring = ε;
44 fetchFromGitHub =
55 {owner = String; repo = String; rev = String; sha256 = String;} -> ζ;
@@ -8,7 +8,7 @@
88 executableHaskellDepends = [ε];
99 isExecutable = Bool;
1010 isLibrary = Bool;
11− license = β;
11+ license = δ;
1212 pname = String;
1313 src = ζ;
1414 version = String;
test/golden/importless/clientlib.txt+5−6
@@ -15,12 +15,11 @@
1515 version = String;
1616 } ->
1717 ι,
18− α.optional = β -> κ -> [η],
19− λ.lib = α,
20− γ.ehmry = ε,
21− γ.licenses = μ,
22− γ.maintainers = ν,
23− γ.platforms = ξ,
18+ γ.optional = β -> κ -> [η],
19+ λ.ehmry = ε,
20+ λ.licenses = μ,
21+ λ.maintainers = ν,
22+ λ.platforms = ξ,
2423 μ.gpl2 = δ,
2524 ξ.unix = ζ
2625) =>
test/golden/importless/clingo.txt+14−16
@@ -1,29 +1,27 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.mit = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { cmakeFlags = [String];
55 meta =
66 { description = String;
77 downloadPage = String;
88 homepage = String;
9− license = β;
10− maintainers = [γ];
11− platforms = δ;
9+ license = γ;
10+ maintainers = [δ];
11+ platforms = ε;
1212 version = String;
1313 };
14− nativeBuildInputs = [ε];
14+ nativeBuildInputs = [ζ];
1515 pname = String;
16− src = ζ;
16+ src = η;
1717 version = String;
1818 } ->
19− η,
20− α.raskin = γ,
21− α.unix = δ,
22− θ.licenses = α,
23− ι.lib = θ,
24− κ.maintainers = α,
25− λ.lib = κ,
26− μ.platforms = α,
27− ν.lib = μ
19+ θ,
20+ β.licenses = ι,
21+ ι.mit = γ,
22+ κ.maintainers = λ,
23+ λ.raskin = δ,
24+ μ.platforms = ν,
25+ ν.unix = ε
2826) =>
29−{cmake = ε; fetchzip = {sha256 = String; url = String;} -> ζ; stdenv = α;} -> η
27+{cmake = ζ; fetchzip = {sha256 = String; url = String;} -> η; stdenv = α;} -> θ
test/golden/importless/clipmenu.txt+4−4
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.clipmenu = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -26,9 +26,9 @@
2626 {default = κ; defaultText = String; description = String; type = λ;} -> μ,
2727 γ.types = ν,
2828 δ.clipmenu = κ,
29− ε.enable = η,
30− ε.package = θ,
31− ξ.services = β,
29+ ε.clipmenu = ξ,
30+ ξ.enable = η,
31+ ξ.package = θ,
3232 ν.package = λ
3333) =>
3434α ->
test/golden/importless/clippy.txt+26−28
@@ -1,46 +1,44 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
22( α.isDarwin = β,
33 α.lib = γ,
4− α.optionalString = δ -> String -> ε,
5− α.optionals = β -> [ζ] -> [η],
6− θ.buildRustPackage =
7− { RUSTC_BOOTSTRAP = Integer;
4+ δ.buildRustPackage =
5+ { RUSTC_BOOTSTRAP = Number;
86 buildAndTestSubdir = String;
9− buildInputs = [η];
7+ buildInputs = [ε];
108 cargoVendorDir = String;
119 doCheck = Bool;
1210 dontUpdateAutotoolsGnuConfigScripts = Bool;
1311 meta =
1412 { description = String;
1513 homepage = String;
16− license = [ι];
17− maintainers = [κ];
18− platforms = λ;
14+ license = [ζ];
15+ maintainers = [η];
16+ platforms = θ;
1917 };
2018 name = String;
21− preFixup = ε;
22− src = μ;
23− version = ν;
19+ preFixup = ι;
20+ src = κ;
21+ version = λ;
2422 } ->
25− ξ,
26− η.llvm = η,
27− η.src = μ,
28− η.version = ν,
29− ο.lib = α,
30− γ.asl20 = ι,
31− γ.basvandijk = κ,
32− γ.licenses = π,
33− γ.maintainers = ρ,
34− γ.mit = ι,
35− γ.platforms = σ,
36− σ.unix = λ,
37− τ.lib = α
23+ μ,
24+ ε.llvm = ε,
25+ ε.src = κ,
26+ ε.version = λ,
27+ γ.optionals = β -> [ν] -> [ε],
28+ ξ.asl20 = ζ,
29+ ξ.basvandijk = η,
30+ ξ.licenses = ο,
31+ ξ.maintainers = π,
32+ ξ.mit = ζ,
33+ ξ.platforms = ρ,
34+ ρ.unix = θ,
35+ σ.optionalString = τ -> String -> ι
3836) =>
39−{ Security = ζ;
37+{ Security = ν;
4038 lib = υ;
4139 patchelf = φ;
42− rustPlatform = θ;
43− rustc = η;
40+ rustPlatform = δ;
41+ rustc = ε;
4442 stdenv = α;
4543} ->
46−ξ
44+μ
test/golden/importless/clooj.txt+6−6
@@ -1,21 +1,21 @@
11∀ α β γ δ ε ζ η θ.
2−( α.bsd3 = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 installPhase = String;
66 jar = δ;
7− meta = {description = String; homepage = String; license = β;};
7+ meta = {description = String; homepage = String; license = ε;};
88 phases = String;
99 pname = String;
1010 version = String;
1111 } ->
12− ε,
13− ζ.licenses = α,
14− η.lib = ζ
12+ ζ,
13+ β.licenses = η,
14+ η.bsd3 = ε
1515) =>
1616{ fetchurl = {sha256 = String; url = String;} -> δ;
1717 jre = θ;
1818 makeWrapper = γ;
1919 stdenv = α;
2020} ->
21−ε
21+ζ
test/golden/importless/closer-mop.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cmake-modules.txt+1−1
@@ -5,7 +5,7 @@
55 nativeBuildInputs = [ε];
66 pname = String;
77 prePatch = String;
8− setupHook = Path;
8+ setupHook = String;
99 src = ζ;
1010 version = String;
1111 } ->
test/golden/importless/coda.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { ipkgName = String;
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = ζ;
test/golden/importless/cohttp.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ λ.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.optionals = Bool -> [ε] -> ζ,
44 η.meta = β,
55 η.src = θ,
test/golden/importless/colord.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.colord = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -17,7 +17,7 @@
1717 } ->
1818 ν,
1919 δ.colord = θ,
20− ε.enable = η,
21− ξ.services = β
20+ ε.colord = ξ,
21+ ξ.enable = η
2222) =>
2323α -> {config = ν; options = {services = {colord = {enable = ζ;};};};}
test/golden/importless/combinators.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.meta = β,
44 δ.src = ε,
55 δ.version = ζ
test/golden/importless/command-line-arguments.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/common-path.txt+4−3
@@ -1,6 +1,6 @@
11∀ α β γ δ.
22( α.bash = β,
3− α.bin = β,
3+ α.bzip2 = γ,
44 α.coreutils = β,
55 α.diffutils = β,
66 α.findutils = β,
@@ -11,7 +11,8 @@
1111 α.gnutar = β,
1212 α.gzip = β,
1313 α.patch = β,
14− γ.bzip2 = α,
15− δ.xz = α
14+ α.xz = δ,
15+ γ.bin = β,
16+ δ.bin = β
1617) =>
1718{pkgs = α;} -> [β]
test/golden/importless/common.txt+6−6
@@ -5,21 +5,21 @@
55 ( β.pkgs = γ,
66 γ.jq = δ,
77 γ.makeWrapper = ε,
8− γ.mkDerivation =
8+ γ.stdenv = ζ,
9+ γ.writeTextDir = String -> String -> η,
10+ ζ.mkDerivation =
911 { buildInputs = [ε];
1012 dontUnpack = Bool;
1113 installPhase = String;
1214 name = String;
1315 postFixup = String;
1416 } ->
15− δ,
16− γ.writeTextDir = String -> String -> ζ,
17− η.stdenv = γ
17+ δ
1818 ) =>
1919 β ->
2020 { environment = {systemPackages = [δ];};
2121 nix =
22− { binaryCaches = ∀ α. α;
22+ { binaryCaches = ∀ α. [α];
2323 buildMachines = [{hostName = String; systems = [ι];}];
2424 distributedBuilds = Bool;
2525 };
@@ -33,6 +33,6 @@
3333 postfix = {enable = Bool;};
3434 };
3535 time = {timeZone = String;};
36− virtualisation = {memorySize = Integer;};
36+ virtualisation = {memorySize = Number;};
3737 };
3838}
test/golden/importless/community.txtnew file+88
@@ -0,0 +1,88 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1
2+λ1 μ1 ν1.
3+( α.cc = β,
4+ α.isDarwin = γ,
5+ α.isLinux = Bool,
6+ α.lib = δ,
7+ α.mkDerivation =
8+ { NIX_CFLAGS_COMPILE = ε;
9+ NIX_LDFLAGS = ζ;
10+ buildInputs = [η];
11+ checkPhase = String;
12+ cmakeFlags = [String];
13+ doCheck = Bool;
14+ meta =
15+ { description = String;
16+ homepage = String;
17+ license = θ;
18+ longDescription = String;
19+ maintainers = [ι];
20+ platforms = [κ];
21+ };
22+ nativeBuildInputs = [λ];
23+ patches = [String];
24+ pname = String;
25+ postPatch = μ;
26+ preFixup = ν;
27+ src = ξ;
28+ version = String;
29+ } ->
30+ ο,
31+ π.apple_sdk = ρ,
32+ δ.jonafato = ι,
33+ δ.licenses = σ,
34+ δ.maintainers = τ,
35+ δ.optional = Bool -> String -> [String],
36+ δ.optionalString = γ -> String -> ν,
37+ δ.platforms = υ,
38+ δ.turion = ι,
39+ φ.optionalString = χ -> String -> μ,
40+ σ.gpl2 = θ,
41+ υ.linux = [κ],
42+ ψ.darwin = [κ],
43+ ω.optional = Bool -> α1 -> [η],
44+ β1.optional = γ1 -> δ1 -> [η],
45+ ε1.optional = Bool -> ζ1 -> [η],
46+ η1.optionalString = θ1 -> String -> ζ,
47+ ι1.optionalString = κ1 -> [String] -> ε,
48+ β.isClang = κ1,
49+ ρ.frameworks = λ1,
50+ λ1.LocalAuthentication = ζ1
51+) =>
52+{ asciidoctor = η;
53+ cmake = λ;
54+ curl = η;
55+ darwin = π;
56+ fetchFromGitHub =
57+ {owner = String; repo = String; rev = String; sha256 = String;} -> ξ;
58+ fetchpatch = μ1;
59+ glibcLocales = η;
60+ libXi = η;
61+ libXtst = η;
62+ libargon2 = η;
63+ libgcrypt = η;
64+ libgpgerror = η;
65+ libsodium = η;
66+ libyubikey = η;
67+ makeWrapper = ν1;
68+ pkg-config = η;
69+ qrencode = η;
70+ qtbase = η;
71+ qtmacextras = δ1;
72+ qtsvg = η;
73+ qttools = λ;
74+ qtx11extras = η;
75+ quazip = α1;
76+ stdenv = α;
77+ withKeePassBrowser = Bool;
78+ withKeePassFDOSecrets = Bool;
79+ withKeePassKeeShare = Bool;
80+ withKeePassKeeShareSecure = Bool;
81+ withKeePassNetworking = Bool;
82+ withKeePassSSHAgent = Bool;
83+ withKeePassTouchID = Bool;
84+ wrapQtAppsHook = λ;
85+ yubikey-personalization = η;
86+ zlib = η;
87+} ->
88+ο
test/golden/importless/comonad.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = γ;
12− maintainers = [β];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/compiler-rt.txt+43−49
@@ -1,61 +1,55 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1
2−λ1.
2+λ1 μ1.
33( α.hostPlatform = β,
4− α.isAarch32 = γ,
5− α.isDarwin = δ,
6− α.isMusl = ε,
7− α.isWasm = Bool,
8− α.libc = String,
4+ β.?useLLVM = Bool,
5+ α.isDarwin = γ,
6+ α.lib = δ,
97 α.mkDerivation =
108 { NIX_CFLAGS_COMPILE = [String];
11− buildInputs = ζ;
9+ buildInputs = ε;
1210 cmakeFlags = [String];
1311 enableParallelBuilding = Bool;
14− nativeBuildInputs = [η];
12+ nativeBuildInputs = [ζ];
1513 outputs = [String];
16− patches = [Path];
14+ patches = [String];
1715 pname = String;
18− postInstall = θ;
19− postPatch = ι;
20− src = κ;
21− version = λ;
16+ postInstall = η;
17+ postPatch = θ;
18+ src = ι;
19+ version = κ;
2220 } ->
23− μ,
24− α.name = String,
25− α.optional = δ -> ν -> ζ,
26− α.optionalString = Bool -> String -> θ,
27− α.optionals = Bool -> [String] -> [String],
28− α.useLLVM = Bool,
29− ξ.hostPlatform = α,
30− β.isMusl = Bool,
31− ο.kernel = α,
32− π.parsed = ο,
33− ρ.hostPlatform = π,
34− σ.lib = α,
35− τ.hostPlatform = α,
36− υ.lib = α,
37− φ.lib = α,
38− χ.lib = α,
39− ψ.lib = α,
40− ω.lib = α,
41− α1.hostPlatform = α,
42− β1.lib = α,
43− γ1.hostPlatform = α,
44− δ1.lib = α,
45− ε1.hostPlatform = α,
46− ζ1.lib = α,
47− η1.hostPlatform = α,
48− θ1.hostPlatform = α,
49− ι1.lib = α,
50− κ1.lib = α,
51− λ1.lib = α
21+ λ,
22+ μ.isMusl = Bool,
23+ ν.parsed = ξ,
24+ ξ.kernel = ο,
25+ ο.name = String,
26+ δ.optional = π -> ρ -> ε,
27+ σ.isDarwin = π,
28+ τ.optionals = Bool -> [String] -> [String],
29+ υ.optionals = Bool -> [String] -> [String],
30+ φ.optionals = Bool -> [String] -> [String],
31+ χ.optionals = Bool -> [String] -> [String],
32+ ψ.optional = ω -> String -> [String],
33+ α1.isMusl = ω,
34+ β1.optional = Bool -> String -> [String],
35+ γ1.libc = String,
36+ δ1.optional = ε1 -> String -> [String],
37+ ζ1.isAarch32 = ε1,
38+ η1.optionalString = Bool -> String -> η,
39+ θ1.isDarwin = Bool,
40+ ι1.isWasm = Bool,
41+ κ1.optionalString = Bool -> String -> η,
42+ λ1.optionalString = γ -> String -> θ,
43+ μ1.optionalString = Bool -> String -> θ,
44+ (String | Number) ~ η,
45+ (String | Number) ~ θ
5246) =>
53−{ cmake = η;
54− fetch = String -> String -> κ;
55− libcxxabi = ν;
56− llvm = η;
57− python3 = η;
47+{ cmake = ζ;
48+ fetch = String -> String -> ι;
49+ libcxxabi = ρ;
50+ llvm = ζ;
51+ python3 = ζ;
5852 stdenv = α;
59− version = λ;
53+ version = κ;
6054} ->
61−μ
55+λ
test/golden/importless/compiler.txt+7−7
@@ -1,17 +1,17 @@
11∀ β γ δ ε ζ η θ ι κ λ.
2−( β.gpl2 = γ,
3− β.vbgl = δ,
4− ε.licenses = β,
5− ζ.maintainers = β
2+( β.licenses = γ,
3+ β.maintainers = δ,
4+ γ.gpl2 = ε,
5+ δ.vbgl = ζ
66) =>
77{ buildDunePackage =
88 { buildInputs = [η];
9− configurePlatforms = ∀ α. α;
9+ configurePlatforms = ∀ α. [α];
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = γ;
14− maintainers = [δ];
13+ license = ε;
14+ maintainers = [ζ];
1515 };
1616 nativeBuildInputs = [θ];
1717 pname = String;
test/golden/importless/component-packages.txt+671−671
@@ -1,36 +1,36 @@
11{ components =
2− { abode = ∀ α β. α -> β;
3− accuweather = ∀ α β. α -> β;
2+ { abode = ∀ α β. α -> [β];
3+ accuweather = ∀ α β. α -> [β];
44 acer_projector = ∀ α β. (α.pyserial = β) => α -> [β];
5− acmeda = ∀ α β. α -> β;
6− actiontec = ∀ α β. α -> β;
7− adguard = ∀ α β. α -> β;
8− ads = ∀ α β. α -> β;
9− aftership = ∀ α β. α -> β;
10− agent_dvr = ∀ α β. α -> β;
11− air_quality = ∀ α β. α -> β;
12− airly = ∀ α β. α -> β;
5+ acmeda = ∀ α β. α -> [β];
6+ actiontec = ∀ α β. α -> [β];
7+ adguard = ∀ α β. α -> [β];
8+ ads = ∀ α β. α -> [β];
9+ aftership = ∀ α β. α -> [β];
10+ agent_dvr = ∀ α β. α -> [β];
11+ air_quality = ∀ α β. α -> [β];
12+ airly = ∀ α β. α -> [β];
1313 airvisual = ∀ α β. (α.pyairvisual = β) => α -> [β];
14− aladdin_connect = ∀ α β. α -> β;
15− alarm_control_panel = ∀ α β. α -> β;
16− alarmdecoder = ∀ α β. α -> β;
17− alert = ∀ α β. α -> β;
14+ aladdin_connect = ∀ α β. α -> [β];
15+ alarm_control_panel = ∀ α β. α -> [β];
16+ alarmdecoder = ∀ α β. α -> [β];
17+ alert = ∀ α β. α -> [β];
1818 alexa = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
1919 almond = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
20− alpha_vantage = ∀ α β. α -> β;
20+ alpha_vantage = ∀ α β. α -> [β];
2121 amazon_polly = ∀ α β. (α.boto3 = β) => α -> [β];
2222 ambiclimate = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
23− ambient_station = ∀ α β. α -> β;
23+ ambient_station = ∀ α β. α -> [β];
2424 amcrest = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
25− ampio = ∀ α β. α -> β;
26− android_ip_webcam = ∀ α β. α -> β;
27− androidtv = ∀ α β. α -> β;
28− anel_pwrctrl = ∀ α β. α -> β;
29− anthemav = ∀ α β. α -> β;
25+ ampio = ∀ α β. α -> [β];
26+ android_ip_webcam = ∀ α β. α -> [β];
27+ androidtv = ∀ α β. α -> [β];
28+ anel_pwrctrl = ∀ α β. α -> [β];
29+ anthemav = ∀ α β. α -> [β];
3030 apache_kafka = ∀ α β. (α.aiokafka = β) => α -> [β];
31− apcupsd = ∀ α β. α -> β;
31+ apcupsd = ∀ α β. α -> [β];
3232 api = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
33− apns = ∀ α β. α -> β;
33+ apns = ∀ α β. α -> [β];
3434 apple_tv =
3535 ∀ α β.
3636 ( α.aiohttp-cors = β,
@@ -40,71 +40,71 @@
4040 ) =>
4141 α -> [β];
4242 apprise = ∀ α β. (α.apprise = β) => α -> [β];
43− aprs = ∀ α β. α -> β;
44− aqualogic = ∀ α β. α -> β;
45− aquostv = ∀ α β. α -> β;
46− arcam_fmj = ∀ α β. α -> β;
47− arduino = ∀ α β. α -> β;
48− arest = ∀ α β. α -> β;
43+ aprs = ∀ α β. α -> [β];
44+ aqualogic = ∀ α β. α -> [β];
45+ aquostv = ∀ α β. α -> [β];
46+ arcam_fmj = ∀ α β. α -> [β];
47+ arduino = ∀ α β. α -> [β];
48+ arest = ∀ α β. α -> [β];
4949 arlo = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
50− arris_tg2492lg = ∀ α β. α -> β;
50+ arris_tg2492lg = ∀ α β. α -> [β];
5151 aruba = ∀ α β. (α.pexpect = β) => α -> [β];
5252 arwn = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
53− asterisk_cdr = ∀ α β. α -> β;
54− asterisk_mbox = ∀ α β. α -> β;
55− asuswrt = ∀ α β. α -> β;
56− atag = ∀ α β. α -> β;
57− aten_pe = ∀ α β. α -> β;
58− atome = ∀ α β. α -> β;
59− august = ∀ α β. α -> β;
60− aurora = ∀ α β. α -> β;
61− aurora_abb_powerone = ∀ α β. α -> β;
53+ asterisk_cdr = ∀ α β. α -> [β];
54+ asterisk_mbox = ∀ α β. α -> [β];
55+ asuswrt = ∀ α β. α -> [β];
56+ atag = ∀ α β. α -> [β];
57+ aten_pe = ∀ α β. α -> [β];
58+ atome = ∀ α β. α -> [β];
59+ august = ∀ α β. α -> [β];
60+ aurora = ∀ α β. α -> [β];
61+ aurora_abb_powerone = ∀ α β. α -> [β];
6262 auth = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
6363 automation = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
64− avea = ∀ α β. α -> β;
65− avion = ∀ α β. α -> β;
64+ avea = ∀ α β. α -> [β];
65+ avion = ∀ α β. α -> [β];
6666 avri = ∀ α β. (α.pycountry = β) => α -> [β];
67− awair = ∀ α β. α -> β;
68− aws = ∀ α β. α -> β;
67+ awair = ∀ α β. α -> [β];
68+ aws = ∀ α β. α -> [β];
6969 axis = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
70− azure_devops = ∀ α β. α -> β;
71− azure_event_hub = ∀ α β. α -> β;
70+ azure_devops = ∀ α β. α -> [β];
71+ azure_event_hub = ∀ α β. α -> [β];
7272 azure_service_bus = ∀ α β. (α.azure-servicebus = β) => α -> [β];
73− baidu = ∀ α β. α -> β;
74− bayesian = ∀ α β. α -> β;
75− bbb_gpio = ∀ α β. α -> β;
76− bbox = ∀ α β. α -> β;
77− beewi_smartclim = ∀ α β. α -> β;
78− bh1750 = ∀ α β. α -> β;
79− binary_sensor = ∀ α β. α -> β;
80− bitcoin = ∀ α β. α -> β;
81− bizkaibus = ∀ α β. α -> β;
82− blackbird = ∀ α β. α -> β;
83− blebox = ∀ α β. α -> β;
84− blink = ∀ α β. α -> β;
73+ baidu = ∀ α β. α -> [β];
74+ bayesian = ∀ α β. α -> [β];
75+ bbb_gpio = ∀ α β. α -> [β];
76+ bbox = ∀ α β. α -> [β];
77+ beewi_smartclim = ∀ α β. α -> [β];
78+ bh1750 = ∀ α β. α -> [β];
79+ binary_sensor = ∀ α β. α -> [β];
80+ bitcoin = ∀ α β. α -> [β];
81+ bizkaibus = ∀ α β. α -> [β];
82+ blackbird = ∀ α β. α -> [β];
83+ blebox = ∀ α β. α -> [β];
84+ blink = ∀ α β. α -> [β];
8585 blinksticklight = ∀ α β. (α.BlinkStick = β) => α -> [β];
86− blinkt = ∀ α β. α -> β;
87− blockchain = ∀ α β. α -> β;
88− bloomsky = ∀ α β. α -> β;
86+ blinkt = ∀ α β. α -> [β];
87+ blockchain = ∀ α β. α -> [β];
88+ bloomsky = ∀ α β. α -> [β];
8989 bluesound = ∀ α β. (α.xmltodict = β) => α -> [β];
90− bluetooth_le_tracker = ∀ α β. α -> β;
90+ bluetooth_le_tracker = ∀ α β. α -> [β];
9191 bluetooth_tracker = ∀ α β. (α.bt_proximity = β) => α -> [β];
92− bme280 = ∀ α β. α -> β;
93− bme680 = ∀ α β. α -> β;
94− bmp280 = ∀ α β. α -> β;
95− bmw_connected_drive = ∀ α β. α -> β;
96− bom = ∀ α β. α -> β;
97− bond = ∀ α β. α -> β;
92+ bme280 = ∀ α β. α -> [β];
93+ bme680 = ∀ α β. α -> [β];
94+ bmp280 = ∀ α β. α -> [β];
95+ bmw_connected_drive = ∀ α β. α -> [β];
96+ bom = ∀ α β. α -> [β];
97+ bond = ∀ α β. α -> [β];
9898 braviatv = ∀ α β. (α.bravia-tv = β) => α -> [β];
9999 broadlink = ∀ α β. (α.broadlink = β) => α -> [β];
100100 brother = ∀ α β. (α.brother = β) => α -> [β];
101− brottsplatskartan = ∀ α β. α -> β;
102− browser = ∀ α β. α -> β;
103− brunt = ∀ α β. α -> β;
104− bsblan = ∀ α β. α -> β;
105− bt_home_hub_5 = ∀ α β. α -> β;
106− bt_smarthub = ∀ α β. α -> β;
107− buienradar = ∀ α β. α -> β;
101+ brottsplatskartan = ∀ α β. α -> [β];
102+ browser = ∀ α β. α -> [β];
103+ brunt = ∀ α β. α -> [β];
104+ bsblan = ∀ α β. α -> [β];
105+ bt_home_hub_5 = ∀ α β. α -> [β];
106+ bt_smarthub = ∀ α β. α -> [β];
107+ buienradar = ∀ α β. α -> [β];
108108 caldav = ∀ α β. (α.caldav = β) => α -> [β];
109109 calendar = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
110110 camera = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
@@ -117,50 +117,50 @@
117117 α.zeroconf = β
118118 ) =>
119119 α -> [β];
120− cert_expiry = ∀ α β. α -> β;
121− channels = ∀ α β. α -> β;
122− circuit = ∀ α β. α -> β;
120+ cert_expiry = ∀ α β. α -> [β];
121+ channels = ∀ α β. α -> [β];
122+ circuit = ∀ α β. α -> [β];
123123 cisco_ios = ∀ α β. (α.pexpect = β) => α -> [β];
124− cisco_mobility_express = ∀ α β. α -> β;
125− cisco_webex_teams = ∀ α β. α -> β;
126− citybikes = ∀ α β. α -> β;
127− clementine = ∀ α β. α -> β;
128− clickatell = ∀ α β. α -> β;
129− clicksend = ∀ α β. α -> β;
130− clicksend_tts = ∀ α β. α -> β;
131− climate = ∀ α β. α -> β;
124+ cisco_mobility_express = ∀ α β. α -> [β];
125+ cisco_webex_teams = ∀ α β. α -> [β];
126+ citybikes = ∀ α β. α -> [β];
127+ clementine = ∀ α β. α -> [β];
128+ clickatell = ∀ α β. α -> [β];
129+ clicksend = ∀ α β. α -> [β];
130+ clicksend_tts = ∀ α β. α -> [β];
131+ climate = ∀ α β. α -> [β];
132132 cloud = ∀ α β. (α.aiohttp-cors = β, α.hass-nabucasa = β) => α -> [β];
133− cloudflare = ∀ α β. α -> β;
134− cmus = ∀ α β. α -> β;
135− co2signal = ∀ α β. α -> β;
136− coinbase = ∀ α β. α -> β;
133+ cloudflare = ∀ α β. α -> [β];
134+ cmus = ∀ α β. α -> [β];
135+ co2signal = ∀ α β. α -> [β];
136+ coinbase = ∀ α β. α -> [β];
137137 coinmarketcap = ∀ α β. (α.coinmarketcap = β) => α -> [β];
138− comed_hourly_pricing = ∀ α β. α -> β;
139− comfoconnect = ∀ α β. α -> β;
140− command_line = ∀ α β. α -> β;
141− concord232 = ∀ α β. α -> β;
138+ comed_hourly_pricing = ∀ α β. α -> [β];
139+ comfoconnect = ∀ α β. α -> [β];
140+ command_line = ∀ α β. α -> [β];
141+ concord232 = ∀ α β. α -> [β];
142142 config = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
143− configurator = ∀ α β. α -> β;
144− control4 = ∀ α β. α -> β;
143+ configurator = ∀ α β. α -> [β];
144+ control4 = ∀ α β. α -> [β];
145145 conversation = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
146− coolmaster = ∀ α β. α -> β;
147− coronavirus = ∀ α β. α -> β;
148− counter = ∀ α β. α -> β;
149− cover = ∀ α β. α -> β;
150− cppm_tracker = ∀ α β. α -> β;
146+ coolmaster = ∀ α β. α -> [β];
147+ coronavirus = ∀ α β. α -> [β];
148+ counter = ∀ α β. α -> [β];
149+ cover = ∀ α β. α -> [β];
150+ cppm_tracker = ∀ α β. α -> [β];
151151 cpuspeed = ∀ α β. (α.py-cpuinfo = β) => α -> [β];
152− crimereports = ∀ α β. α -> β;
152+ crimereports = ∀ α β. α -> [β];
153153 cups = ∀ α β. (α.pycups = β) => α -> [β];
154− currencylayer = ∀ α β. α -> β;
155− daikin = ∀ α β. α -> β;
156− danfoss_air = ∀ α β. α -> β;
154+ currencylayer = ∀ α β. α -> [β];
155+ daikin = ∀ α β. α -> [β];
156+ danfoss_air = ∀ α β. α -> [β];
157157 darksky = ∀ α β. (α.python-forecastio = β) => α -> [β];
158158 datadog = ∀ α β. (α.datadog = β) => α -> [β];
159− ddwrt = ∀ α β. α -> β;
159+ ddwrt = ∀ α β. α -> [β];
160160 debugpy = ∀ α β. (α.debugpy = β) => α -> [β];
161− deconz = ∀ α β. α -> β;
161+ deconz = ∀ α β. α -> [β];
162162 decora = ∀ α β. (α.bluepy = β) => α -> [β];
163− decora_wifi = ∀ α β. α -> β;
163+ decora_wifi = ∀ α β. α -> [β];
164164 default_config =
165165 ∀ α β.
166166 ( α.aiohttp-cors = β,
@@ -174,157 +174,157 @@
174174 α.zeroconf = β
175175 ) =>
176176 α -> [β];
177− delijn = ∀ α β. α -> β;
177+ delijn = ∀ α β. α -> [β];
178178 deluge = ∀ α β. (α.deluge-client = β) => α -> [β];
179179 demo = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
180− denon = ∀ α β. α -> β;
180+ denon = ∀ α β. α -> [β];
181181 denonavr = ∀ α β. (α.denonavr = β, α.getmac = β) => α -> [β];
182− derivative = ∀ α β. α -> β;
183− deutsche_bahn = ∀ α β. α -> β;
184− device_automation = ∀ α β. α -> β;
185− device_sun_light_trigger = ∀ α β. α -> β;
186− device_tracker = ∀ α β. α -> β;
187− devolo_home_control = ∀ α β. α -> β;
188− dexcom = ∀ α β. α -> β;
189− dht = ∀ α β. α -> β;
182+ derivative = ∀ α β. α -> [β];
183+ deutsche_bahn = ∀ α β. α -> [β];
184+ device_automation = ∀ α β. α -> [β];
185+ device_sun_light_trigger = ∀ α β. α -> [β];
186+ device_tracker = ∀ α β. α -> [β];
187+ devolo_home_control = ∀ α β. α -> [β];
188+ dexcom = ∀ α β. α -> [β];
189+ dht = ∀ α β. α -> [β];
190190 dialogflow = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
191191 digital_ocean = ∀ α β. (α.digital-ocean = β) => α -> [β];
192− digitalloggers = ∀ α β. α -> β;
193− directv = ∀ α β. α -> β;
192+ digitalloggers = ∀ α β. α -> [β];
193+ directv = ∀ α β. α -> [β];
194194 discogs = ∀ α β. (α.discogs_client = β) => α -> [β];
195195 discord = ∀ α β. (α.discordpy = β) => α -> [β];
196196 discovery =
197197 ∀ α β. (α.aiohttp-cors = β, α.netdisco = β, α.zeroconf = β) => α -> [β];
198198 dlib_face_detect = ∀ α β. (α.face_recognition = β) => α -> [β];
199199 dlib_face_identify = ∀ α β. (α.face_recognition = β) => α -> [β];
200− dlink = ∀ α β. α -> β;
200+ dlink = ∀ α β. α -> [β];
201201 dlna_dmr = ∀ α β. (α.async-upnp-client = β) => α -> [β];
202202 dnsip = ∀ α β. (α.aiodns = β) => α -> [β];
203203 dominos = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
204204 doods = ∀ α β. (α.pillow = β) => α -> [β];
205205 doorbird = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
206− dovado = ∀ α β. α -> β;
207− downloader = ∀ α β. α -> β;
208− dsmr = ∀ α β. α -> β;
206+ dovado = ∀ α β. α -> [β];
207+ downloader = ∀ α β. α -> [β];
208+ dsmr = ∀ α β. α -> [β];
209209 dsmr_reader = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
210− dte_energy_bridge = ∀ α β. α -> β;
211− dublin_bus_transport = ∀ α β. α -> β;
212− duckdns = ∀ α β. α -> β;
213− dunehd = ∀ α β. α -> β;
210+ dte_energy_bridge = ∀ α β. α -> [β];
211+ dublin_bus_transport = ∀ α β. α -> [β];
212+ duckdns = ∀ α β. α -> [β];
213+ dunehd = ∀ α β. α -> [β];
214214 dwd_weather_warnings =
215215 ∀ α β. (α.jsonpath = β, α.xmltodict = β) => α -> [β];
216− dweet = ∀ α β. α -> β;
217− dynalite = ∀ α β. α -> β;
216+ dweet = ∀ α β. α -> [β];
217+ dynalite = ∀ α β. α -> [β];
218218 dyson = ∀ α β. (α.aiohttp-cors = β, α.zeroconf = β) => α -> [β];
219− ebox = ∀ α β. α -> β;
220− ebusd = ∀ α β. α -> β;
221− ecoal_boiler = ∀ α β. α -> β;
222− ecobee = ∀ α β. α -> β;
223− econet = ∀ α β. α -> β;
224− ecovacs = ∀ α β. α -> β;
219+ ebox = ∀ α β. α -> [β];
220+ ebusd = ∀ α β. α -> [β];
221+ ecoal_boiler = ∀ α β. α -> [β];
222+ ecobee = ∀ α β. α -> [β];
223+ econet = ∀ α β. α -> [β];
224+ ecovacs = ∀ α β. α -> [β];
225225 eddystone_temperature = ∀ α β. (α.construct = β) => α -> [β];
226− edimax = ∀ α β. α -> β;
227− edl21 = ∀ α β. α -> β;
228− ee_brightbox = ∀ α β. α -> β;
229− efergy = ∀ α β. α -> β;
230− egardia = ∀ α β. α -> β;
231− eight_sleep = ∀ α β. α -> β;
232− elgato = ∀ α β. α -> β;
233− eliqonline = ∀ α β. α -> β;
234− elkm1 = ∀ α β. α -> β;
235− elv = ∀ α β. α -> β;
236− emby = ∀ α β. α -> β;
237− emoncms = ∀ α β. α -> β;
238− emoncms_history = ∀ α β. α -> β;
226+ edimax = ∀ α β. α -> [β];
227+ edl21 = ∀ α β. α -> [β];
228+ ee_brightbox = ∀ α β. α -> [β];
229+ efergy = ∀ α β. α -> [β];
230+ egardia = ∀ α β. α -> [β];
231+ eight_sleep = ∀ α β. α -> [β];
232+ elgato = ∀ α β. α -> [β];
233+ eliqonline = ∀ α β. α -> [β];
234+ elkm1 = ∀ α β. α -> [β];
235+ elv = ∀ α β. α -> [β];
236+ emby = ∀ α β. α -> [β];
237+ emoncms = ∀ α β. α -> [β];
238+ emoncms_history = ∀ α β. α -> [β];
239239 emulated_hue = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
240− emulated_roku = ∀ α β. α -> β;
240+ emulated_roku = ∀ α β. α -> [β];
241241 enigma2 = ∀ α β. (α.openwebifpy = β) => α -> [β];
242− enocean = ∀ α β. α -> β;
243− enphase_envoy = ∀ α β. α -> β;
244− entur_public_transport = ∀ α β. α -> β;
245− environment_canada = ∀ α β. α -> β;
246− envirophat = ∀ α β. α -> β;
247− envisalink = ∀ α β. α -> β;
248− ephember = ∀ α β. α -> β;
249− epson = ∀ α β. α -> β;
250− epsonworkforce = ∀ α β. α -> β;
242+ enocean = ∀ α β. α -> [β];
243+ enphase_envoy = ∀ α β. α -> [β];
244+ entur_public_transport = ∀ α β. α -> [β];
245+ environment_canada = ∀ α β. α -> [β];
246+ envirophat = ∀ α β. α -> [β];
247+ envisalink = ∀ α β. α -> [β];
248+ ephember = ∀ α β. α -> [β];
249+ epson = ∀ α β. α -> [β];
250+ epsonworkforce = ∀ α β. α -> [β];
251251 eq3btsmart = ∀ α β. (α.construct = β) => α -> [β];
252252 esphome = ∀ α β. (α.aioesphomeapi = β) => α -> [β];
253− essent = ∀ α β. α -> β;
254− etherscan = ∀ α β. α -> β;
255− eufy = ∀ α β. α -> β;
256− everlights = ∀ α β. α -> β;
257− evohome = ∀ α β. α -> β;
258− ezviz = ∀ α β. α -> β;
259− facebook = ∀ α β. α -> β;
260− facebox = ∀ α β. α -> β;
261− fail2ban = ∀ α β. α -> β;
262− familyhub = ∀ α β. α -> β;
263− fan = ∀ α β. α -> β;
264− fastdotcom = ∀ α β. α -> β;
265− feedreader = ∀ α β. α -> β;
253+ essent = ∀ α β. α -> [β];
254+ etherscan = ∀ α β. α -> [β];
255+ eufy = ∀ α β. α -> [β];
256+ everlights = ∀ α β. α -> [β];
257+ evohome = ∀ α β. α -> [β];
258+ ezviz = ∀ α β. α -> [β];
259+ facebook = ∀ α β. α -> [β];
260+ facebox = ∀ α β. α -> [β];
261+ fail2ban = ∀ α β. α -> [β];
262+ familyhub = ∀ α β. α -> [β];
263+ fan = ∀ α β. α -> [β];
264+ fastdotcom = ∀ α β. α -> [β];
265+ feedreader = ∀ α β. α -> [β];
266266 ffmpeg = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
267267 ffmpeg_motion = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
268268 ffmpeg_noise = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
269− fibaro = ∀ α β. α -> β;
270− fido = ∀ α β. α -> β;
271− file = ∀ α β. α -> β;
272− filesize = ∀ α β. α -> β;
269+ fibaro = ∀ α β. α -> [β];
270+ fido = ∀ α β. α -> [β];
271+ file = ∀ α β. α -> [β];
272+ filesize = ∀ α β. α -> [β];
273273 filter = ∀ α β. (α.aiohttp-cors = β, α.sqlalchemy = β) => α -> [β];
274274 fints = ∀ α β. (α.fints = β) => α -> [β];
275− firmata = ∀ α β. α -> β;
275+ firmata = ∀ α β. α -> [β];
276276 fitbit = ∀ α β. (α.aiohttp-cors = β, α.fitbit = β) => α -> [β];
277− fixer = ∀ α β. α -> β;
278− fleetgo = ∀ α β. α -> β;
279− flexit = ∀ α β. α -> β;
280− flic = ∀ α β. α -> β;
281− flick_electric = ∀ α β. α -> β;
282− flock = ∀ α β. α -> β;
283− flume = ∀ α β. α -> β;
284− flunearyou = ∀ α β. α -> β;
285− flux = ∀ α β. α -> β;
277+ fixer = ∀ α β. α -> [β];
278+ fleetgo = ∀ α β. α -> [β];
279+ flexit = ∀ α β. α -> [β];
280+ flic = ∀ α β. α -> [β];
281+ flick_electric = ∀ α β. α -> [β];
282+ flock = ∀ α β. α -> [β];
283+ flume = ∀ α β. α -> [β];
284+ flunearyou = ∀ α β. α -> [β];
285+ flux = ∀ α β. α -> [β];
286286 flux_led = ∀ α β. (α.flux-led = β) => α -> [β];
287− folder = ∀ α β. α -> β;
287+ folder = ∀ α β. α -> [β];
288288 folder_watcher = ∀ α β. (α.watchdog = β) => α -> [β];
289− foobot = ∀ α β. α -> β;
290− forked_daapd = ∀ α β. α -> β;
291− fortios = ∀ α β. α -> β;
292− foscam = ∀ α β. α -> β;
289+ foobot = ∀ α β. α -> [β];
290+ forked_daapd = ∀ α β. α -> [β];
291+ fortios = ∀ α β. α -> [β];
292+ foscam = ∀ α β. α -> [β];
293293 foursquare = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
294− free_mobile = ∀ α β. α -> β;
294+ free_mobile = ∀ α β. α -> [β];
295295 freebox =
296296 ∀ α β. (α.aiohttp-cors = β, α.netdisco = β, α.zeroconf = β) => α -> [β];
297− freedns = ∀ α β. α -> β;
297+ freedns = ∀ α β. α -> [β];
298298 fritz = ∀ α β. (α.fritzconnection = β) => α -> [β];
299299 fritzbox = ∀ α β. (α.pyfritzhome = β) => α -> [β];
300300 fritzbox_callmonitor = ∀ α β. (α.fritzconnection = β) => α -> [β];
301301 fritzbox_netmonitor = ∀ α β. (α.fritzconnection = β) => α -> [β];
302− fronius = ∀ α β. α -> β;
302+ fronius = ∀ α β. α -> [β];
303303 frontend = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
304− frontier_silicon = ∀ α β. α -> β;
305− futurenow = ∀ α β. α -> β;
306− garadget = ∀ α β. α -> β;
307− garmin_connect = ∀ α β. α -> β;
308− gc100 = ∀ α β. α -> β;
309− gdacs = ∀ α β. α -> β;
310− geizhals = ∀ α β. α -> β;
311− generic = ∀ α β. α -> β;
312− generic_thermostat = ∀ α β. α -> β;
313− geniushub = ∀ α β. α -> β;
314− geo_json_events = ∀ α β. α -> β;
315− geo_location = ∀ α β. α -> β;
316− geo_rss_events = ∀ α β. α -> β;
304+ frontier_silicon = ∀ α β. α -> [β];
305+ futurenow = ∀ α β. α -> [β];
306+ garadget = ∀ α β. α -> [β];
307+ garmin_connect = ∀ α β. α -> [β];
308+ gc100 = ∀ α β. α -> [β];
309+ gdacs = ∀ α β. α -> [β];
310+ geizhals = ∀ α β. α -> [β];
311+ generic = ∀ α β. α -> [β];
312+ generic_thermostat = ∀ α β. α -> [β];
313+ geniushub = ∀ α β. α -> [β];
314+ geo_json_events = ∀ α β. α -> [β];
315+ geo_location = ∀ α β. α -> [β];
316+ geo_rss_events = ∀ α β. α -> [β];
317317 geofency = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
318− geonetnz_quakes = ∀ α β. α -> β;
319− geonetnz_volcano = ∀ α β. α -> β;
320− gios = ∀ α β. α -> β;
318+ geonetnz_quakes = ∀ α β. α -> [β];
319+ geonetnz_volcano = ∀ α β. α -> [β];
320+ gios = ∀ α β. α -> [β];
321321 github = ∀ α β. (α.PyGithub = β) => α -> [β];
322322 gitlab_ci = ∀ α β. (α.python-gitlab = β) => α -> [β];
323− gitter = ∀ α β. α -> β;
324− glances = ∀ α β. α -> β;
325− gntp = ∀ α β. α -> β;
326− goalfeed = ∀ α β. α -> β;
327− gogogate2 = ∀ α β. α -> β;
323+ gitter = ∀ α β. α -> [β];
324+ glances = ∀ α β. α -> [β];
325+ gntp = ∀ α β. α -> [β];
326+ goalfeed = ∀ α β. α -> [β];
327+ gogogate2 = ∀ α β. α -> [β];
328328 google =
329329 ∀ α β.
330330 ( α.google_api_python_client = β,
@@ -334,45 +334,45 @@
334334 α -> [β];
335335 google_assistant = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
336336 google_cloud = ∀ α β. (α.google_cloud_texttospeech = β) => α -> [β];
337− google_domains = ∀ α β. α -> β;
338− google_maps = ∀ α β. α -> β;
337+ google_domains = ∀ α β. α -> [β];
338+ google_maps = ∀ α β. α -> [β];
339339 google_pubsub = ∀ α β. (α.google_cloud_pubsub = β) => α -> [β];
340340 google_translate = ∀ α β. (α.gtts-token = β) => α -> [β];
341− google_travel_time = ∀ α β. α -> β;
342− google_wifi = ∀ α β. α -> β;
341+ google_travel_time = ∀ α β. α -> [β];
342+ google_wifi = ∀ α β. α -> [β];
343343 gpmdp = ∀ α β. (α.websocket_client = β) => α -> [β];
344− gpsd = ∀ α β. α -> β;
344+ gpsd = ∀ α β. α -> [β];
345345 gpslogger = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
346− graphite = ∀ α β. α -> β;
347− greeneye_monitor = ∀ α β. α -> β;
348− greenwave = ∀ α β. α -> β;
349− griddy = ∀ α β. α -> β;
350− group = ∀ α β. α -> β;
351− growatt_server = ∀ α β. α -> β;
352− gstreamer = ∀ α β. α -> β;
353− gtfs = ∀ α β. α -> β;
354− guardian = ∀ α β. α -> β;
355− habitica = ∀ α β. α -> β;
356− hangouts = ∀ α β. α -> β;
357− harman_kardon_avr = ∀ α β. α -> β;
346+ graphite = ∀ α β. α -> [β];
347+ greeneye_monitor = ∀ α β. α -> [β];
348+ greenwave = ∀ α β. α -> [β];
349+ griddy = ∀ α β. α -> [β];
350+ group = ∀ α β. α -> [β];
351+ growatt_server = ∀ α β. α -> [β];
352+ gstreamer = ∀ α β. α -> [β];
353+ gtfs = ∀ α β. α -> [β];
354+ guardian = ∀ α β. α -> [β];
355+ habitica = ∀ α β. α -> [β];
356+ hangouts = ∀ α β. α -> [β];
357+ harman_kardon_avr = ∀ α β. α -> [β];
358358 harmony = ∀ α β. (α.aioharmony = β) => α -> [β];
359359 hassio = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
360− haveibeenpwned = ∀ α β. α -> β;
361− hddtemp = ∀ α β. α -> β;
362− hdmi_cec = ∀ α β. α -> β;
363− heatmiser = ∀ α β. α -> β;
364− heos = ∀ α β. α -> β;
365− here_travel_time = ∀ α β. α -> β;
366− hikvision = ∀ α β. α -> β;
367− hikvisioncam = ∀ α β. α -> β;
368− hisense_aehw4a1 = ∀ α β. α -> β;
360+ haveibeenpwned = ∀ α β. α -> [β];
361+ hddtemp = ∀ α β. α -> [β];
362+ hdmi_cec = ∀ α β. α -> [β];
363+ heatmiser = ∀ α β. α -> [β];
364+ heos = ∀ α β. α -> [β];
365+ here_travel_time = ∀ α β. α -> [β];
366+ hikvision = ∀ α β. α -> [β];
367+ hikvisioncam = ∀ α β. α -> [β];
368+ hisense_aehw4a1 = ∀ α β. α -> [β];
369369 history = ∀ α β. (α.aiohttp-cors = β, α.sqlalchemy = β) => α -> [β];
370370 history_stats = ∀ α β. (α.aiohttp-cors = β, α.sqlalchemy = β) => α -> [β];
371− hitron_coda = ∀ α β. α -> β;
372− hive = ∀ α β. α -> β;
373− hlk_sw16 = ∀ α β. α -> β;
371+ hitron_coda = ∀ α β. α -> [β];
372+ hive = ∀ α β. α -> [β];
373+ hlk_sw16 = ∀ α β. α -> [β];
374374 home_connect = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
375− homeassistant = ∀ α β. α -> β;
375+ homeassistant = ∀ α β. α -> [β];
376376 homekit =
377377 ∀ α β.
378378 ( α.HAP-python = β,
@@ -385,152 +385,152 @@
385385 homekit_controller =
386386 ∀ α β. (α.aiohttp-cors = β, α.zeroconf = β) => α -> [β];
387387 homematic = ∀ α β. (α.pyhomematic = β) => α -> [β];
388− homematicip_cloud = ∀ α β. α -> β;
389− homeworks = ∀ α β. α -> β;
390− honeywell = ∀ α β. α -> β;
391− horizon = ∀ α β. α -> β;
392− hp_ilo = ∀ α β. α -> β;
388+ homematicip_cloud = ∀ α β. α -> [β];
389+ homeworks = ∀ α β. α -> [β];
390+ honeywell = ∀ α β. α -> [β];
391+ horizon = ∀ α β. α -> [β];
392+ hp_ilo = ∀ α β. α -> [β];
393393 html5 = ∀ α β. (α.aiohttp-cors = β, α.pywebpush = β) => α -> [β];
394394 http = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
395− htu21d = ∀ α β. α -> β;
395+ htu21d = ∀ α β. α -> [β];
396396 huawei_lte = ∀ α β. (α.getmac = β, α.stringcase = β) => α -> [β];
397− huawei_router = ∀ α β. α -> β;
397+ huawei_router = ∀ α β. α -> [β];
398398 hue = ∀ α β. (α.aiohue = β) => α -> [β];
399− humidifier = ∀ α β. α -> β;
400− hunterdouglas_powerview = ∀ α β. α -> β;
401− hvv_departures = ∀ α β. α -> β;
402− hydrawise = ∀ α β. α -> β;
403− hyperion = ∀ α β. α -> β;
404− ialarm = ∀ α β. α -> β;
405− iammeter = ∀ α β. α -> β;
406− iaqualink = ∀ α β. α -> β;
399+ humidifier = ∀ α β. α -> [β];
400+ hunterdouglas_powerview = ∀ α β. α -> [β];
401+ hvv_departures = ∀ α β. α -> [β];
402+ hydrawise = ∀ α β. α -> [β];
403+ hyperion = ∀ α β. α -> [β];
404+ ialarm = ∀ α β. α -> [β];
405+ iammeter = ∀ α β. α -> [β];
406+ iaqualink = ∀ α β. α -> [β];
407407 icloud = ∀ α β. (α.pyicloud = β) => α -> [β];
408− idteck_prox = ∀ α β. α -> β;
408+ idteck_prox = ∀ α β. α -> [β];
409409 ifttt = ∀ α β. (α.aiohttp-cors = β, α.pyfttt = β) => α -> [β];
410− iglo = ∀ α β. α -> β;
411− ign_sismologia = ∀ α β. α -> β;
410+ iglo = ∀ α β. α -> [β];
411+ ign_sismologia = ∀ α β. α -> [β];
412412 ihc = ∀ α β. (α.defusedxml = β) => α -> [β];
413413 image_processing = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
414− imap = ∀ α β. α -> β;
415− imap_email_content = ∀ α β. α -> β;
416− incomfort = ∀ α β. α -> β;
414+ imap = ∀ α β. α -> [β];
415+ imap_email_content = ∀ α β. α -> [β];
416+ incomfort = ∀ α β. α -> [β];
417417 influxdb = ∀ α β. (α.influxdb = β, α.influxdb-client = β) => α -> [β];
418− input_boolean = ∀ α β. α -> β;
419− input_datetime = ∀ α β. α -> β;
420− input_number = ∀ α β. α -> β;
421− input_select = ∀ α β. α -> β;
422− input_text = ∀ α β. α -> β;
423− insteon = ∀ α β. α -> β;
424− integration = ∀ α β. α -> β;
418+ input_boolean = ∀ α β. α -> [β];
419+ input_datetime = ∀ α β. α -> [β];
420+ input_number = ∀ α β. α -> [β];
421+ input_select = ∀ α β. α -> [β];
422+ input_text = ∀ α β. α -> [β];
423+ insteon = ∀ α β. α -> [β];
424+ integration = ∀ α β. α -> [β];
425425 intent = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
426− intent_script = ∀ α β. α -> β;
427− intesishome = ∀ α β. α -> β;
426+ intent_script = ∀ α β. α -> [β];
427+ intesishome = ∀ α β. α -> [β];
428428 ios = ∀ α β. (α.aiohttp-cors = β, α.zeroconf = β) => α -> [β];
429− iota = ∀ α β. α -> β;
430− iperf3 = ∀ α β. α -> β;
431− ipma = ∀ α β. α -> β;
429+ iota = ∀ α β. α -> [β];
430+ iperf3 = ∀ α β. α -> [β];
431+ ipma = ∀ α β. α -> [β];
432432 ipp = ∀ α β. (α.pyipp = β) => α -> [β];
433433 iqvia = ∀ α β. (α.numpy = β) => α -> [β];
434− irish_rail_transport = ∀ α β. α -> β;
435− islamic_prayer_times = ∀ α β. α -> β;
436− iss = ∀ α β. α -> β;
437− isy994 = ∀ α β. α -> β;
438− itach = ∀ α β. α -> β;
439− itunes = ∀ α β. α -> β;
440− izone = ∀ α β. α -> β;
441− jewish_calendar = ∀ α β. α -> β;
442− joaoapps_join = ∀ α β. α -> β;
443− juicenet = ∀ α β. α -> β;
444− kaiterra = ∀ α β. α -> β;
445− kankun = ∀ α β. α -> β;
446− keba = ∀ α β. α -> β;
447− keenetic_ndms2 = ∀ α β. α -> β;
434+ irish_rail_transport = ∀ α β. α -> [β];
435+ islamic_prayer_times = ∀ α β. α -> [β];
436+ iss = ∀ α β. α -> [β];
437+ isy994 = ∀ α β. α -> [β];
438+ itach = ∀ α β. α -> [β];
439+ itunes = ∀ α β. α -> [β];
440+ izone = ∀ α β. α -> [β];
441+ jewish_calendar = ∀ α β. α -> [β];
442+ joaoapps_join = ∀ α β. α -> [β];
443+ juicenet = ∀ α β. α -> [β];
444+ kaiterra = ∀ α β. α -> [β];
445+ kankun = ∀ α β. α -> [β];
446+ keba = ∀ α β. α -> [β];
447+ keenetic_ndms2 = ∀ α β. α -> [β];
448448 kef = ∀ α β. (α.getmac = β) => α -> [β];
449− keyboard = ∀ α β. α -> β;
449+ keyboard = ∀ α β. α -> [β];
450450 keyboard_remote = ∀ α β. (α.evdev = β) => α -> [β];
451− kira = ∀ α β. α -> β;
452− kiwi = ∀ α β. α -> β;
453− knx = ∀ α β. α -> β;
451+ kira = ∀ α β. α -> [β];
452+ kiwi = ∀ α β. α -> [β];
453+ knx = ∀ α β. α -> [β];
454454 kodi = ∀ α β. (α.jsonrpc-async = β, α.jsonrpc-websocket = β) => α -> [β];
455455 konnected = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
456− kwb = ∀ α β. α -> β;
457− lacrosse = ∀ α β. α -> β;
458− lametric = ∀ α β. α -> β;
459− lannouncer = ∀ α β. α -> β;
456+ kwb = ∀ α β. α -> [β];
457+ lacrosse = ∀ α β. α -> [β];
458+ lametric = ∀ α β. α -> [β];
459+ lannouncer = ∀ α β. α -> [β];
460460 lastfm = ∀ α β. (α.pylast = β) => α -> [β];
461− launch_library = ∀ α β. α -> β;
462− lcn = ∀ α β. α -> β;
463− lg_netcast = ∀ α β. α -> β;
464− lg_soundbar = ∀ α β. α -> β;
465− life360 = ∀ α β. α -> β;
461+ launch_library = ∀ α β. α -> [β];
462+ lcn = ∀ α β. α -> [β];
463+ lg_netcast = ∀ α β. α -> [β];
464+ lg_soundbar = ∀ α β. α -> [β];
465+ life360 = ∀ α β. α -> [β];
466466 lifx = ∀ α β. (α.aiolifx = β, α.aiolifx-effects = β) => α -> [β];
467− lifx_cloud = ∀ α β. α -> β;
468− lifx_legacy = ∀ α β. α -> β;
469− light = ∀ α β. α -> β;
470− lightwave = ∀ α β. α -> β;
467+ lifx_cloud = ∀ α β. α -> [β];
468+ lifx_legacy = ∀ α β. α -> [β];
469+ light = ∀ α β. α -> [β];
470+ lightwave = ∀ α β. α -> [β];
471471 limitlessled = ∀ α β. (α.limitlessled = β) => α -> [β];
472− linksys_smart = ∀ α β. α -> β;
472+ linksys_smart = ∀ α β. α -> [β];
473473 linode = ∀ α β. (α.linode-api = β) => α -> [β];
474474 linux_battery = ∀ α β. (α.batinfo = β) => α -> [β];
475− lirc = ∀ α β. α -> β;
476− litejet = ∀ α β. α -> β;
477− llamalab_automate = ∀ α β. α -> β;
478− local_file = ∀ α β. α -> β;
479− local_ip = ∀ α β. α -> β;
475+ lirc = ∀ α β. α -> [β];
476+ litejet = ∀ α β. α -> [β];
477+ llamalab_automate = ∀ α β. α -> [β];
478+ local_file = ∀ α β. α -> [β];
479+ local_ip = ∀ α β. α -> [β];
480480 locative = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
481− lock = ∀ α β. α -> β;
481+ lock = ∀ α β. α -> [β];
482482 logbook = ∀ α β. (α.aiohttp-cors = β, α.sqlalchemy = β) => α -> [β];
483− logentries = ∀ α β. α -> β;
484− logger = ∀ α β. α -> β;
483+ logentries = ∀ α β. α -> [β];
484+ logger = ∀ α β. α -> [β];
485485 logi_circle = ∀ α β. (α.aiohttp-cors = β, α.ha-ffmpeg = β) => α -> [β];
486− london_air = ∀ α β. α -> β;
487− london_underground = ∀ α β. α -> β;
488− loopenergy = ∀ α β. α -> β;
489− lovelace = ∀ α β. α -> β;
486+ london_air = ∀ α β. α -> [β];
487+ london_underground = ∀ α β. α -> [β];
488+ loopenergy = ∀ α β. α -> [β];
489+ lovelace = ∀ α β. α -> [β];
490490 luci = ∀ α β. (α.openwrt-luci-rpc = β) => α -> [β];
491491 luftdaten = ∀ α β. (α.luftdaten = β) => α -> [β];
492− lupusec = ∀ α β. α -> β;
493− lutron = ∀ α β. α -> β;
494− lutron_caseta = ∀ α β. α -> β;
495− lw12wifi = ∀ α β. α -> β;
496− lyft = ∀ α β. α -> β;
497− magicseaweed = ∀ α β. α -> β;
492+ lupusec = ∀ α β. α -> [β];
493+ lutron = ∀ α β. α -> [β];
494+ lutron_caseta = ∀ α β. α -> [β];
495+ lw12wifi = ∀ α β. α -> [β];
496+ lyft = ∀ α β. α -> [β];
497+ magicseaweed = ∀ α β. α -> [β];
498498 mailbox = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
499499 mailgun = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
500− manual = ∀ α β. α -> β;
500+ manual = ∀ α β. α -> [β];
501501 manual_mqtt = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
502502 map = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
503− marytts = ∀ α β. α -> β;
504− mastodon = ∀ α β. α -> β;
503+ marytts = ∀ α β. α -> [β];
504+ mastodon = ∀ α β. α -> [β];
505505 matrix = ∀ α β. (α.matrix-client = β) => α -> [β];
506− maxcube = ∀ α β. α -> β;
507− mcp23017 = ∀ α β. α -> β;
506+ maxcube = ∀ α β. α -> [β];
507+ mcp23017 = ∀ α β. α -> [β];
508508 media_extractor =
509509 ∀ α β. (α.aiohttp-cors = β, α.youtube-dl-light = β) => α -> [β];
510510 media_player = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
511− mediaroom = ∀ α β. α -> β;
512− melcloud = ∀ α β. α -> β;
513− melissa = ∀ α β. α -> β;
511+ mediaroom = ∀ α β. α -> [β];
512+ melcloud = ∀ α β. α -> [β];
513+ melissa = ∀ α β. α -> [β];
514514 meraki = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
515− message_bird = ∀ α β. α -> β;
515+ message_bird = ∀ α β. α -> [β];
516516 met = ∀ α β. (α.pymetno = β) => α -> [β];
517− meteo_france = ∀ α β. α -> β;
518− meteoalarm = ∀ α β. α -> β;
519− metoffice = ∀ α β. α -> β;
520− mfi = ∀ α β. α -> β;
521− mhz19 = ∀ α β. α -> β;
522− microsoft = ∀ α β. α -> β;
517+ meteo_france = ∀ α β. α -> [β];
518+ meteoalarm = ∀ α β. α -> [β];
519+ metoffice = ∀ α β. α -> [β];
520+ mfi = ∀ α β. α -> [β];
521+ mhz19 = ∀ α β. α -> [β];
522+ microsoft = ∀ α β. α -> [β];
523523 microsoft_face = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
524524 microsoft_face_detect = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
525525 microsoft_face_identify = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
526526 miflora = ∀ α β. (α.bluepy = β) => α -> [β];
527− mikrotik = ∀ α β. α -> β;
528− mill = ∀ α β. α -> β;
529− min_max = ∀ α β. α -> β;
527+ mikrotik = ∀ α β. α -> [β];
528+ mill = ∀ α β. α -> [β];
529+ min_max = ∀ α β. α -> [β];
530530 minecraft_server = ∀ α β. (α.aiodns = β, α.getmac = β) => α -> [β];
531531 minio = ∀ α β. (α.minio = β) => α -> [β];
532− mitemp_bt = ∀ α β. α -> β;
533− mjpeg = ∀ α β. α -> β;
532+ mitemp_bt = ∀ α β. α -> [β];
533+ mjpeg = ∀ α β. α -> [β];
534534 mobile_app =
535535 ∀ α β.
536536 ( α.aiohttp-cors = β,
@@ -539,13 +539,13 @@
539539 α.pynacl = β
540540 ) =>
541541 α -> [β];
542− mochad = ∀ α β. α -> β;
543− modbus = ∀ α β. α -> β;
544− modem_callerid = ∀ α β. α -> β;
545− mold_indicator = ∀ α β. α -> β;
546− monoprice = ∀ α β. α -> β;
547− moon = ∀ α β. α -> β;
548− mpchc = ∀ α β. α -> β;
542+ mochad = ∀ α β. α -> [β];
543+ modbus = ∀ α β. α -> [β];
544+ modem_callerid = ∀ α β. α -> [β];
545+ mold_indicator = ∀ α β. α -> [β];
546+ monoprice = ∀ α β. α -> [β];
547+ moon = ∀ α β. α -> [β];
548+ mpchc = ∀ α β. α -> [β];
549549 mpd = ∀ α β. (α.mpd2 = β) => α -> [β];
550550 mqtt = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
551551 mqtt_eventstream =
@@ -554,89 +554,89 @@
554554 mqtt_room = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
555555 mqtt_statestream =
556556 ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
557− msteams = ∀ α β. α -> β;
557+ msteams = ∀ α β. α -> [β];
558558 mvglive = ∀ α β. (α.PyMVGLive = β) => α -> [β];
559− mychevy = ∀ α β. α -> β;
560− mycroft = ∀ α β. α -> β;
561− myq = ∀ α β. α -> β;
559+ mychevy = ∀ α β. α -> [β];
560+ mycroft = ∀ α β. α -> [β];
561+ myq = ∀ α β. α -> [β];
562562 mysensors = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
563563 mystrom = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
564− mythicbeastsdns = ∀ α β. α -> β;
565− n26 = ∀ α β. α -> β;
566− nad = ∀ α β. α -> β;
564+ mythicbeastsdns = ∀ α β. α -> [β];
565+ n26 = ∀ α β. α -> [β];
566+ nad = ∀ α β. α -> [β];
567567 namecheapdns = ∀ α β. (α.defusedxml = β) => α -> [β];
568568 nanoleaf = ∀ α β. (α.pynanoleaf = β) => α -> [β];
569569 neato = ∀ α β. (α.pybotvac = β) => α -> [β];
570− nederlandse_spoorwegen = ∀ α β. α -> β;
571− nello = ∀ α β. α -> β;
572− ness_alarm = ∀ α β. α -> β;
573− nest = ∀ α β. α -> β;
570+ nederlandse_spoorwegen = ∀ α β. α -> [β];
571+ nello = ∀ α β. α -> [β];
572+ ness_alarm = ∀ α β. α -> [β];
573+ nest = ∀ α β. α -> [β];
574574 netatmo =
575575 ∀ α β.
576576 (α.aiohttp-cors = β, α.hass-nabucasa = β, α.pyatmo = β) => α -> [β];
577− netdata = ∀ α β. α -> β;
578− netgear = ∀ α β. α -> β;
579− netgear_lte = ∀ α β. α -> β;
577+ netdata = ∀ α β. α -> [β];
578+ netgear = ∀ α β. α -> [β];
579+ netgear_lte = ∀ α β. α -> [β];
580580 netio = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
581− neurio_energy = ∀ α β. α -> β;
582− nexia = ∀ α β. α -> β;
583− nextbus = ∀ α β. α -> β;
584− nextcloud = ∀ α β. α -> β;
585− nfandroidtv = ∀ α β. α -> β;
586− niko_home_control = ∀ α β. α -> β;
587− nilu = ∀ α β. α -> β;
588− nissan_leaf = ∀ α β. α -> β;
581+ neurio_energy = ∀ α β. α -> [β];
582+ nexia = ∀ α β. α -> [β];
583+ nextbus = ∀ α β. α -> [β];
584+ nextcloud = ∀ α β. α -> [β];
585+ nfandroidtv = ∀ α β. α -> [β];
586+ niko_home_control = ∀ α β. α -> [β];
587+ nilu = ∀ α β. α -> [β];
588+ nissan_leaf = ∀ α β. α -> [β];
589589 nmap_tracker = ∀ α β. (α.getmac = β) => α -> [β];
590− nmbs = ∀ α β. α -> β;
591− no_ip = ∀ α β. α -> β;
592− noaa_tides = ∀ α β. α -> β;
590+ nmbs = ∀ α β. α -> [β];
591+ no_ip = ∀ α β. α -> [β];
592+ noaa_tides = ∀ α β. α -> [β];
593593 norway_air = ∀ α β. (α.pymetno = β) => α -> [β];
594− notify = ∀ α β. α -> β;
595− notify_events = ∀ α β. α -> β;
596− notion = ∀ α β. α -> β;
597− nsw_fuel_station = ∀ α β. α -> β;
598− nsw_rural_fire_service_feed = ∀ α β. α -> β;
599− nuheat = ∀ α β. α -> β;
600− nuimo_controller = ∀ α β. α -> β;
601− nuki = ∀ α β. α -> β;
602− numato = ∀ α β. α -> β;
603− nut = ∀ α β. α -> β;
604− nws = ∀ α β. α -> β;
605− nx584 = ∀ α β. α -> β;
606− nzbget = ∀ α β. α -> β;
607− oasa_telematics = ∀ α β. α -> β;
608− obihai = ∀ α β. α -> β;
594+ notify = ∀ α β. α -> [β];
595+ notify_events = ∀ α β. α -> [β];
596+ notion = ∀ α β. α -> [β];
597+ nsw_fuel_station = ∀ α β. α -> [β];
598+ nsw_rural_fire_service_feed = ∀ α β. α -> [β];
599+ nuheat = ∀ α β. α -> [β];
600+ nuimo_controller = ∀ α β. α -> [β];
601+ nuki = ∀ α β. α -> [β];
602+ numato = ∀ α β. α -> [β];
603+ nut = ∀ α β. α -> [β];
604+ nws = ∀ α β. α -> [β];
605+ nx584 = ∀ α β. α -> [β];
606+ nzbget = ∀ α β. α -> [β];
607+ oasa_telematics = ∀ α β. α -> [β];
608+ obihai = ∀ α β. α -> [β];
609609 octoprint =
610610 ∀ α β. (α.aiohttp-cors = β, α.netdisco = β, α.zeroconf = β) => α -> [β];
611− oem = ∀ α β. α -> β;
611+ oem = ∀ α β. α -> [β];
612612 ohmconnect = ∀ α β. (α.defusedxml = β) => α -> [β];
613− ombi = ∀ α β. α -> β;
613+ ombi = ∀ α β. α -> [β];
614614 onboarding = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
615− onewire = ∀ α β. α -> β;
615+ onewire = ∀ α β. α -> [β];
616616 onkyo = ∀ α β. (α.onkyo-eiscp = β) => α -> [β];
617617 onvif = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
618− openalpr_cloud = ∀ α β. α -> β;
619− openalpr_local = ∀ α β. α -> β;
618+ openalpr_cloud = ∀ α β. α -> [β];
619+ openalpr_local = ∀ α β. α -> [β];
620620 opencv = ∀ α β. (α.numpy = β) => α -> [β];
621− openerz = ∀ α β. α -> β;
622− openevse = ∀ α β. α -> β;
623− openexchangerates = ∀ α β. α -> β;
624− opengarage = ∀ α β. α -> β;
625− openhardwaremonitor = ∀ α β. α -> β;
626− openhome = ∀ α β. α -> β;
627− opensensemap = ∀ α β. α -> β;
628− opensky = ∀ α β. α -> β;
629− opentherm_gw = ∀ α β. α -> β;
630− openuv = ∀ α β. α -> β;
621+ openerz = ∀ α β. α -> [β];
622+ openevse = ∀ α β. α -> [β];
623+ openexchangerates = ∀ α β. α -> [β];
624+ opengarage = ∀ α β. α -> [β];
625+ openhardwaremonitor = ∀ α β. α -> [β];
626+ openhome = ∀ α β. α -> [β];
627+ opensensemap = ∀ α β. α -> [β];
628+ opensky = ∀ α β. α -> [β];
629+ opentherm_gw = ∀ α β. α -> [β];
630+ openuv = ∀ α β. α -> [β];
631631 openweathermap = ∀ α β. (α.pyowm = β) => α -> [β];
632− opnsense = ∀ α β. α -> β;
633− opple = ∀ α β. α -> β;
634− orangepi_gpio = ∀ α β. α -> β;
635− oru = ∀ α β. α -> β;
636− orvibo = ∀ α β. α -> β;
637− osramlightify = ∀ α β. α -> β;
632+ opnsense = ∀ α β. α -> [β];
633+ opple = ∀ α β. α -> [β];
634+ orangepi_gpio = ∀ α β. α -> [β];
635+ oru = ∀ α β. α -> [β];
636+ orvibo = ∀ α β. α -> [β];
637+ osramlightify = ∀ α β. α -> [β];
638638 otp = ∀ α β. (α.pyotp = β) => α -> [β];
639− ovo_energy = ∀ α β. α -> β;
639+ ovo_energy = ∀ α β. α -> [β];
640640 owntracks =
641641 ∀ α β.
642642 ( α.aiohttp-cors = β,
@@ -646,24 +646,24 @@
646646 ) =>
647647 α -> [β];
648648 ozw = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
649− panasonic_bluray = ∀ α β. α -> β;
650− panasonic_viera = ∀ α β. α -> β;
649+ panasonic_bluray = ∀ α β. α -> [β];
650+ panasonic_viera = ∀ α β. α -> [β];
651651 pandora = ∀ α β. (α.pexpect = β) => α -> [β];
652652 panel_custom = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
653653 panel_iframe = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
654− pcal9535a = ∀ α β. α -> β;
655− pencom = ∀ α β. α -> β;
656− persistent_notification = ∀ α β. α -> β;
657− person = ∀ α β. α -> β;
658− philips_js = ∀ α β. α -> β;
659− pi4ioe5v9xxxx = ∀ α β. α -> β;
660− pi_hole = ∀ α β. α -> β;
661− picotts = ∀ α β. α -> β;
662− piglow = ∀ α β. α -> β;
663− pilight = ∀ α β. α -> β;
664− ping = ∀ α β. α -> β;
665− pioneer = ∀ α β. α -> β;
666− pjlink = ∀ α β. α -> β;
654+ pcal9535a = ∀ α β. α -> [β];
655+ pencom = ∀ α β. α -> [β];
656+ persistent_notification = ∀ α β. α -> [β];
657+ person = ∀ α β. α -> [β];
658+ philips_js = ∀ α β. α -> [β];
659+ pi4ioe5v9xxxx = ∀ α β. α -> [β];
660+ pi_hole = ∀ α β. α -> [β];
661+ picotts = ∀ α β. α -> [β];
662+ piglow = ∀ α β. α -> [β];
663+ pilight = ∀ α β. α -> [β];
664+ ping = ∀ α β. α -> [β];
665+ pioneer = ∀ α β. α -> [β];
666+ pjlink = ∀ α β. α -> [β];
667667 plaato = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
668668 plant = ∀ α β. (α.sqlalchemy = β) => α -> [β];
669669 plex =
@@ -675,158 +675,158 @@
675675 α.pysonos = β
676676 ) =>
677677 α -> [β];
678− plugwise = ∀ α β. α -> β;
679− plum_lightpad = ∀ α β. α -> β;
680− pocketcasts = ∀ α β. α -> β;
678+ plugwise = ∀ α β. α -> [β];
679+ plum_lightpad = ∀ α β. α -> [β];
680+ pocketcasts = ∀ α β. α -> [β];
681681 point = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
682− poolsense = ∀ α β. α -> β;
683− powerwall = ∀ α β. α -> β;
684− prezzibenzina = ∀ α β. α -> β;
685− proliphix = ∀ α β. α -> β;
682+ poolsense = ∀ α β. α -> [β];
683+ powerwall = ∀ α β. α -> [β];
684+ prezzibenzina = ∀ α β. α -> [β];
685+ proliphix = ∀ α β. α -> [β];
686686 prometheus =
687687 ∀ α β. (α.aiohttp-cors = β, α.prometheus_client = β) => α -> [β];
688− prowl = ∀ α β. α -> β;
689− proximity = ∀ α β. α -> β;
690− proxmoxve = ∀ α β. α -> β;
688+ prowl = ∀ α β. α -> [β];
689+ proximity = ∀ α β. α -> [β];
690+ proxmoxve = ∀ α β. α -> [β];
691691 proxy = ∀ α β. (α.pillow = β) => α -> [β];
692− ps4 = ∀ α β. α -> β;
693− ptvsd = ∀ α β. α -> β;
692+ ps4 = ∀ α β. α -> [β];
693+ ptvsd = ∀ α β. α -> [β];
694694 pulseaudio_loopback = ∀ α β. (α.pulsectl = β) => α -> [β];
695695 push = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
696696 pushbullet = ∀ α β. (α.pushbullet = β) => α -> [β];
697697 pushover = ∀ α β. (α.pushover-complete = β) => α -> [β];
698− pushsafer = ∀ α β. α -> β;
698+ pushsafer = ∀ α β. α -> [β];
699699 pvoutput = ∀ α β. (α.jsonpath = β, α.xmltodict = β) => α -> [β];
700− pvpc_hourly_pricing = ∀ α β. α -> β;
701− pyload = ∀ α β. α -> β;
700+ pvpc_hourly_pricing = ∀ α β. α -> [β];
701+ pyload = ∀ α β. α -> [β];
702702 python_script = ∀ α β. (α.restrictedpython = β) => α -> [β];
703− qbittorrent = ∀ α β. α -> β;
704− qld_bushfire = ∀ α β. α -> β;
705− qnap = ∀ α β. α -> β;
703+ qbittorrent = ∀ α β. α -> [β];
704+ qld_bushfire = ∀ α β. α -> [β];
705+ qnap = ∀ α β. α -> [β];
706706 qrcode = ∀ α β. (α.pillow = β) => α -> [β];
707− quantum_gateway = ∀ α β. α -> β;
708− qvr_pro = ∀ α β. α -> β;
709− qwikswitch = ∀ α β. α -> β;
707+ quantum_gateway = ∀ α β. α -> [β];
708+ qvr_pro = ∀ α β. α -> [β];
709+ qwikswitch = ∀ α β. α -> [β];
710710 rachio = ∀ α β. (α.aiohttp-cors = β, α.hass-nabucasa = β) => α -> [β];
711− radarr = ∀ α β. α -> β;
712− radiotherm = ∀ α β. α -> β;
713− rainbird = ∀ α β. α -> β;
714− raincloud = ∀ α β. α -> β;
715− rainforest_eagle = ∀ α β. α -> β;
716− rainmachine = ∀ α β. α -> β;
717− random = ∀ α β. α -> β;
718− raspihats = ∀ α β. α -> β;
719− raspyrfm = ∀ α β. α -> β;
720− recollect_waste = ∀ α β. α -> β;
711+ radarr = ∀ α β. α -> [β];
712+ radiotherm = ∀ α β. α -> [β];
713+ rainbird = ∀ α β. α -> [β];
714+ raincloud = ∀ α β. α -> [β];
715+ rainforest_eagle = ∀ α β. α -> [β];
716+ rainmachine = ∀ α β. α -> [β];
717+ random = ∀ α β. α -> [β];
718+ raspihats = ∀ α β. α -> [β];
719+ raspyrfm = ∀ α β. α -> [β];
720+ recollect_waste = ∀ α β. α -> [β];
721721 recorder = ∀ α β. (α.sqlalchemy = β) => α -> [β];
722− recswitch = ∀ α β. α -> β;
722+ recswitch = ∀ α β. α -> [β];
723723 reddit = ∀ α β. (α.praw = β) => α -> [β];
724− rejseplanen = ∀ α β. α -> β;
724+ rejseplanen = ∀ α β. α -> [β];
725725 remember_the_milk = ∀ α β. (α.httplib2 = β) => α -> [β];
726− remote = ∀ α β. α -> β;
727− remote_rpi_gpio = ∀ α β. α -> β;
728− repetier = ∀ α β. α -> β;
726+ remote = ∀ α β. α -> [β];
727+ remote_rpi_gpio = ∀ α β. α -> [β];
728+ repetier = ∀ α β. α -> [β];
729729 rest = ∀ α β. (α.jsonpath = β, α.xmltodict = β) => α -> [β];
730− rest_command = ∀ α β. α -> β;
731− rflink = ∀ α β. α -> β;
732− rfxtrx = ∀ α β. α -> β;
730+ rest_command = ∀ α β. α -> [β];
731+ rflink = ∀ α β. α -> [β];
732+ rfxtrx = ∀ α β. α -> [β];
733733 ring = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
734− ripple = ∀ α β. α -> β;
734+ ripple = ∀ α β. α -> [β];
735735 rmvtransport = ∀ α β. (α.PyRMVtransport = β) => α -> [β];
736− rocketchat = ∀ α β. α -> β;
737− roku = ∀ α β. α -> β;
738− roomba = ∀ α β. α -> β;
736+ rocketchat = ∀ α β. α -> [β];
737+ roku = ∀ α β. α -> [β];
738+ roomba = ∀ α β. α -> [β];
739739 route53 = ∀ α β. (α.boto3 = β) => α -> [β];
740− rova = ∀ α β. α -> β;
741− rpi_camera = ∀ α β. α -> β;
742− rpi_gpio = ∀ α β. α -> β;
743− rpi_gpio_pwm = ∀ α β. α -> β;
744− rpi_pfio = ∀ α β. α -> β;
745− rpi_rf = ∀ α β. α -> β;
740+ rova = ∀ α β. α -> [β];
741+ rpi_camera = ∀ α β. α -> [β];
742+ rpi_gpio = ∀ α β. α -> [β];
743+ rpi_gpio_pwm = ∀ α β. α -> [β];
744+ rpi_pfio = ∀ α β. α -> [β];
745+ rpi_rf = ∀ α β. α -> [β];
746746 rss_feed_template = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
747− rtorrent = ∀ α β. α -> β;
748− russound_rio = ∀ α β. α -> β;
749− russound_rnet = ∀ α β. α -> β;
747+ rtorrent = ∀ α β. α -> [β];
748+ russound_rio = ∀ α β. α -> [β];
749+ russound_rnet = ∀ α β. α -> [β];
750750 sabnzbd =
751751 ∀ α β. (α.aiohttp-cors = β, α.netdisco = β, α.zeroconf = β) => α -> [β];
752752 safe_mode = ∀ α β. (α.aiohttp-cors = β, α.hass-nabucasa = β) => α -> [β];
753− saj = ∀ α β. α -> β;
754− salt = ∀ α β. α -> β;
753+ saj = ∀ α β. α -> [β];
754+ salt = ∀ α β. α -> [β];
755755 samsungtv = ∀ α β. (α.samsungctl = β, α.samsungtvws = β) => α -> [β];
756− satel_integra = ∀ α β. α -> β;
757− scene = ∀ α β. α -> β;
758− schluter = ∀ α β. α -> β;
756+ satel_integra = ∀ α β. α -> [β];
757+ scene = ∀ α β. α -> [β];
758+ schluter = ∀ α β. α -> [β];
759759 scrape =
760760 ∀ α β.
761761 (α.beautifulsoup4 = β, α.jsonpath = β, α.xmltodict = β) => α -> [β];
762− script = ∀ α β. α -> β;
763− scsgate = ∀ α β. α -> β;
762+ script = ∀ α β. α -> [β];
763+ scsgate = ∀ α β. α -> [β];
764764 search = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
765765 season = ∀ α β. (α.ephem = β) => α -> [β];
766− sendgrid = ∀ α β. α -> β;
767− sense = ∀ α β. α -> β;
768− sensehat = ∀ α β. α -> β;
769− sensibo = ∀ α β. α -> β;
770− sensor = ∀ α β. α -> β;
766+ sendgrid = ∀ α β. α -> [β];
767+ sense = ∀ α β. α -> [β];
768+ sensehat = ∀ α β. α -> [β];
769+ sensibo = ∀ α β. α -> [β];
770+ sensor = ∀ α β. α -> [β];
771771 sentry = ∀ α β. (α.sentry-sdk = β) => α -> [β];
772772 serial = ∀ α β. (α.pyserial-asyncio = β) => α -> [β];
773− serial_pm = ∀ α β. α -> β;
774− sesame = ∀ α β. α -> β;
773+ serial_pm = ∀ α β. α -> [β];
774+ sesame = ∀ α β. α -> [β];
775775 seven_segments = ∀ α β. (α.pillow = β) => α -> [β];
776− seventeentrack = ∀ α β. α -> β;
777− shell_command = ∀ α β. α -> β;
776+ seventeentrack = ∀ α β. α -> [β];
777+ shell_command = ∀ α β. α -> [β];
778778 shiftr = ∀ α β. (α.paho-mqtt = β) => α -> [β];
779779 shodan = ∀ α β. (α.shodan = β) => α -> [β];
780780 shopping_list = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
781− sht31 = ∀ α β. α -> β;
782− sigfox = ∀ α β. α -> β;
781+ sht31 = ∀ α β. α -> [β];
782+ sigfox = ∀ α β. α -> [β];
783783 sighthound = ∀ α β. (α.pillow = β) => α -> [β];
784− signal_messenger = ∀ α β. α -> β;
785− simplepush = ∀ α β. α -> β;
786− simplisafe = ∀ α β. α -> β;
787− simulated = ∀ α β. α -> β;
788− sinch = ∀ α β. α -> β;
789− sisyphus = ∀ α β. α -> β;
790− sky_hub = ∀ α β. α -> β;
791− skybeacon = ∀ α β. α -> β;
792− skybell = ∀ α β. α -> β;
793− slack = ∀ α β. α -> β;
794− sleepiq = ∀ α β. α -> β;
795− slide = ∀ α β. α -> β;
796− sma = ∀ α β. α -> β;
784+ signal_messenger = ∀ α β. α -> [β];
785+ simplepush = ∀ α β. α -> [β];
786+ simplisafe = ∀ α β. α -> [β];
787+ simulated = ∀ α β. α -> [β];
788+ sinch = ∀ α β. α -> [β];
789+ sisyphus = ∀ α β. α -> [β];
790+ sky_hub = ∀ α β. α -> [β];
791+ skybeacon = ∀ α β. α -> [β];
792+ skybell = ∀ α β. α -> [β];
793+ slack = ∀ α β. α -> [β];
794+ sleepiq = ∀ α β. α -> [β];
795+ slide = ∀ α β. α -> [β];
796+ sma = ∀ α β. α -> [β];
797797 smappee = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
798− smarthab = ∀ α β. α -> β;
798+ smarthab = ∀ α β. α -> [β];
799799 smartthings =
800800 ∀ α β. (α.aiohttp-cors = β, α.hass-nabucasa = β) => α -> [β];
801− smarty = ∀ α β. α -> β;
802− smhi = ∀ α β. α -> β;
803− sms = ∀ α β. α -> β;
804− smtp = ∀ α β. α -> β;
801+ smarty = ∀ α β. α -> [β];
802+ smhi = ∀ α β. α -> [β];
803+ sms = ∀ α β. α -> [β];
804+ smtp = ∀ α β. α -> [β];
805805 snapcast = ∀ α β. (α.snapcast = β) => α -> [β];
806806 snips = ∀ α β. (α.aiohttp-cors = β, α.paho-mqtt = β) => α -> [β];
807807 snmp = ∀ α β. (α.pysnmp = β) => α -> [β];
808− sochain = ∀ α β. α -> β;
809− socialblade = ∀ α β. α -> β;
808+ sochain = ∀ α β. α -> [β];
809+ socialblade = ∀ α β. α -> [β];
810810 solaredge = ∀ α β. (α.stringcase = β) => α -> [β];
811− solaredge_local = ∀ α β. α -> β;
812− solarlog = ∀ α β. α -> β;
813− solax = ∀ α β. α -> β;
814− soma = ∀ α β. α -> β;
811+ solaredge_local = ∀ α β. α -> [β];
812+ solarlog = ∀ α β. α -> [β];
813+ solax = ∀ α β. α -> [β];
814+ soma = ∀ α β. α -> [β];
815815 somfy = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
816− somfy_mylink = ∀ α β. α -> β;
817− sonarr = ∀ α β. α -> β;
818− songpal = ∀ α β. α -> β;
816+ somfy_mylink = ∀ α β. α -> [β];
817+ sonarr = ∀ α β. α -> [β];
818+ songpal = ∀ α β. α -> [β];
819819 sonos = ∀ α β. (α.pysonos = β) => α -> [β];
820− sony_projector = ∀ α β. α -> β;
820+ sony_projector = ∀ α β. α -> [β];
821821 soundtouch =
822822 ∀ α β.
823823 (α.aiohttp-cors = β, α.libsoundtouch = β, α.zeroconf = β) => α -> [β];
824824 spaceapi = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
825− spc = ∀ α β. α -> β;
825+ spc = ∀ α β. α -> [β];
826826 speedtestdotnet = ∀ α β. (α.speedtest-cli = β) => α -> [β];
827− spider = ∀ α β. α -> β;
828− splunk = ∀ α β. α -> β;
829− spotcrime = ∀ α β. α -> β;
827+ spider = ∀ α β. α -> [β];
828+ splunk = ∀ α β. α -> [β];
829+ spotcrime = ∀ α β. α -> [β];
830830 spotify = ∀ α β. (α.aiohttp-cors = β, α.spotipy = β) => α -> [β];
831831 sql = ∀ α β. (α.sqlalchemy = β) => α -> [β];
832832 squeezebox = ∀ α β. (α.pysqueezebox = β) => α -> [β];
@@ -838,47 +838,47 @@
838838 α.zeroconf = β
839839 ) =>
840840 α -> [β];
841− starline = ∀ α β. α -> β;
842− starlingbank = ∀ α β. α -> β;
841+ starline = ∀ α β. α -> [β];
842+ starlingbank = ∀ α β. α -> [β];
843843 startca = ∀ α β. (α.xmltodict = β) => α -> [β];
844844 statistics = ∀ α β. (α.sqlalchemy = β) => α -> [β];
845845 statsd = ∀ α β. (α.statsd = β) => α -> [β];
846− steam_online = ∀ α β. α -> β;
847− stiebel_eltron = ∀ α β. α -> β;
848− stookalert = ∀ α β. α -> β;
846+ steam_online = ∀ α β. α -> [β];
847+ stiebel_eltron = ∀ α β. α -> [β];
848+ stookalert = ∀ α β. α -> [β];
849849 stream = ∀ α β. (α.aiohttp-cors = β, α.av = β) => α -> [β];
850− streamlabswater = ∀ α β. α -> β;
850+ streamlabswater = ∀ α β. α -> [β];
851851 stt = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
852− suez_water = ∀ α β. α -> β;
853− sun = ∀ α β. α -> β;
854− supervisord = ∀ α β. α -> β;
855− supla = ∀ α β. α -> β;
856− surepetcare = ∀ α β. α -> β;
857− swiss_hydrological_data = ∀ α β. α -> β;
858− swiss_public_transport = ∀ α β. α -> β;
859− swisscom = ∀ α β. α -> β;
860− switch = ∀ α β. α -> β;
861− switchbot = ∀ α β. α -> β;
862− switcher_kis = ∀ α β. α -> β;
863− switchmate = ∀ α β. α -> β;
864− syncthru = ∀ α β. α -> β;
865− synology = ∀ α β. α -> β;
866− synology_chat = ∀ α β. α -> β;
867− synology_dsm = ∀ α β. α -> β;
868− synology_srm = ∀ α β. α -> β;
869− syslog = ∀ α β. α -> β;
852+ suez_water = ∀ α β. α -> [β];
853+ sun = ∀ α β. α -> [β];
854+ supervisord = ∀ α β. α -> [β];
855+ supla = ∀ α β. α -> [β];
856+ surepetcare = ∀ α β. α -> [β];
857+ swiss_hydrological_data = ∀ α β. α -> [β];
858+ swiss_public_transport = ∀ α β. α -> [β];
859+ swisscom = ∀ α β. α -> [β];
860+ switch = ∀ α β. α -> [β];
861+ switchbot = ∀ α β. α -> [β];
862+ switcher_kis = ∀ α β. α -> [β];
863+ switchmate = ∀ α β. α -> [β];
864+ syncthru = ∀ α β. α -> [β];
865+ synology = ∀ α β. α -> [β];
866+ synology_chat = ∀ α β. α -> [β];
867+ synology_dsm = ∀ α β. α -> [β];
868+ synology_srm = ∀ α β. α -> [β];
869+ syslog = ∀ α β. α -> [β];
870870 system_health = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
871871 system_log = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
872872 systemmonitor = ∀ α β. (α.psutil = β) => α -> [β];
873− tado = ∀ α β. α -> β;
874− tahoma = ∀ α β. α -> β;
875− tank_utility = ∀ α β. α -> β;
876− tankerkoenig = ∀ α β. α -> β;
877− tapsaff = ∀ α β. α -> β;
878− tautulli = ∀ α β. α -> β;
879− tcp = ∀ α β. α -> β;
873+ tado = ∀ α β. α -> [β];
874+ tahoma = ∀ α β. α -> [β];
875+ tank_utility = ∀ α β. α -> [β];
876+ tankerkoenig = ∀ α β. α -> [β];
877+ tapsaff = ∀ α β. α -> [β];
878+ tautulli = ∀ α β. α -> [β];
879+ tcp = ∀ α β. α -> [β];
880880 ted5000 = ∀ α β. (α.xmltodict = β) => α -> [β];
881− teksavvy = ∀ α β. α -> β;
881+ teksavvy = ∀ α β. α -> [β];
882882 telegram =
883883 ∀ α β.
884884 (α.aiohttp-cors = β, α.pysocks = β, α.python-telegram-bot = β) => α ->
@@ -887,139 +887,139 @@
887887 ∀ α β.
888888 (α.aiohttp-cors = β, α.pysocks = β, α.python-telegram-bot = β) => α ->
889889 [β];
890− tellduslive = ∀ α β. α -> β;
891− tellstick = ∀ α β. α -> β;
892− telnet = ∀ α β. α -> β;
893− temper = ∀ α β. α -> β;
894− template = ∀ α β. α -> β;
890+ tellduslive = ∀ α β. α -> [β];
891+ tellstick = ∀ α β. α -> [β];
892+ telnet = ∀ α β. α -> [β];
893+ temper = ∀ α β. α -> [β];
894+ template = ∀ α β. α -> [β];
895895 tensorflow =
896896 ∀ α β. (α.numpy = β, α.pillow = β, α.protobuf = β) => α -> [β];
897− tesla = ∀ α β. α -> β;
898− tfiac = ∀ α β. α -> β;
897+ tesla = ∀ α β. α -> [β];
898+ tfiac = ∀ α β. α -> [β];
899899 thermoworks_smoke = ∀ α β. (α.stringcase = β) => α -> [β];
900− thethingsnetwork = ∀ α β. α -> β;
901− thingspeak = ∀ α β. α -> β;
902− thinkingcleaner = ∀ α β. α -> β;
903− thomson = ∀ α β. α -> β;
904− threshold = ∀ α β. α -> β;
905− tibber = ∀ α β. α -> β;
906− tikteck = ∀ α β. α -> β;
907− tile = ∀ α β. α -> β;
908− time_date = ∀ α β. α -> β;
909− timer = ∀ α β. α -> β;
910− tmb = ∀ α β. α -> β;
911− tod = ∀ α β. α -> β;
900+ thethingsnetwork = ∀ α β. α -> [β];
901+ thingspeak = ∀ α β. α -> [β];
902+ thinkingcleaner = ∀ α β. α -> [β];
903+ thomson = ∀ α β. α -> [β];
904+ threshold = ∀ α β. α -> [β];
905+ tibber = ∀ α β. α -> [β];
906+ tikteck = ∀ α β. α -> [β];
907+ tile = ∀ α β. α -> [β];
908+ time_date = ∀ α β. α -> [β];
909+ timer = ∀ α β. α -> [β];
910+ tmb = ∀ α β. α -> [β];
911+ tod = ∀ α β. α -> [β];
912912 todoist = ∀ α β. (α.todoist = β) => α -> [β];
913− tof = ∀ α β. α -> β;
914− tomato = ∀ α β. α -> β;
913+ tof = ∀ α β. α -> [β];
914+ tomato = ∀ α β. α -> [β];
915915 toon = ∀ α β. (α.aiohttp-cors = β, α.hass-nabucasa = β) => α -> [β];
916916 torque = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
917− totalconnect = ∀ α β. α -> β;
918− touchline = ∀ α β. α -> β;
917+ totalconnect = ∀ α β. α -> [β];
918+ touchline = ∀ α β. α -> [β];
919919 tplink = ∀ α β. (α.pyhs100 = β) => α -> [β];
920− tplink_lte = ∀ α β. α -> β;
920+ tplink_lte = ∀ α β. α -> [β];
921921 traccar = ∀ α β. (α.aiohttp-cors = β, α.stringcase = β) => α -> [β];
922− trackr = ∀ α β. α -> β;
923− tradfri = ∀ α β. α -> β;
924− trafikverket_train = ∀ α β. α -> β;
925− trafikverket_weatherstation = ∀ α β. α -> β;
922+ trackr = ∀ α β. α -> [β];
923+ tradfri = ∀ α β. α -> [β];
924+ trafikverket_train = ∀ α β. α -> [β];
925+ trafikverket_weatherstation = ∀ α β. α -> [β];
926926 transmission = ∀ α β. (α.transmissionrpc = β) => α -> [β];
927− transport_nsw = ∀ α β. α -> β;
928− travisci = ∀ α β. α -> β;
927+ transport_nsw = ∀ α β. α -> [β];
928+ travisci = ∀ α β. α -> [β];
929929 trend = ∀ α β. (α.numpy = β) => α -> [β];
930930 tts = ∀ α β. (α.aiohttp-cors = β, α.mutagen = β) => α -> [β];
931− tuya = ∀ α β. α -> β;
932− twentemilieu = ∀ α β. α -> β;
931+ tuya = ∀ α β. α -> [β];
932+ twentemilieu = ∀ α β. α -> [β];
933933 twilio = ∀ α β. (α.aiohttp-cors = β, α.twilio = β) => α -> [β];
934934 twilio_call = ∀ α β. (α.aiohttp-cors = β, α.twilio = β) => α -> [β];
935935 twilio_sms = ∀ α β. (α.aiohttp-cors = β, α.twilio = β) => α -> [β];
936− twitch = ∀ α β. α -> β;
937− twitter = ∀ α β. α -> β;
938− ubee = ∀ α β. α -> β;
939− ubus = ∀ α β. α -> β;
940− ue_smart_radio = ∀ α β. α -> β;
941− uk_transport = ∀ α β. α -> β;
936+ twitch = ∀ α β. α -> [β];
937+ twitter = ∀ α β. α -> [β];
938+ ubee = ∀ α β. α -> [β];
939+ ubus = ∀ α β. α -> [β];
940+ ue_smart_radio = ∀ α β. α -> [β];
941+ uk_transport = ∀ α β. α -> [β];
942942 unifi = ∀ α β. (α.aiounifi = β) => α -> [β];
943943 unifi_direct = ∀ α β. (α.pexpect = β) => α -> [β];
944− unifiled = ∀ α β. α -> β;
945− universal = ∀ α β. α -> β;
946− upb = ∀ α β. α -> β;
947− upc_connect = ∀ α β. α -> β;
948− upcloud = ∀ α β. α -> β;
944+ unifiled = ∀ α β. α -> [β];
945+ universal = ∀ α β. α -> [β];
946+ upb = ∀ α β. α -> [β];
947+ upc_connect = ∀ α β. α -> [β];
948+ upcloud = ∀ α β. α -> [β];
949949 updater = ∀ α β. (α.distro = β) => α -> [β];
950950 upnp = ∀ α β. (α.async-upnp-client = β) => α -> [β];
951− uptime = ∀ α β. α -> β;
952− uptimerobot = ∀ α β. α -> β;
953− uscis = ∀ α β. α -> β;
954− usgs_earthquakes_feed = ∀ α β. α -> β;
955− utility_meter = ∀ α β. α -> β;
951+ uptime = ∀ α β. α -> [β];
952+ uptimerobot = ∀ α β. α -> [β];
953+ uscis = ∀ α β. α -> [β];
954+ usgs_earthquakes_feed = ∀ α β. α -> [β];
955+ utility_meter = ∀ α β. α -> [β];
956956 uvc = ∀ α β. (α.uvcclient = β) => α -> [β];
957− vacuum = ∀ α β. α -> β;
958− vallox = ∀ α β. α -> β;
959− vasttrafik = ∀ α β. α -> β;
960− velbus = ∀ α β. α -> β;
961− velux = ∀ α β. α -> β;
962− venstar = ∀ α β. α -> β;
963− vera = ∀ α β. α -> β;
957+ vacuum = ∀ α β. α -> [β];
958+ vallox = ∀ α β. α -> [β];
959+ vasttrafik = ∀ α β. α -> [β];
960+ velbus = ∀ α β. α -> [β];
961+ velux = ∀ α β. α -> [β];
962+ venstar = ∀ α β. α -> [β];
963+ vera = ∀ α β. α -> [β];
964964 verisure = ∀ α β. (α.jsonpath = β) => α -> [β];
965− versasense = ∀ α β. α -> β;
965+ versasense = ∀ α β. α -> [β];
966966 version = ∀ α β. (α.pyhaversion = β) => α -> [β];
967− vesync = ∀ α β. α -> β;
968− viaggiatreno = ∀ α β. α -> β;
969− vicare = ∀ α β. α -> β;
970− vilfo = ∀ α β. α -> β;
971− vivotek = ∀ α β. α -> β;
972− vizio = ∀ α β. α -> β;
967+ vesync = ∀ α β. α -> [β];
968+ viaggiatreno = ∀ α β. α -> [β];
969+ vicare = ∀ α β. α -> [β];
970+ vilfo = ∀ α β. α -> [β];
971+ vivotek = ∀ α β. α -> [β];
972+ vizio = ∀ α β. α -> [β];
973973 vlc = ∀ α β. (α.python-vlc = β) => α -> [β];
974− vlc_telnet = ∀ α β. α -> β;
975− voicerss = ∀ α β. α -> β;
976− volkszaehler = ∀ α β. α -> β;
977− volumio = ∀ α β. α -> β;
978− volvooncall = ∀ α β. α -> β;
974+ vlc_telnet = ∀ α β. α -> [β];
975+ voicerss = ∀ α β. α -> [β];
976+ volkszaehler = ∀ α β. α -> [β];
977+ volumio = ∀ α β. α -> [β];
978+ volvooncall = ∀ α β. α -> [β];
979979 vultr = ∀ α β. (α.vultr = β) => α -> [β];
980− w800rf32 = ∀ α β. α -> β;
980+ w800rf32 = ∀ α β. α -> [β];
981981 wake_on_lan = ∀ α β. (α.wakeonlan = β) => α -> [β];
982− waqi = ∀ α β. α -> β;
983− water_heater = ∀ α β. α -> β;
984− waterfurnace = ∀ α β. α -> β;
985− watson_iot = ∀ α β. α -> β;
986− watson_tts = ∀ α β. α -> β;
982+ waqi = ∀ α β. α -> [β];
983+ water_heater = ∀ α β. α -> [β];
984+ waterfurnace = ∀ α β. α -> [β];
985+ watson_iot = ∀ α β. α -> [β];
986+ watson_tts = ∀ α β. α -> [β];
987987 waze_travel_time = ∀ α β. (α.WazeRouteCalculator = β) => α -> [β];
988− weather = ∀ α β. α -> β;
988+ weather = ∀ α β. α -> [β];
989989 webhook = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
990− webostv = ∀ α β. α -> β;
990+ webostv = ∀ α β. α -> [β];
991991 websocket_api = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
992− wemo = ∀ α β. α -> β;
993− whois = ∀ α β. α -> β;
994− wiffi = ∀ α β. α -> β;
992+ wemo = ∀ α β. α -> [β];
993+ whois = ∀ α β. α -> [β];
994+ wiffi = ∀ α β. α -> [β];
995995 wink = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
996− wirelesstag = ∀ α β. α -> β;
996+ wirelesstag = ∀ α β. α -> [β];
997997 withings = ∀ α β. (α.aiohttp-cors = β) => α -> [β];
998− wled = ∀ α β. α -> β;
999− wolflink = ∀ α β. α -> β;
998+ wled = ∀ α β. α -> [β];
999+ wolflink = ∀ α β. α -> [β];
10001000 workday = ∀ α β. (α.holidays = β) => α -> [β];
1001− worldclock = ∀ α β. α -> β;
1002− worldtidesinfo = ∀ α β. α -> β;
1003− worxlandroid = ∀ α β. α -> β;
1004− wsdot = ∀ α β. α -> β;
1005− wunderground = ∀ α β. α -> β;
1006− x10 = ∀ α β. α -> β;
1007− xbee = ∀ α β. α -> β;
1008− xbox_live = ∀ α β. α -> β;
1009− xeoma = ∀ α β. α -> β;
1010− xfinity = ∀ α β. α -> β;
1001+ worldclock = ∀ α β. α -> [β];
1002+ worldtidesinfo = ∀ α β. α -> [β];
1003+ worxlandroid = ∀ α β. α -> [β];
1004+ wsdot = ∀ α β. α -> [β];
1005+ wunderground = ∀ α β. α -> [β];
1006+ x10 = ∀ α β. α -> [β];
1007+ xbee = ∀ α β. α -> [β];
1008+ xbox_live = ∀ α β. α -> [β];
1009+ xeoma = ∀ α β. α -> [β];
1010+ xfinity = ∀ α β. α -> [β];
10111011 xiaomi = ∀ α β. (α.ha-ffmpeg = β) => α -> [β];
10121012 xiaomi_aqara =
10131013 ∀ α β. (α.aiohttp-cors = β, α.netdisco = β, α.zeroconf = β) => α -> [β];
10141014 xiaomi_miio = ∀ α β. (α.construct = β, α.python-miio = β) => α -> [β];
1015− xiaomi_tv = ∀ α β. α -> β;
1015+ xiaomi_tv = ∀ α β. α -> [β];
10161016 xmpp = ∀ α β. (α.slixmpp = β) => α -> [β];
1017− xs1 = ∀ α β. α -> β;
1018− yale_smart_alarm = ∀ α β. α -> β;
1017+ xs1 = ∀ α β. α -> [β];
1018+ yale_smart_alarm = ∀ α β. α -> [β];
10191019 yamaha = ∀ α β. (α.rxv = β) => α -> [β];
1020− yamaha_musiccast = ∀ α β. α -> β;
1021− yandex_transport = ∀ α β. α -> β;
1022− yandextts = ∀ α β. α -> β;
1020+ yamaha_musiccast = ∀ α β. α -> [β];
1021+ yandex_transport = ∀ α β. α -> [β];
1022+ yandextts = ∀ α β. α -> [β];
10231023 yeelight =
10241024 ∀ α β.
10251025 ( α.aiohttp-cors = β,
@@ -1028,15 +1028,15 @@
10281028 α.zeroconf = β
10291029 ) =>
10301030 α -> [β];
1031− yeelightsunflower = ∀ α β. α -> β;
1032− yessssms = ∀ α β. α -> β;
1031+ yeelightsunflower = ∀ α β. α -> [β];
1032+ yessssms = ∀ α β. α -> [β];
10331033 yi = ∀ α β. (α.aioftp = β, α.ha-ffmpeg = β) => α -> [β];
10341034 yr = ∀ α β. (α.xmltodict = β) => α -> [β];
1035− zabbix = ∀ α β. α -> β;
1036− zamg = ∀ α β. α -> β;
1037− zengge = ∀ α β. α -> β;
1035+ zabbix = ∀ α β. α -> [β];
1036+ zamg = ∀ α β. α -> [β];
1037+ zengge = ∀ α β. α -> [β];
10381038 zeroconf = ∀ α β. (α.aiohttp-cors = β, α.zeroconf = β) => α -> [β];
1039− zerproc = ∀ α β. α -> β;
1039+ zerproc = ∀ α β. α -> [β];
10401040 zestimate = ∀ α β. (α.xmltodict = β) => α -> [β];
10411041 zha =
10421042 ∀ α β.
@@ -1050,9 +1050,9 @@
10501050 α.zigpy-zigate = β
10511051 ) =>
10521052 α -> [β];
1053− zhong_hong = ∀ α β. α -> β;
1054− ziggo_mediabox_xl = ∀ α β. α -> β;
1055− zone = ∀ α β. α -> β;
1053+ zhong_hong = ∀ α β. α -> [β];
1054+ ziggo_mediabox_xl = ∀ α β. α -> [β];
1055+ zone = ∀ α β. α -> [β];
10561056 zoneminder = ∀ α β. (α.zm-py = β) => α -> [β];
10571057 zwave =
10581058 ∀ α β. (α.homeassistant-pyozw = β, α.pydispatcher = β) => α -> [β];
test/golden/importless/composition.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/configuration-ghc-8.4.x.txtnew file+86
@@ -0,0 +1,86 @@
1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1 λ1
2+μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1 υ1 φ1 χ1 ψ1 ω1 α2 β2.
3+( β.fetchpatch = {sha256 = String; stripLen = Number; url = String;} -> γ,
4+ β.llvmPackages_5 = δ,
5+ ε.addBuildDepend = ζ -> η -> θ,
6+ ε.appendPatch = ι -> γ -> κ,
7+ ε.doJailbreak = λ -> μ,
8+ ε.dontCheck = ν -> ξ,
9+ ε.dontHaddock = ο -> π,
10+ ρ.Cabal_2_4_1_0 = σ,
11+ ρ.Cabal_3_2_0_0 = τ,
12+ ρ.contravariant = η,
13+ ρ.ghc-lib-parser = υ,
14+ ρ.hackage-security = φ,
15+ ρ.hpack = χ,
16+ ρ.resolv_0_1_1_2 = ψ,
17+ ω.aeson = ζ,
18+ ω.base-compat-batteries = α1,
19+ ω.cabal-install = β1,
20+ ω.enclosed-exceptions = ν,
21+ ω.fast-logger = ο,
22+ ω.ghc-lib-parser-ex = γ1,
23+ ω.hadoop-rpc = ι,
24+ ω.hinotify_0_3_9 = λ,
25+ ω.jailbreak-cabal = δ1,
26+ ω.purescript = ε1,
27+ ω.stack = ζ1,
28+ ω.xmobar = η1,
29+ θ1.Cabal_3_2_0_0 = ι1,
30+ κ1.override = λ1,
31+ μ1.hinotify_0_3_9 = ν1,
32+ φ.override = {Cabal = ξ1;} -> ο1,
33+ χ.override = {Cabal = π1;} -> ρ1,
34+ β1.overrideScope = (θ1 -> σ1 -> {Cabal = ι1;}) -> τ1,
35+ δ1.override = {Cabal = τ;} -> υ1,
36+ η1.overrideScope = (μ1 -> φ1 -> {hinotify = ν1;}) -> χ1
37+) =>
38+{haskellLib = ε; pkgs = β;} ->
39+ρ ->
40+ω ->
41+{ Cabal = Null;
42+ aeson = θ;
43+ array = Null;
44+ base = Null;
45+ base-compat-batteries = ψ1;
46+ binary = Null;
47+ bytestring = Null;
48+ cabal-install = τ1;
49+ containers = Null;
50+ deepseq = Null;
51+ directory = Null;
52+ enclosed-exceptions = ξ;
53+ fast-logger = π;
54+ filepath = Null;
55+ ghc-boot = Null;
56+ ghc-boot-th = Null;
57+ ghc-compact = Null;
58+ ghc-heap = Null;
59+ ghc-lib-parser-ex = ω1;
60+ ghc-prim = Null;
61+ ghci = Null;
62+ hadoop-rpc = κ;
63+ haskeline = Null;
64+ hinotify_0_3_9 = α2;
65+ hpc = Null;
66+ integer-gmp = Null;
67+ jailbreak-cabal = υ1;
68+ llvmPackages = δ;
69+ mtl = Null;
70+ parsec = Null;
71+ pretty = Null;
72+ process = Null;
73+ purescript = β2;
74+ resolv = ψ;
75+ rts = Null;
76+ stack = ∀ α. α;
77+ stm = Null;
78+ template-haskell = Null;
79+ terminfo = Null;
80+ text = Null;
81+ time = Null;
82+ transformers = Null;
83+ unix = Null;
84+ xhtml = Null;
85+ xmobar = χ1;
86+}
test/golden/importless/configuration-ghc-8.6.x.txtnew file+117
@@ -0,0 +1,117 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1
2+λ1 μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1 υ1 φ1 χ1 ψ1 ω1 α2 β2 γ2 δ2 ε2 ζ2 η2 θ2 ι2 κ2 λ2 μ2 ν2
3+ξ2 ο2 π2 ρ2 σ2 τ2 υ2 φ2 χ2 ψ2 ω2 α3 β3 γ3.
4+( α.llvmPackages_6 = β,
5+ γ.addBuildDepend = δ -> ε -> ζ,
6+ γ.doDistribute = η -> θ,
7+ γ.doJailbreak = ι -> κ,
8+ γ.dontCheck = λ -> μ,
9+ γ.markBroken = ν -> ξ,
10+ γ.markUnbroken = ο -> η,
11+ π.Cabal_3_2_0_0 = ρ,
12+ π.ghc-lib-parser = ε,
13+ π.haddock-library_1_7_0 = σ,
14+ π.resolv_0_1_1_2 = τ,
15+ υ.Diff = λ,
16+ υ.HaTeX = ι,
17+ υ.RSA = φ,
18+ υ.apply-refact_0_6_0_0 = χ,
19+ υ.binary-orphans = ψ,
20+ υ.cabal-install = ω,
21+ υ.cabal2nix = α1,
22+ υ.cabal2spec = β1,
23+ υ.data-clist = γ1,
24+ υ.dates = δ1,
25+ υ.equivalence = ε1,
26+ υ.ghc-lib-parser-ex = δ,
27+ υ.github = ζ1,
28+ υ.haddock-library_1_7_0 = η1,
29+ υ.hpc-coveralls = θ1,
30+ υ.http-api-data = ι1,
31+ υ.jailbreak-cabal = κ1,
32+ υ.monad-par = λ1,
33+ υ.persistent-sqlite = μ1,
34+ υ.policeman = ν,
35+ υ.rebase = ν1,
36+ υ.skylighting-core = ξ1,
37+ υ.stack = ο1,
38+ υ.stylish-cabal = π1,
39+ υ.system-fileio = ρ1,
40+ υ.unicode-transforms = σ1,
41+ υ.unordered-containers = τ1,
42+ υ.wl-pprint-extras = υ1,
43+ φ1.Cabal_3_2_0_0 = χ1,
44+ ψ1.Cabal_3_2_0_0 = ω1,
45+ α2.Cabal_3_2_0_0 = β2,
46+ ω.overrideScope = (φ1 -> γ2 -> {Cabal = χ1;}) -> δ2,
47+ α1.overrideScope = (ψ1 -> ε2 -> {Cabal = ω1;}) -> ζ2,
48+ β1.overrideScope = (α2 -> η2 -> {Cabal = β2;}) -> θ2,
49+ κ1.override = {Cabal = ρ;} -> ι2,
50+ π1.override = {haddock-library = σ;} -> ο
51+) =>
52+{haskellLib = γ; pkgs = α;} ->
53+π ->
54+υ ->
55+{ Cabal = Null;
56+ Diff = μ;
57+ HaTeX = κ;
58+ RSA = κ2;
59+ apply-refact = χ;
60+ array = Null;
61+ base = Null;
62+ binary = Null;
63+ binary-orphans = λ2;
64+ bytestring = Null;
65+ cabal-install = δ2;
66+ cabal2nix = ζ2;
67+ cabal2spec = θ2;
68+ containers = Null;
69+ data-clist = μ2;
70+ dates = ν2;
71+ deepseq = Null;
72+ directory = Null;
73+ equivalence = ξ2;
74+ filepath = Null;
75+ ghc-boot = Null;
76+ ghc-boot-th = Null;
77+ ghc-compact = Null;
78+ ghc-heap = Null;
79+ ghc-lib-parser-ex = ζ;
80+ ghc-prim = Null;
81+ ghci = Null;
82+ github = ο2;
83+ haddock-library_1_7_0 = π2;
84+ haskeline = Null;
85+ hpc = Null;
86+ hpc-coveralls = ρ2;
87+ http-api-data = σ2;
88+ integer-gmp = Null;
89+ jailbreak-cabal = ι2;
90+ libiserv = Null;
91+ llvmPackages = β;
92+ monad-par = τ2;
93+ mtl = Null;
94+ parsec = Null;
95+ persistent-sqlite = υ2;
96+ policeman = ξ;
97+ pretty = Null;
98+ process = Null;
99+ rebase = φ2;
100+ resolv = τ;
101+ rts = Null;
102+ skylighting-core = χ2;
103+ stack = ψ2;
104+ stm = Null;
105+ stylish-cabal = θ;
106+ system-fileio = ω2;
107+ template-haskell = Null;
108+ terminfo = Null;
109+ text = Null;
110+ time = Null;
111+ transformers = Null;
112+ unicode-transforms = α3;
113+ unix = Null;
114+ unordered-containers = β3;
115+ wl-pprint-extras = γ3;
116+ xhtml = Null;
117+}
test/golden/importless/configuration-ghc-head.txt+1−1
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1
22λ1 μ1 ν1 ξ1 ο1 π1 ρ1.
33( α.llvmPackages_6 = β,
4− γ.appendPatch = δ -> Path -> ε,
4+ γ.appendPatch = δ -> String -> ε,
55 γ.doJailbreak = ζ -> η,
66 γ.dontCheck = θ -> ι,
77 κ.Diff = θ,
test/golden/importless/console.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.asl20 = β,
3− α.brainrape = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.asl20 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = β;
13− maintainers = [γ];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/container-config.txt+9−9
@@ -2,20 +2,20 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.isContainer = ε,
5+ β.boot = ε,
66 γ.mkDefault = Bool -> ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { documentation = {nixos = {enable = ζ;};};
1010 environment = {variables = {NIX_REMOTE = String;};};
11− networking = {useHostResolvConf = η;};
12− nix = {optimise = {automatic = θ;};};
13− powerManagement = {enable = ι;};
11+ networking = {useHostResolvConf = θ;};
12+ nix = {optimise = {automatic = ι;};};
13+ powerManagement = {enable = κ;};
1414 security = {audit = {enable = Bool;};};
15− services = {openssh = {startWhenNeeded = κ;}; udisks2 = {enable = λ;};};
15+ services = {openssh = {startWhenNeeded = λ;}; udisks2 = {enable = μ;};};
1616 system = {build = {installBootLoader = String;};};
1717 } ->
18− μ,
19− ν.boot = β
18+ ν,
19+ ε.isContainer = η
2020) =>
21−α -> {config = μ;}
21+α -> {config = ν;}
test/golden/importless/containers.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/contrib.txt+16−17
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1.
2−( (β) // ({description = String; homepage = String;}) ~ (γ),
2+( β // {description = String; homepage = String;} ~ γ,
33 δ.lib = ε,
44 δ.mkDerivation =
55 { doInstallCheck = Bool;
@@ -21,11 +21,10 @@
2121 version = λ;
2222 } ->
2323 μ,
24− ν.maintainers = η,
25− ν.meta = β,
24+ ν.meta = ξ,
2625 ν.src = κ,
2726 ν.version = λ,
28− ξ.buildPythonApplication =
27+ ο.buildPythonApplication =
2928 { dontBuild = Bool;
3029 dontConfigure = Bool;
3130 format = String;
@@ -33,19 +32,19 @@
3332 lname = String;
3433 meta = ∀ α. α;
3534 pname = String;
36− propagatedBuildInputs = [ο];
37− src = π;
38− version = ρ;
35+ propagatedBuildInputs = [π];
36+ src = ρ;
37+ version = σ;
3938 } ->
40− σ,
41− ξ.i3ipc = ο,
39+ τ,
40+ ο.i3ipc = π,
4241 ε.evils = η,
43− ε.licenses = τ,
44− ε.maintainers = υ,
45− ε.platforms = φ,
46− τ.mit = ζ,
47− φ.all = θ,
48− χ.meta = ν
42+ ε.licenses = υ,
43+ ε.maintainers = φ,
44+ ε.platforms = χ,
45+ υ.mit = ζ,
46+ χ.all = θ,
47+ ξ.maintainers = η
4948) =>
5049{ coreutils = ψ;
5150 fetchurl = ω;
@@ -54,10 +53,10 @@
5453 jq = β1;
5554 libnotify = γ1;
5655 makeWrapper = ι;
57− python3Packages = ξ;
56+ python3Packages = ο;
5857 slurp = δ1;
5958 stdenv = δ;
6059 sway-unwrapped = ν;
6160 wl-clipboard = ε1;
6261} ->
63−{grimshot = μ; inactive-windows-transparency = σ;}
62+{grimshot = μ; inactive-windows-transparency = τ;}
test/golden/importless/control.txt+7−9
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ.
2−( β.majorMinor = String -> γ,
2+( β.lib = γ,
33 β.mkDerivation =
44 { buildInputs = [δ];
55 doBuild = Bool;
@@ -19,18 +19,16 @@
1919 version = ∀ α. α;
2020 } ->
2121 ι,
22− β.unfree = ε,
23− β.zimbatm = ζ,
2422 κ.withPackages = (λ -> [μ]) -> δ,
2523 λ.pycairo = μ,
2624 λ.pygobject2 = ν,
2725 λ.pygtk = ξ,
28− ο.versions = β,
29− π.lib = ο,
30− ρ.licenses = β,
31− σ.lib = ρ,
32− τ.maintainers = β,
33− υ.lib = τ
26+ γ.versions = ο,
27+ ο.majorMinor = String -> π,
28+ ρ.licenses = σ,
29+ σ.unfree = ε,
30+ τ.maintainers = υ,
31+ υ.zimbatm = ζ
3432) =>
3533{ autoPatchelfHook = φ;
3634 dpkg = η;
test/golden/importless/convert.txt+3−3
@@ -9,15 +9,15 @@
99 maintainers = [β];
1010 };
1111 passthru = {scriptName = String;};
12− patches = [Path];
12+ patches = [String];
1313 pname = String;
1414 postPatch = String;
1515 src = γ;
1616 version = String;
1717 } ->
1818 δ,
19− ε.Profpatsch = β,
20− ζ.maintainers = ε
19+ ε.maintainers = ζ,
20+ ζ.Profpatsch = β
2121) =>
2222{ fetchgit = {rev = String; sha256 = String; url = String;} -> γ;
2323 lib = ε;
test/golden/importless/couchpotato.txt+14−13
@@ -2,10 +2,11 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.couchpotato = ε,
6− γ.mkEnableOption = String -> ζ,
5+ β.ids = ε,
6+ β.services = ζ,
7+ γ.mkEnableOption = String -> η,
78 γ.mkIf =
8− η ->
9+ θ ->
910 { systemd =
1011 { services =
1112 { couchpotato =
@@ -24,19 +25,19 @@
2425 };
2526 };
2627 users =
27− { groups = {couchpotato = {gid = θ;};};
28+ { groups = {couchpotato = {gid = ι;};};
2829 users =
2930 { couchpotato =
30− {description = String; group = String; home = String; uid = ι;};
31+ {description = String; group = String; home = String; uid = κ;};
3132 };
3233 };
3334 } ->
34− κ,
35− ε.enable = η,
36− λ.services = β,
37− μ.gids = β,
38− ν.ids = μ,
39− ξ.uids = β,
40− ο.ids = ξ
35+ λ,
36+ ζ.couchpotato = μ,
37+ μ.enable = θ,
38+ ε.gids = ν,
39+ ν.couchpotato = ι,
40+ ξ.uids = ο,
41+ ο.couchpotato = κ
4142) =>
42−α -> {config = κ; options = {services = {couchpotato = {enable = ζ;};};};}
43+α -> {config = λ; options = {services = {couchpotato = {enable = η;};};};}
test/golden/importless/criu.txt+5−5
@@ -2,8 +2,8 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.criu = ε,
6− β.kernelConfig = ζ,
5+ β.lib = ε,
6+ β.programs = ζ,
77 γ.isYes = String -> η,
88 γ.mkIf =
99 θ ->
@@ -15,9 +15,9 @@
1515 γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
1616 γ.types = ν,
1717 δ.criu = ι,
18− ε.enable = θ,
19− ξ.programs = β,
20− ο.lib = β,
18+ ζ.criu = ξ,
19+ ξ.enable = θ,
20+ ε.kernelConfig = ο,
2121 ν.bool = λ
2222) =>
2323α -> {config = κ; options = {programs = {criu = {enable = μ;};};};}
test/golden/importless/cryptpad.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.cryptpad = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -31,8 +31,8 @@
3131 κ,
3232 γ.types = λ,
3333 δ.cryptpad = μ,
34− ε.enable = η,
35− ν.services = β,
34+ ε.cryptpad = ν,
35+ ν.enable = η,
3636 λ.path = ι,
3737 ξ.package = ο
3838) =>
test/golden/importless/cryptsetup.txtnew file+38
@@ -0,0 +1,38 @@
1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2+( β.lib = γ,
3+ β.mkDerivation =
4+ { buildInputs = [δ];
5+ configureFlags = [String];
6+ meta =
7+ { description = String;
8+ homepage = String;
9+ license = ε;
10+ maintainers = ∀ α. [α];
11+ platforms = ζ;
12+ };
13+ name = String;
14+ nativeBuildInputs = [η];
15+ patches = [θ];
16+ src = ι;
17+ } ->
18+ κ,
19+ γ.licenses = λ,
20+ λ.gpl2 = ε,
21+ μ.maintainers = ν,
22+ ξ.platforms = ο,
23+ ο.linux = ζ,
24+ π.optional = Bool -> String -> [String],
25+ ρ.optional = Bool -> Null -> [δ]
26+) =>
27+{ enablePython = Bool;
28+ fetchpatch = {sha256 = String; url = String;} -> θ;
29+ fetchurl = {sha256 = String; url = String;} -> ι;
30+ libgcrypt = δ;
31+ libuuid = δ;
32+ lvm2 = δ;
33+ pkgconfig = η;
34+ popt = δ;
35+ python = Null;
36+ stdenv = β;
37+} ->
38+κ
test/golden/importless/css-lite.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/cstore_fdw.txt+5−5
@@ -16,12 +16,12 @@
1616 version = String;
1717 } ->
1818 ι,
19− γ.platforms = ζ,
20− β.licenses = κ,
21− β.maintainers = λ,
19+ γ.meta = κ,
20+ β.licenses = λ,
21+ β.maintainers = μ,
2222 β.thoughtpolice = ε,
23− κ.asl20 = δ,
24− μ.meta = γ
23+ λ.asl20 = δ,
24+ κ.platforms = ζ
2525) =>
2626{ fetchFromGitHub =
2727 {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
test/golden/importless/cstruct.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.meta = β,
44 δ.minimumOCamlVersion = ε,
55 δ.src = ζ,
test/golden/importless/cube.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.agpl3 = β,
3− α.brainrape = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.agpl3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = β;
12− maintainers = [γ];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/curaengine.txt+1−1
@@ -11,7 +11,7 @@
1111 platforms = ζ;
1212 };
1313 nativeBuildInputs = [η];
14− patches = [Path];
14+ patches = [String];
1515 pname = String;
1616 src = θ;
1717 version = String;
test/golden/importless/curry-base.txt+3−3
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { Cabal = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { Cabal = ε;
33 base = ε;
44 containers = ε;
55 directory = ε;
@@ -9,9 +9,9 @@
99 { description = String;
1010 homepage = String;
1111 libraryHaskellDepends = [ε];
12− license = β;
12+ license = δ;
1313 pname = String;
14− src = Path;
14+ src = String;
1515 testHaskellDepends = [ε];
1616 version = String;
1717 } ->
test/golden/importless/curry-frontend.txt+3−3
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { Cabal = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { Cabal = ε;
33 base = ε;
44 bytestring = ε;
55 containers = ε;
@@ -16,9 +16,9 @@
1616 isExecutable = Bool;
1717 isLibrary = Bool;
1818 libraryHaskellDepends = [ε];
19− license = β;
19+ license = δ;
2020 pname = String;
21− src = Path;
21+ src = String;
2222 testHaskellDepends = [ε];
2323 version = String;
2424 } ->
test/golden/importless/cursive.txt+21−22
@@ -1,39 +1,38 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
22( α.isDarwin = β,
33 α.lib = γ,
4− α.optionals = β -> [δ] -> [ε],
5− ζ.buildRustPackage =
4+ δ.buildRustPackage =
65 { buildInputs = [ε];
76 cargoBuildFlags = [String];
87 cargoSha256 = String;
98 meta =
109 { description = String;
1110 homepage = String;
12− license = η;
13− maintainers = [θ];
14− platforms = ι;
11+ license = ζ;
12+ maintainers = [η];
13+ platforms = θ;
1514 };
1615 nativeBuildInputs = [ε];
17− patches = [Path];
16+ patches = [String];
1817 pname = String;
1918 preFixup = String;
20− src = κ;
19+ src = ι;
2120 version = String;
2221 } ->
23− λ,
24− ζ.licenses = μ,
25− ζ.maintainers = ν,
26− ζ.platforms = ξ,
27− ζ.sgo = θ,
28− ο.libxcb = ε,
29− π.lib = α,
30− μ.gpl3 = η,
31− ξ.unix = ι
22+ κ,
23+ δ.licenses = λ,
24+ δ.maintainers = μ,
25+ δ.platforms = ν,
26+ δ.sgo = η,
27+ ξ.libxcb = ε,
28+ ο.optionals = β -> [π] -> [ε],
29+ λ.gpl3 = ζ,
30+ ν.unix = θ
3231) =>
33−{ AppKit = δ;
34− Security = δ;
32+{ AppKit = π;
33+ Security = π;
3534 fetchFromGitHub =
36− {owner = String; repo = String; rev = String; sha256 = String;} -> κ;
35+ {owner = String; repo = String; rev = String; sha256 = String;} -> ι;
3736 gpgme = ε;
3837 lib = ρ;
3938 libgpgerror = ε;
@@ -41,8 +40,8 @@
4140 openssl = ε;
4241 pkgconfig = ε;
4342 python3 = ε;
44− rustPlatform = ζ;
43+ rustPlatform = δ;
4544 stdenv = α;
46− xorg = ο;
45+ xorg = ξ;
4746} ->
48−λ
47+κ
test/golden/importless/cutter.txt+5−5
@@ -14,13 +14,13 @@
1414 version = String;
1515 } ->
1616 ι,
17− θ.homepage = δ,
17+ θ.meta = κ,
1818 β.dtzWill = ζ,
19− β.licenses = κ,
20− β.maintainers = λ,
19+ β.licenses = λ,
20+ β.maintainers = μ,
2121 β.mic92 = ζ,
22− κ.gpl3 = ε,
23− μ.meta = θ
22+ λ.gpl3 = ε,
23+ κ.homepage = δ
2424) =>
2525{ fetchFromGitHub =
2626 {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
test/golden/importless/cwm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.cwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.cwm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.cwm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/dante.txt+4−4
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.dante = ε,
5+ β.services = ε,
66 γ.arobyn = ζ,
77 γ.maintainers = η,
88 γ.mkEnableOption = String -> θ,
@@ -36,9 +36,9 @@
3636 γ.mkOption = {description = String; type = λ;} -> μ,
3737 γ.types = ν,
3838 δ.writeText = String -> String -> ξ,
39− ε.config = String,
40− ε.enable = ι,
41− ο.services = β,
39+ ε.dante = ο,
40+ ο.config = String,
41+ ο.enable = ι,
4242 ν.lines = λ
4343) =>
4444α ->
test/golden/importless/das_watchdog.txt+8−8
@@ -2,11 +2,11 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
9− { environment = {systemPackages = [η];};
8+ η ->
9+ { environment = {systemPackages = [θ];};
1010 systemd =
1111 { services =
1212 { das_watchdog =
@@ -23,9 +23,9 @@
2323 };
2424 };
2525 } ->
26− θ,
27− δ.das_watchdog = η,
28− ι.das_watchdog = β,
29− κ.services = ι
26+ ι,
27+ δ.das_watchdog = θ,
28+ ε.das_watchdog = κ,
29+ κ.enable = η
3030) =>
31−α -> {config = θ; options = {services = {das_watchdog = {enable = ζ;};};};}
31+α -> {config = ι; options = {services = {das_watchdog = {enable = ζ;};};};}
test/golden/importless/data-api.txt+6−6
@@ -4,21 +4,21 @@
44 α.maintainers = ζ,
55 α.nixType = δ -> String,
66 α.offline = η,
7− α.substring = Integer -> Integer -> String -> θ,
7+ α.strings = θ,
88 ι.buildNodePackage =
99 { deps = ε;
1010 meta = {description = String; homepage = String; maintainers = [η];};
1111 name = String;
1212 rev = String;
1313 src = κ;
14− version = θ;
14+ version = λ;
1515 } ->
16− λ,
17− ι.override = {generated = Path; self = β;} -> β,
18− μ.strings = α
16+ μ,
17+ ι.override = {generated = String; self = β;} -> β,
18+ θ.substring = Number -> Number -> String -> λ
1919) =>
2020{ fetchgit = {rev = String; sha256 = String; url = String;} -> κ;
2121 lib = α;
2222 nodePackages = ι;
2323} ->
24−λ
24+μ
test/golden/importless/data.txt+1−1
@@ -5,7 +5,7 @@
55 meta =
66 { description = String;
77 homepage = String;
8− hydraPlatforms = ∀ α. α;
8+ hydraPlatforms = ∀ α. [α];
99 license = δ;
1010 platforms = ε;
1111 };
test/golden/importless/db3.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/dconf2nix.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.asl20 = β, γ.licenses = α, δ.lib = γ) => { base = ε;
2+(α.lib = β, β.licenses = γ, γ.asl20 = δ) => { base = ε;
33 containers = ε;
44 fetchgit =
55 {fetchSubmodules = Bool; rev = String; sha256 = String; url = String;} -> ζ;
@@ -9,7 +9,7 @@
99 isExecutable = Bool;
1010 isLibrary = Bool;
1111 libraryHaskellDepends = [ε];
12− license = β;
12+ license = δ;
1313 pname = String;
1414 src = ζ;
1515 version = String;
test/golden/importless/debian-build.txtnew file+29
@@ -0,0 +1,29 @@
1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο.
2+( β //
3+ { installExtraDebsPhase = String;
4+ installPhase = String;
5+ meta = ∀ α. α;
6+ name = String;
7+ postHook = String;
8+ sysInfoPhase = String;
9+ } ~
10+ γ,
11+ {doCheck = Bool; prePhases = String; prefix = String;} // γ ~ δ,
12+ ε.?debProvides = [ζ],
13+ ε.?debRequires = [η],
14+ ε.?fsTranslation = Bool,
15+ ε.meta = {},
16+ ε.?name = String,
17+ θ.version = String,
18+ ε.checkinstall = ι,
19+ ε.diskImage = κ,
20+ ε.src = θ,
21+ ε.stdenv = λ,
22+ ε.vmTools = μ,
23+ κ.name = String,
24+ λ.lib = ν,
25+ λ.mkDerivation = δ -> ξ,
26+ μ.runInLinuxImage = ξ -> ο,
27+ ν.removeAttrs = ε -> [String] -> β
28+) =>
29+ε -> ο
test/golden/importless/debug-info.txt+8−8
@@ -1,18 +1,18 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.config = β,
33 α.lib = γ,
4− β.enableDebugInfo = δ,
4+ β.environment = δ,
55 γ.mkIf =
6− δ ->
6+ ε ->
77 { environment =
88 { extraOutputsToInstall = [String];
99 variables = {NIX_DEBUG_INFO_DIRS = [String];};
1010 };
1111 } ->
12− ε,
13− γ.mkOption = {default = Bool; description = String; type = ζ;} -> η,
14− γ.types = θ,
15− ι.environment = β,
16− θ.bool = ζ
12+ ζ,
13+ γ.mkOption = {default = Bool; description = String; type = η;} -> θ,
14+ γ.types = ι,
15+ δ.enableDebugInfo = ε,
16+ ι.bool = η
1717) =>
18−α -> {config = ε; options = {environment = {enableDebugInfo = η;};};}
18+α -> {config = ζ; options = {environment = {enableDebugInfo = θ;};};}
test/golden/importless/declare-attrsOf.txt+5−6
@@ -1,9 +1,8 @@
11∀ α β γ δ ε ζ η.
22( α.lib = β,
3− β.attrsOf = γ -> δ,
4− β.mkOption = {default = {}; type = δ;} -> ε,
5− β.str = γ,
6− ζ.types = β,
7− η.types = β
3+ β.mkOption = {default = {}; type = γ;} -> δ,
4+ β.types = ε,
5+ ε.attrsOf = ζ -> γ,
6+ η.str = ζ
87) =>
9−α -> {options = {value = ε;};}
8+α -> {options = {value = δ;};}
test/golden/importless/declare-coerced-value-unsound.txt+8−10
@@ -1,13 +1,11 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
22( α.lib = β,
3− β.coercedTo = γ -> δ -> ε -> ζ,
4− β.mkOption = {default = String; type = ζ;} -> η,
5− β.s8 = ε,
6− β.str = γ,
7− β.toInt = δ,
8− θ.types = β,
9− ι.types = β,
10− κ.ints = β,
11− λ.types = κ
3+ β.mkOption = {default = String; type = γ;} -> δ,
4+ β.toInt = ε,
5+ β.types = ζ,
6+ ζ.coercedTo = η -> ε -> θ -> γ,
7+ ι.str = η,
8+ κ.ints = λ,
9+ λ.s8 = θ
1210) =>
13−α -> {options = {value = η;};}
11+α -> {options = {value = δ;};}
test/golden/importless/declare-either.txt+6−8
@@ -1,11 +1,9 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.lib = β,
3− β.either = γ -> δ -> ε,
4− β.int = γ,
5− β.mkOption = {type = ε;} -> ζ,
6− β.str = δ,
7− η.types = β,
8− θ.types = β,
9− ι.types = β
3+ β.mkOption = {type = γ;} -> δ,
4+ β.types = ε,
5+ ε.either = ζ -> η -> γ,
6+ θ.int = ζ,
7+ ι.str = η
108) =>
11−α -> {options = {value = ζ;};}
9+α -> {options = {value = δ;};}
test/golden/importless/declare-enable-nested.txt+2−2
@@ -1,8 +1,8 @@
11∀ α β γ δ ε.
22( α.lib = β,
3− β.bool = γ,
43 β.mkOption =
54 {default = Bool; description = String; example = Bool; type = γ;} -> δ,
6− ε.types = β
5+ β.types = ε,
6+ ε.bool = γ
77) =>
88α -> {options = {set = {enable = δ;};};}
test/golden/importless/declare-enable.txt+2−2
@@ -1,8 +1,8 @@
11∀ α β γ δ ε.
22( α.lib = β,
3− β.bool = γ,
43 β.mkOption =
54 {default = Bool; description = String; example = Bool; type = γ;} -> δ,
6− ε.types = β
5+ β.types = ε,
6+ ε.bool = γ
77) =>
88α -> {options = {enable = δ;};}
test/golden/importless/declare-int-between-value.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ.
22( α.lib = β,
3− β.between = Integer -> Integer -> γ,
43 β.mkOption = {type = γ;} -> δ,
5− ε.ints = β,
6− ζ.types = ε
4+ β.types = ε,
5+ ε.ints = ζ,
6+ ζ.between = Number -> Number -> γ
77) =>
88α -> {options = {value = δ;};}
test/golden/importless/declare-int-positive-value-nested.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ.
22( α.lib = β,
33 β.mkOption = {type = γ;} -> δ,
4− β.positive = γ,
5− ε.ints = β,
6− ζ.types = ε
4+ β.types = ε,
5+ ε.ints = ζ,
6+ ζ.positive = γ
77) =>
88α -> {options = {set = {value = δ;};};}
test/golden/importless/declare-int-positive-value.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ.
22( α.lib = β,
33 β.mkOption = {type = γ;} -> δ,
4− β.positive = γ,
5− ε.ints = β,
6− ζ.types = ε
4+ β.types = ε,
5+ ε.ints = ζ,
6+ ζ.positive = γ
77) =>
88α -> {options = {value = δ;};}
test/golden/importless/declare-int-unsigned-value.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ.
22( α.lib = β,
33 β.mkOption = {type = γ;} -> δ,
4− β.unsigned = γ,
5− ε.ints = β,
6− ζ.types = ε
4+ β.types = ε,
5+ ε.ints = ζ,
6+ ζ.unsigned = γ
77) =>
88α -> {options = {value = δ;};}
test/golden/importless/declare-lazyAttrsOf.txt+4−5
@@ -1,10 +1,9 @@
11∀ α β γ δ ε ζ η θ.
2−( (α) // ({emptyValue = {value = String;};}) ~ (β),
2+( α // {emptyValue = {value = String;};} ~ β,
33 γ.lib = δ,
4− δ.lazyAttrsOf = β -> ε,
54 δ.mkOption = {default = {}; type = ε;} -> ζ,
6− δ.str = α,
7− η.types = δ,
8− θ.types = δ
5+ δ.types = η,
6+ η.lazyAttrsOf = β -> ε,
7+ θ.str = α
98) =>
109γ -> {options = {value = ζ;};}
test/golden/importless/declare-oneOf.txt+8−11
@@ -1,14 +1,11 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
22( α.lib = β,
3− β.int = γ,
4− β.listOf = δ -> γ,
5− β.mkOption = {type = ε;} -> ζ,
6− β.oneOf = [γ] -> ε,
7− β.str = γ,
8− η.types = β,
9− θ.types = β,
10− ι.types = β,
11− κ.types = β,
12− λ.types = β
3+ β.mkOption = {type = γ;} -> δ,
4+ β.types = ε,
5+ ε.oneOf = [ζ] -> γ,
6+ η.int = ζ,
7+ θ.listOf = ι -> ζ,
8+ κ.int = ι,
9+ λ.str = ζ
1310) =>
14−α -> {options = {value = ζ;};}
11+α -> {options = {value = δ;};}
test/golden/importless/declare-submoduleWith-path.txt+3−3
@@ -1,7 +1,7 @@
11∀ α β γ δ ε.
22( α.lib = β,
33 β.mkOption = {default = {}; type = γ;} -> δ,
4− β.submoduleWith = {modules = [Path];} -> γ,
5− ε.types = β
4+ β.types = ε,
5+ ε.submoduleWith = {modules = [String];} -> γ
66) =>
7−α -> {config = {submodule = Path;}; options = {submodule = δ;};}
7+α -> {config = {submodule = String;}; options = {submodule = δ;};}
test/golden/importless/declare-submoduleWith-special.txt+4−4
@@ -1,8 +1,9 @@
11∀ ζ η θ ι κ λ.
2−( (ζ) // ({foo = String;}) ~ (η),
2+( ζ // {foo = String;} ~ η,
33 θ.lib = ζ,
44 ζ.mkOption = {default = {}; type = ι;} -> κ,
5− ζ.submoduleWith =
5+ ζ.types = λ,
6+ λ.submoduleWith =
67 { modules =
78 ∀ β γ δ ε.
89 (β.lib = γ, γ.foo = δ, γ.mkOption = {default = δ;} -> ε) => [ ( β ->
@@ -11,7 +12,6 @@
1112 ];
1213 specialArgs = {lib = ∀ α. α;};
1314 } ->
14− ι,
15− λ.types = ζ
15+ ι
1616) =>
1717θ -> {options = {submodule = κ;};}
test/golden/importless/default-crate-overrides.txt+7−8
@@ -19,15 +19,14 @@
1919 β.stdenv = μ,
2020 β.zlib = δ,
2121 μ.isDarwin = ν,
22− μ.optional = ξ -> κ -> ο,
23− μ.optionals = ν -> [κ] -> [δ],
24− ε.frameworks = π,
22+ μ.lib = ξ,
23+ ε.apple_sdk = ο,
24+ ο.frameworks = π,
2525 π.Security = κ,
26− ρ.apple_sdk = ε,
26+ ρ.frameworks = σ,
2727 σ.CoreFoundation = κ,
28− τ.apple_sdk = ε,
29− υ.lib = μ,
30− φ.lib = μ
28+ ξ.optionals = ν -> [κ] -> [δ],
29+ τ.optional = υ -> κ -> φ
3130) =>
3231β ->
3332{ cairo-rs = ∀ α. α -> {buildInputs = [γ];};
@@ -59,7 +58,7 @@
5958 ∀ α.
6059 α -> {buildInputs = [ι]; crateBin = [{name = String; path = String;}];};
6160 security-framework-sys = ∀ α. α -> {propagatedBuildInputs = [κ];};
62− serde_derive = ∀ α. α -> {buildInputs = ο;};
61+ serde_derive = ∀ α. α -> {buildInputs = φ;};
6362 thrussh-libsodium = ∀ α. α -> {buildInputs = [δ];};
6463 xcb = ∀ α. α -> {buildInputs = [λ];};
6564}
test/golden/importless/define-option-dependently-nested.txt+9−6
@@ -1,7 +1,10 @@
1−∀ β γ δ ε.
2−( ({value = Integer;}) // (β) ~ (γ),
3− δ.lib = ε,
4− δ.options = Bool,
5− ε.optionalAttrs = Bool -> {enable = Bool;} -> β
1+∀ β γ δ ε ζ η θ ι κ.
2+( {value = Number;} // β ~ γ,
3+ δ.?set = ε,
4+ ε.?enable = ζ,
5+ η.?enable = θ,
6+ ι.lib = κ,
7+ ι.options = δ,
8+ κ.optionalAttrs = Bool -> {enable = Bool;} -> β
69) =>
7−δ -> {config = {set = ∀ α. α;};}
10+ι -> {config = {set = ∀ α. α;};}
test/golden/importless/define-option-dependently.txt+7−6
@@ -1,7 +1,8 @@
1−∀ β γ δ ε.
2−( ({value = Integer;}) // (β) ~ (γ),
3− δ.lib = ε,
4− δ.options = Bool,
5− ε.optionalAttrs = Bool -> {enable = Bool;} -> β
1+∀ β γ δ ε ζ η.
2+( {value = Number;} // β ~ γ,
3+ δ.?enable = ε,
4+ ζ.lib = η,
5+ ζ.options = δ,
6+ η.optionalAttrs = Bool -> {enable = Bool;} -> β
67) =>
7−δ -> {config = ∀ α. α;}
8+ζ -> {config = ∀ α. α;}
test/golden/importless/define-value-int-negative.txt+1−1
@@ -1 +1 @@
1−{value = Integer;}
1+{value = Number;}
test/golden/importless/define-value-int-positive.txt+1−1
@@ -1 +1 @@
1−{value = Integer;}
1+{value = Number;}
test/golden/importless/define-value-int-zero.txt+1−1
@@ -1 +1 @@
1−{value = Integer;}
1+{value = Number;}
test/golden/importless/define-value-list.txt+1−1
@@ -1 +1 @@
1−{value = ∀ α. α;}
1+{value = ∀ α. [α];}
test/golden/importless/dep-overrides.txtnew file+21
@@ -0,0 +1,21 @@
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2+( α.doJailbreak = β -> γ,
3+ α.dontCheck = δ -> β,
4+ α.dontHaddock = ε -> β,
5+ ζ.happy_1_19_5 = η,
6+ θ.ghc-api-ghcjs = ι,
7+ θ.ghcjs = κ,
8+ θ.haddock-api-ghcjs = ε,
9+ θ.haddock-library-ghcjs = δ,
10+ θ.shelly_1_8_1 = λ,
11+ ι.override = {happy = η;} -> μ,
12+ κ.override = {shelly = λ;} -> ν
13+) =>
14+{haskellLib = α;} ->
15+ζ ->
16+θ ->
17+{ ghc-api-ghcjs = μ;
18+ ghcjs = ν;
19+ haddock-api-ghcjs = γ;
20+ haddock-library-ghcjs = γ;
21+}
test/golden/importless/derive.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/descncrunch.txt+6−6
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.gpl3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
@@ -10,8 +10,8 @@
1010 { broken = Bool;
1111 description = String;
1212 homepage = String;
13− license = γ;
14− maintainers = [β];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
1717 src = η;
test/golden/importless/devmon.txt+3−3
@@ -6,7 +6,7 @@
66 δ.udevil = ε,
77 δ.udisks2 = ε,
88 δ.which = ε,
9− β.devmon = ζ,
9+ β.services = ζ,
1010 γ.mkEnableOption = String -> η,
1111 γ.mkIf =
1212 θ ->
@@ -25,7 +25,7 @@
2525 };
2626 } ->
2727 ι,
28− ζ.enable = θ,
29− κ.services = β
28+ ζ.devmon = κ,
29+ κ.enable = θ
3030) =>
3131α -> {config = ι; options = {services = {devmon = {enable = η;};};};}
test/golden/importless/dfu-util.txt+1−1
@@ -7,7 +7,7 @@
77 homepage = String;
88 license = ε;
99 longDescription = String;
10− maintainers = ∀ α. α;
10+ maintainers = ∀ α. [α];
1111 platforms = ζ;
1212 };
1313 nativeBuildInputs = [η];
test/golden/importless/dhall-packages.txt+1−1
@@ -13,4 +13,4 @@
1313 η,
1414 α.fix' = η -> θ
1515) =>
16−{lib = α; newScope = δ -> Path -> {} -> ζ; overrides = β -> γ -> {};} -> θ
16+{lib = α; newScope = δ -> String -> {} -> ζ; overrides = β -> γ -> {};} -> θ
test/golden/importless/dict.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 postUnpack = String;
test/golden/importless/dictd-db.txt+16−16
@@ -1,30 +1,30 @@
11∀ α β γ δ ε ζ η.
2−( α.linux = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildPhase = String;
55 dbName = String;
66 installPhase = String;
77 locale = String;
8− meta = {description = String; platforms = β;};
8+ meta = {description = String; platforms = γ;};
99 name = String;
10− src = γ;
10+ src = δ;
1111 unpackPhase = String;
1212 } ->
13− δ,
14− ε.platforms = α,
15− ζ.lib = ε
13+ ε,
14+ β.platforms = ζ,
15+ ζ.linux = γ
1616) =>
17−{ callPackage = Path -> {} -> η;
18− fetchurl = {sha256 = String; url = String;} -> γ;
17+{ callPackage = String -> {} -> η;
18+ fetchurl = {sha256 = String; url = String;} -> δ;
1919 stdenv = α;
2020} ->
21−{ deu2eng = δ;
22− eng2deu = δ;
23− eng2fra = δ;
24− eng2nld = δ;
25− eng2rus = δ;
26− fra2eng = δ;
27− mueller_eng2rus_pkg = δ;
21+{ deu2eng = ε;
22+ eng2deu = ε;
23+ eng2fra = ε;
24+ eng2nld = ε;
25+ eng2rus = ε;
26+ fra2eng = ε;
27+ mueller_eng2rus_pkg = ε;
2828 mueller_enru_abbr =
2929 {dbName = String; locale = String; name = String; outPath = String;};
3030 mueller_enru_base =
@@ -35,7 +35,7 @@
3535 {dbName = String; locale = String; name = String; outPath = String;};
3636 mueller_enru_names =
3737 {dbName = String; locale = String; name = String; outPath = String;};
38− nld2eng = δ;
38+ nld2eng = ε;
3939 wiktionary = η;
4040 wordnet = η;
4141}
test/golden/importless/dictd-wiktionary.txt+8−8
@@ -1,22 +1,22 @@
11∀ β γ δ ε ζ η θ ι.
2−( β.all = γ,
2+( β.lib = γ,
33 β.mkDerivation =
44 { buildInputs = [δ];
55 builder = ε;
6− convert = Path;
6+ convert = String;
77 data = ζ;
88 meta =
99 { description = String;
1010 homepage = String;
11− maintainers = ∀ α. α;
12− platforms = γ;
11+ maintainers = ∀ α. [α];
12+ platforms = η;
1313 };
1414 pname = String;
1515 version = String;
1616 } ->
17− η,
18− θ.platforms = β,
19− ι.lib = θ
17+ θ,
18+ γ.platforms = ι,
19+ ι.all = η
2020) =>
2121{ dict = δ;
2222 fetchurl = {sha256 = String; url = String;} -> ζ;
@@ -25,4 +25,4 @@
2525 stdenv = β;
2626 writeScript = String -> String -> ε;
2727} ->
28−η
28+θ
test/golden/importless/dictd-wordnet.txt+8−8
@@ -1,21 +1,21 @@
11∀ β γ δ ε ζ η θ.
2−( β.all = γ,
2+( β.lib = γ,
33 β.mkDerivation =
44 { buildInputs = [δ];
55 builder = ε;
6− convert = Path;
6+ convert = String;
77 meta =
88 { description = String;
99 homepage = String;
1010 longDescription = String;
11− maintainers = ∀ α. α;
12− platforms = γ;
11+ maintainers = ∀ α. [α];
12+ platforms = ζ;
1313 };
1414 pname = String;
1515 version = String;
1616 } ->
17− ζ,
18− η.platforms = β,
19− θ.lib = η
17+ η,
18+ γ.platforms = θ,
19+ θ.all = ζ
2020) =>
21−{python = δ; stdenv = β; wordnet = δ; writeScript = String -> String -> ε;} -> ζ
21+{python = δ; stdenv = β; wordnet = δ; writeScript = String -> String -> ε;} -> η
test/golden/importless/digimend.txt+12−11
@@ -2,21 +2,22 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.digimend = ε,
6− γ.mkEnableOption = String -> ζ,
5+ β.boot = ε,
6+ β.services = ζ,
7+ γ.mkEnableOption = String -> η,
78 γ.mkIf =
8− η ->
9− { boot = {extraModulePackages = [ε];};
9+ θ ->
10+ { boot = {extraModulePackages = [ι];};
1011 environment =
1112 {etc = {X11/xorg.conf.d/50-digimend.conf = {source = String;};};};
1213 services = {xserver = {wacom = {enable = Bool;};};};
1314 } ->
14− θ,
15− ι.kernelPackages = β,
16− κ.boot = ι,
17− λ.enable = η,
18− μ.xserver = β,
19− ν.services = μ
15+ κ,
16+ ε.kernelPackages = λ,
17+ λ.digimend = ι,
18+ ζ.xserver = μ,
19+ μ.digimend = ν,
20+ ν.enable = θ
2021) =>
2122α ->
22−{config = θ; options = {services = {xserver = {digimend = {enable = ζ;};};};};}
23+{config = κ; options = {services = {xserver = {digimend = {enable = η;};};};};}
test/golden/importless/disable-bar.txt+1−1
@@ -1 +1 @@
1−{disabledModules = [Path];}
1+{disabledModules = [String];}
test/golden/importless/disable-declare-enable.txt+1−1
@@ -1 +1 @@
1−∀ α β. (α.lib = β) => α -> {disabledModules = [Path];}
1+∀ α β. (α.lib = β) => α -> {disabledModules = [String];}
test/golden/importless/disable-define-enable.txt+1−1
@@ -1 +1 @@
1−∀ α β. (α.lib = β) => α -> {disabledModules = [Path];}
1+∀ α β. (α.lib = β) => α -> {disabledModules = [String];}
test/golden/importless/disable-foo.txt+1−1
@@ -1 +1 @@
1−{disabledModules = [Path];}
1+{disabledModules = [String];}
test/golden/importless/dispatch.txt+1−1
@@ -15,7 +15,7 @@
1515 maintainers = [ε];
1616 };
1717 nativeBuildInputs = δ;
18− patches = [Path];
18+ patches = [String];
1919 pname = String;
2020 preBuild = String;
2121 propagatedBuildInputs = [γ];
test/golden/importless/displaylink.txt+15−15
@@ -2,17 +2,17 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.evdi = ε,
6− β.videoDrivers = ζ,
7− γ.elem = String -> ζ -> η,
5+ β.boot = ε,
6+ β.services = ζ,
7+ γ.elem = String -> η -> θ,
88 γ.mkIf =
9− η ->
10− { boot = {extraModulePackages = [ε]; kernelModules = [String];};
9+ θ ->
10+ { boot = {extraModulePackages = [ι]; kernelModules = [String];};
1111 environment =
1212 {etc = {X11/xorg.conf.d/40-displaylink.conf = {text = String;};};};
1313 powerManagement = {powerDownCommands = String; resumeCommands = String;};
1414 services =
15− { udev = {packages = [θ];};
15+ { udev = {packages = [κ];};
1616 xserver = {displayManager = {sessionCommands = String;};};
1717 };
1818 systemd =
@@ -25,18 +25,18 @@
2525 { ExecStart = String;
2626 LogsDirectory = String;
2727 Restart = String;
28− RestartSec = Integer;
28+ RestartSec = Number;
2929 };
3030 };
3131 };
3232 };
3333 } ->
34− ι,
35− δ.override = {evdi = ε;} -> θ,
36− κ.kernelPackages = β,
37− λ.boot = κ,
38− μ.xserver = β,
39− ν.services = μ,
40− ξ.displaylink = δ
34+ λ,
35+ δ.displaylink = μ,
36+ ε.kernelPackages = ν,
37+ ν.evdi = ι,
38+ ζ.xserver = ξ,
39+ ξ.videoDrivers = η,
40+ μ.override = {evdi = ι;} -> κ
4141) =>
42−α -> {config = ι;}
42+α -> {config = λ;}
test/golden/importless/dissect.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/dleyna-renderer.txt+12−12
@@ -2,18 +2,18 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkIf =
7− ε ->
8− { environment = {systemPackages = [ζ];};
9− services = {dbus = {packages = [η];};};
7+ ζ ->
8+ { environment = {systemPackages = [η];};
9+ services = {dbus = {packages = [θ];};};
1010 } ->
11− θ,
12− γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
13− γ.types = λ,
14− δ.dleyna-renderer = ζ,
15− μ.dleyna-renderer = β,
16− ν.services = μ,
17− λ.bool = ι
11+ ι,
12+ γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
13+ γ.types = μ,
14+ δ.dleyna-renderer = η,
15+ ε.dleyna-renderer = ν,
16+ ν.enable = ζ,
17+ μ.bool = κ
1818) =>
19−α -> {config = θ; options = {services = {dleyna-renderer = {enable = κ;};};};}
19+α -> {config = ι; options = {services = {dleyna-renderer = {enable = λ;};};};}
test/golden/importless/dleyna-server.txt+12−12
@@ -2,18 +2,18 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkIf =
7− ε ->
8− { environment = {systemPackages = [ζ];};
9− services = {dbus = {packages = [η];};};
7+ ζ ->
8+ { environment = {systemPackages = [η];};
9+ services = {dbus = {packages = [θ];};};
1010 } ->
11− θ,
12− γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
13− γ.types = λ,
14− δ.dleyna-server = ζ,
15− μ.dleyna-server = β,
16− ν.services = μ,
17− λ.bool = ι
11+ ι,
12+ γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
13+ γ.types = μ,
14+ δ.dleyna-server = η,
15+ ε.dleyna-server = ν,
16+ ν.enable = ζ,
17+ μ.bool = κ
1818) =>
19−α -> {config = θ; options = {services = {dleyna-server = {enable = κ;};};};}
19+α -> {config = ι; options = {services = {dleyna-server = {enable = λ;};};};}
test/golden/importless/dmraid.txt+9−10
@@ -1,22 +1,21 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( α.linux = β,
2+( α.lib = β,
33 α.mkDerivation =
44 { buildInputs = [γ];
55 meta =
66 { description = String;
77 longDescription = String;
88 maintainers = [δ];
9− platforms = β;
9+ platforms = ε;
1010 };
1111 name = String;
1212 preConfigure = String;
13− src = ε;
13+ src = ζ;
1414 } ->
15− ζ,
16− α.raskin = δ,
17− η.maintainers = α,
18− θ.lib = η,
19− ι.platforms = α,
20− κ.lib = ι
15+ η,
16+ β.maintainers = θ,
17+ θ.raskin = δ,
18+ ι.platforms = κ,
19+ κ.linux = ε
2120) =>
22−{fetchurl = {sha256 = String; url = String;} -> ε; lvm2 = γ; stdenv = α;} -> ζ
21+{fetchurl = {sha256 = String; url = String;} -> ζ; lvm2 = γ; stdenv = α;} -> η
test/golden/importless/do-agent.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.do-agent = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -18,7 +18,7 @@
1818 } ->
1919 ι,
2020 δ.do-agent = θ,
21− ε.enable = η,
22− κ.services = β
21+ ε.do-agent = κ,
22+ κ.enable = η
2323) =>
2424α -> {config = ι; options = {services = {do-agent = {enable = ζ;};};};}
test/golden/importless/dolphin-plugins.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−(α.gpl2 = β, α.ttuegel = γ, δ.licenses = α, ε.maintainers = α) => { dolphin = ζ;
2+(α.licenses = β, α.maintainers = γ, β.gpl2 = δ, γ.ttuegel = ε) => { dolphin = ζ;
33 extra-cmake-modules = η;
44 kdelibs4support = ζ;
55 kdoctools = η;
@@ -8,7 +8,7 @@
88 kxmlgui = ζ;
99 lib = α;
1010 mkDerivation =
11− { meta = {license = [β]; maintainers = [γ];};
11+ { meta = {license = [δ]; maintainers = [ε];};
1212 name = String;
1313 nativeBuildInputs = [η];
1414 outputs = [String];
test/golden/importless/dolphin.txt+3−3
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ η θ.
22( α.licenses = β,
3− α.ttuegel = γ,
3+ α.maintainers = γ,
44 β.fdl12 = δ,
55 β.gpl2 = δ,
6− ε.maintainers = α
6+ γ.ttuegel = ε
77) =>
88{ baloo = ζ;
99 baloo-widgets = ζ;
@@ -30,7 +30,7 @@
3030 lib = α;
3131 mkDerivation =
3232 { cmakeFlags = [String];
33− meta = {license = [δ]; maintainers = [γ];};
33+ meta = {license = [δ]; maintainers = [ε];};
3434 name = String;
3535 nativeBuildInputs = [η];
3636 outputs = [String];
test/golden/importless/dom.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.asl20 = β,
3− α.brainrape = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.asl20 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = β;
13− maintainers = [γ];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/dotty.txt+1−1
@@ -4,7 +4,7 @@
44 δ.meta = β
55) =>
66{ callPackage =
7− Path -> {fetchurl = ε; jre = ζ; makeWrapper = η; stdenv = α;} -> δ;
7+ String -> {fetchurl = ε; jre = ζ; makeWrapper = η; stdenv = α;} -> δ;
88 fetchurl = ε;
99 jre = ζ;
1010 makeWrapper = η;
test/golden/importless/dovecot-exporter.txt+1−1
@@ -11,7 +11,7 @@
1111 ζ.homepage = μ
1212) =>
1313{ buildGoPackage =
14− { goDeps = Path;
14+ { goDeps = String;
1515 goPackagePath = String;
1616 meta =
1717 {description = String; homepage = μ; license = κ; maintainers = [η];};
test/golden/importless/dragon.txt+6−6
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ η θ.
2−( α.jonathanreeve = β,
3− α.licenses = γ,
4− γ.fdl12 = δ,
5− γ.gpl2 = δ,
6− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.fdl12 = δ,
5+ β.gpl2 = δ,
6+ γ.jonathanreeve = ε
77) =>
88{ baloo = ζ;
99 baloo-widgets = ζ;
@@ -29,7 +29,7 @@
2929 kwindowsystem = ζ;
3030 lib = α;
3131 mkDerivation =
32− { meta = {description = String; license = [δ]; maintainers = [β];};
32+ { meta = {description = String; license = [δ]; maintainers = [ε];};
3333 name = String;
3434 nativeBuildInputs = [η];
3535 outputs = [String];
test/golden/importless/dsseries.txt+12−12
@@ -1,25 +1,25 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.config = ε,
44 δ.lib = ζ,
55 δ.pkgs = η,
6− ε.enable = Bool,
6+ ε.hardware = θ,
77 ζ.mkEnableOption = String -> β,
88 ζ.mkIf =
99 Bool ->
1010 { boot = {kernelModules = [String];};
11− hardware = {sane = {extraBackends = [θ];};};
12− services = {udev = {packages = [ι];};};
11+ hardware = {sane = {extraBackends = [ι];};};
12+ services = {udev = {packages = [κ];};};
1313 } ->
14− κ,
15− η.dsseries = θ,
16− λ.sane = ε,
17− μ.hardware = λ,
18− ν.dsseries = ε,
19− ξ.sane = ν,
20− ο.hardware = ξ
14+ λ,
15+ η.dsseries = ι,
16+ θ.sane = μ,
17+ μ.enable = Bool,
18+ ν.sane = ξ,
19+ ξ.dsseries = ο,
20+ ο.enable = Bool
2121) =>
2222δ ->
23−{ config = κ;
23+{ config = λ;
2424 options = {hardware = {sane = {dsseries = {enable = ∀ α. α;};};};};
2525}
test/golden/importless/dust.txt+17−19
@@ -1,30 +1,28 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.darwin = [β],
3− α.lgpl3 = γ,
4− α.linux = [β],
2+( α.lib = β,
53 α.mkDerivation =
6− { buildInputs = [δ];
4+ { buildInputs = [γ];
75 configurePhase = String;
86 installPhase = String;
97 meta =
10− {description = String; homepage = ε; license = γ; platforms = [β];};
8+ {description = String; homepage = δ; license = ε; platforms = [ζ];};
119 name = String;
12− patches = [Path];
13− src = ζ;
10+ patches = [String];
11+ src = η;
1412 } ->
15− η,
16− ζ.homepage = ε,
17− θ.licenses = α,
18− ι.lib = θ,
19− κ.platforms = α,
20− λ.lib = κ,
21− μ.platforms = α,
22− ν.lib = μ,
23− ξ.meta = ζ
13+ θ,
14+ η.meta = ι,
15+ β.licenses = κ,
16+ κ.lgpl3 = ε,
17+ λ.platforms = μ,
18+ μ.linux = [ζ],
19+ ν.platforms = ξ,
20+ ξ.darwin = [ζ],
21+ ι.homepage = δ
2422) =>
2523{ fetchFromGitHub =
26− {owner = String; repo = String; rev = String; sha256 = String;} -> ζ;
27− pixie = δ;
24+ {owner = String; repo = String; rev = String; sha256 = String;} -> η;
25+ pixie = γ;
2826 stdenv = α;
2927} ->
30−η
28+θ
test/golden/importless/dvtm.txt+7−8
@@ -14,26 +14,25 @@
1414 };
1515 name = ι;
1616 nativeBuildInputs = [ε];
17− patches = κ;
17+ patches = [κ];
1818 postPatch = λ;
1919 prePatch = String;
2020 src = μ;
2121 } ->
2222 ν,
23− α.optionalString = β -> String -> δ,
24− ξ.lib = α,
25− γ.licenses = ο,
26− γ.maintainers = π,
27− γ.platforms = ρ,
23+ γ.optionalString = β -> String -> δ,
24+ ξ.licenses = ο,
25+ ξ.maintainers = π,
26+ ξ.platforms = ρ,
2827 ο.mit = ζ,
2928 π.vrthra = η,
3029 ρ.unix = θ,
31− σ.lib = α
30+ σ.optionalString = Bool -> String -> λ
3231) =>
3332{ customConfig = Null;
3433 name = ι;
3534 ncurses = ε;
36− patches = κ;
35+ patches = [κ];
3736 src = μ;
3837 stdenv = α;
3938} ->
test/golden/importless/dwm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.dwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.dwm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.dwm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/eagle.txt+3−4
@@ -1,9 +1,8 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ.
22( α.lib = β,
3− α.makeLibraryPath = [γ] -> δ,
4− ε.lib = α,
5− β.licenses = ζ,
6− β.maintainers = η,
3+ β.makeLibraryPath = [γ] -> δ,
4+ ε.licenses = ζ,
5+ ε.maintainers = η,
76 ζ.unfree = θ,
87 η.rittelle = ι
98) =>
test/golden/importless/easyfocus.txt+9−9
@@ -16,19 +16,19 @@
1616 version = String;
1717 } ->
1818 ι,
19− κ.dev = γ,
20− λ.dev = γ,
21− β.licenses = μ,
22− β.maintainers = ν,
23− β.platforms = ξ,
19+ κ.libX11 = λ,
20+ μ.dev = γ,
21+ β.licenses = ν,
22+ β.maintainers = ξ,
23+ β.platforms = ο,
2424 β.teto = ε,
25− μ.gpl3 = δ,
26− ξ.linux = ζ,
27− ο.libX11 = κ
25+ ν.gpl3 = δ,
26+ ο.linux = ζ,
27+ λ.dev = γ
2828) =>
2929{ fetchFromGitHub =
3030 {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
31− glib = λ;
31+ glib = μ;
3232 i3ipc-glib = γ;
3333 libxcb = γ;
3434 pkgconfig = η;
test/golden/importless/ecryptfs.txt+8−8
@@ -2,20 +2,20 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.supportedFilesystems = ε,
6− γ.any = (String -> Bool) -> ε -> ζ,
5+ β.boot = ε,
6+ γ.any = (String -> Bool) -> ζ -> η,
77 γ.mkIf =
8− ζ ->
8+ η ->
99 { security =
1010 { wrappers =
1111 { mount.ecryptfs_private = {source = String;};
1212 umount.ecryptfs_private = {source = String;};
1313 };
1414 };
15− system = {fsPackages = [η];};
15+ system = {fsPackages = [θ];};
1616 } ->
17− θ,
18− δ.ecryptfs = η,
19− ι.boot = β
17+ ι,
18+ δ.ecryptfs = θ,
19+ ε.supportedFilesystems = ζ
2020) =>
21−α -> {config = θ;}
21+α -> {config = ι;}
test/golden/importless/edit.txt+5−6
@@ -8,16 +8,15 @@
88 {description = String; homepage = String; license = δ; platforms = ε;};
99 name = String;
1010 nativeBuildInputs = [ζ];
11− patches = [Path];
11+ patches = [String];
1212 postPatch = String;
1313 src = η;
1414 } ->
1515 θ,
16− α.optionalString = Bool -> String -> String,
17− γ.api_version = Integer,
18− ι.lib = α,
19− β.licenses = κ,
20− β.platforms = λ,
16+ γ.api_version = Number,
17+ β.optionalString = Bool -> String -> String,
18+ ι.licenses = κ,
19+ ι.platforms = λ,
2120 κ.gpl3Plus = δ,
2221 λ.linux = ε
2322) =>
test/golden/importless/editor.txt+5−6
@@ -1,11 +1,10 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο.
22( α.lib = β,
3− α.toLower = String -> γ,
4− δ.lib = α,
5− β.licenses = ε,
6− β.maintainers = ζ,
7− β.platforms = η,
8− β.tadeokondrak = θ,
3+ β.toLower = String -> γ,
4+ δ.licenses = ε,
5+ δ.maintainers = ζ,
6+ δ.platforms = η,
7+ δ.tadeokondrak = θ,
98 ε.mit = ι,
109 η.all = κ
1110) =>
test/golden/importless/editors.txt+26−31
@@ -1,24 +1,20 @@
11∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ.
2−( γ.edwtjo = δ,
3− γ.gpl2 = ε,
4− γ.gpl2Plus = ε,
5− γ.lib = ζ,
6− γ.linux = η,
2+( γ.lib = δ,
73 γ.mkDerivation =
8− { application = θ;
9− buildInputs = [ι];
4+ { application = ε;
5+ buildInputs = [ζ];
106 buildPhase = String;
117 description = ∀ β. β;
128 dontStrip = Bool;
13− editorItem = κ;
9+ editorItem = η;
1410 exec = String;
1511 installPhase = String;
1612 meta =
1713 { description = String;
1814 homepage = String;
19− license = ε;
20− maintainers = [δ];
21− platforms = η;
15+ license = θ;
16+ maintainers = [ι];
17+ platforms = κ;
2218 };
2319 module = ∀ β. β;
2420 patchPhase = String;
@@ -27,26 +23,25 @@
2723 version = ∀ β. β;
2824 } ->
2925 λ,
30− γ.replaceChars = [String] -> [String] -> String -> String,
31− ζ.removeSuffix = String -> μ -> String,
32− ζ.toLower = ν -> μ,
33− ξ.maintainers = γ,
34− ο.lib = ξ,
35− π.platforms = γ,
36− ρ.lib = π,
37− σ.lib = γ,
38− τ.licenses = γ,
39− υ.lib = τ,
40− φ.licenses = γ,
41− χ.lib = φ
26+ δ.removeSuffix = String -> μ -> String,
27+ δ.toLower = ν -> μ,
28+ ξ.maintainers = ο,
29+ ο.edwtjo = ι,
30+ π.platforms = ρ,
31+ ρ.linux = κ,
32+ σ.replaceChars = [String] -> [String] -> String -> String,
33+ τ.licenses = υ,
34+ υ.gpl2 = θ,
35+ φ.licenses = χ,
36+ χ.gpl2Plus = θ
4237) =>
43−{ ant = ι;
38+{ ant = ζ;
4439 fetchcvs =
4540 {cvsRoot = String; module = String; sha256 = String; tag = String;} -> ψ;
46− gsettings-desktop-schemas = ι;
47− gtk3 = ι;
48− jdk = ι;
49− jre = ι;
41+ gsettings-desktop-schemas = ζ;
42+ gtk3 = ζ;
43+ jdk = ζ;
44+ jre = ζ;
5045 makeDesktopItem =
5146 { categories = String;
5247 comment = ∀ α. α;
@@ -55,9 +50,9 @@
5550 genericName = String;
5651 name = ∀ α. α;
5752 } ->
58− κ;
59− makeWrapper = ι;
53+ η;
54+ makeWrapper = ζ;
6055 stdenv = γ;
61− sweethome3dApp = θ;
56+ sweethome3dApp = ε;
6257} ->
6358{furniture-editor = λ; textures-editor = λ;}
test/golden/importless/egg2nix.txt+13−15
@@ -1,25 +1,23 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.bsd3 = β,
3− α.maintainers = γ,
4− α.unix = δ,
5− ε.args = ζ,
6− ε.matchable = ζ,
7− η.licenses = α,
8− θ.lib = η,
9− γ.corngood = ι,
10− κ.lib = α,
11− λ.platforms = α,
12− μ.lib = λ
2+( α.lib = β,
3+ γ.args = δ,
4+ γ.matchable = δ,
5+ β.licenses = ε,
6+ ε.bsd3 = ζ,
7+ η.maintainers = θ,
8+ θ.corngood = ι,
9+ κ.platforms = λ,
10+ λ.unix = μ
1311) =>
14−{ chickenEggs = ε;
12+{ chickenEggs = γ;
1513 eggDerivation =
16− { buildInputs = [ζ];
14+ { buildInputs = [δ];
1715 meta =
1816 { description = String;
1917 homepage = String;
20− license = β;
18+ license = ζ;
2119 maintainers = [ι];
22− platforms = δ;
20+ platforms = μ;
2321 };
2422 name = String;
2523 src = ν;
test/golden/importless/eggs.txtnew file+14
@@ -0,0 +1,14 @@
1+∀ ζ η θ.
2+( ζ.eggDerivation = ∀ ε. {buildInputs = ∀ β. [β]; name = String; src = η;} -> ε,
3+ ζ.fetchegg = {name = String; sha256 = String; version = String;} -> η
4+) =>
5+{pkgs = ζ; stdenv = θ;} ->
6+{ args = δ;
7+ eggDerivation = ∀ γ. {buildInputs = ∀ α. [α]; name = String; src = η;} -> γ;
8+ fetchegg = {name = String; sha256 = String; version = String;} -> η;
9+ matchable = δ;
10+ srfi-1 = δ;
11+ srfi-13 = δ;
12+ srfi-14 = δ;
13+ srfi-37 = δ;
14+}
test/golden/importless/electron.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.unlicense = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.unlicense = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/element-desktop.txt+5−5
@@ -4,8 +4,8 @@
44 γ.licenses = ζ,
55 γ.teams = η,
66 ζ.asl20 = θ,
7− η.members = ι,
8− κ.matrix = η,
7+ η.matrix = ι,
8+ ι.members = κ,
99 ε.platforms = λ
1010) =>
1111{ electron_9 = δ;
@@ -32,15 +32,15 @@
3232 { description = String;
3333 homepage = String;
3434 license = θ;
35− maintainers = ι;
35+ maintainers = κ;
3636 platforms = λ;
3737 };
3838 name = String;
3939 nativeBuildInputs = [ο];
40− packageJSON = Path;
40+ packageJSON = String;
4141 src = ∀ α. α;
4242 version = ∀ α. α;
43− yarnNix = Path;
43+ yarnNix = String;
4444 } ->
4545 π;
4646 stdenv = β;
test/golden/importless/elm-format.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { HUnit = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { HUnit = ε;
33 QuickCheck = ε;
44 ansi-terminal = ε;
55 ansi-wl-pprint = ε;
@@ -22,7 +22,7 @@
2222 isExecutable = Bool;
2323 isLibrary = Bool;
2424 libraryHaskellDepends = [ε];
25− license = β;
25+ license = δ;
2626 pname = String;
2727 postPatch = String;
2828 src = ζ;
test/golden/importless/elm-instrument.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { Cabal = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { Cabal = ε;
33 HUnit = ε;
44 QuickCheck = ε;
55 ansi-terminal = ε;
@@ -24,7 +24,7 @@
2424 isExecutable = Bool;
2525 isLibrary = Bool;
2626 libraryHaskellDepends = [ε];
27− license = β;
27+ license = δ;
2828 pname = String;
2929 setupHaskellDepends = [ε];
3030 src = ζ;
test/golden/importless/elm-json.txt+1−1
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.buildRustPackage =
33 { buildInputs = [β];
4− cargoPatches = [Path];
4+ cargoPatches = [String];
55 cargoSha256 = String;
66 doCheck = Bool;
77 meta =
test/golden/importless/elm.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { HTTP = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { HTTP = ε;
33 SHA = ε;
44 ansi-terminal = ε;
55 ansi-wl-pprint = ε;
@@ -26,7 +26,7 @@
2626 homepage = String;
2727 isExecutable = Bool;
2828 isLibrary = Bool;
29− license = β;
29+ license = δ;
3030 pname = String;
3131 src = ζ;
3232 version = String;
test/golden/importless/elmi-to-json.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { aeson = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { aeson = ε;
33 base = ε;
44 binary = ε;
55 bytestring = ε;
@@ -17,7 +17,7 @@
1717 isLibrary = Bool;
1818 libraryHaskellDepends = [ε];
1919 libraryToolDepends = [η];
20− license = β;
20+ license = δ;
2121 pname = String;
2222 prePatch = String;
2323 src = ζ;
test/golden/importless/emergency-mode.txt+6−6
@@ -1,14 +1,14 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.config = β,
33 α.lib = γ,
4− β.enableEmergencyMode = δ,
4+ β.systemd = δ,
55 γ.mkOption = {default = Bool; description = String; type = ε;} -> ζ,
6− γ.optionals = δ -> [String] -> η,
7− γ.types = θ,
8− ι.systemd = β,
9− θ.bool = ε
6+ γ.optionals = η -> [String] -> θ,
7+ γ.types = ι,
8+ δ.enableEmergencyMode = η,
9+ ι.bool = ε
1010) =>
1111α ->
12−{ config = {systemd = {additionalUpstreamSystemUnits = η;};};
12+{ config = {systemd = {additionalUpstreamSystemUnits = θ;};};
1313 options = {systemd = {enableEmergencyMode = ζ;};};
1414}
test/golden/importless/emscripten-packages.txtnew file+49
@@ -0,0 +1,49 @@
1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1.
2+( γ.autoconf = δ,
3+ γ.automake = δ,
4+ γ.autoreconfHook = ε,
5+ γ.buildEmscriptenPackage =
6+ { buildInputs = [ζ];
7+ buildPhase = String;
8+ checkPhase = String;
9+ configurePhase = String;
10+ installPhase = String;
11+ nativeBuildInputs = [η];
12+ outputs = [String];
13+ pname = String;
14+ src = θ;
15+ version = String;
16+ } ->
17+ ι,
18+ γ.emscriptenStdenv = κ,
19+ γ.fetchgit = {rev = String; sha256 = String; url = String;} -> θ,
20+ γ.gnumake = ζ,
21+ γ.json_c = λ,
22+ γ.libtool = ζ,
23+ γ.libxml2 = μ,
24+ γ.nodejs = ζ,
25+ γ.openjdk = ζ,
26+ γ.pkgconfig = ν,
27+ γ.stdenv = ξ,
28+ γ.zlib = ο,
29+ π.overrideDerivation = ρ,
30+ σ.overrideDerivation = τ,
31+ υ.buildInputs = [ν],
32+ φ.overrideDerivation = χ,
33+ ψ.buildInputs = [ν],
34+ ω.buildInputs = [ν],
35+ α1.buildInputs = [β1],
36+ γ1.buildInputs = [δ],
37+ ο.override = {stdenv = κ;} -> π,
38+ ξ.lib = δ1,
39+ δ1.optionalString = ε1 -> String -> ζ1,
40+ η1.isDarwin = ε1,
41+ μ.override = {pythonSupport = Bool; stdenv = θ1;} -> σ,
42+ λ.override = {stdenv = ι1;} -> φ
43+) =>
44+{pkgs = γ;} ->
45+{ json_c = ∀ α β. (α.buildInputs = [δ]) => β;
46+ libxml2 = ∀ α β. (α.buildInputs = [β1]) => β;
47+ xmlmirror = ι;
48+ zlib = ∀ α β. (α.buildInputs = [ν]) => β;
49+}
test/golden/importless/emulate-app.txt+1−1
@@ -20,7 +20,7 @@
2020 app = Null;
2121 avdHomeDir = Null;
2222 enableGPU = Bool;
23− extraAVDFiles = θ;
23+ extraAVDFiles = [θ];
2424 name = β;
2525 package = Null;
2626 platformVersion = String;
test/golden/importless/emulator.txt+16−25
@@ -2,40 +2,31 @@
22( α.optional = Bool -> [β] -> [γ],
33 α.optionalString = Bool -> String -> δ,
44 ε.alsaLib = β,
5− ε.cc = β,
65 ε.expat = β,
76 ε.freetype = β,
87 ε.glibc = β,
98 ε.libGL = β,
10− ε.libX11 = β,
11− ε.libXcomposite = β,
12− ε.libXcursor = β,
13− ε.libXdamage = β,
14− ε.libXext = β,
15− ε.libXfixes = β,
16− ε.libXi = β,
17− ε.libXrender = β,
18− ε.libXtst = β,
199 ε.libcxx = β,
2010 ε.libpulseaudio = β,
21− ε.libxcb = β,
2211 ε.ncurses5 = β,
2312 ε.nspr = β,
2413 ε.nss = β,
14+ ε.stdenv = ζ,
15+ ε.xlibs = η,
2516 ε.zlib = β,
26− ζ.glibc = β,
27− η.xlibs = ε,
28− θ.xlibs = ε,
29− ι.xlibs = ε,
30− κ.xlibs = ε,
31− λ.xlibs = ε,
32− μ.xlibs = ε,
33− ν.xlibs = ε,
34− ξ.xlibs = ε,
35− ο.xlibs = ε,
36− π.xlibs = ε,
37− ρ.cc = ε,
38− σ.stdenv = ρ
17+ θ.glibc = β,
18+ η.libX11 = β,
19+ ι.libXext = β,
20+ κ.libXdamage = β,
21+ λ.libXfixes = β,
22+ μ.libxcb = β,
23+ ν.libXcomposite = β,
24+ ξ.libXcursor = β,
25+ ο.libXi = β,
26+ π.libXrender = β,
27+ ρ.libXtst = β,
28+ ζ.cc = σ,
29+ σ.cc = β
3930) =>
4031{ autoPatchelfHook = γ;
4132 deployAndroidPackage =
@@ -51,6 +42,6 @@
5142 os = String;
5243 package = τ;
5344 pkgs = ε;
54− pkgs_i686 = ζ;
45+ pkgs_i686 = θ;
5546} ->
5647υ
test/golden/importless/engine.txt+8−9
@@ -16,16 +16,15 @@
1616 version = String;
1717 } ->
1818 κ,
19− α.optional = β -> λ -> [δ],
20− γ.licenses = μ,
21− γ.maintainers = ν,
22− γ.platforms = ξ,
23− μ.gpl3 = ε,
24− ν.aanderse = ζ,
25− ξ.unix = η,
26− ο.lib = α
19+ γ.licenses = λ,
20+ γ.maintainers = μ,
21+ γ.platforms = ν,
22+ λ.gpl3 = ε,
23+ μ.aanderse = ζ,
24+ ν.unix = η,
25+ ξ.optional = β -> ο -> [δ]
2726) =>
28−{ Cocoa = λ;
27+{ Cocoa = ο;
2928 SDL2 = δ;
3029 SDL2_image = δ;
3130 SDL2_mixer = δ;
test/golden/importless/eos.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/epmd.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.epmd = ε,
5+ β.services = ε,
66 γ.mkIf =
77 ζ ->
88 { systemd =
@@ -29,8 +29,8 @@
2929 γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
3030 γ.types = κ,
3131 δ.erlang = λ,
32− ε.enable = ζ,
33− μ.services = β,
32+ ε.epmd = μ,
33+ μ.enable = ζ,
3434 κ.bool = θ,
3535 ν.package = ξ
3636) =>
test/golden/importless/espanso.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.espanso = ε,
5+ β.services = ε,
66 γ.espanso = ζ,
77 γ.libnotify = ζ,
88 γ.maintainers = η,
@@ -27,8 +27,8 @@
2727 γ.options = μ,
2828 γ.xclip = ζ,
2929 δ.espanso = ι,
30− ε.enable = θ,
31− ν.services = β,
30+ ε.espanso = ν,
31+ ν.enable = θ,
3232 μ.mkEnableOption = String -> ξ
3333) =>
3434α ->
test/golden/importless/esxi.txt+14−15
@@ -1,28 +1,27 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ.
22( α.lib = β,
3− α.replaceStrings = [String] -> [String] -> String -> γ,
4− δ.buildPythonApplication =
3+ γ.buildPythonApplication =
54 { doCheck = Bool;
65 dontBuild = Bool;
76 installPhase = String;
87 meta =
9− {broken = Bool; homepage = String; license = ε; maintainers = [ζ];};
8+ {broken = Bool; homepage = String; license = δ; maintainers = [ε];};
109 name = String;
11− propagatedBuildInputs = [η];
12− src = θ;
10+ propagatedBuildInputs = [ζ];
11+ src = η;
1312 version = String;
1413 } ->
15− ι,
16− δ.pywbem = η,
17− κ.lib = α,
18− β.licenses = λ,
19− β.maintainers = μ,
20− β.peterhoeg = ζ,
21− λ.gpl2 = ε
14+ θ,
15+ γ.pywbem = ζ,
16+ β.replaceStrings = [String] -> [String] -> String -> ι,
17+ κ.licenses = λ,
18+ κ.maintainers = μ,
19+ κ.peterhoeg = ε,
20+ λ.gpl2 = δ
2221) =>
2322{ fetchFromGitHub =
24− {owner = String; repo = String; rev = String; sha256 = String;} -> θ;
25− python2Packages = δ;
23+ {owner = String; repo = String; rev = String; sha256 = String;} -> η;
24+ python2Packages = γ;
2625 stdenv = α;
2726} ->
28−ι
27+θ
test/golden/importless/eternal.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 postUnpack = String;
test/golden/importless/evilwm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.evilwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.evilwm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.evilwm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/evolution-data-server.txt+22−22
@@ -2,30 +2,30 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkIf =
7− ε ->
8− { environment = {systemPackages = [ζ];};
9− services = {dbus = {packages = [η];};};
10− systemd = {packages = [θ];};
7+ ζ ->
8+ { environment = {systemPackages = [η];};
9+ services = {dbus = {packages = [θ];};};
10+ systemd = {packages = [ι];};
1111 } ->
12− ι,
13− γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
14− γ.teams = μ,
15− γ.types = ν,
16− δ.evolution-data-server = ζ,
17− ξ.evolution-data-server = β,
18− ο.gnome3 = ξ,
19− π.services = ο,
20− ρ.gnome3 = δ,
21− σ.gnome3 = δ,
22− τ.gnome3 = δ,
23− μ.members = υ,
24− φ.gnome = μ,
25− ν.bool = κ
12+ κ,
13+ γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
14+ γ.teams = ν,
15+ γ.types = ξ,
16+ δ.gnome3 = ο,
17+ ε.gnome3 = π,
18+ π.evolution-data-server = ρ,
19+ ρ.enable = ζ,
20+ ο.evolution-data-server = η,
21+ σ.evolution-data-server = θ,
22+ τ.evolution-data-server = ι,
23+ ν.gnome = υ,
24+ υ.members = φ,
25+ ξ.bool = λ
2626) =>
2727α ->
28−{ config = ι;
29− meta = {maintainers = υ;};
30− options = {services = {gnome3 = {evolution-data-server = {enable = λ;};};};};
28+{ config = κ;
29+ meta = {maintainers = φ;};
30+ options = {services = {gnome3 = {evolution-data-server = {enable = μ;};};};};
3131}
test/golden/importless/exfat.txt+6−6
@@ -2,10 +2,10 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.supportedFilesystems = ε,
6− γ.any = (String -> Bool) -> ε -> ζ,
7− γ.mkIf = ζ -> {system = {fsPackages = [η];};} -> θ,
8− δ.exfat = η,
9− ι.boot = β
5+ β.boot = ε,
6+ γ.any = (String -> Bool) -> ζ -> η,
7+ γ.mkIf = η -> {system = {fsPackages = [θ];};} -> ι,
8+ δ.exfat = θ,
9+ ε.supportedFilesystems = ζ
1010) =>
11−α -> {config = θ;}
11+α -> {config = ι;}
test/golden/importless/extlinux-conf-builder.txt+1−1
@@ -4,6 +4,6 @@
44 α.gnugrep = γ,
55 α.gnused = γ,
66 α.substituteAll =
7− {bash = β; isExecutable = Bool; path = [γ]; src = Path;} -> δ
7+ {bash = β; isExecutable = Bool; path = [γ]; src = String;} -> δ
88) =>
99{pkgs = α;} -> δ
test/golden/importless/extpack.txtdeleted−27
@@ -1,27 +0,0 @@
1−∀ α β γ δ ε ζ η θ ι.
2−( α.builtins = β,
3− α.cdepillabout = γ,
4− α.licenses = δ,
5− α.maintainers = ε,
6− α.sander = γ,
7− ζ.version = η,
8− β.stringLength = String -> Integer,
9− δ.virtualbox-puel = θ
10−) =>
11−{ fetchurl =
12− { meta =
13− { description = String;
14− homepage = String;
15− license = θ;
16− maintainers = [γ];
17− platforms = [String];
18− };
19− name = String;
20− sha256 = String;
21− url = String;
22− } ->
23− ι;
24− lib = α;
25− virtualbox = ζ;
26−} ->
27−ι
test/golden/importless/extra-target-flags.txt+1−2
@@ -1,10 +1,9 @@
11∀ α β γ δ ε ζ.
22( α.hostPlatform = β,
33 α.lib = γ,
4− α.optionals = Bool -> [String] -> [String],
54 α.targetPlatform = β,
65 γ.optionals = Bool -> [String] -> [δ],
7− ε.lib = α
6+ ε.optionals = Bool -> [String] -> [String]
87) =>
98{ crossStageStatic = Bool;
109 langD = Bool;
test/golden/importless/extras.txt+10−11
@@ -17,8 +17,6 @@
1717 version = String;
1818 } ->
1919 κ,
20− α.optionalString = Bool -> String -> γ,
21− α.optionals = Bool -> [String] -> [String],
2220 β.ekleog = ζ,
2321 β.gebner = ζ,
2422 β.licenses = λ,
@@ -26,15 +24,16 @@
2624 β.platforms = ν,
2725 λ.isc = ε,
2826 ν.linux = η,
29− ξ.lib = α,
30− ο.lib = α,
31− π.lib = α,
32− ρ.lib = α,
33− σ.lib = α,
34− τ.lib = α,
35− υ.lib = α,
36− φ.lib = α,
37− χ.lib = α
27+ ξ.optionals = Bool -> [String] -> [String],
28+ ο.optionals = Bool -> [String] -> [String],
29+ π.optionals = Bool -> [String] -> [String],
30+ ρ.optionals = Bool -> [String] -> [String],
31+ σ.optionals = Bool -> [String] -> [String],
32+ τ.optionals = Bool -> [String] -> [String],
33+ υ.optionals = Bool -> [String] -> [String],
34+ φ.optionalString = Bool -> String -> γ,
35+ χ.optionalString = Bool -> String -> γ,
36+ (String | Number) ~ γ
3837) =>
3938{ enableLua = Bool;
4039 enableMysql = Bool;
test/golden/importless/facetimehd.txt+8−8
@@ -2,8 +2,8 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.facetimehd = ε,
6− β.kernelPackages = ζ,
5+ β.boot = ε,
6+ β.hardware = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
99 θ ->
@@ -20,11 +20,11 @@
2020 γ.singleton = {assertion = ν; message = String;} -> ι,
2121 γ.versionAtLeast = ξ -> String -> ν,
2222 δ.facetimehd-firmware = λ,
23− ζ.facetimehd = κ,
24− ζ.version = ξ,
25− ο.boot = β,
26− ε.enable = θ,
27− π.hardware = β,
28− ρ.kernel = ζ
23+ ε.kernelPackages = ο,
24+ ο.facetimehd = κ,
25+ ο.kernel = π,
26+ ζ.facetimehd = ρ,
27+ ρ.enable = θ,
28+ π.version = ξ
2929) =>
3030α -> {config = μ; options = {hardware = {facetimehd = {enable = η;};};};}
test/golden/importless/fancontrol.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.fancontrol = ε,
5+ β.hardware = ε,
66 γ.cfg = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
@@ -25,8 +25,8 @@
2525 γ.types = μ,
2626 δ.writeText = String -> ν -> ξ,
2727 ζ.config = ν,
28− ε.enable = θ,
29− ο.hardware = β,
28+ ε.fancontrol = ο,
29+ ο.enable = θ,
3030 μ.nullOr = π -> κ,
3131 ρ.lines = π
3232) =>
test/golden/importless/fare-utils.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/farrp.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/faust1.txt+60−70
@@ -1,52 +1,45 @@
1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1.
2−( ( γ
3− ) //
4− ( { dontBuild = Bool;
5− installPhase = String;
6− meta = ∀ β. β;
7− name = String;
8− postInstall = String;
9− src = δ;
10− }
11− ) ~
12− ( ε
13− ),
14− ( ζ
15− ) //
16− ( { buildInputs = [η];
17− nativeBuildInputs = [θ];
18− postFixup = String;
19− propagatedBuildInputs = [ι];
20− }
21− ) ~
22− ( { buildInputs = [η];
23− meta = ∀ β. β;
24− passthru = {wrap = κ; wrapWithBuildEnv = λ;};
25− pname = String;
26− postFixup = String;
27− postInstall = String;
28− preConfigure = String;
29− src = δ;
30− version = μ;
31− }
32− ),
33− ( ν
34− ) //
35− ( {buildInputs = [η]; postFixup = String;}
36− ) ~
37− ( { buildInputs = [η];
38− meta = ∀ β. β;
39− passthru = {wrap = κ; wrapWithBuildEnv = λ;};
40− pname = String;
41− postFixup = String;
42− postInstall = String;
43− preConfigure = String;
44− src = δ;
45− version = μ;
46− }
47− ),
48− ξ.lib = ο,
49− ξ.mkDerivation =
1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1.
2+( γ //
3+ { dontBuild = Bool;
4+ installPhase = String;
5+ meta = ∀ β. β;
6+ name = String;
7+ postInstall = String;
8+ src = δ;
9+ } ~
10+ ε,
11+ ζ //
12+ { buildInputs = [η];
13+ nativeBuildInputs = [θ];
14+ postFixup = String;
15+ propagatedBuildInputs = [ι];
16+ } ~
17+ { buildInputs = [η];
18+ meta = ∀ β. β;
19+ passthru = {wrap = κ; wrapWithBuildEnv = λ;};
20+ pname = String;
21+ postFixup = String;
22+ postInstall = String;
23+ preConfigure = String;
24+ src = δ;
25+ version = μ;
26+ },
27+ ν //
28+ {buildInputs = [η]; postFixup = String;} ~
29+ { buildInputs = [η];
30+ meta = ∀ β. β;
31+ passthru = {wrap = κ; wrapWithBuildEnv = λ;};
32+ pname = String;
33+ postFixup = String;
34+ postInstall = String;
35+ preConfigure = String;
36+ src = δ;
37+ version = μ;
38+ },
39+ ξ.?scripts = [ο],
40+ π.?scripts = [ο],
41+ ρ.lib = σ,
42+ ρ.mkDerivation =
5043 { buildInputs = [η];
5144 meta = ∀ α. α;
5245 passthru = {wrap = κ; wrapWithBuildEnv = λ;};
@@ -58,29 +51,26 @@
5851 version = μ;
5952 } ->
6053 ι,
61− ξ.strings = π,
62− ρ.scripts = [σ],
63− τ.scripts = [σ],
64− π.baseName = σ,
65− π.concatStringsSep = String -> υ -> φ,
66− π.licenses = χ,
67− π.magnetophon = ψ,
68− π.maintainers = ω,
69− π.map = (α1 -> String) -> [ι] -> υ,
70− π.platforms = β1,
71− π.pmahoney = ψ,
72− π.src = δ,
73− π.version = μ,
74− π.wrap = κ,
75− π.wrapWithBuildEnv = λ,
76− γ1.lib = ξ,
77− χ.gpl2 = δ1,
78− β1.linux = ε1
54+ σ.strings = τ,
55+ τ.baseName = ο,
56+ τ.concatStringsSep = String -> υ -> φ,
57+ τ.licenses = χ,
58+ τ.magnetophon = ψ,
59+ τ.maintainers = ω,
60+ τ.map = (α1 -> String) -> [ι] -> υ,
61+ τ.platforms = β1,
62+ τ.pmahoney = ψ,
63+ τ.src = δ,
64+ τ.version = μ,
65+ τ.wrap = κ,
66+ τ.wrapWithBuildEnv = λ,
67+ χ.gpl2 = γ1,
68+ β1.linux = δ1
7969) =>
80−{ coreutils = ζ1;
81− fetchurl = {sha256 = String; url = String;} -> η1;
70+{ coreutils = ε1;
71+ fetchurl = {sha256 = String; url = String;} -> ζ1;
8272 makeWrapper = η;
8373 pkgconfig = θ;
84− stdenv = ξ;
74+ stdenv = ρ;
8575} ->
8676ι
test/golden/importless/faust2.txt+66−77
@@ -1,58 +1,50 @@
1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1.
2−( ( γ
3− ) //
4− ( { dontBuild = Bool;
5− installPhase = String;
6− meta = ∀ β. β;
7− name = String;
8− postInstall = String;
9− src = δ;
10− }
11− ) ~
12− ( ε
13− ),
14− ( ζ
15− ) //
16− ( { buildInputs = [η];
17− libPath = θ;
18− nativeBuildInputs = [η];
19− postFixup = String;
20− propagatedBuildInputs = [ι];
21− }
22− ) ~
23− ( { buildInputs = [κ];
24− cmakeFlags = String;
25− meta = ∀ β. β;
26− nativeBuildInputs = [η];
27− passthru = {wrap = λ; wrapWithBuildEnv = μ;};
28− pname = String;
29− postFixup = String;
30− postInstall = String;
31− preConfigure = String;
32− src = δ;
33− version = ν;
34− }
35− ),
36− ( ξ
37− ) //
38− ( {buildInputs = [η]; postFixup = String;}
39− ) ~
40− ( { buildInputs = [κ];
41− cmakeFlags = String;
42− meta = ∀ β. β;
43− nativeBuildInputs = [η];
44− passthru = {wrap = λ; wrapWithBuildEnv = μ;};
45− pname = String;
46− postFixup = String;
47− postInstall = String;
48− preConfigure = String;
49− src = δ;
50− version = ν;
51− }
52− ),
53− ο.lib = π,
54− ο.makeLibraryPath = [ι] -> θ,
55− ο.mkDerivation =
1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1.
2+( γ //
3+ { dontBuild = Bool;
4+ installPhase = String;
5+ meta = ∀ β. β;
6+ name = String;
7+ postInstall = String;
8+ src = δ;
9+ } ~
10+ ε,
11+ ζ //
12+ { buildInputs = [η];
13+ libPath = θ;
14+ nativeBuildInputs = [η];
15+ postFixup = String;
16+ propagatedBuildInputs = [ι];
17+ } ~
18+ { buildInputs = [κ];
19+ cmakeFlags = String;
20+ meta = ∀ β. β;
21+ nativeBuildInputs = [η];
22+ passthru = {wrap = λ; wrapWithBuildEnv = μ;};
23+ pname = String;
24+ postFixup = String;
25+ postInstall = String;
26+ preConfigure = String;
27+ src = δ;
28+ version = ν;
29+ },
30+ ξ //
31+ {buildInputs = [η]; postFixup = String;} ~
32+ { buildInputs = [κ];
33+ cmakeFlags = String;
34+ meta = ∀ β. β;
35+ nativeBuildInputs = [η];
36+ passthru = {wrap = λ; wrapWithBuildEnv = μ;};
37+ pname = String;
38+ postFixup = String;
39+ postInstall = String;
40+ preConfigure = String;
41+ src = δ;
42+ version = ν;
43+ },
44+ ο.?scripts = [π],
45+ ρ.?scripts = [π],
46+ σ.lib = τ,
47+ σ.mkDerivation =
5648 { buildInputs = [κ];
5749 cmakeFlags = String;
5850 meta = ∀ α. α;
@@ -66,28 +58,25 @@
6658 version = ν;
6759 } ->
6860 ι,
69− ο.strings = ρ,
70− σ.scripts = [τ],
71− υ.scripts = [τ],
72− ρ.baseName = τ,
73− ρ.concatStringsSep = String -> φ -> χ,
74− ρ.licenses = ψ,
75− ρ.magnetophon = ω,
76− ρ.maintainers = α1,
77− ρ.map = (β1 -> String) -> [ι] -> φ,
78− ρ.platforms = γ1,
79− ρ.pmahoney = ω,
80− ρ.src = δ,
81− ρ.version = ν,
82− ρ.wrap = λ,
83− ρ.wrapWithBuildEnv = μ,
84− δ1.lib = ο,
85− ψ.gpl2 = ε1,
86− γ1.linux = ζ1,
87− η1.lib = ο
61+ τ.strings = υ,
62+ υ.baseName = π,
63+ υ.concatStringsSep = String -> φ -> χ,
64+ υ.licenses = ψ,
65+ υ.magnetophon = ω,
66+ υ.maintainers = α1,
67+ υ.map = (β1 -> String) -> [ι] -> φ,
68+ υ.platforms = γ1,
69+ υ.pmahoney = ω,
70+ υ.src = δ,
71+ υ.version = ν,
72+ υ.wrap = λ,
73+ υ.wrapWithBuildEnv = μ,
74+ ψ.gpl2 = δ1,
75+ γ1.linux = ε1,
76+ τ.makeLibraryPath = [ι] -> θ
8877) =>
8978{ cmake = η;
90− coreutils = θ1;
79+ coreutils = ζ1;
9180 emscripten = κ;
9281 fetchFromGitHub =
9382 { fetchSubmodules = Bool;
@@ -96,7 +85,7 @@
9685 rev = String;
9786 sha256 = String;
9887 } ->
99− ι1;
88+ η1;
10089 gnutls = κ;
10190 libmicrohttpd = κ;
10291 libsndfile = κ;
@@ -106,7 +95,7 @@
10695 openssl = κ;
10796 p11-kit = κ;
10897 pkgconfig = η;
109− stdenv = ο;
98+ stdenv = σ;
11099 vim = η;
111100 which = η;
112101} ->
test/golden/importless/fcitx.txt+23−25
@@ -1,23 +1,21 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1.
2−( (β) // ({check = γ -> Bool; name = String;}) ~ (δ),
2+( β // {check = γ -> Bool; name = String;} ~ δ,
33 ε.config = ζ,
44 ε.lib = η,
55 ε.pkgs = θ,
6− ζ.enabled = String,
7− ζ.fcitx = ι,
8− θ.fcitx-engines = κ,
9− θ.override = {plugins = λ;} -> μ,
6+ ζ.i18n = ι,
7+ θ.fcitx = κ,
8+ θ.fcitx-engines = λ,
109 η.attrByPath = [String] -> Bool -> γ -> Bool,
11− η.attrNames = ν -> ξ,
12− η.cfg = ο,
13− η.check = γ -> Bool,
14− η.concatStringsSep = String -> π -> ρ,
15− η.const = σ -> τ,
16− η.filterAttrs = τ -> κ -> ν,
17− η.isDerivation = σ,
18− η.listOf = υ -> φ,
19− η.literalExample = String -> χ,
20− η.map = (ψ -> String) -> ξ -> π,
10+ η.attrNames = μ -> ν,
11+ η.cfg = ξ,
12+ η.concatStringsSep = String -> ο -> π,
13+ η.const = ρ -> σ,
14+ η.filterAttrs = σ -> λ -> μ,
15+ η.isDerivation = ρ,
16+ η.listOf = τ -> υ,
17+ η.literalExample = String -> φ,
18+ η.map = (χ -> String) -> ν -> ο,
2119 η.mkIf =
2220 Bool ->
2321 { environment =
@@ -27,22 +25,22 @@
2725 XMODIFIERS = String;
2826 };
2927 };
30− i18n = {inputMethod = {package = μ;};};
28+ i18n = {inputMethod = {package = ψ;};};
3129 services = {xserver = {displayManager = {sessionCommands = String;};};};
3230 } ->
3331 ω,
3432 η.mkOption =
35− {default = ∀ α. α; description = String; example = χ; type = φ;} -> α1,
33+ {default = ∀ α. [α]; description = String; example = φ; type = υ;} -> α1,
3634 η.types = β1,
37− γ1.fcitx = θ,
38− ο.engines = λ,
35+ κ.override = {plugins = γ1;} -> ψ,
36+ ξ.engines = γ1,
3937 β1.package = β,
40− δ1.package = η,
41− ε1.types = δ1,
42− ζ1.inputMethod = ζ,
43− η1.i18n = ζ1,
44− θ1.inputMethod = ζ,
45− ι1.i18n = θ1
38+ δ1.package = ε1,
39+ ε1.check = γ -> Bool,
40+ ι.inputMethod = ζ1,
41+ ζ1.fcitx = η1,
42+ θ1.inputMethod = ι1,
43+ ι1.enabled = String
4644) =>
4745ε ->
4846{config = ω; options = {i18n = {inputMethod = {fcitx = {engines = α1;};};};};}
test/golden/importless/fetch-rebar-deps.txt+2−3
@@ -12,9 +12,8 @@
1212 phases = [String];
1313 } ->
1414 ε,
15− α.proxyImpureEnvVars = γ,
16− ζ.fetchers = α,
17− η.lib = ζ
15+ ζ.fetchers = η,
16+ η.proxyImpureEnvVars = γ
1817) =>
1918{rebar3 = θ; stdenv = α;} ->
2019{meta = {}; name = ι; sha256 = δ; src = κ; version = λ;} -> ε
test/golden/importless/fetchNodeModules.txt+8−8
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.mkDerivation =
2+( α.lib = β,
3+ α.mkDerivation =
34 { buildCommand = String;
45 name = String;
5− nativeBuildInputs = [β];
6− outputHash = γ;
6+ nativeBuildInputs = [γ];
7+ outputHash = δ;
78 outputHashAlgo = String;
89 outputHashMode = String;
910 } ->
10− δ,
11− α.versionAtLeast = ε -> String -> Bool,
12− β.version = ε,
13− ζ.lib = α
11+ ε,
12+ γ.version = ζ,
13+ β.versionAtLeast = ζ -> String -> Bool
1414) =>
15−{jq = β; stdenv = α;} -> {nodejs = β; sha256 = γ; src = η;} -> δ
15+{jq = γ; stdenv = α;} -> {nodejs = γ; sha256 = δ; src = η;} -> ε
test/golden/importless/ffmpegthumbs.txt+3−3
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ η θ.
22( α.licenses = β,
3− α.ttuegel = γ,
3+ α.maintainers = γ,
44 β.bsd3 = δ,
55 β.gpl2 = δ,
6− ε.maintainers = α
6+ γ.ttuegel = ε
77) =>
88{ extra-cmake-modules = ζ;
99 ffmpeg_3 = η;
@@ -11,7 +11,7 @@
1111 lib = α;
1212 mkDerivation =
1313 { buildInputs = [η];
14− meta = {license = [δ]; maintainers = [γ];};
14+ meta = {license = [δ]; maintainers = [ε];};
1515 name = String;
1616 nativeBuildInputs = [ζ];
1717 } ->
test/golden/importless/filters.txt+34−36
@@ -1,51 +1,49 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.gpl2 = β,
3− α.linux = γ,
4− α.makeBinPath = [δ] -> ε,
2+( α.lib = β,
53 α.mkDerivation =
6− { buildInputs = [ζ];
4+ { buildInputs = [γ];
75 configureFlags = [String];
86 doCheck = Bool;
97 enableParallelBuilding = Bool;
108 makeFlags = [String];
119 meta =
12− {description = String; homepage = String; license = β; platforms = γ;};
13− nativeBuildInputs = [η];
10+ {description = String; homepage = String; license = δ; platforms = ε;};
11+ nativeBuildInputs = [ζ];
1412 pname = String;
1513 postConfigure = String;
1614 postInstall = String;
17− src = θ;
15+ src = η;
1816 version = String;
1917 } ->
20− ι,
21− κ.lib = α,
22− λ.licenses = α,
23− μ.lib = λ,
24− ν.platforms = α,
25− ξ.lib = ν
18+ θ,
19+ β.makeBinPath = [ι] -> κ,
20+ λ.licenses = μ,
21+ μ.gpl2 = δ,
22+ ν.platforms = ξ,
23+ ξ.linux = ε
2624) =>
27−{ avahi = ζ;
28− bc = δ;
29− coreutils = δ;
30− cups = ζ;
31− dbus = ζ;
32− fetchurl = {sha256 = String; url = String;} -> θ;
33− fontconfig = ζ;
34− gawk = δ;
35− ghostscript = ζ;
36− gnugrep = δ;
37− gnused = δ;
38− ijs = ζ;
39− libjpeg = ζ;
40− libpng = ζ;
41− makeWrapper = η;
42− mupdf = ζ;
43− perl = ζ;
44− pkgconfig = η;
45− poppler = ζ;
46− poppler_utils = ζ;
47− qpdf = ζ;
25+{ avahi = γ;
26+ bc = ι;
27+ coreutils = ι;
28+ cups = γ;
29+ dbus = γ;
30+ fetchurl = {sha256 = String; url = String;} -> η;
31+ fontconfig = γ;
32+ gawk = ι;
33+ ghostscript = γ;
34+ gnugrep = ι;
35+ gnused = ι;
36+ ijs = γ;
37+ libjpeg = γ;
38+ libpng = γ;
39+ makeWrapper = ζ;
40+ mupdf = γ;
41+ perl = γ;
42+ pkgconfig = ζ;
43+ poppler = γ;
44+ poppler_utils = γ;
45+ qpdf = γ;
4846 stdenv = α;
49− which = δ;
47+ which = ι;
5048} ->
51−ι
49+θ
test/golden/importless/firejail.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.firejail = ε,
5+ β.programs = ε,
66 γ.literalExample = String -> ζ,
77 γ.maintainers = η,
88 γ.mkEnableOption = String -> θ,
@@ -20,8 +20,8 @@
2020 δ.runCommand =
2121 String ->
2222 {allowSubstitutes = Bool; preferLocalBuild = Bool;} -> String -> κ,
23− ε.enable = ι,
24− π.programs = β,
23+ ε.firejail = π,
24+ π.enable = ι,
2525 ο.attrsOf = ρ -> μ,
2626 σ.path = ρ
2727) =>
test/golden/importless/fixed-points.txt+5−9
@@ -2,18 +2,14 @@
22θ ->
33{ composeExtensions =
44 ∀ α β γ δ ε ζ η.
5− ((α) // (β) ~ (γ), (β) // (δ) ~ (ε)) => (ζ -> α -> β) ->
6− (ζ -> η -> δ) -> ζ -> α -> ε;
5+ (α // β ~ γ, β // δ ~ ε) => (ζ -> α -> β) -> (ζ -> η -> δ) -> ζ -> α -> ε;
76 converge = ∀ α. (α -> α) -> α -> α;
8− extends =
9− ∀ α β γ δ. ((α) // (β) ~ (γ)) => (δ -> α -> β) -> (δ -> α) -> δ -> γ;
7+ extends = ∀ α β γ δ. (α // β ~ γ) => (δ -> α -> β) -> (δ -> α) -> δ -> γ;
108 fix = ∀ α. (α -> α) -> α;
11− fix' = ∀ α β. ((α) // ({__unfix__ = β -> α;}) ~ (β)) => (β -> α) -> β;
9+ fix' = ∀ α β. (α // {__unfix__ = β -> α;} ~ β) => (β -> α) -> β;
1210 makeExtensible =
13− ∀ α β γ.
14− ((α) // ({__unfix__ = β -> α;}) ~ (β), (β) // ({}) ~ (γ)) => (β -> α) -> γ;
11+ ∀ α β γ. (α // {__unfix__ = β -> α;} ~ β, β // {} ~ γ) => (β -> α) -> γ;
1512 makeExtensibleWithCustomName =
1613 ∀ α β γ δ.
17− ((α) // ({__unfix__ = β -> α;}) ~ (β), (β) // ({}) ~ (γ)) => δ ->
18− (β -> α) -> γ;
14+ (α // {__unfix__ = β -> α;} ~ β, β // {} ~ γ) => δ -> (β -> α) -> γ;
1915}
test/golden/importless/flatpak-builder.txt+1−1
@@ -3,7 +3,7 @@
33 { testConfig =
44 { environment = {systemPackages = [β];};
55 services = {flatpak = {enable = Bool;};};
6− virtualisation = {diskSize = Integer;};
6+ virtualisation = {diskSize = Number;};
77 xdg = {portal = {enable = Bool;};};
88 };
99 testRunnerFlags = String;
test/golden/importless/flatpak.txt+26−27
@@ -2,16 +2,16 @@
22( β.config = γ,
33 β.lib = δ,
44 β.pkgs = ε,
5− γ.enable = Bool,
6− γ.flatpak = ζ,
7− δ.literalExample = String -> η,
8− δ.mkEnableOption = String -> θ,
5+ γ.services = ζ,
6+ γ.xdg = η,
7+ δ.literalExample = String -> θ,
8+ δ.mkEnableOption = String -> ι,
99 δ.mkIf =
10− ι ->
10+ κ ->
1111 { assertions = [{assertion = Bool; message = String;}];
12− environment = {profiles = [String]; systemPackages = [κ];};
13− services = {dbus = {packages = [λ];};};
14− systemd = {packages = [μ];};
12+ environment = {profiles = [String]; systemPackages = [λ];};
13+ services = {dbus = {packages = [μ];};};
14+ systemd = {packages = [ν];};
1515 users =
1616 { groups = {flatpak = {};};
1717 users =
@@ -20,30 +20,29 @@
2020 };
2121 };
2222 } ->
23− ν,
23+ ξ,
2424 δ.mkOption =
25− { default = ∀ α. α;
25+ { default = ∀ α. [α];
2626 description = String;
27− example = η;
27+ example = θ;
2828 internal = Bool;
29− type = ξ;
29+ type = ο;
3030 } ->
31− ο,
32− δ.types = π,
33− ε.flatpak = κ,
34− ε.maintainers = ρ,
35− ζ.enable = ι,
36− ζ.guiPackages = [κ],
37− σ.services = γ,
38− τ.portal = γ,
39− υ.xdg = τ,
40− φ.meta = ε,
41− χ.flatpak = φ,
42− π.listOf = ψ -> ξ,
31+ π,
32+ δ.types = ρ,
33+ ε.flatpak = λ,
34+ ζ.flatpak = σ,
35+ σ.enable = κ,
36+ σ.guiPackages = [λ],
37+ η.portal = τ,
38+ τ.enable = Bool,
39+ υ.meta = φ,
40+ φ.maintainers = χ,
41+ ρ.listOf = ψ -> ο,
4342 ω.package = ψ
4443) =>
4544β ->
46−{ config = ν;
47− meta = {doc = Path; maintainers = ρ;};
48− options = {services = {flatpak = {enable = θ; guiPackages = ο;};};};
45+{ config = ξ;
46+ meta = {doc = String; maintainers = χ;};
47+ options = {services = {flatpak = {enable = ι; guiPackages = π;};};};
4948}
test/golden/importless/fluxbox.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.fluxbox = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.fluxbox = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.fluxbox = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/fontdir.txt+8−8
@@ -2,13 +2,13 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enableFontDir = ε,
5+ β.fonts = ε,
66 γ.mkIf =
7− ε -> {environment = {pathsToLink = [String]; systemPackages = [ζ];};} -> η,
8− γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
9− γ.types = κ,
10− δ.runCommand = String -> {preferLocalBuild = Bool;} -> String -> ζ,
11− λ.fonts = β,
12− κ.bool = θ
7+ ζ -> {environment = {pathsToLink = [String]; systemPackages = [η];};} -> θ,
8+ γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
9+ γ.types = λ,
10+ δ.runCommand = String -> {preferLocalBuild = Bool;} -> String -> η,
11+ ε.enableFontDir = ζ,
12+ λ.bool = ι
1313) =>
14−α -> {config = η; options = {fonts = {enableFontDir = ι;};};}
14+α -> {config = θ; options = {fonts = {enableFontDir = κ;};};}
test/golden/importless/fox-1.6.txt+28−30
@@ -1,9 +1,8 @@
11∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο.
22( γ.isDarwin = δ,
3− γ.lgpl3 = ε,
4− γ.mesaPlatforms = ζ,
3+ γ.lib = ε,
54 γ.mkDerivation =
6− { buildInputs = [η];
5+ { buildInputs = [ζ];
76 doCheck = Bool;
87 enableParallelBuilding = Bool;
98 hardeningDisable = [String];
@@ -11,38 +10,37 @@
1110 { branch = String;
1211 description = String;
1312 homepage = String;
14− license = ε;
13+ license = η;
1514 longDescription = String;
16− maintainers = ∀ α. α;
17− platforms = ζ;
15+ maintainers = ∀ α. [α];
16+ platforms = θ;
1817 };
1918 pname = String;
20− src = θ;
19+ src = ι;
2120 version = ∀ β. β;
2221 } ->
23− ι,
24− γ.optional = δ -> κ -> [η],
25− λ.licenses = γ,
26− μ.lib = λ,
27− ν.platforms = γ,
28− ξ.lib = ν,
29− ο.lib = γ
22+ κ,
23+ ε.licenses = λ,
24+ λ.lgpl3 = η,
25+ μ.platforms = ν,
26+ ν.mesaPlatforms = θ,
27+ ξ.optional = δ -> ο -> [ζ]
3028) =>
31−{ CoreServices = κ;
32− bzip2 = η;
33− fetchurl = {sha256 = String; url = String;} -> θ;
34− libGL = η;
35− libGLU = η;
36− libXcursor = η;
37− libXfixes = η;
38− libXft = η;
39− libXrandr = η;
40− libjpeg = η;
41− libpng = η;
42− libtiff = η;
29+{ CoreServices = ο;
30+ bzip2 = ζ;
31+ fetchurl = {sha256 = String; url = String;} -> ι;
32+ libGL = ζ;
33+ libGLU = ζ;
34+ libXcursor = ζ;
35+ libXfixes = ζ;
36+ libXft = ζ;
37+ libXrandr = ζ;
38+ libjpeg = ζ;
39+ libpng = ζ;
40+ libtiff = ζ;
4341 stdenv = γ;
44− xinput = η;
45− xlibsWrapper = η;
46− zlib = η;
42+ xinput = ζ;
43+ xlibsWrapper = ζ;
44+ zlib = ζ;
4745} ->
48−ι
46+κ
test/golden/importless/frameworkintegration.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kbookmarks = ε;
44 kcompletion = ε;
55 kconfig = ε;
@@ -15,7 +15,7 @@
1515 libXcursor = ε;
1616 mkDerivation =
1717 { buildInputs = [ε];
18− meta = {maintainers = [β];};
18+ meta = {maintainers = [γ];};
1919 name = String;
2020 nativeBuildInputs = [δ];
2121 propagatedBuildInputs = [ζ];
test/golden/importless/frameworks.txt+60−60
@@ -47,115 +47,115 @@
4747{frameworks = β; libobjc = χ; libs = ψ;} ->
4848{ AGL = [θ];
4949 AVFoundation = [ε];
50− AVKit = ∀ α. α;
50+ AVKit = ∀ α. [α];
5151 Accelerate = [ο];
52− Accounts = ∀ α. α;
52+ Accounts = ∀ α. [α];
5353 AddressBook = [ω];
5454 AppKit = [ζ];
55− AppKitScripting = ∀ α. α;
56− AppleScriptKit = ∀ α. α;
57− AppleScriptObjC = ∀ α. α;
55+ AppKitScripting = ∀ α. [α];
56+ AppleScriptKit = ∀ α. [α];
57+ AppleScriptObjC = ∀ α. [α];
5858 ApplicationServices = [ν];
5959 AudioToolbox = [ι];
6060 AudioUnit = [α1];
6161 AudioVideoBridging = [β1];
62− Automator = ∀ α. α;
63− CFNetwork = ∀ α. α;
64− CalendarStore = ∀ α. α;
62+ Automator = ∀ α. [α];
63+ CFNetwork = ∀ α. [α];
64+ CalendarStore = ∀ α. [α];
6565 Carbon = [π];
6666 Cocoa = [δ];
67− Collaboration = ∀ α. α;
67+ Collaboration = ∀ α. [α];
6868 CoreAudio = [γ1];
6969 CoreAudioKit = [δ1];
70− CoreBluetooth = ∀ α. α;
71− CoreData = ∀ α. α;
72− CoreFoundation = ∀ α. α;
70+ CoreBluetooth = ∀ α. [α];
71+ CoreData = ∀ α. [α];
72+ CoreFoundation = ∀ α. [α];
7373 CoreGraphics = [γ];
74− CoreImage = ∀ α. α;
75− CoreLocation = ∀ α. α;
76− CoreMIDI = ∀ α. α;
77− CoreMIDIServer = ∀ α. α;
74+ CoreImage = ∀ α. [α];
75+ CoreLocation = ∀ α. [α];
76+ CoreMIDI = ∀ α. [α];
77+ CoreMIDIServer = ∀ α. [α];
7878 CoreMedia = [ξ];
7979 CoreMediaIO = [λ];
8080 CoreServices = [η];
8181 CoreText = [ε1];
8282 CoreVideo = [ζ1];
8383 CoreWLAN = [υ];
84− DVDPlayback = ∀ α. α;
85− DirectoryService = ∀ α. α;
84+ DVDPlayback = ∀ α. [α];
85+ DirectoryService = ∀ α. [α];
8686 DiscRecording = [η1];
87− DiscRecordingUI = ∀ α. α;
87+ DiscRecordingUI = ∀ α. [α];
8888 DiskArbitration = [θ1];
89− EventKit = ∀ α. α;
90− ExceptionHandling = ∀ α. α;
91− FWAUserLib = ∀ α. α;
89+ EventKit = ∀ α. [α];
90+ ExceptionHandling = ∀ α. [α];
91+ FWAUserLib = ∀ α. [α];
9292 ForceFeedback = [ι1];
9393 Foundation = [χ];
94− GLKit = ∀ α. α;
94+ GLKit = ∀ α. [α];
9595 GLUT = [κ1];
96− GSS = ∀ α. α;
97− GameController = ∀ α. α;
96+ GSS = ∀ α. [α];
97+ GameController = ∀ α. [α];
9898 GameKit = [λ1];
99− Hypervisor = ∀ α. α;
99+ Hypervisor = ∀ α. [α];
100100 ICADevices = [μ1];
101− IMServicePlugIn = ∀ α. α;
101+ IMServicePlugIn = ∀ α. [α];
102102 IOBluetooth = [ν1];
103103 IOBluetoothUI = [ξ1];
104− IOKit = ∀ α. α;
104+ IOKit = ∀ α. [α];
105105 IOSurface = [φ];
106− ImageCaptureCore = ∀ α. α;
106+ ImageCaptureCore = ∀ α. [α];
107107 ImageIO = [ο1];
108108 InputMethodKit = [π1];
109− InstallerPlugins = ∀ α. α;
110− InstantMessage = ∀ α. α;
111− JavaFrameEmbedding = ∀ α. α;
112− JavaNativeFoundation = ∀ α. α;
113− JavaRuntimeSupport = ∀ α. α;
114− JavaScriptCore = ∀ α. α;
115− JavaVM = ∀ α. α;
116− Kerberos = ∀ α. α;
109+ InstallerPlugins = ∀ α. [α];
110+ InstantMessage = ∀ α. [α];
111+ JavaFrameEmbedding = ∀ α. [α];
112+ JavaNativeFoundation = ∀ α. [α];
113+ JavaRuntimeSupport = ∀ α. [α];
114+ JavaScriptCore = ∀ α. [α];
115+ JavaVM = ∀ α. [α];
116+ Kerberos = ∀ α. [α];
117117 Kernel = [ρ1];
118− LDAP = ∀ α. α;
118+ LDAP = ∀ α. [α];
119119 LatentSemanticMapping = [σ1];
120− LocalAuthentication = ∀ α. α;
121− MapKit = ∀ α. α;
120+ LocalAuthentication = ∀ α. [α];
121+ MapKit = ∀ α. [α];
122122 MediaAccessibility = [τ1];
123− MediaPlayer = ∀ α. α;
123+ MediaPlayer = ∀ α. [α];
124124 MediaToolbox = [υ1];
125− Metal = ∀ α. α;
125+ Metal = ∀ α. [α];
126126 MetalKit = [σ];
127− ModelIO = ∀ α. α;
128− NetFS = ∀ α. α;
127+ ModelIO = ∀ α. [α];
128+ NetFS = ∀ α. [α];
129129 OSAKit = [φ1];
130− OpenAL = ∀ α. α;
130+ OpenAL = ∀ α. [α];
131131 OpenCL = [χ1];
132− OpenDirectory = ∀ α. α;
133− OpenGL = ∀ α. α;
132+ OpenDirectory = ∀ α. [α];
133+ OpenGL = ∀ α. [α];
134134 PCSC = [ψ1];
135− PreferencePanes = ∀ α. α;
136− PubSub = ∀ α. α;
135+ PreferencePanes = ∀ α. [α];
136+ PubSub = ∀ α. [α];
137137 QTKit = [μ];
138138 Quartz = [τ];
139139 QuartzCore = [κ];
140140 QuickLook = [ω1];
141141 QuickTime = [α2];
142− SceneKit = ∀ α. α;
143− ScreenSaver = ∀ α. α;
144− Scripting = ∀ α. α;
145− ScriptingBridge = ∀ α. α;
142+ SceneKit = ∀ α. [α];
143+ ScreenSaver = ∀ α. [α];
144+ Scripting = ∀ α. [α];
145+ ScriptingBridge = ∀ α. [α];
146146 Security = [β2];
147− SecurityFoundation = ∀ α. α;
147+ SecurityFoundation = ∀ α. [α];
148148 SecurityInterface = [γ2];
149149 ServiceManagement = [δ2];
150− Social = ∀ α. α;
151− SpriteKit = ∀ α. α;
152− StoreKit = ∀ α. α;
153− SyncServices = ∀ α. α;
150+ Social = ∀ α. [α];
151+ SpriteKit = ∀ α. [α];
152+ StoreKit = ∀ α. [α];
153+ SyncServices = ∀ α. [α];
154154 SystemConfiguration = [ε2];
155155 TWAIN = [ζ2];
156− Tcl = ∀ α. α;
156+ Tcl = ∀ α. [α];
157157 VideoDecodeAcceleration = [η2];
158158 VideoToolbox = [θ2];
159159 WebKit = [ρ];
160− vmnet = ∀ α. α;
160+ vmnet = ∀ α. [α];
161161}
test/golden/importless/free.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd2 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd2 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { ipkgName = String;
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = ζ;
test/golden/importless/freeform-nested.txt+2−2
@@ -1,7 +1,7 @@
11∀ α β γ δ ε.
22( α.lib = β,
3− β.bool = γ,
43 β.mkOption = {default = Bool; type = γ;} -> δ,
5− ε.types = β
4+ β.types = ε,
5+ ε.bool = γ
66) =>
77α -> {config = {nest = {bar = String;};}; options = {nest = {foo = δ;};};}
test/golden/importless/freeform-str-dep-unstr.txt+10−11
@@ -1,12 +1,11 @@
1−∀ α β γ δ ε ζ η θ ι κ.
2−( α.config = β,
3− α.lib = γ,
4− γ.mkIf = β -> δ -> ε,
5− γ.mkOption = {default = Null; type = ζ;} -> η,
6− γ.nullOr = θ -> ζ,
7− γ.str = θ,
8− β.value = δ,
9− ι.types = γ,
10− κ.types = γ
1+∀ α β γ δ ε ζ η θ ι κ λ.
2+( α.value = β,
3+ γ.config = α,
4+ γ.lib = δ,
5+ δ.mkIf = Bool -> ε -> ζ,
6+ δ.mkOption = {default = Null; type = η;} -> θ,
7+ δ.types = ι,
8+ ι.nullOr = κ -> η,
9+ λ.str = κ
1110) =>
12−α -> {config = {foo = ε;}; options = {foo = η;};}
11+γ -> {config = {foo = ζ;}; options = {foo = θ;};}
test/golden/importless/freeform-unstr-dep-str.txt+3−4
@@ -3,10 +3,9 @@
33 α.lib = γ,
44 γ.mkIf = Bool -> δ -> ε,
55 γ.mkOption = {default = Null; type = ζ;} -> η,
6− γ.nullOr = θ -> ζ,
7− γ.str = θ,
6+ γ.types = θ,
87 β.value = Null,
9− ι.types = γ,
10− κ.types = γ
8+ θ.nullOr = ι -> ζ,
9+ κ.str = ι
1110) =>
1211α -> {config = {foo = ε;}; options = {value = η;};}
test/golden/importless/freeoffice.txt+12−15
@@ -1,18 +1,15 @@
11∀ α β γ δ.
2−( ( α
3− ) //
4− ( { archive = String;
5− edition = String;
6− pname = String;
7− src = β;
8− suiteName = String;
9− version = String;
10− }
11− ) ~
12− ( γ
13− ),
14− α.callPackage = Path -> γ -> δ,
15− α.fetchurl = {sha256 = String; url = String;} -> β,
16− α.officeVersion = {edition = String; sha256 = String; version = String;}
2+( α //
3+ { archive = String;
4+ edition = String;
5+ pname = String;
6+ src = β;
7+ suiteName = String;
8+ version = String;
9+ } ~
10+ γ,
11+ α.?officeVersion = {edition = String; sha256 = String; version = String;},
12+ α.callPackage = String -> γ -> δ,
13+ α.fetchurl = {sha256 = String; url = String;} -> β
1714) =>
1815α -> δ
test/golden/importless/freetds.txt+13−13
@@ -2,26 +2,26 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.freetds = ε,
6− γ.attrNames = ε -> ζ,
7− γ.concatStrings = η -> θ,
8− γ.length = ζ -> Integer,
9− γ.literalExample = String -> ι,
10− γ.mapAttrsToList = (κ -> λ -> String) -> ε -> η,
5+ β.environment = ε,
6+ γ.attrNames = ζ -> η,
7+ γ.concatStrings = θ -> ι,
8+ γ.length = η -> Number,
9+ γ.literalExample = String -> κ,
10+ γ.mapAttrsToList = (λ -> μ -> String) -> ζ -> θ,
1111 γ.mkIf =
1212 Bool ->
1313 { environment =
14− { etc = {freetds.conf = {text = θ;};};
14+ { etc = {freetds.conf = {text = ι;};};
1515 variables =
1616 {FREETDS = String; FREETDSCONF = String; SYBASE = String;};
1717 };
1818 } ->
19− μ,
19+ ν,
2020 γ.mkOption =
21− {default = {}; description = String; example = ι; type = ν;} -> ξ,
22− γ.types = ο,
23− π.environment = β,
24− ο.attrsOf = ρ -> ν,
21+ {default = {}; description = String; example = κ; type = ξ;} -> ο,
22+ γ.types = π,
23+ ε.freetds = ζ,
24+ π.attrsOf = ρ -> ξ,
2525 σ.str = ρ
2626) =>
27−α -> {config = μ; options = {environment = {freetds = ξ;};};}
27+α -> {config = ν; options = {environment = {freetds = ο;};};}
test/golden/importless/frontends.txt+1−2
@@ -17,14 +17,13 @@
1717 version = String;
1818 } ->
1919 ι,
20− α.optional = Bool -> Null -> [γ],
2120 β.licenses = κ,
2221 β.maintainers = λ,
2322 β.peti = ε,
2423 β.platforms = μ,
2524 κ.gpl2Plus = δ,
2625 μ.linux = ζ,
27− ν.lib = α
26+ ν.optional = Bool -> Null -> [γ]
2827) =>
2928{ fetchurl = {sha256 = String; url = String;} -> θ;
3029 gtk2 = γ;
test/golden/importless/fs.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.optional = Bool -> ε -> ζ,
44 η.meta = β,
55 η.src = θ,
test/golden/importless/fsm.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = γ;
12− maintainers = [β];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/fstrim.txt+4−4
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.fstrim = ε,
5+ β.services = ε,
66 γ.gnidorah = ζ,
77 γ.maintainers = η,
88 γ.mkEnableOption = String -> θ,
@@ -18,9 +18,9 @@
1818 γ.mkOption = {default = String; description = String; type = ν;} -> ξ,
1919 γ.types = ο,
2020 δ.utillinux = κ,
21− ε.enable = ι,
22− ε.interval = λ,
23− π.services = β,
21+ ε.fstrim = π,
22+ π.enable = ι,
23+ π.interval = λ,
2424 ο.str = ν
2525) =>
2626α ->
test/golden/importless/full.txt+1−1
@@ -5,7 +5,7 @@
55 meta =
66 { description = String;
77 homepage = String;
8− hydraPlatforms = ∀ α. α;
8+ hydraPlatforms = ∀ α. [α];
99 license = [δ];
1010 maintainers = [ε];
1111 platforms = ζ;
test/golden/importless/fuseki-binary.txt+15−17
@@ -1,35 +1,33 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.asl20 = β,
3− α.linux = γ,
2+( α.lib = β,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 installPhase = String;
76 meta =
87 { description = String;
98 downloadPage = String;
109 downloadURLRegexp = String;
1110 homepage = String;
12− license = β;
11+ license = δ;
1312 maintainers = [ε];
14− platforms = γ;
13+ platforms = ζ;
1514 version = String;
1615 };
1716 name = String;
18− src = ζ;
17+ src = η;
1918 version = String;
2019 } ->
21− η,
22− α.raskin = ε,
23− θ.licenses = α,
24− ι.lib = θ,
25− κ.maintainers = α,
26− λ.lib = κ,
27− μ.platforms = α,
28− ν.lib = μ
20+ θ,
21+ β.licenses = ι,
22+ ι.asl20 = δ,
23+ κ.maintainers = λ,
24+ λ.raskin = ε,
25+ μ.platforms = ν,
26+ ν.linux = ζ
2927) =>
30−{ fetchurl = {sha256 = String; url = String;} -> ζ;
28+{ fetchurl = {sha256 = String; url = String;} -> η;
3129 java = ξ;
32− makeWrapper = δ;
30+ makeWrapper = γ;
3331 stdenv = α;
3432} ->
35−η
33+θ
test/golden/importless/fvwm.txt+8−8
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.fvwm = ε,
5+ β.services = ε,
66 γ.cfg = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
@@ -14,13 +14,13 @@
1414 γ.mkOption = {default = Bool; description = String; type = μ;} -> ν,
1515 γ.singleton = {name = String; start = String;} -> κ,
1616 γ.types = ξ,
17− δ.override = {gestures = ο;} -> ι,
18− π.fvwm = δ,
19− ζ.gestures = ο,
20− ε.enable = θ,
21− ρ.windowManager = β,
22− σ.xserver = ρ,
23− τ.services = σ,
17+ δ.fvwm = ο,
18+ ο.override = {gestures = π;} -> ι,
19+ ζ.gestures = π,
20+ ε.xserver = ρ,
21+ ρ.windowManager = σ,
22+ σ.fvwm = τ,
23+ τ.enable = θ,
2424 ξ.bool = μ
2525) =>
2626α ->
test/golden/importless/garbage-pools.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/gateone.txt+34−33
@@ -2,60 +2,61 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.gateone = ε,
6− γ.coreutils = ζ,
7− γ.gateone = η,
8− γ.mkEnableOption = String -> θ,
5+ β.ids = ε,
6+ β.services = ζ,
7+ γ.coreutils = η,
8+ γ.gateone = θ,
9+ γ.mkEnableOption = String -> ι,
910 γ.mkIf =
10− ι ->
11− { environment = {systemPackages = [η];};
11+ κ ->
12+ { environment = {systemPackages = [θ];};
1213 systemd =
1314 { services =
1415 { gateone =
1516 { description = String;
16− path = [ζ];
17+ path = [η];
1718 preStart = String;
1819 requires = [String];
1920 serviceConfig =
2021 { ExecStart = String;
2122 Group = String;
2223 User = String;
23− WorkingDirectory = κ;
24+ WorkingDirectory = λ;
2425 };
2526 wantedBy = [String];
2627 };
2728 };
2829 };
2930 users =
30− { groups = {gateone = {gid = λ;};};
31− users = {gateone = {description = String; home = μ; uid = ν;};};
31+ { groups = {gateone = {gid = μ;};};
32+ users = {gateone = {description = String; home = ν; uid = ξ;};};
3233 };
3334 } ->
34− ξ,
35− γ.mkOption = {default = String; description = String; type = ο;} -> π,
36− γ.nix = ζ,
37− γ.openssh = ζ,
38− γ.procps = ζ,
39− γ.pythonPackages = ρ,
40− γ.types = σ,
41− δ.cacert = η,
42− δ.coreutils = η,
43− δ.openssh = η,
44− δ.procps = η,
45− δ.pythonPackages = τ,
46− ε.enable = ι,
47− ε.settingsDir = κ,
48− υ.services = β,
49− ρ.gateone = ζ,
50− φ.gids = β,
51− χ.ids = φ,
52− ψ.uids = β,
53− ω.ids = ψ,
54− σ.path = ο,
35+ ο,
36+ γ.mkOption = {default = String; description = String; type = π;} -> ρ,
37+ γ.nix = η,
38+ γ.openssh = η,
39+ γ.procps = η,
40+ γ.pythonPackages = σ,
41+ γ.types = τ,
42+ δ.cacert = θ,
43+ δ.coreutils = θ,
44+ δ.openssh = θ,
45+ δ.procps = θ,
46+ δ.pythonPackages = υ,
47+ ζ.gateone = φ,
48+ φ.enable = κ,
49+ φ.settingsDir = λ,
50+ σ.gateone = η,
51+ ε.gids = χ,
52+ χ.gateone = μ,
53+ ψ.uids = ω,
54+ ω.gateone = ξ,
55+ τ.path = π,
5556 α1.path = β1
5657) =>
5758α ->
58−{ config = ξ;
59+{ config = ο;
5960 options =
60− {services = {gateone = {enable = θ; pidDir = π; settingsDir = γ1;};};};
61+ {services = {gateone = {enable = ι; pidDir = ρ; settingsDir = γ1;};};};
6162}
test/golden/importless/gc.txt+2−2
@@ -18,9 +18,9 @@
1818 θ.maintainers = κ,
1919 θ.offline = δ,
2020 θ.rev = λ,
21− μ.platforms = ε,
21+ μ.meta = ν,
2222 ι.asl20 = γ,
23− ν.meta = μ
23+ ν.platforms = ε
2424) =>
2525{ coreutils = ξ;
2626 docker = μ;
test/golden/importless/gdal-1_11.txt+26−28
@@ -1,51 +1,49 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
2−( α.marcweber = β,
3− α.mit = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { NIX_CFLAGS_COMPILE = String;
6− buildInputs = [δ];
5+ buildInputs = [γ];
76 configureFlags = [String];
87 enableParallelBuilding = Bool;
98 hardeningDisable = [String];
109 meta =
1110 { description = String;
1211 homepage = String;
13− license = γ;
14− maintainers = [β];
15− platforms = [ε];
12+ license = δ;
13+ maintainers = [ε];
14+ platforms = [ζ];
1615 };
17− patches = [Path];
16+ patches = [String];
1817 pname = String;
1918 preBuild = String;
2019 preConfigure = String;
21− src = ζ;
20+ src = η;
2221 version = String;
2322 } ->
24− η,
25− α.platforms = θ,
26− ι.numpy = δ,
27− κ.licenses = α,
28− λ.lib = κ,
29− μ.maintainers = α,
30− ν.lib = μ,
31− θ.darwin = [ε],
32− θ.linux = [ε],
33− ξ.lib = α
23+ θ,
24+ ι.numpy = γ,
25+ β.licenses = κ,
26+ κ.mit = δ,
27+ λ.maintainers = μ,
28+ μ.marcweber = ε,
29+ ν.platforms = ξ,
30+ ξ.darwin = [ζ],
31+ ξ.linux = [ζ]
3432) =>
35−{ fetchurl = {sha256 = String; url = String;} -> ζ;
33+{ fetchurl = {sha256 = String; url = String;} -> η;
3634 geos = ο;
37− libgeotiff = δ;
38− libjpeg = δ;
39− libpng = δ;
40− libtiff = δ;
35+ libgeotiff = γ;
36+ libjpeg = γ;
37+ libpng = γ;
38+ libtiff = γ;
4139 mysql57 = π;
42− openssl = δ;
40+ openssl = γ;
4341 postgresql = ρ;
44− proj = δ;
45− python = δ;
42+ proj = γ;
43+ python = γ;
4644 pythonPackages = ι;
4745 stdenv = α;
48− unzip = δ;
46+ unzip = γ;
4947 zlib = σ;
5048} ->
51−η
49+θ
test/golden/importless/gdk-pixbuf.txt+5−5
@@ -2,20 +2,20 @@
22( β.config = γ,
33 β.lib = δ,
44 β.pkgs = ε,
5− γ.gdk-pixbuf = ζ,
5+ γ.services = ζ,
66 δ.cfg = η,
77 δ.mkIf =
88 Bool ->
99 {environment = {variables = {GDK_PIXBUF_MODULE_FILE = String;};};} -> θ,
10− δ.mkOption = {default = ∀ α. α; description = String; type = ι;} -> κ,
10+ δ.mkOption = {default = ∀ α. [α]; description = String; type = ι;} -> κ,
1111 δ.types = λ,
1212 δ.unique = [μ] -> ν,
1313 ε.gdk-pixbuf = μ,
1414 ε.runCommand = String -> {preferLocalBuild = Bool;} -> String -> ξ,
1515 η.modulePackages = [μ],
16− ζ.modulePackages = ο,
17− π.xserver = γ,
18− ρ.services = π,
16+ ζ.xserver = ο,
17+ ο.gdk-pixbuf = π,
18+ π.modulePackages = [ρ],
1919 λ.listOf = σ -> ι,
2020 τ.package = σ
2121) =>
test/golden/importless/gdomap.txt+9−9
@@ -2,26 +2,26 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { systemd =
1010 { services =
1111 { gdomap =
1212 { after = [String];
1313 description = String;
14− path = [η];
14+ path = [θ];
1515 serviceConfig = {ExecStart = String;};
1616 wantedBy = [String];
1717 };
1818 };
1919 };
2020 } ->
21− θ,
22− δ.base = η,
23− ι.gdomap = β,
24− κ.services = ι,
25− λ.gnustep = δ
21+ ι,
22+ δ.gnustep = κ,
23+ ε.gdomap = λ,
24+ λ.enable = η,
25+ κ.base = θ
2626) =>
27−α -> {config = θ; options = {services = {gdomap = {enable = ζ;};};};}
27+α -> {config = ι; options = {services = {gdomap = {enable = ζ;};};};}
test/golden/importless/geary.txt+12−12
@@ -2,12 +2,12 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.geary = ε,
6− δ.geary = ζ,
5+ β.programs = ε,
6+ δ.gnome3 = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
99 θ ->
10− { environment = {systemPackages = [ζ];};
10+ { environment = {systemPackages = [ι];};
1111 programs = {dconf = {enable = Bool;};};
1212 services =
1313 { gnome3 =
@@ -16,16 +16,16 @@
1616 };
1717 };
1818 } ->
19− ι,
20− γ.teams = κ,
21− ε.enable = θ,
22− λ.programs = β,
23− μ.gnome3 = δ,
24− κ.members = ν,
25− ξ.gnome = κ
19+ κ,
20+ γ.teams = λ,
21+ ε.geary = μ,
22+ μ.enable = θ,
23+ ζ.geary = ι,
24+ λ.gnome = ν,
25+ ν.members = ξ
2626) =>
2727α ->
28−{ config = ι;
29− meta = {maintainers = ν;};
28+{ config = κ;
29+ meta = {maintainers = ξ;};
3030 options = {programs = {geary = {enable = η;};};};
3131}
test/golden/importless/gemset-beta.txt+36−36
@@ -1,228 +1,228 @@
11{ CFPropertyList =
22 { groups = [String];
3− platforms = ∀ α. α;
3+ platforms = ∀ α. [α];
44 source = {remotes = [String]; sha256 = String; type = String;};
55 version = String;
66 };
77 activesupport =
88 { dependencies = [String];
99 groups = [String];
10− platforms = ∀ α. α;
10+ platforms = ∀ α. [α];
1111 source = {remotes = [String]; sha256 = String; type = String;};
1212 version = String;
1313 };
1414 addressable =
1515 { dependencies = [String];
1616 groups = [String];
17− platforms = ∀ α. α;
17+ platforms = ∀ α. [α];
1818 source = {remotes = [String]; sha256 = String; type = String;};
1919 version = String;
2020 };
2121 algoliasearch =
2222 { dependencies = [String];
2323 groups = [String];
24− platforms = ∀ α. α;
24+ platforms = ∀ α. [α];
2525 source = {remotes = [String]; sha256 = String; type = String;};
2626 version = String;
2727 };
2828 atomos =
2929 { groups = [String];
30− platforms = ∀ α. α;
30+ platforms = ∀ α. [α];
3131 source = {remotes = [String]; sha256 = String; type = String;};
3232 version = String;
3333 };
3434 claide =
3535 { groups = [String];
36− platforms = ∀ α. α;
36+ platforms = ∀ α. [α];
3737 source = {remotes = [String]; sha256 = String; type = String;};
3838 version = String;
3939 };
4040 cocoapods =
4141 { dependencies = [String];
4242 groups = [String];
43− platforms = ∀ α. α;
43+ platforms = ∀ α. [α];
4444 source = {remotes = [String]; sha256 = String; type = String;};
4545 version = String;
4646 };
4747 cocoapods-core =
4848 { dependencies = [String];
4949 groups = [String];
50− platforms = ∀ α. α;
50+ platforms = ∀ α. [α];
5151 source = {remotes = [String]; sha256 = String; type = String;};
5252 version = String;
5353 };
5454 cocoapods-deintegrate =
5555 { groups = [String];
56− platforms = ∀ α. α;
56+ platforms = ∀ α. [α];
5757 source = {remotes = [String]; sha256 = String; type = String;};
5858 version = String;
5959 };
6060 cocoapods-downloader =
6161 { groups = [String];
62− platforms = ∀ α. α;
62+ platforms = ∀ α. [α];
6363 source = {remotes = [String]; sha256 = String; type = String;};
6464 version = String;
6565 };
6666 cocoapods-plugins =
6767 { dependencies = [String];
6868 groups = [String];
69− platforms = ∀ α. α;
69+ platforms = ∀ α. [α];
7070 source = {remotes = [String]; sha256 = String; type = String;};
7171 version = String;
7272 };
7373 cocoapods-search =
7474 { groups = [String];
75− platforms = ∀ α. α;
75+ platforms = ∀ α. [α];
7676 source = {remotes = [String]; sha256 = String; type = String;};
7777 version = String;
7878 };
7979 cocoapods-trunk =
8080 { dependencies = [String];
8181 groups = [String];
82− platforms = ∀ α. α;
82+ platforms = ∀ α. [α];
8383 source = {remotes = [String]; sha256 = String; type = String;};
8484 version = String;
8585 };
8686 cocoapods-try =
8787 { groups = [String];
88− platforms = ∀ α. α;
88+ platforms = ∀ α. [α];
8989 source = {remotes = [String]; sha256 = String; type = String;};
9090 version = String;
9191 };
9292 colored2 =
9393 { groups = [String];
94− platforms = ∀ α. α;
94+ platforms = ∀ α. [α];
9595 source = {remotes = [String]; sha256 = String; type = String;};
9696 version = String;
9797 };
9898 concurrent-ruby =
9999 { groups = [String];
100− platforms = ∀ α. α;
100+ platforms = ∀ α. [α];
101101 source = {remotes = [String]; sha256 = String; type = String;};
102102 version = String;
103103 };
104104 escape =
105105 { groups = [String];
106− platforms = ∀ α. α;
106+ platforms = ∀ α. [α];
107107 source = {remotes = [String]; sha256 = String; type = String;};
108108 version = String;
109109 };
110110 ethon =
111111 { dependencies = [String];
112112 groups = [String];
113− platforms = ∀ α. α;
113+ platforms = ∀ α. [α];
114114 source = {remotes = [String]; sha256 = String; type = String;};
115115 version = String;
116116 };
117117 ffi =
118118 { groups = [String];
119− platforms = ∀ α. α;
119+ platforms = ∀ α. [α];
120120 source = {remotes = [String]; sha256 = String; type = String;};
121121 version = String;
122122 };
123123 fourflusher =
124124 { groups = [String];
125− platforms = ∀ α. α;
125+ platforms = ∀ α. [α];
126126 source = {remotes = [String]; sha256 = String; type = String;};
127127 version = String;
128128 };
129129 fuzzy_match =
130130 { groups = [String];
131− platforms = ∀ α. α;
131+ platforms = ∀ α. [α];
132132 source = {remotes = [String]; sha256 = String; type = String;};
133133 version = String;
134134 };
135135 gh_inspector =
136136 { groups = [String];
137− platforms = ∀ α. α;
137+ platforms = ∀ α. [α];
138138 source = {remotes = [String]; sha256 = String; type = String;};
139139 version = String;
140140 };
141141 httpclient =
142142 { groups = [String];
143− platforms = ∀ α. α;
143+ platforms = ∀ α. [α];
144144 source = {remotes = [String]; sha256 = String; type = String;};
145145 version = String;
146146 };
147147 i18n =
148148 { dependencies = [String];
149149 groups = [String];
150− platforms = ∀ α. α;
150+ platforms = ∀ α. [α];
151151 source = {remotes = [String]; sha256 = String; type = String;};
152152 version = String;
153153 };
154154 json =
155155 { groups = [String];
156− platforms = ∀ α. α;
156+ platforms = ∀ α. [α];
157157 source = {remotes = [String]; sha256 = String; type = String;};
158158 version = String;
159159 };
160160 minitest =
161161 { groups = [String];
162− platforms = ∀ α. α;
162+ platforms = ∀ α. [α];
163163 source = {remotes = [String]; sha256 = String; type = String;};
164164 version = String;
165165 };
166166 molinillo =
167167 { groups = [String];
168− platforms = ∀ α. α;
168+ platforms = ∀ α. [α];
169169 source = {remotes = [String]; sha256 = String; type = String;};
170170 version = String;
171171 };
172172 nanaimo =
173173 { groups = [String];
174− platforms = ∀ α. α;
174+ platforms = ∀ α. [α];
175175 source = {remotes = [String]; sha256 = String; type = String;};
176176 version = String;
177177 };
178178 nap =
179179 { groups = [String];
180− platforms = ∀ α. α;
180+ platforms = ∀ α. [α];
181181 source = {remotes = [String]; sha256 = String; type = String;};
182182 version = String;
183183 };
184184 netrc =
185185 { groups = [String];
186− platforms = ∀ α. α;
186+ platforms = ∀ α. [α];
187187 source = {remotes = [String]; sha256 = String; type = String;};
188188 version = String;
189189 };
190190 public_suffix =
191191 { groups = [String];
192− platforms = ∀ α. α;
192+ platforms = ∀ α. [α];
193193 source = {remotes = [String]; sha256 = String; type = String;};
194194 version = String;
195195 };
196196 ruby-macho =
197197 { groups = [String];
198− platforms = ∀ α. α;
198+ platforms = ∀ α. [α];
199199 source = {remotes = [String]; sha256 = String; type = String;};
200200 version = String;
201201 };
202202 thread_safe =
203203 { groups = [String];
204− platforms = ∀ α. α;
204+ platforms = ∀ α. [α];
205205 source = {remotes = [String]; sha256 = String; type = String;};
206206 version = String;
207207 };
208208 typhoeus =
209209 { dependencies = [String];
210210 groups = [String];
211− platforms = ∀ α. α;
211+ platforms = ∀ α. [α];
212212 source = {remotes = [String]; sha256 = String; type = String;};
213213 version = String;
214214 };
215215 tzinfo =
216216 { dependencies = [String];
217217 groups = [String];
218− platforms = ∀ α. α;
218+ platforms = ∀ α. [α];
219219 source = {remotes = [String]; sha256 = String; type = String;};
220220 version = String;
221221 };
222222 xcodeproj =
223223 { dependencies = [String];
224224 groups = [String];
225− platforms = ∀ α. α;
225+ platforms = ∀ α. [α];
226226 source = {remotes = [String]; sha256 = String; type = String;};
227227 version = String;
228228 };
test/golden/importless/gemset_libvirt.txt+15−15
@@ -1,97 +1,97 @@
11{ builder =
22 { groups = [String];
3− platforms = ∀ α. α;
3+ platforms = ∀ α. [α];
44 source = {remotes = [String]; sha256 = String; type = String;};
55 version = String;
66 };
77 excon =
88 { groups = [String];
9− platforms = ∀ α. α;
9+ platforms = ∀ α. [α];
1010 source = {remotes = [String]; sha256 = String; type = String;};
1111 version = String;
1212 };
1313 fog-core =
1414 { dependencies = [String];
1515 groups = [String];
16− platforms = ∀ α. α;
16+ platforms = ∀ α. [α];
1717 source = {remotes = [String]; sha256 = String; type = String;};
1818 version = String;
1919 };
2020 fog-json =
2121 { dependencies = [String];
2222 groups = [String];
23− platforms = ∀ α. α;
23+ platforms = ∀ α. [α];
2424 source = {remotes = [String]; sha256 = String; type = String;};
2525 version = String;
2626 };
2727 fog-libvirt =
2828 { dependencies = [String];
2929 groups = [String];
30− platforms = ∀ α. α;
30+ platforms = ∀ α. [α];
3131 source = {remotes = [String]; sha256 = String; type = String;};
3232 version = String;
3333 };
3434 fog-xml =
3535 { dependencies = [String];
3636 groups = [String];
37− platforms = ∀ α. α;
37+ platforms = ∀ α. [α];
3838 source = {remotes = [String]; sha256 = String; type = String;};
3939 version = String;
4040 };
4141 formatador =
4242 { groups = [String];
43− platforms = ∀ α. α;
43+ platforms = ∀ α. [α];
4444 source = {remotes = [String]; sha256 = String; type = String;};
4545 version = String;
4646 };
4747 json =
4848 { groups = [String];
49− platforms = ∀ α. α;
49+ platforms = ∀ α. [α];
5050 source = {remotes = [String]; sha256 = String; type = String;};
5151 version = String;
5252 };
5353 mime-types =
5454 { dependencies = [String];
5555 groups = [String];
56− platforms = ∀ α. α;
56+ platforms = ∀ α. [α];
5757 source = {remotes = [String]; sha256 = String; type = String;};
5858 version = String;
5959 };
6060 mime-types-data =
6161 { groups = [String];
62− platforms = ∀ α. α;
62+ platforms = ∀ α. [α];
6363 source = {remotes = [String]; sha256 = String; type = String;};
6464 version = String;
6565 };
6666 mini_portile2 =
6767 { groups = [String];
68− platforms = ∀ α. α;
68+ platforms = ∀ α. [α];
6969 source = {remotes = [String]; sha256 = String; type = String;};
7070 version = String;
7171 };
7272 multi_json =
7373 { groups = [String];
74− platforms = ∀ α. α;
74+ platforms = ∀ α. [α];
7575 source = {remotes = [String]; sha256 = String; type = String;};
7676 version = String;
7777 };
7878 nokogiri =
7979 { dependencies = [String];
8080 groups = [String];
81− platforms = ∀ α. α;
81+ platforms = ∀ α. [α];
8282 source = {remotes = [String]; sha256 = String; type = String;};
8383 version = String;
8484 };
8585 ruby-libvirt =
8686 { groups = [String];
87− platforms = ∀ α. α;
87+ platforms = ∀ α. [α];
8888 source = {remotes = [String]; sha256 = String; type = String;};
8989 version = String;
9090 };
9191 vagrant-libvirt =
9292 { dependencies = [String];
9393 groups = [String];
94− platforms = ∀ α. α;
94+ platforms = ∀ α. [α];
9595 source = {remotes = [String]; sha256 = String; type = String;};
9696 version = String;
9797 };
test/golden/importless/generations-dir.txt+18−14
@@ -2,10 +2,9 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− β.generationsDir = ζ,
5+ β.boot = ε,
76 γ.mkIf =
8− ε ->
7+ ζ ->
98 { system =
109 { boot = {loader = {id = String; kernelFile = η;};};
1110 build = {installBootLoader = θ;};
@@ -18,19 +17,24 @@
1817 δ.coreutils = ξ,
1918 δ.gnugrep = ξ,
2019 δ.gnused = ξ,
21− δ.hostPlatform = ο,
20+ δ.stdenv = ο,
2221 δ.substituteAll =
23− {bash = ν; copyKernels = π; isExecutable = Bool; path = [ξ]; src = Path;} ->
22+ { bash = ν;
23+ copyKernels = π;
24+ isExecutable = Bool;
25+ path = [ξ];
26+ src = String;
27+ } ->
2428 θ,
25− ο.platform = ρ,
26− σ.stdenv = δ,
27− ρ.kernelTarget = η,
28− ζ.copyKernels = π,
29− τ.loader = β,
30− υ.boot = τ,
31− φ.generationsDir = β,
32− χ.loader = φ,
33− ψ.boot = χ,
29+ ο.hostPlatform = ρ,
30+ ρ.platform = σ,
31+ σ.kernelTarget = η,
32+ ε.loader = τ,
33+ τ.generationsDir = υ,
34+ υ.copyKernels = π,
35+ φ.loader = χ,
36+ χ.generationsDir = ψ,
37+ ψ.enable = ζ,
3438 μ.bool = κ,
3539 ω.bool = α1
3640) =>
test/golden/importless/generatorrunner.txt+19−20
@@ -1,32 +1,31 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( β.all = γ,
3− β.gpl2 = δ,
2+( β.lib = γ,
43 β.mkDerivation =
5− { buildInputs = [ε];
4+ { buildInputs = [δ];
65 enableParallelBuilding = Bool;
76 meta =
87 { description = String;
98 homepage = String;
10− license = δ;
11− maintainers = ∀ α. α;
12− platforms = γ;
9+ license = ε;
10+ maintainers = ∀ α. [α];
11+ platforms = ζ;
1312 };
1413 name = String;
15− src = ζ;
14+ src = η;
1615 } ->
17− η,
18− θ.withPackages = (ι -> [κ]) -> ε,
19− ι.sphinx = κ,
20− λ.licenses = β,
21− μ.lib = λ,
22− ν.platforms = β,
23− ξ.lib = ν
16+ θ,
17+ ι.withPackages = (κ -> [λ]) -> δ,
18+ κ.sphinx = λ,
19+ γ.licenses = μ,
20+ μ.gpl2 = ε,
21+ ν.platforms = ξ,
22+ ξ.all = ζ
2423) =>
25−{ cmake = ε;
26− fetchurl = {sha256 = String; url = String;} -> ζ;
27− pysideApiextractor = ε;
28− python2 = θ;
29− qt4 = ε;
24+{ cmake = δ;
25+ fetchurl = {sha256 = String; url = String;} -> η;
26+ pysideApiextractor = δ;
27+ python2 = ι;
28+ qt4 = δ;
3029 stdenv = β;
3130} ->
32−η
31+θ
test/golden/importless/generic-builder.txt+29−33
@@ -1,40 +1,36 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( (α) // ({name = String;}) ~ (β),
3− ( { NIX_CFLAGS_COMPILE = γ;
4− buildInputs = [δ];
5− buildPhase = String;
6− checkPhase = String;
7− configurePhase = String;
8− installFlags = [String];
9− installPhase = String;
10− postFixup = String;
11− rCommand = String;
12− }
13− ) //
14− ( β
15− ) ~
16− ( ε
17− ),
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο.
2+( α // {name = String;} ~ β,
3+ { NIX_CFLAGS_COMPILE = γ;
4+ buildInputs = [δ];
5+ buildPhase = String;
6+ checkPhase = String;
7+ configurePhase = String;
8+ installFlags = [String];
9+ installPhase = String;
10+ postFixup = String;
11+ rCommand = String;
12+ } //
13+ β ~
14+ ε,
15+ α.?buildInputs = [δ],
16+ α.?doCheck = Bool,
17+ α.?requireX = Bool,
1818 ζ.isDarwin = η,
19− ζ.mkDerivation = ε -> θ,
20− ζ.optionalString = η -> String -> γ,
21− ζ.optionals = Bool -> [ι] -> [δ],
22− α.buildInputs = [δ],
23− α.doCheck = Bool,
19+ ζ.lib = θ,
20+ ζ.mkDerivation = ε -> ι,
2421 α.name = String,
25− α.requireX = Bool,
26− κ.lib = ζ,
27− λ.lib = ζ,
28− μ.lib = ζ
22+ θ.optionalString = η -> String -> γ,
23+ κ.optionals = Bool -> [λ] -> [δ],
24+ μ.optionals = ν -> [ξ] -> [δ]
2925) =>
30−{ Cocoa = ν;
31− Foundation = ν;
26+{ Cocoa = ξ;
27+ Foundation = ξ;
3228 R = δ;
3329 gettext = δ;
34− gfortran = ν;
35− libcxx = ξ;
30+ gfortran = ξ;
31+ libcxx = ο;
3632 stdenv = ζ;
37− utillinux = ι;
38− xvfb_run = ι;
33+ utillinux = λ;
34+ xvfb_run = λ;
3935} ->
40−α -> θ
36+α -> ι
test/golden/importless/generic-stack-builder.txt+37−40
@@ -1,48 +1,45 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ.
2−( ( α
3− ) //
4− ( { GIT_SSL_CAINFO = String;
5− LANG = String;
6− LD_LIBRARY_PATH = β;
7− STACK_IN_NIX_EXTRA_ARGS = γ;
8− STACK_IN_NIX_SHELL = Integer;
9− STACK_PLATFORM_VARIANT = String;
10− __noChroot = Bool;
11− buildInputs = [δ];
12− buildPhase = String;
13− checkPhase = String;
14− doCheck = Bool;
15− installPhase = String;
16− nativeBuildInputs = [ε];
17− preConfigure = String;
18− preferLocalBuild = Bool;
19− }
20− ) ~
21− ( ζ
22− ),
23− η.libc = String,
24− η.mkDerivation = ζ -> θ,
25− ι.makeLibraryPath = [δ] -> β,
26− ι.optional = Bool -> κ -> [δ],
27− α.LD_LIBRARY_PATH = [δ],
28− α.buildInputs = [δ],
29− α.buildPhase = String,
30− α.checkPhase = String,
31− α.doCheck = Bool,
32− α.extraArgs = γ,
33− α.ghc = ε,
34− α.installPhase = String,
35− α.nativeBuildInputs = [ε],
36− α.stack = ε,
37− λ.hostPlatform = η
2+( α //
3+ { GIT_SSL_CAINFO = String;
4+ LANG = String;
5+ LD_LIBRARY_PATH = β;
6+ STACK_IN_NIX_EXTRA_ARGS = [γ];
7+ STACK_IN_NIX_SHELL = Number;
8+ STACK_PLATFORM_VARIANT = String;
9+ __noChroot = Bool;
10+ buildInputs = [δ];
11+ buildPhase = String;
12+ checkPhase = String;
13+ doCheck = Bool;
14+ installPhase = String;
15+ nativeBuildInputs = [ε];
16+ preConfigure = String;
17+ preferLocalBuild = Bool;
18+ } ~
19+ ζ,
20+ α.?LD_LIBRARY_PATH = [δ],
21+ α.?buildInputs = [δ],
22+ α.?buildPhase = String,
23+ α.?checkPhase = String,
24+ α.?doCheck = Bool,
25+ α.?extraArgs = [γ],
26+ α.?ghc = ε,
27+ α.?installPhase = String,
28+ α.?nativeBuildInputs = [ε],
29+ α.?stack = ε,
30+ η.hostPlatform = θ,
31+ η.mkDerivation = ζ -> ι,
32+ κ.makeLibraryPath = [δ] -> β,
33+ κ.optional = Bool -> λ -> [δ],
34+ θ.libc = String
3835) =>
3936{ cacert = μ;
4037 ghc = ε;
41− glibcLocales = κ;
42− lib = ι;
43− makeSetupHook = {} -> Path -> ε;
38+ glibcLocales = λ;
39+ lib = κ;
40+ makeSetupHook = {} -> String -> ε;
4441 pkgconfig = ε;
4542 stack = ε;
4643 stdenv = η;
4744} ->
48−α -> θ
45+α -> ι
test/golden/importless/generic-v3.txt+22−27
@@ -8,8 +8,8 @@
88 α.stdenv = ζ,
99 α.version = η,
1010 α.zlib = θ,
11− ζ.bsd3 = ι,
12− ζ.isDarwin = κ,
11+ ζ.isDarwin = ι,
12+ ζ.lib = κ,
1313 ζ.mkDerivation =
1414 { buildInputs = [θ];
1515 configureFlags = [String];
@@ -19,9 +19,9 @@
1919 meta =
2020 { description = String;
2121 homepage = String;
22− license = ι;
22+ license = λ;
2323 longDescription = String;
24− platforms = λ;
24+ platforms = μ;
2525 };
2626 nativeBuildInputs = [Null];
2727 passthru = {version = η;};
@@ -30,16 +30,14 @@
3030 src = δ;
3131 version = η;
3232 } ->
33− μ,
34− ζ.optionalString = κ -> String -> String,
35− ζ.unix = λ,
36− ν.licenses = ζ,
37− ξ.lib = ν,
38− ο.platforms = ζ,
39− π.lib = ο,
40− ρ.lib = ζ,
41− σ.bsd3 = τ,
42− σ.isDarwin = υ,
33+ ν,
34+ κ.licenses = ξ,
35+ ξ.bsd3 = λ,
36+ ο.platforms = π,
37+ π.unix = μ,
38+ ρ.optionalString = ι -> String -> String,
39+ σ.isDarwin = τ,
40+ σ.lib = υ,
4341 σ.mkDerivation =
4442 { buildInputs = [θ];
4543 configureFlags = [String];
@@ -49,9 +47,9 @@
4947 meta =
5048 { description = String;
5149 homepage = String;
52− license = τ;
50+ license = φ;
5351 longDescription = String;
54− platforms = φ;
52+ platforms = χ;
5553 };
5654 nativeBuildInputs = [Null];
5755 passthru = {version = η;};
@@ -61,18 +59,15 @@
6159 version = η;
6260 } ->
6361 Null,
64− σ.optionalString = υ -> String -> String,
65− σ.unix = φ,
66− χ.licenses = σ,
67− ψ.lib = χ,
68− ω.platforms = σ,
69− α1.lib = ω,
70− β1.lib = σ,
62+ υ.licenses = ψ,
63+ ψ.bsd3 = φ,
64+ ω.platforms = α1,
65+ α1.unix = χ,
66+ β1.optionalString = τ -> String -> String,
7167 ζ.buildPlatform = γ1,
7268 ζ.hostPlatform = γ1,
73− β.cc = Null,
74− β.stdenv = σ,
69+ β.stdenv = δ1,
7570 β.which = Null,
76− δ1.stdenv = β
71+ δ1.cc = Null
7772) =>
78−α -> μ
73+α -> ν
test/golden/importless/generic.txt+11−12
@@ -14,30 +14,29 @@
1414 β.which = γ,
1515 θ.cc = κ,
1616 θ.lib = λ,
17− θ.makeLibraryPath = [κ] -> μ,
1817 θ.mkDerivation =
1918 { installPhase = String;
2019 meta =
2120 { description = String;
2221 homepage = String;
23− license = ν;
24− maintainers = [ξ];
25− platforms = ο;
22+ license = μ;
23+ maintainers = [ν];
24+ platforms = ξ;
2625 };
2726 nativeBuildInputs = [δ];
2827 pname = String;
2928 src = ζ;
3029 version = ∀ α. α;
3130 } ->
32− π,
33− ρ.lib = θ,
34− σ.cc = θ,
35− λ.makeBinPath = [γ] -> τ,
36− υ.cransom = ξ,
31+ ο,
32+ λ.makeLibraryPath = [π] -> ρ,
33+ κ.cc = π,
34+ σ.makeBinPath = [γ] -> τ,
35+ υ.cransom = ν,
3736 υ.licenses = φ,
3837 υ.maintainers = χ,
3938 υ.platforms = ψ,
40− φ.asl20 = ν,
41− ψ.unix = ο
39+ φ.asl20 = μ,
40+ ψ.unix = ξ
4241) =>
43−β -> π
42+β -> ο
test/golden/importless/geogebra6.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
2−( (β) // ({license = γ; maintainers = [δ]; platforms = ε;}) ~ (ζ),
2+( β // {license = γ; maintainers = [δ]; platforms = ε;} ~ ζ,
33 η.lib = θ,
44 η.mkDerivation =
55 { desktopItem = ι;
test/golden/importless/gerbil-crypto.txt+20−20
@@ -1,43 +1,43 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
22( α.pkg-config = β,
33 α.secp256k1 = β,
4− γ.asl20 = δ,
4+ γ.licenses = δ,
55 γ.maintainers = ε,
6− γ.unix = ζ,
7− η.gerbil-utils = θ,
6+ γ.platforms = ζ,
87 η.gerbilPackage =
98 { buildInputs = [β];
10− gambit-params = ι;
11− gerbil = κ;
9+ gambit-params = θ;
10+ gerbil = ι;
1211 gerbil-package = String;
13− gerbilInputs = [θ];
12+ gerbilInputs = [κ];
1413 git-version = String;
1514 meta =
1615 { description = String;
1716 homepage = String;
18− license = δ;
19− maintainers = [λ];
20− platforms = ζ;
17+ license = λ;
18+ maintainers = [μ];
19+ platforms = ν;
2120 };
2221 pname = String;
2322 softwareName = String;
24− src = μ;
23+ src = ξ;
2524 version = String;
2625 version-path = String;
2726 } ->
28− ν,
29− ξ.unstable-params = ι,
30− ο.licenses = γ,
31− ε.fare = λ,
32− π.platforms = γ,
33− ρ.gerbilPackages-unstable = η
27+ ο,
28+ η.gerbilPackages-unstable = π,
29+ ρ.unstable-params = θ,
30+ δ.asl20 = λ,
31+ ε.fare = μ,
32+ ζ.unix = ν,
33+ π.gerbil-utils = κ
3434) =>
3535{ fetchFromGitHub =
36− {owner = String; repo = String; rev = String; sha256 = String;} -> μ;
37− gambit-support = ξ;
36+ {owner = String; repo = String; rev = String; sha256 = String;} -> ξ;
37+ gambit-support = ρ;
3838 gerbil-support = η;
39− gerbil-unstable = κ;
39+ gerbil-unstable = ι;
4040 lib = γ;
4141 pkgs = α;
4242} ->
43−ν
43+ο
test/golden/importless/gerbil-ethereum.txt+20−20
@@ -1,9 +1,9 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( β.asl20 = γ,
2+( β.licenses = γ,
33 β.maintainers = δ,
4− β.unix = ε,
4+ β.platforms = ε,
55 ζ.gerbilPackage =
6− { buildInputs = ∀ α. α;
6+ { buildInputs = ∀ α. [α];
77 gambit-params = η;
88 gerbil = θ;
99 gerbil-package = String;
@@ -12,33 +12,33 @@
1212 meta =
1313 { description = String;
1414 homepage = String;
15− license = γ;
16− maintainers = [κ];
17− platforms = ε;
15+ license = κ;
16+ maintainers = [λ];
17+ platforms = μ;
1818 };
1919 pname = String;
2020 softwareName = String;
21− src = λ;
21+ src = ν;
2222 version = String;
2323 version-path = String;
2424 } ->
25− μ,
26− ζ.gerbilPackages-unstable = ν,
27− ξ.unstable-params = η,
28− ο.licenses = β,
29− δ.fare = κ,
30− π.platforms = β,
31− ν.gerbil-crypto = ι,
32− ν.gerbil-persist = ι,
33− ν.gerbil-poo = ι,
34− ν.gerbil-utils = ι
25+ ξ,
26+ ζ.gerbilPackages-unstable = ο,
27+ π.unstable-params = η,
28+ γ.asl20 = κ,
29+ δ.fare = λ,
30+ ε.unix = μ,
31+ ο.gerbil-crypto = ι,
32+ ο.gerbil-persist = ι,
33+ ο.gerbil-poo = ι,
34+ ο.gerbil-utils = ι
3535) =>
3636{ fetchFromGitHub =
37− {owner = String; repo = String; rev = String; sha256 = String;} -> λ;
38− gambit-support = ξ;
37+ {owner = String; repo = String; rev = String; sha256 = String;} -> ν;
38+ gambit-support = π;
3939 gerbil-support = ζ;
4040 gerbil-unstable = θ;
4141 lib = β;
4242 pkgs = ρ;
4343} ->
44−μ
44+ξ
test/golden/importless/gerbil-persist.txt+19−19
@@ -1,9 +1,9 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( β.asl20 = γ,
2+( β.licenses = γ,
33 β.maintainers = δ,
4− β.unix = ε,
4+ β.platforms = ε,
55 ζ.gerbilPackage =
6− { buildInputs = ∀ α. α;
6+ { buildInputs = ∀ α. [α];
77 gambit-params = η;
88 gerbil = θ;
99 gerbil-package = String;
@@ -12,32 +12,32 @@
1212 meta =
1313 { description = String;
1414 homepage = String;
15− license = γ;
16− maintainers = [κ];
17− platforms = ε;
15+ license = κ;
16+ maintainers = [λ];
17+ platforms = μ;
1818 };
1919 pname = String;
2020 softwareName = String;
21− src = λ;
21+ src = ν;
2222 version = String;
2323 version-path = String;
2424 } ->
25− μ,
26− ζ.gerbilPackages-unstable = ν,
27− ξ.unstable-params = η,
28− ο.licenses = β,
29− δ.fare = κ,
30− π.platforms = β,
31− ν.gerbil-crypto = ι,
32− ν.gerbil-poo = ι,
33− ν.gerbil-utils = ι
25+ ξ,
26+ ζ.gerbilPackages-unstable = ο,
27+ π.unstable-params = η,
28+ γ.asl20 = κ,
29+ δ.fare = λ,
30+ ε.unix = μ,
31+ ο.gerbil-crypto = ι,
32+ ο.gerbil-poo = ι,
33+ ο.gerbil-utils = ι
3434) =>
3535{ fetchFromGitHub =
36− {owner = String; repo = String; rev = String; sha256 = String;} -> λ;
37− gambit-support = ξ;
36+ {owner = String; repo = String; rev = String; sha256 = String;} -> ν;
37+ gambit-support = π;
3838 gerbil-support = ζ;
3939 gerbil-unstable = θ;
4040 lib = β;
4141 pkgs = ρ;
4242} ->
43−μ
43+ξ
test/golden/importless/gerbil-poo.txt+18−18
@@ -1,9 +1,9 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2−( β.asl20 = γ,
2+( β.licenses = γ,
33 β.maintainers = δ,
4− β.unix = ε,
4+ β.platforms = ε,
55 ζ.gerbilPackage =
6− { buildInputs = ∀ α. α;
6+ { buildInputs = ∀ α. [α];
77 gambit-params = η;
88 gerbil = θ;
99 gerbil-package = String;
@@ -12,31 +12,31 @@
1212 meta =
1313 { description = String;
1414 homepage = String;
15− license = γ;
16− maintainers = [κ];
17− platforms = ε;
15+ license = κ;
16+ maintainers = [λ];
17+ platforms = μ;
1818 };
1919 pname = String;
2020 softwareName = String;
21− src = λ;
21+ src = ν;
2222 version = String;
2323 version-path = String;
2424 } ->
25− μ,
26− ζ.gerbilPackages-unstable = ν,
27− ξ.unstable-params = η,
28− ο.licenses = β,
29− δ.fare = κ,
30− π.platforms = β,
31− ν.gerbil-crypto = ι,
32− ν.gerbil-utils = ι
25+ ξ,
26+ ζ.gerbilPackages-unstable = ο,
27+ π.unstable-params = η,
28+ γ.asl20 = κ,
29+ δ.fare = λ,
30+ ε.unix = μ,
31+ ο.gerbil-crypto = ι,
32+ ο.gerbil-utils = ι
3333) =>
3434{ fetchFromGitHub =
35− {owner = String; repo = String; rev = String; sha256 = String;} -> λ;
36− gambit-support = ξ;
35+ {owner = String; repo = String; rev = String; sha256 = String;} -> ν;
36+ gambit-support = π;
3737 gerbil-support = ζ;
3838 gerbil-unstable = θ;
3939 lib = β;
4040 pkgs = ρ;
4141} ->
42−μ
42+ξ
test/golden/importless/gerbil-utils.txt+14−14
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.lgpl21 = β,
2+( α.licenses = β,
33 α.maintainers = γ,
4− α.unix = δ,
4+ α.platforms = δ,
55 ε.gerbilPackage =
66 { gambit-params = ζ;
77 gerbil = η;
@@ -10,27 +10,27 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = β;
14− maintainers = [θ];
15− platforms = δ;
13+ license = θ;
14+ maintainers = [ι];
15+ platforms = κ;
1616 };
1717 pname = String;
1818 softwareName = String;
19− src = ι;
19+ src = λ;
2020 version = String;
2121 version-path = String;
2222 } ->
23− κ,
24− λ.unstable-params = ζ,
25− μ.licenses = α,
26− γ.fare = θ,
27− ν.platforms = α
23+ μ,
24+ ν.unstable-params = ζ,
25+ β.lgpl21 = θ,
26+ γ.fare = ι,
27+ δ.unix = κ
2828) =>
2929{ fetchFromGitHub =
30− {owner = String; repo = String; rev = String; sha256 = String;} -> ι;
31− gambit-support = λ;
30+ {owner = String; repo = String; rev = String; sha256 = String;} -> λ;
31+ gambit-support = ν;
3232 gerbil-support = ε;
3333 gerbil-unstable = η;
3434 lib = α;
3535} ->
36−κ
36+μ
test/golden/importless/ghcjs-base.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.mit = β, γ.licenses = α, δ.lib = γ) => { HUnit = ε;
2+(α.lib = β, β.licenses = γ, γ.mit = δ) => { HUnit = ε;
33 QuickCheck = ε;
44 aeson = ε;
55 array = ε;
@@ -20,7 +20,7 @@
2020 { description = String;
2121 homepage = String;
2222 libraryHaskellDepends = [ε];
23− license = β;
23+ license = δ;
2424 pname = String;
2525 src = ζ;
2626 testHaskellDepends = [ε];
test/golden/importless/ghostscript.txt+7−7
@@ -2,11 +2,11 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enableGhostscriptFonts = ε,
6− γ.mkIf = ε -> {fonts = {fonts = [String];};} -> ζ,
7− γ.mkOption = {default = Bool; description = String; type = η;} -> θ,
8− γ.types = ι,
9− κ.fonts = β,
10− ι.bool = η
5+ β.fonts = ε,
6+ γ.mkIf = ζ -> {fonts = {fonts = [String];};} -> η,
7+ γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
8+ γ.types = κ,
9+ ε.enableGhostscriptFonts = ζ,
10+ κ.bool = θ
1111) =>
12−α -> {config = ζ; options = {fonts = {enableGhostscriptFonts = θ;};};}
12+α -> {config = η; options = {fonts = {enableGhostscriptFonts = ι;};};}
test/golden/importless/gitlab-ci-pipelines-exporter.txt+1−1
@@ -7,7 +7,7 @@
77) =>
88{ buildGoPackage =
99 { doCheck = Bool;
10− goDeps = Path;
10+ goDeps = String;
1111 goPackagePath = String;
1212 meta =
1313 { description = String;
test/golden/importless/glfw.txt+6−6
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ η θ ι κ λ.
2−( α.brainrape = β,
3− α.mit = γ,
2+( α.licenses = β,
3+ α.maintainers = γ,
44 δ.glfw = ε,
55 δ.pkgconfig = ζ,
6− η.licenses = α,
7− θ.maintainers = α
6+ β.mit = η,
7+ γ.brainrape = θ
88) =>
99{ build-idris-package =
1010 { extraBuildInputs = [ε];
@@ -12,8 +12,8 @@
1212 meta =
1313 { description = String;
1414 homepage = String;
15− license = γ;
16− maintainers = [β];
15+ license = η;
16+ maintainers = [θ];
1717 };
1818 name = String;
1919 nativeBuildInputs = [ζ];
test/golden/importless/glib-networking.txt+12−12
@@ -2,25 +2,25 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 δ.glib-networking = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
9− ε ->
9+ θ ->
1010 { environment = {variables = {GIO_EXTRA_MODULES = [String];};};
1111 services = {dbus = {packages = [ζ];};};
12− systemd = {packages = [θ];};
12+ systemd = {packages = [ι];};
1313 } ->
14− ι,
15− γ.teams = κ,
16− λ.glib-networking = β,
17− μ.gnome3 = λ,
18− ν.services = μ,
19− κ.members = ξ,
20− ο.gnome = κ
14+ κ,
15+ γ.teams = λ,
16+ ε.gnome3 = μ,
17+ μ.glib-networking = ν,
18+ ν.enable = θ,
19+ λ.gnome = ξ,
20+ ξ.members = ο
2121) =>
2222α ->
23−{ config = ι;
24− meta = {maintainers = ξ;};
23+{ config = κ;
24+ meta = {maintainers = ο;};
2525 options = {services = {gnome3 = {glib-networking = {enable = η;};};};};
2626}
test/golden/importless/global-vars.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/gmusic.txt+1−1
@@ -5,7 +5,7 @@
55 meta =
66 { description = String;
77 homepage = String;
8− hydraPlatforms = ∀ α. α;
8+ hydraPlatforms = ∀ α. [α];
99 license = ε;
1010 maintainers = [ζ];
1111 };
test/golden/importless/gnome-initial-setup.txt+20−20
@@ -2,17 +2,17 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− β.stateVersion = ζ,
7− δ.gnome-initial-setup = η,
5+ β.services = ε,
6+ β.system = ζ,
7+ δ.gnome3 = η,
88 δ.writeScript = String -> String -> θ,
99 δ.writeTextFile = {destination = String; name = String; text = String;} -> ι,
1010 γ.mkEnableOption = String -> κ,
1111 γ.mkIf =
12− ε ->
13− { environment = {systemPackages = [η];};
12+ λ ->
13+ { environment = {systemPackages = [μ];};
1414 systemd =
15− { packages = [λ];
15+ { packages = [ν];
1616 user =
1717 { targets =
1818 { gnome-session = {wants = [String];};
@@ -21,21 +21,21 @@
2121 };
2222 };
2323 } ->
24− μ,
25− γ.optional = ν -> ι -> [η],
26− γ.teams = ξ,
27− γ.versionOlder = ζ -> String -> ν,
28− ο.gnome-initial-setup = β,
29− π.gnome3 = ο,
30− ρ.services = π,
31− σ.gnome3 = δ,
32− τ.system = β,
33− υ.gnome3 = δ,
34− ξ.members = φ,
35− χ.gnome = ξ
24+ ξ,
25+ γ.optional = ο -> ι -> [μ],
26+ γ.teams = π,
27+ γ.versionOlder = ρ -> String -> ο,
28+ ε.gnome3 = σ,
29+ σ.gnome-initial-setup = τ,
30+ τ.enable = λ,
31+ η.gnome-initial-setup = μ,
32+ ζ.stateVersion = ρ,
33+ υ.gnome-initial-setup = ν,
34+ π.gnome = φ,
35+ φ.members = χ
3636) =>
3737α ->
38−{ config = μ;
39− meta = {maintainers = φ;};
38+{ config = ξ;
39+ meta = {maintainers = χ;};
4040 options = {services = {gnome3 = {gnome-initial-setup = {enable = κ;};};};};
4141}
test/golden/importless/gnome-keyring.txt+21−21
@@ -2,36 +2,36 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 δ.gcr = ζ,
7− δ.gnome-keyring = η,
7+ δ.gnome3 = η,
88 γ.mkIf =
9− ε ->
10− { environment = {systemPackages = [η];};
9+ θ ->
10+ { environment = {systemPackages = [ι];};
1111 security =
1212 { pam = {services = {login = {enableGnomeKeyring = Bool;};};};
1313 wrappers =
1414 {gnome-keyring-daemon = {capabilities = String; source = String;};};
1515 };
1616 services = {dbus = {packages = [ζ];};};
17− xdg = {portal = {extraPortals = [θ];};};
17+ xdg = {portal = {extraPortals = [κ];};};
1818 } ->
19− ι,
20− γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
21− γ.teams = μ,
22− γ.types = ν,
23− ξ.gnome-keyring = β,
24− ο.gnome3 = ξ,
25− π.services = ο,
26− ρ.gnome3 = δ,
27− σ.gnome3 = δ,
28− τ.gnome3 = δ,
29− μ.members = υ,
30− φ.gnome = μ,
31− ν.bool = κ
19+ λ,
20+ γ.mkOption = {default = Bool; description = String; type = μ;} -> ν,
21+ γ.teams = ξ,
22+ γ.types = ο,
23+ ε.gnome3 = π,
24+ π.gnome-keyring = ρ,
25+ ρ.enable = θ,
26+ η.gnome-keyring = ι,
27+ σ.gnome-keyring = ζ,
28+ τ.gnome-keyring = κ,
29+ ξ.gnome = υ,
30+ υ.members = φ,
31+ ο.bool = μ
3232) =>
3333α ->
34−{ config = ι;
35− meta = {maintainers = υ;};
36− options = {services = {gnome3 = {gnome-keyring = {enable = λ;};};};};
34+{ config = λ;
35+ meta = {maintainers = φ;};
36+ options = {services = {gnome3 = {gnome-keyring = {enable = ν;};};};};
3737}
test/golden/importless/gnome-online-accounts.txt+16−16
@@ -2,26 +2,26 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 δ.gnome-online-accounts = ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { environment = {systemPackages = [ζ];};
10− services = {dbus = {packages = [η];};};
10+ services = {dbus = {packages = [θ];};};
1111 } ->
12− θ,
13− γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
14− γ.teams = λ,
15− γ.types = μ,
16− ν.gnome-online-accounts = β,
17− ξ.gnome3 = ν,
18− ο.services = ξ,
19− λ.members = π,
20− ρ.gnome = λ,
21− μ.bool = ι
12+ ι,
13+ γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
14+ γ.teams = μ,
15+ γ.types = ν,
16+ ε.gnome3 = ξ,
17+ ξ.gnome-online-accounts = ο,
18+ ο.enable = η,
19+ μ.gnome = π,
20+ π.members = ρ,
21+ ν.bool = κ
2222) =>
2323α ->
24−{ config = θ;
25− meta = {maintainers = π;};
26− options = {services = {gnome3 = {gnome-online-accounts = {enable = κ;};};};};
24+{ config = ι;
25+ meta = {maintainers = ρ;};
26+ options = {services = {gnome3 = {gnome-online-accounts = {enable = λ;};};};};
2727}
test/golden/importless/gnome-online-miners.txt+20−20
@@ -2,28 +2,28 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− δ.gnome-online-miners = ζ,
5+ β.services = ε,
6+ δ.gnome3 = ζ,
77 γ.mkIf =
8− ε ->
9− { environment = {systemPackages = [ζ];};
10− services = {dbus = {packages = [η];};};
8+ η ->
9+ { environment = {systemPackages = [θ];};
10+ services = {dbus = {packages = [ι];};};
1111 } ->
12− θ,
13− γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
14− γ.teams = λ,
15− γ.types = μ,
16− ν.gnome-online-miners = β,
17− ξ.gnome3 = ν,
18− ο.services = ξ,
19− π.gnome3 = δ,
20− ρ.gnome3 = δ,
21− λ.members = σ,
22− τ.gnome = λ,
23− μ.bool = ι
12+ κ,
13+ γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
14+ γ.teams = ν,
15+ γ.types = ξ,
16+ ε.gnome3 = ο,
17+ ο.gnome-online-miners = π,
18+ π.enable = η,
19+ ζ.gnome-online-miners = θ,
20+ ρ.gnome-online-miners = ι,
21+ ν.gnome = σ,
22+ σ.members = τ,
23+ ξ.bool = λ
2424) =>
2525α ->
26−{ config = θ;
27− meta = {maintainers = σ;};
28− options = {services = {gnome3 = {gnome-online-miners = {enable = κ;};};};};
26+{ config = κ;
27+ meta = {maintainers = τ;};
28+ options = {services = {gnome3 = {gnome-online-miners = {enable = μ;};};};};
2929}
test/golden/importless/gnome-remote-desktop.txt+14−14
@@ -2,23 +2,23 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
9− {services = {pipewire = {enable = Bool;};}; systemd = {packages = [η];};} ->
10− θ,
11− γ.teams = ι,
12− δ.gnome-remote-desktop = η,
13− κ.gnome-remote-desktop = β,
14− λ.gnome3 = κ,
15− μ.services = λ,
16− ν.gnome3 = δ,
17− ι.members = ξ,
18− ο.gnome = ι
8+ η ->
9+ {services = {pipewire = {enable = Bool;};}; systemd = {packages = [θ];};} ->
10+ ι,
11+ γ.teams = κ,
12+ δ.gnome3 = λ,
13+ ε.gnome3 = μ,
14+ μ.gnome-remote-desktop = ν,
15+ ν.enable = η,
16+ λ.gnome-remote-desktop = θ,
17+ κ.gnome = ξ,
18+ ξ.members = ο
1919) =>
2020α ->
21−{ config = θ;
22− meta = {maintainers = ξ;};
21+{ config = ι;
22+ meta = {maintainers = ο;};
2323 options = {services = {gnome3 = {gnome-remote-desktop = {enable = ζ;};};};};
2424}
test/golden/importless/gnome-user-share.txt+14−14
@@ -2,23 +2,23 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− δ.gnome-user-share = ζ,
5+ β.services = ε,
6+ δ.gnome3 = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
9− ε ->
10− {environment = {systemPackages = [ζ];}; systemd = {packages = [θ];};} -> ι,
11− γ.teams = κ,
12− λ.gnome-user-share = β,
13− μ.gnome3 = λ,
14− ν.services = μ,
15− ξ.gnome3 = δ,
16− ο.gnome3 = δ,
17− κ.members = π,
18− ρ.gnome = κ
9+ θ ->
10+ {environment = {systemPackages = [ι];}; systemd = {packages = [κ];};} -> λ,
11+ γ.teams = μ,
12+ ε.gnome3 = ν,
13+ ν.gnome-user-share = ξ,
14+ ξ.enable = θ,
15+ ζ.gnome-user-share = ι,
16+ ο.gnome-user-share = κ,
17+ μ.gnome = π,
18+ π.members = ρ
1919) =>
2020α ->
21−{ config = ι;
22− meta = {maintainers = π;};
21+{ config = λ;
22+ meta = {maintainers = ρ;};
2323 options = {services = {gnome3 = {gnome-user-share = {enable = η;};};};};
2424}
test/golden/importless/gnu.txt+5−5
@@ -6,7 +6,7 @@
66 γ.grub2 = ζ,
77 γ.mkIf =
88 ε ->
9− { boot = {loader = {grub = {enable = Bool; version = Integer;};};};
9+ { boot = {loader = {grub = {enable = Bool; version = Number;};};};
1010 environment = {systemPackages = [η];};
1111 programs = {ssh = {startAgent = Bool;};};
1212 services =
@@ -23,10 +23,10 @@
2323 γ.texinfo = η,
2424 γ.types = μ,
2525 γ.zile = η,
26− δ.isAarch32 = Bool,
27− ν.stdenv = δ,
28− λ.optional = Bool -> ζ -> [η],
29− ξ.lib = λ,
26+ δ.stdenv = ν,
27+ ν.isAarch32 = Bool,
28+ λ.lib = ξ,
29+ ξ.optional = Bool -> ζ -> [η],
3030 ο.isAarch32 = Bool,
3131 μ.bool = ι
3232) =>
test/golden/importless/go-ethereum.txt+9−10
@@ -1,16 +1,15 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ.
22( α.isDarwin = β,
33 α.lib = γ,
4− α.optionals = β -> [δ] -> ε,
5− ζ.lib = α,
6− γ.RaghavSood = η,
7− γ.adisbladis = η,
8− γ.gpl3 = θ,
9− γ.lgpl3 = θ,
10− γ.licenses = ι,
11− γ.lionello = η,
12− γ.maintainers = κ,
13− γ.xrelkd = η
4+ γ.optionals = β -> [δ] -> ε,
5+ ζ.RaghavSood = η,
6+ ζ.adisbladis = η,
7+ ζ.gpl3 = θ,
8+ ζ.lgpl3 = θ,
9+ ζ.licenses = ι,
10+ ζ.lionello = η,
11+ ζ.maintainers = κ,
12+ ζ.xrelkd = η
1413) =>
1514{ IOKit = δ;
1615 buildGoModule =
test/golden/importless/go-shadowsocks2.txt+4−4
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.server = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -20,9 +20,9 @@
2020 θ,
2121 γ.mkOption = {description = String; example = String; type = ι;} -> κ,
2222 γ.types = λ,
23− ε.enable = η,
24− μ.go-shadowsocks2 = β,
25− ν.services = μ,
23+ ε.go-shadowsocks2 = μ,
24+ μ.server = ν,
25+ ν.enable = η,
2626 λ.str = ι
2727) =>
2828α ->
test/golden/importless/google_oslogin.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.googleOsLogin = ε,
5+ β.security = ε,
66 γ.mkIf =
77 ζ ->
88 { environment =
@@ -38,8 +38,8 @@
3838 γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
3939 γ.types = λ,
4040 δ.google-compute-engine-oslogin = η,
41− ε.enable = ζ,
42− μ.security = β,
41+ ε.googleOsLogin = μ,
42+ μ.enable = ζ,
4343 λ.bool = ι
4444) =>
4545α -> {config = θ; options = {security = {googleOsLogin = {enable = κ;};};};}
test/golden/importless/gphoto2.txt+14−14
@@ -2,26 +2,26 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.programs = ε,
66 γ.maintainers = ζ,
77 γ.mkIf =
8− ε ->
9− { environment = {systemPackages = [η];};
10− services = {udev = {packages = [θ];};};
8+ η ->
9+ { environment = {systemPackages = [θ];};
10+ services = {udev = {packages = [ι];};};
1111 users = {groups = {camera = {};};};
1212 } ->
13− ι,
14− γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
15− γ.types = μ,
16− δ.gphoto2 = η,
17− δ.libgphoto2 = θ,
18− ν.gphoto2 = β,
19− ξ.programs = ν,
13+ κ,
14+ γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
15+ γ.types = ν,
16+ δ.gphoto2 = θ,
17+ δ.libgphoto2 = ι,
18+ ε.gphoto2 = ξ,
19+ ξ.enable = η,
2020 ζ.league = ο,
21− μ.bool = κ
21+ ν.bool = λ
2222) =>
2323α ->
24−{ config = ι;
24+{ config = κ;
2525 meta = {maintainers = [ο];};
26− options = {programs = {gphoto2 = {enable = λ;};};};
26+ options = {programs = {gphoto2 = {enable = μ;};};};
2727}
test/golden/importless/graphite2.txt+4−5
@@ -14,11 +14,10 @@
1414 version = String;
1515 } ->
1616 μ,
17− α.optionals = β -> [Path] -> κ,
18− ν.lib = α,
19− γ.licenses = ξ,
20− γ.maintainers = ο,
21− γ.platforms = π,
17+ γ.optionals = β -> [String] -> κ,
18+ ν.licenses = ξ,
19+ ν.maintainers = ο,
20+ ν.platforms = π,
2221 ξ.lgpl21 = ζ,
2322 ο.raskin = η,
2423 π.unix = θ
test/golden/importless/graphql.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.meta = β,
44 δ.src = ε,
55 δ.version = ζ
test/golden/importless/graphviz-2.0.txt+12−13
@@ -1,5 +1,6 @@
11∀ α β γ δ ε ζ η θ.
2−( α.mkDerivation =
2+( α.lib = β,
3+ α.mkDerivation =
34 { buildInputs = [Null];
45 configureFlags = [String];
56 hardeningDisable = [String];
@@ -7,21 +8,19 @@
78 { branch = String;
89 description = String;
910 homepage = String;
10− platforms = β;
11+ platforms = γ;
1112 };
1213 name = String;
13− nativeBuildInputs = [γ];
14− src = δ;
14+ nativeBuildInputs = [δ];
15+ src = ε;
1516 } ->
16− ε,
17− α.optional = Bool -> String -> [String],
18− α.unix = β,
19− ζ.platforms = α,
20− η.lib = ζ,
21− θ.lib = α
17+ ζ,
18+ β.platforms = η,
19+ η.unix = γ,
20+ θ.optional = Bool -> String -> [String]
2221) =>
2322{ expat = Null;
24− fetchurl = {sha256 = String; url = String;} -> δ;
23+ fetchurl = {sha256 = String; url = String;} -> ε;
2524 fontconfig = Null;
2625 gd = Null;
2726 libXaw = Null;
@@ -30,9 +29,9 @@
3029 libtool = Null;
3130 libwebp = Null;
3231 pango = Null;
33− pkgconfig = γ;
32+ pkgconfig = δ;
3433 stdenv = α;
3534 xlibsWrapper = Null;
3635 yacc = Null;
3736} ->
38−ε
37+ζ
test/golden/importless/graphviz.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.gpl3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 postUnpack = String;
test/golden/importless/greenclip.txt+6−6
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.greenclip = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -25,11 +25,11 @@
2525 γ.mkOption =
2626 {default = κ; defaultText = String; description = String; type = λ;} -> μ,
2727 γ.types = ν,
28− δ.greenclip = κ,
29− ε.enable = η,
30− ε.package = θ,
31− ξ.services = β,
32− ο.haskellPackages = δ,
28+ δ.haskellPackages = ξ,
29+ ε.greenclip = ο,
30+ ο.enable = η,
31+ ο.package = θ,
32+ ξ.greenclip = κ,
3333 ν.package = λ
3434) =>
3535α ->
test/golden/importless/gsl-1_16.txt+15−17
@@ -1,6 +1,6 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
2−( α.gpl3Plus = β,
3− α.isx86_64 = γ,
2+( α.isx86_64 = β,
3+ α.lib = γ,
44 α.mkDerivation =
55 { NIX_CFLAGS_COMPILE = δ;
66 doCheck = Bool;
@@ -8,25 +8,23 @@
88 { badPlatforms = [String];
99 description = String;
1010 homepage = String;
11− license = β;
11+ license = ε;
1212 longDescription = String;
13− platforms = ε;
13+ platforms = ζ;
1414 };
1515 name = String;
16− patches = [ζ];
17− src = η;
16+ patches = [η];
17+ src = θ;
1818 } ->
19− θ,
20− α.optionalString = γ -> String -> δ,
21− α.unix = ε,
22− ι.licenses = α,
23− κ.lib = ι,
24− λ.platforms = α,
25− μ.lib = λ,
26− ν.lib = α
19+ ι,
20+ γ.licenses = κ,
21+ κ.gpl3Plus = ε,
22+ λ.platforms = μ,
23+ μ.unix = ζ,
24+ ν.optionalString = β -> String -> δ
2725) =>
28−{ fetchpatch = {name = String; sha256 = String; url = String;} -> ζ;
29− fetchurl = {sha256 = String; url = String;} -> η;
26+{ fetchpatch = {name = String; sha256 = String; url = String;} -> η;
27+ fetchurl = {sha256 = String; url = String;} -> θ;
3028 stdenv = α;
3129} ->
32−θ
30+ι
test/golden/importless/gsm.txt+5−6
@@ -17,12 +17,11 @@
1717 version = String;
1818 } ->
1919 ι,
20− α.optionals = Bool -> [Null] -> [γ],
21− κ.lib = α,
22− β.licenses = λ,
23− β.maintainers = μ,
24− β.mog = ε,
25− β.platforms = ν,
20+ β.optionals = Bool -> [Null] -> [γ],
21+ κ.licenses = λ,
22+ κ.maintainers = μ,
23+ κ.mog = ε,
24+ κ.platforms = ν,
2625 λ.gpl3Plus = δ,
2726 ν.linux = ζ
2827) =>
test/golden/importless/gstreamer.txt+1−1
@@ -12,7 +12,7 @@
1212 platforms = η;
1313 };
1414 nativeBuildInputs = [θ];
15− patches = [Path];
15+ patches = [String];
1616 pname = String;
1717 src = ι;
1818 version = String;
test/golden/importless/gtk-greeter.txt+1−2
@@ -16,14 +16,13 @@
1616 version = ∀ α. α;
1717 } ->
1818 λ,
19− β.optional = Bool -> String -> [String],
2019 γ.licenses = μ,
2120 γ.maintainers = ν,
2221 γ.ocharles = ζ,
2322 γ.platforms = ξ,
2423 μ.gpl3 = ε,
2524 ξ.linux = η,
26− ο.lib = β
25+ ο.optional = Bool -> String -> [String]
2726) =>
2827{ at-spi2-core = π;
2928 exo = δ;
test/golden/importless/gtk-icon-cache.txt+11−10
@@ -2,14 +2,15 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− γ.mkIf = ε -> {environment = {extraSetup = String;};} -> ζ,
7− γ.mkOption = {default = η; description = String; type = θ;} -> ι,
8− γ.types = κ,
9− λ.iconCache = β,
10− μ.gtk = λ,
11− ν.xserver = β,
12− ξ.services = ν,
13− κ.bool = θ
5+ β.gtk = ε,
6+ β.services = ζ,
7+ γ.mkIf = η -> {environment = {extraSetup = String;};} -> θ,
8+ γ.mkOption = {default = ι; description = String; type = κ;} -> λ,
9+ γ.types = μ,
10+ ε.iconCache = ν,
11+ ν.enable = η,
12+ ζ.xserver = ξ,
13+ ξ.enable = ι,
14+ μ.bool = κ
1415) =>
15−α -> {config = ζ; options = {gtk = {iconCache = {enable = ι;};};};}
16+α -> {config = θ; options = {gtk = {iconCache = {enable = λ;};};};}
test/golden/importless/gui.txt+21−22
@@ -6,38 +6,37 @@
66 α.platforms = ι,
77 α.primeos = κ,
88 λ.override = {packageOverrides = ζ;} -> μ,
9− μ.buildPythonPackage =
9+ μ.pkgs = ν,
10+ η.gpl3Plus = ξ,
11+ ι.linux = ο,
12+ ν.buildPythonPackage =
1013 { doCheck = Bool;
1114 dontWrapQtApps = Bool;
1215 meta =
1316 { changelog = String;
1417 description = String;
1518 homepage = String;
16− license = ν;
19+ license = ξ;
1720 longDescription = String;
1821 maintainers = [κ];
19− platforms = ξ;
22+ platforms = ο;
2023 };
2124 name = String;
22− nativeBuildInputs = [ο];
25+ nativeBuildInputs = [π];
2326 pname = String;
2427 postFixup = String;
25− propagatedBuildInputs = [π];
26− src = ρ;
28+ propagatedBuildInputs = [ρ];
29+ src = σ;
2730 } ->
28− σ,
29− μ.pkgs = τ,
30− η.gpl3Plus = ν,
31− ι.linux = ξ,
32− υ.pkgs = μ,
33− τ.distro = π,
34− τ.jsonschema = π,
35− τ.psutil = π,
36− τ.pyqt5 = φ,
37− τ.sentry-sdk = π,
38− τ.setuptools = π,
39− τ.sip = π,
40− φ.override = {withWebSockets = Bool;} -> π
31+ τ,
32+ υ.distro = ρ,
33+ υ.jsonschema = ρ,
34+ υ.psutil = ρ,
35+ υ.pyqt5 = φ,
36+ υ.sentry-sdk = ρ,
37+ υ.setuptools = ρ,
38+ υ.sip = ρ,
39+ φ.override = {withWebSockets = Bool;} -> ρ
4140) =>
4241{ branch = χ;
4342 commonOverrides = [ε];
@@ -47,9 +46,9 @@
4746 version = β1;
4847} ->
4948{ fetchFromGitHub =
50− {owner = String; repo = String; rev = String; sha256 = ω;} -> ρ;
49+ {owner = String; repo = String; rev = String; sha256 = ω;} -> σ;
5150 lib = α;
5251 python3 = λ;
53− wrapQtAppsHook = ο;
52+ wrapQtAppsHook = π;
5453} ->
55−σ
54+τ
test/golden/importless/gwenview.txt+3−3
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.getBin = β -> γ,
33 α.licenses = δ,
4− α.ttuegel = ε,
4+ α.maintainers = ε,
55 δ.fdl12 = ζ,
66 δ.gpl2 = ζ,
7− η.maintainers = α
7+ ε.ttuegel = η
88) =>
99{ baloo = γ;
1010 exiv2 = γ;
@@ -21,7 +21,7 @@
2121 libkipi = γ;
2222 mkDerivation =
2323 { buildInputs = [γ];
24− meta = {license = [ζ]; maintainers = [ε];};
24+ meta = {license = [ζ]; maintainers = [η];};
2525 name = String;
2626 nativeBuildInputs = [θ];
2727 propagatedUserEnvPkgs = [γ];
test/golden/importless/hamster.txt+12−13
@@ -2,23 +2,22 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.programs = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
8− ε ->
9− { environment = {systemPackages = [η];};
10− services = {dbus = {packages = [θ];};};
8+ η ->
9+ { environment = {systemPackages = [θ];};
10+ services = {dbus = {packages = [ι];};};
1111 } ->
12− ι,
13− δ.hamster = η,
14− δ.maintainers = κ,
15− λ.hamster = β,
16− μ.programs = λ,
17− ν.meta = δ,
18− ξ.hamster = ν
12+ κ,
13+ δ.hamster = θ,
14+ ε.hamster = λ,
15+ λ.enable = η,
16+ μ.meta = ν,
17+ ν.maintainers = ξ
1918) =>
2019α ->
21−{ config = ι;
22− meta = {maintainers = κ;};
20+{ config = κ;
21+ meta = {maintainers = ξ;};
2322 options = {programs = {hamster = {enable = ζ;};};};
2423}
test/golden/importless/hamt.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.bsd3 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd3 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/hdaps.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.hdapsd = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,7 +12,7 @@
1212 } ->
1313 ι,
1414 δ.hdapsd = θ,
15− ε.enable = η,
16− κ.services = β
15+ ε.hdapsd = κ,
16+ κ.enable = η
1717) =>
1818α -> {config = ι; options = {services = {hdapsd = {enable = ζ;};};};}
test/golden/importless/helper.txt+1−1
@@ -5,7 +5,7 @@
55 installPhase = String;
66 meta =
77 { description = String;
8− hydraPlatforms = ∀ α. α;
8+ hydraPlatforms = ∀ α. [α];
99 license = ε;
1010 maintainers = [ζ];
1111 platforms = η;
test/golden/importless/herbstluftwm.txt+6−6
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.herbstluftwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -17,11 +17,11 @@
1717 γ.singleton = {name = String; start = String;} -> ι,
1818 γ.types = ο,
1919 δ.herbstluftwm = θ,
20− ε.configFile = Null,
21− ε.enable = η,
22− π.windowManager = β,
23− ρ.xserver = π,
24− σ.services = ρ
20+ ε.xserver = π,
21+ π.windowManager = ρ,
22+ ρ.herbstluftwm = σ,
23+ σ.configFile = Null,
24+ σ.enable = η
2525) =>
2626α ->
2727{ config = κ;
test/golden/importless/hezarfen.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = γ;
12− maintainers = [β];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/hg.txt+1−1
@@ -14,7 +14,7 @@
1414 maintainers = [ε];
1515 };
1616 nativeBuildInputs = δ;
17− patches = [Path];
17+ patches = [String];
1818 pname = String;
1919 preBuild = String;
2020 propagatedBuildInputs = [γ];
test/golden/importless/hidepid.txt+14−14
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.config = β,
33 α.lib = γ,
4− β.hideProcessInformation = δ,
5− β.proc = ε,
4+ β.ids = δ,
5+ β.security = ε,
66 γ.maintainers = ζ,
77 γ.mkIf =
8− δ ->
8+ η ->
99 { boot = {specialFileSystems = {/proc = {options = [String];};};};
1010 systemd =
1111 { services =
@@ -13,19 +13,19 @@
1313 {serviceConfig = {SupplementaryGroups = [String];};};
1414 };
1515 };
16− users = {groups = {proc = {gid = ε; members = [String];};};};
16+ users = {groups = {proc = {gid = θ; members = [String];};};};
1717 } ->
18− η,
19− γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
20− γ.types = κ,
21− λ.security = β,
22− μ.gids = β,
23− ν.ids = μ,
18+ ι,
19+ γ.mkOption = {default = Bool; description = String; type = κ;} -> λ,
20+ γ.types = μ,
21+ ε.hideProcessInformation = η,
22+ δ.gids = ν,
23+ ν.proc = θ,
2424 ζ.joachifm = ξ,
25− κ.bool = θ
25+ μ.bool = κ
2626) =>
2727α ->
28−{ config = η;
29− meta = {doc = Path; maintainers = [ξ];};
30− options = {security = {hideProcessInformation = ι;};};
28+{ config = ι;
29+ meta = {doc = String; maintainers = [ξ];};
30+ options = {security = {hideProcessInformation = λ;};};
3131}
test/golden/importless/hls-ghcide.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.asl20 = β, γ.licenses = α, δ.lib = γ) => { Chart = ε;
2+(α.lib = β, β.licenses = γ, γ.asl20 = δ) => { Chart = ε;
33 Chart-diagrams = ε;
44 QuickCheck = ε;
55 aeson = ε;
@@ -44,7 +44,7 @@
4444 isExecutable = Bool;
4545 isLibrary = Bool;
4646 libraryHaskellDepends = [ε];
47− license = β;
47+ license = δ;
4848 pname = String;
4949 src = ζ;
5050 testHaskellDepends = [ε];
test/golden/importless/hpsa.txt+19−19
@@ -2,44 +2,44 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.hardware = ε,
66 γ.licenses = ζ,
77 γ.maintainers = η,
88 γ.mkEnableOption = String -> θ,
99 γ.mkIf =
10− ε ->
10+ ι ->
1111 { boot =
1212 { initrd =
1313 {availableKernelModules = [String]; kernelModules = [String];};
1414 };
15− environment = {systemPackages = [ι];};
15+ environment = {systemPackages = [κ];};
1616 } ->
17− κ,
18− γ.volth = λ,
19− δ.dpkg = μ,
20− δ.fetchurl = {sha256 = String; url = String;} -> ν,
21− δ.mkDerivation =
17+ λ,
18+ γ.volth = μ,
19+ δ.dpkg = ν,
20+ δ.fetchurl = {sha256 = String; url = String;} -> ξ,
21+ δ.stdenv = ο,
22+ ο.mkDerivation =
2223 { dontStrip = Bool;
2324 installPhase = String;
2425 meta =
2526 { description = String;
2627 homepage = String;
27− license = ξ;
28− maintainers = [λ];
28+ license = π;
29+ maintainers = [μ];
2930 platforms = [String];
3031 };
31− nativeBuildInputs = [μ];
32+ nativeBuildInputs = [ν];
3233 pname = String;
33− src = ν;
34+ src = ξ;
3435 unpackPhase = String;
3536 version = String;
3637 } ->
37− ι,
38− ο.stdenv = δ,
39− ζ.unfreeRedistributable = ξ,
40− π.HPSmartArray = β,
41− ρ.raid = π,
42− σ.hardware = ρ
38+ κ,
39+ ζ.unfreeRedistributable = π,
40+ ε.raid = ρ,
41+ ρ.HPSmartArray = σ,
42+ σ.enable = ι
4343) =>
4444α ->
45−{config = κ; options = {hardware = {raid = {HPSmartArray = {enable = θ;};};};};}
45+{config = λ; options = {hardware = {raid = {HPSmartArray = {enable = θ;};};};};}
test/golden/importless/hrtime.txt+6−6
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.asl20 = β,
3− α.brainrape = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.asl20 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
@@ -10,8 +10,8 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = β;
14− maintainers = [γ];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
1717 src = η;
test/golden/importless/html.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.asl20 = β,
3− α.brainrape = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.asl20 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = β;
13− maintainers = [γ];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 postUnpack = String;
test/golden/importless/http.txt+1−1
@@ -1,5 +1,5 @@
11∀ β γ δ ε ζ η θ ι κ.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.optionals = Bool -> [ε] -> ζ,
44 η.meta = β,
55 η.src = θ,
test/golden/importless/http4idris.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/hyperv-guest.txt+22−23
@@ -2,36 +2,35 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.bin = ε,
6− β.hypervGuest = ζ,
7− β.lib = η,
8− γ.mkEnableOption = String -> θ,
5+ β.boot = ε,
6+ β.virtualisation = ζ,
7+ γ.mkEnableOption = String -> η,
98 γ.mkIf =
10− ι ->
9+ θ ->
1110 { boot = {initrd = {kernelModules = [String];}; kernelParams = [String];};
12− environment = {systemPackages = [ε];};
11+ environment = {systemPackages = [ι];};
1312 security = {rngd = {enable = Bool;};};
1413 services = {udev = {packages = κ;};};
1514 systemd =
16− {packages = [η]; targets = {hyperv-daemons = {wantedBy = [String];};};};
15+ {packages = [λ]; targets = {hyperv-daemons = {wantedBy = [String];};};};
1716 } ->
18− λ,
17+ μ,
1918 γ.mkOption =
20− {default = String; description = String; example = String; type = μ;} -> ν,
21− γ.singleton = ξ -> κ,
22− γ.types = ο,
23− δ.writeTextFile = {destination = String; name = String; text = String;} -> ξ,
24− ζ.enable = ι,
25− π.virtualisation = β,
26− ρ.hyperv-daemons = β,
27− σ.kernelPackages = ρ,
28− τ.boot = σ,
29− υ.hyperv-daemons = β,
30− φ.kernelPackages = υ,
31− χ.boot = φ,
32− ο.str = μ
19+ {default = String; description = String; example = String; type = ν;} -> ξ,
20+ γ.singleton = ο -> κ,
21+ γ.types = π,
22+ δ.writeTextFile = {destination = String; name = String; text = String;} -> ο,
23+ ζ.hypervGuest = ρ,
24+ ρ.enable = θ,
25+ ε.kernelPackages = σ,
26+ σ.hyperv-daemons = τ,
27+ τ.bin = ι,
28+ υ.kernelPackages = φ,
29+ φ.hyperv-daemons = χ,
30+ χ.lib = λ,
31+ π.str = ν
3332) =>
3433α ->
35−{ config = λ;
36− options = {virtualisation = {hypervGuest = {enable = θ; videoMode = ν;};};};
34+{ config = μ;
35+ options = {virtualisation = {hypervGuest = {enable = η; videoMode = ξ;};};};
3736}
test/golden/importless/i2p.txt+14−13
@@ -2,10 +2,11 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.i2p = ε,
6− γ.mkEnableOption = String -> ζ,
5+ β.ids = ε,
6+ β.services = ζ,
7+ γ.mkEnableOption = String -> η,
78 γ.mkIf =
8− η ->
9+ θ ->
910 { systemd =
1011 { services =
1112 { i2p =
@@ -22,24 +23,24 @@
2223 };
2324 };
2425 users =
25− { groups = {i2p = {gid = θ;};};
26+ { groups = {i2p = {gid = ι;};};
2627 users =
2728 { i2p =
2829 { createHome = Bool;
2930 description = String;
3031 group = String;
3132 home = String;
32− uid = ι;
33+ uid = κ;
3334 };
3435 };
3536 };
3637 } ->
37− κ,
38− ε.enable = η,
39− λ.services = β,
40− μ.gids = β,
41− ν.ids = μ,
42− ξ.uids = β,
43− ο.ids = ξ
38+ λ,
39+ ζ.i2p = μ,
40+ μ.enable = θ,
41+ ε.gids = ν,
42+ ν.i2p = ι,
43+ ξ.uids = ο,
44+ ο.i2p = κ
4445) =>
45−α -> {config = κ; options = {services = {i2p = {enable = ζ;};};};}
46+α -> {config = λ; options = {services = {i2p = {enable = η;};};};}
test/golden/importless/iaia.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/icewm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.icewm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.icewm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.icewm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/icons.txt+14−14
@@ -1,27 +1,27 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.config = β,
33 α.lib = γ,
4− β.enable = δ,
4+ β.xdg = δ,
55 γ.mkIf =
6− δ ->
6+ ε ->
77 { environment =
88 { pathsToLink = [String];
99 profileRelativeSessionVariables = {XCURSOR_PATH = [String];};
1010 sessionVariables = {XCURSOR_PATH = [String];};
1111 };
1212 } ->
13− ε,
14− γ.mkOption = {default = Bool; description = String; type = ζ;} -> η,
15− γ.teams = θ,
16− γ.types = ι,
17− κ.icons = β,
18− λ.xdg = κ,
19− θ.members = μ,
20− ν.freedesktop = θ,
21− ι.bool = ζ
13+ ζ,
14+ γ.mkOption = {default = Bool; description = String; type = η;} -> θ,
15+ γ.teams = ι,
16+ γ.types = κ,
17+ δ.icons = λ,
18+ λ.enable = ε,
19+ ι.freedesktop = μ,
20+ μ.members = ν,
21+ κ.bool = η
2222) =>
2323α ->
24−{ config = ε;
25− meta = {maintainers = μ;};
26− options = {xdg = {icons = {enable = η;};};};
24+{ config = ζ;
25+ meta = {maintainers = ν;};
26+ options = {xdg = {icons = {enable = θ;};};};
2727}
test/golden/importless/idrishighlighter.txt+6−6
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
@@ -10,8 +10,8 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = γ;
14− maintainers = [β];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
1717 src = η;
test/golden/importless/idrisscript.txt+6−6
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η.
2−( α.brainrape = β,
3− α.bsd2 = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.bsd2 = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { meta =
99 { description = String;
1010 homepage = String;
11− license = γ;
12− maintainers = [β];
11+ license = δ;
12+ maintainers = [ε];
1313 };
1414 name = String;
1515 src = ζ;
test/golden/importless/iftop.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.iftop = ε,
5+ β.programs = ε,
66 δ.iftop = ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
@@ -12,7 +12,7 @@
1212 {wrappers = {iftop = {capabilities = String; source = String;};};};
1313 } ->
1414 ι,
15− ε.enable = θ,
16− κ.programs = β
15+ ε.iftop = κ,
16+ κ.enable = θ
1717) =>
1818α -> {config = ι; options = {programs = {iftop = {enable = η;};};};}
test/golden/importless/iio.txt+12−12
@@ -2,21 +2,21 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
5+ β.hardware = ε,
66 γ.iio-sensor-proxy = ζ,
77 γ.mkIf =
8− ε ->
8+ η ->
99 { boot = {initrd = {availableKernelModules = [String];};};
1010 environment = {systemPackages = [ζ];};
11− services = {dbus = {packages = [η];}; udev = {packages = [θ];};};
12− systemd = {packages = [ι];};
11+ services = {dbus = {packages = [θ];}; udev = {packages = [ι];};};
12+ systemd = {packages = [κ];};
1313 } ->
14− κ,
15− γ.mkOption = {default = Bool; description = String; type = λ;} -> μ,
16− γ.types = ν,
17− ξ.iio = β,
18− ο.sensor = ξ,
19− π.hardware = ο,
20− ν.bool = λ
14+ λ,
15+ γ.mkOption = {default = Bool; description = String; type = μ;} -> ν,
16+ γ.types = ξ,
17+ ε.sensor = ο,
18+ ο.iio = π,
19+ π.enable = η,
20+ ξ.bool = μ
2121) =>
22−α -> {config = κ; options = {hardware = {sensor = {iio = {enable = μ;};};};};}
22+α -> {config = λ; options = {hardware = {sensor = {iio = {enable = ν;};};};};}
test/golden/importless/illum.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.illum = ε,
5+ β.services = ε,
66 γ.mkIf =
77 ζ ->
88 { systemd =
@@ -18,8 +18,8 @@
1818 η,
1919 γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
2020 γ.types = κ,
21− ε.enable = ζ,
22− λ.services = β,
21+ ε.illum = λ,
22+ λ.enable = ζ,
2323 κ.bool = θ
2424) =>
2525α -> {config = η; options = {services = {illum = {enable = ι;};};};}
test/golden/importless/imapfilter.txt+7−9
@@ -1,13 +1,12 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν.
2−( β.maintainers = γ,
3− β.mit = δ,
2+( β.lib = γ,
43 β.mkDerivation =
54 { makeFlags = [String];
65 meta =
76 { description = String;
87 homepage = String;
98 license = δ;
10− maintainers = ∀ α. α;
9+ maintainers = ∀ α. [α];
1110 platforms = ε;
1211 };
1312 pname = String;
@@ -16,12 +15,11 @@
1615 version = String;
1716 } ->
1817 θ,
19− β.unix = ε,
20− ι.licenses = β,
21− κ.lib = ι,
22− λ.lib = β,
23− μ.platforms = β,
24− ν.lib = μ
18+ γ.licenses = ι,
19+ ι.mit = δ,
20+ κ.maintainers = λ,
21+ μ.platforms = ν,
22+ ν.unix = ε
2523) =>
2624{ fetchFromGitHub =
2725 {owner = String; repo = String; rev = String; sha256 = String;} -> η;
test/golden/importless/indents.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ.
2−(α.bsd3 = β, γ.licenses = α, δ.lib = γ) => { base = ε;
2+(α.lib = β, β.licenses = γ, γ.bsd3 = δ) => { base = ε;
33 concatenative = ε;
44 mkDerivation =
55 { description = String;
66 doCheck = Bool;
77 homepage = String;
88 libraryHaskellDepends = [ε];
9− license = β;
9+ license = δ;
1010 pname = String;
1111 sha256 = String;
1212 version = String;
test/golden/importless/info.txt+1−1
@@ -1,6 +1,6 @@
11∀ α β.
22{ callPackage =
3− Path ->
3+ String ->
44 {} ->
55 { buildInputs = [α];
66 buildPhase = String;
test/golden/importless/init-script.txt+14−14
@@ -2,20 +2,20 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− γ.mkIf = ε -> {system = {build = {installBootLoader = ζ;};};} -> η,
7− γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
8− γ.types = κ,
9− δ.bash = λ,
10− δ.coreutils = μ,
11− δ.gnugrep = μ,
12− δ.gnused = μ,
5+ β.boot = ε,
6+ γ.mkIf = ζ -> {system = {build = {installBootLoader = η;};};} -> θ,
7+ γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
8+ γ.types = λ,
9+ δ.bash = μ,
10+ δ.coreutils = ν,
11+ δ.gnugrep = ν,
12+ δ.gnused = ν,
1313 δ.substituteAll =
14− {bash = λ; isExecutable = Bool; path = [μ]; src = Path;} -> ζ,
15− ν.initScript = β,
16− ξ.loader = ν,
17− ο.boot = ξ,
18− κ.bool = θ
14+ {bash = μ; isExecutable = Bool; path = [ν]; src = String;} -> η,
15+ ε.loader = ξ,
16+ ξ.initScript = ο,
17+ ο.enable = ζ,
18+ λ.bool = ι
1919) =>
2020α ->
21−{config = η; options = {boot = {loader = {initScript = {enable = ι;};};};};}
21+{config = θ; options = {boot = {loader = {initScript = {enable = κ;};};};};}
test/golden/importless/integrations-core.txt+12−16
@@ -1,21 +1,17 @@
1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ.
2−( ( α
3− ) //
4− ( { doCheck = Bool;
5− name = String;
6− postPatch = String;
7− sourceRoot = String;
8− src = β;
9− version = String;
10− }
11− ) ~
12− ( γ
13− ),
14− (δ) // ({datadog_checks_base = ε; python = ζ;}) ~ (η),
1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ.
2+( α //
3+ { doCheck = Bool;
4+ name = String;
5+ postPatch = String;
6+ sourceRoot = String;
7+ src = β;
8+ version = String;
9+ } ~
10+ γ,
11+ δ // {datadog_checks_base = ε; python = ζ;} ~ η,
1512 θ.fetchFromGitHub =
1613 {owner = String; repo = String; rev = String; sha256 = String;} -> β,
1714 θ.lib = ι,
18− κ.buildPythonPackage = γ -> ε,
1915 κ.pkgs = λ,
2016 κ.withPackages = (μ -> ν) -> ζ,
2117 ι.attrValues = δ -> ν,
@@ -28,6 +24,6 @@
2824 ι.simplejson = ρ,
2925 ι.uptime = ρ,
3026 ι.uuid = ρ,
31− σ.pkgs = κ
27+ λ.buildPythonPackage = γ -> ε
3228) =>
3329{extraIntegrations = {}; pkgs = θ; python = κ;} -> η
test/golden/importless/intel-2200bg.txt+7−7
@@ -2,12 +2,12 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enableIntel2200BGFirmware = ε,
5+ β.networking = ε,
66 δ.intel2200BGFirmware = ζ,
7− γ.bool = η,
8− γ.mkIf = ε -> {hardware = {firmware = [ζ];};} -> θ,
9− γ.mkOption = {default = Bool; description = String; type = η;} -> ι,
10− κ.networking = β,
11− λ.types = γ
7+ γ.mkIf = η -> {hardware = {firmware = [ζ];};} -> θ,
8+ γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
9+ γ.types = λ,
10+ ε.enableIntel2200BGFirmware = η,
11+ λ.bool = ι
1212) =>
13−α -> {config = θ; options = {networking = {enableIntel2200BGFirmware = ι;};};}
13+α -> {config = θ; options = {networking = {enableIntel2200BGFirmware = κ;};};}
test/golden/importless/intel-microcode.txt+11−11
@@ -2,17 +2,17 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.updateMicrocode = ε,
6− γ.mkIf = ε -> {boot = {initrd = {prepend = ζ;};};} -> η,
7− γ.mkOption = {default = Bool; description = String; type = θ;} -> ι,
8− γ.mkOrder = Integer -> [String] -> ζ,
9− γ.types = κ,
10− λ.intel = β,
11− μ.cpu = λ,
12− ν.hardware = μ,
13− κ.bool = θ
5+ β.hardware = ε,
6+ γ.mkIf = ζ -> {boot = {initrd = {prepend = η;};};} -> θ,
7+ γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
8+ γ.mkOrder = Number -> [String] -> η,
9+ γ.types = λ,
10+ ε.cpu = μ,
11+ μ.intel = ν,
12+ ν.updateMicrocode = ζ,
13+ λ.bool = ι
1414) =>
1515α ->
16−{ config = η;
17− options = {hardware = {cpu = {intel = {updateMicrocode = ι;};};};};
16+{ config = θ;
17+ options = {hardware = {cpu = {intel = {updateMicrocode = κ;};};};};
1818}
test/golden/importless/introspect-environment.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/iotop.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.iotop = ε,
5+ β.programs = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -10,7 +10,7 @@
1010 {wrappers = {iotop = {capabilities = String; source = String;};};};
1111 } ->
1212 θ,
13− ε.enable = η,
14− ι.programs = β
13+ ε.iotop = ι,
14+ ι.enable = η
1515) =>
1616α -> {config = θ; options = {programs = {iotop = {enable = ζ;};};};}
test/golden/importless/ipkgparser.txt+2−2
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ.
2−(α.brainrape = β, γ.maintainers = α) => { build-idris-package =
2+(α.maintainers = β, β.brainrape = γ) => { build-idris-package =
33 { idrisDeps = [δ];
4− meta = {description = String; homepage = String; maintainers = [β];};
4+ meta = {description = String; homepage = String; maintainers = [γ];};
55 name = String;
66 src = ε;
77 version = String;
test/golden/importless/iproute2.txt+6−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.iproute2 = ε,
5+ β.networking = ε,
66 γ.fileContents = String -> ζ,
77 γ.mkEnableOption = String -> η,
88 γ.mkIf =
@@ -25,10 +25,11 @@
2525 γ.mkOption = {default = String; description = String; type = σ;} -> τ,
2626 γ.optionalString = Bool -> String -> π,
2727 γ.types = υ,
28− ε.enable = θ,
29− ε.rttablesExtraConfig = String,
30− φ.networking = β,
31− υ.lines = σ
28+ ε.iproute2 = φ,
29+ φ.enable = θ,
30+ φ.rttablesExtraConfig = String,
31+ υ.lines = σ,
32+ (String | Number) ~ π
3233) =>
3334α ->
3435{ config = ρ;
test/golden/importless/irqbalance.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.irqbalance = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,7 +12,7 @@
1212 } ->
1313 κ,
1414 δ.irqbalance = θ,
15− ε.enable = η,
16− λ.services = β
15+ ε.irqbalance = λ,
16+ λ.enable = η
1717) =>
1818α -> {config = κ; options = {services = {irqbalance = {enable = ζ;};};};}
test/golden/importless/iterate.txt+1−1
@@ -2,7 +2,7 @@
22(β.fetchurl = {sha256 = String; url = String;} -> γ) => β ->
33{ asdFilesToKeep = [String];
44 baseName = String;
5− deps = ∀ α. α;
5+ deps = ∀ α. [α];
66 description = String;
77 overrides = ∀ α. α -> α;
88 packageName = String;
test/golden/importless/iwd.txt+6−7
@@ -2,8 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = Bool,
6− β.iwd = ε,
5+ β.networking = ε,
76 γ.dtzWill = ζ,
87 γ.maintainers = η,
98 γ.mic92 = ζ,
@@ -17,11 +16,11 @@
1716 } ->
1817 ν,
1918 δ.iwd = κ,
20− ε.enable = ι,
21− ξ.wireless = β,
22− ο.networking = ξ,
23− π.wireless = β,
24− ρ.networking = π
19+ ε.wireless = ξ,
20+ ξ.iwd = ο,
21+ ο.enable = ι,
22+ π.wireless = ρ,
23+ ρ.enable = Bool
2524) =>
2625α ->
2726{ config = ν;
test/golden/importless/janePackage.txt+14−17
@@ -1,24 +1,21 @@
11∀ α β γ δ ε ζ η θ ι κ.
2−( ( α
3− ) //
4− ( { meta = {homepage = String; license = β;};
5− minimumOCamlVersion = String;
6− src = γ;
7− version = String;
8− }
9− ) ~
10− ( δ
11− ),
12− ε.asl20 = β,
13− α.hash = ζ,
14− α.pname = η,
15− α.version = String,
16− θ.licenses = ε,
17− ι.lib = θ
2+( α //
3+ { meta = {homepage = String; license = β;};
4+ minimumOCamlVersion = String;
5+ src = γ;
6+ version = String;
7+ } ~
8+ δ,
9+ α.?version = String,
10+ ε.lib = ζ,
11+ α.hash = η,
12+ α.pname = θ,
13+ ζ.licenses = ι,
14+ ι.asl20 = β
1815) =>
1916{ buildDunePackage = δ -> κ;
2017 defaultVersion = String;
21− fetchFromGitHub = {owner = String; repo = η; rev = String; sha256 = ζ;} -> γ;
18+ fetchFromGitHub = {owner = String; repo = θ; rev = String; sha256 = η;} -> γ;
2219 stdenv = ε;
2320} ->
2421α -> κ
test/golden/importless/janePackage_0_12.txt+13−16
@@ -1,23 +1,20 @@
11∀ α β γ δ ε ζ η θ ι.
2−( ( α
3− ) //
4− ( { meta = {homepage = String; license = β;};
5− minimumOCamlVersion = String;
6− src = γ;
7− version = String;
8− }
9− ) ~
10− ( δ
11− ),
12− ε.mit = β,
13− α.hash = ζ,
14− α.pname = η,
15− α.version = String,
16− θ.licenses = ε
2+( α //
3+ { meta = {homepage = String; license = β;};
4+ minimumOCamlVersion = String;
5+ src = γ;
6+ version = String;
7+ } ~
8+ δ,
9+ α.?version = String,
10+ ε.licenses = ζ,
11+ α.hash = η,
12+ α.pname = θ,
13+ ζ.mit = β
1714) =>
1815{ buildDunePackage = δ -> ι;
1916 defaultVersion = String;
20− fetchFromGitHub = {owner = String; repo = η; rev = String; sha256 = ζ;} -> γ;
17+ fetchFromGitHub = {owner = String; repo = θ; rev = String; sha256 = η;} -> γ;
2118 lib = ε;
2219} ->
2320α -> ι
test/golden/importless/janePackage_0_13.txt+13−16
@@ -1,23 +1,20 @@
11∀ α β γ δ ε ζ η θ ι.
2−( ( α
3− ) //
4− ( { meta = {homepage = String; license = β;};
5− minimumOCamlVersion = String;
6− src = γ;
7− version = String;
8− }
9− ) ~
10− ( δ
11− ),
12− ε.mit = β,
13− α.hash = ζ,
14− α.pname = η,
15− α.version = String,
16− θ.licenses = ε
2+( α //
3+ { meta = {homepage = String; license = β;};
4+ minimumOCamlVersion = String;
5+ src = γ;
6+ version = String;
7+ } ~
8+ δ,
9+ α.?version = String,
10+ ε.licenses = ζ,
11+ α.hash = η,
12+ α.pname = θ,
13+ ζ.mit = β
1714) =>
1815{ buildDunePackage = δ -> ι;
1916 defaultVersion = String;
20− fetchFromGitHub = {owner = String; repo = η; rev = String; sha256 = ζ;} -> γ;
17+ fetchFromGitHub = {owner = String; repo = θ; rev = String; sha256 = η;} -> γ;
2118 lib = ε;
2219} ->
2320α -> ι
test/golden/importless/java.txt+5−5
@@ -1,9 +1,9 @@
11∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
2−( (β) // ({description = String;}) ~ (γ),
2+( β // {description = String;} ~ γ,
33 δ.config = ε,
44 δ.lib = ζ,
55 δ.pkgs = η,
6− ε.java = θ,
6+ ε.programs = θ,
77 ζ.mkEnableOption = String -> β,
88 ζ.mkIf =
99 ι -> {environment = {shellInit = String; systemPackages = [κ];};} -> λ,
@@ -11,9 +11,9 @@
1111 {default = μ; defaultText = String; description = String; type = ν;} -> ξ,
1212 ζ.types = ο,
1313 η.jdk = μ,
14− θ.enable = ι,
15− θ.package = κ,
16− π.programs = ε,
14+ θ.java = π,
15+ π.enable = ι,
16+ π.package = κ,
1717 ο.package = ν
1818) =>
1919δ ->
test/golden/importless/jdk-darwin-base.txt+10−11
@@ -1,9 +1,9 @@
11∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π.
22( γ.packageType = String,
3− δ.lib = ε,
4− δ.maintainers = ζ,
3+ δ.hostPlatform = ε,
4+ δ.lib = ζ,
55 δ.mkDerivation =
6− { dontStrip = Integer;
6+ { dontStrip = Number;
77 installPhase = String;
88 meta =
99 { description = String;
@@ -16,14 +16,13 @@
1616 src = κ;
1717 } ->
1818 ι,
19− δ.name = λ,
20− ε.licenses = μ,
21− ε.taku0 = θ,
22− μ.gpl2Classpath = η,
23− ν.lib = δ,
24− ξ.cpu = δ,
25− ο.parsed = ξ,
26− π.hostPlatform = ο
19+ ζ.licenses = λ,
20+ ζ.taku0 = θ,
21+ λ.gpl2Classpath = η,
22+ μ.maintainers = ν,
23+ ε.parsed = ξ,
24+ ξ.cpu = ο,
25+ ο.name = π
2726) =>
2827γ ->
2928{ fetchurl =
test/golden/importless/jheiling-extras.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.unlicense = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.unlicense = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/jheiling-js.txt+6−6
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.unlicense = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.unlicense = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
@@ -10,8 +10,8 @@
1010 meta =
1111 { description = String;
1212 homepage = String;
13− license = γ;
14− maintainers = [β];
13+ license = δ;
14+ maintainers = [ε];
1515 };
1616 name = String;
1717 src = η;
test/golden/importless/js-build-tools.txt+1−1
@@ -14,7 +14,7 @@
1414 meta = {description = String; license = ε; maintainers = [ζ];};
1515 minimumSupportedOcamlVersion = String;
1616 name = String;
17− patches = [Path];
17+ patches = [String];
1818 src = θ;
1919 version = String;
2020 } ->
test/golden/importless/js.txt+6−6
@@ -1,16 +1,16 @@
11∀ α β γ δ ε ζ η θ.
2−( α.brainrape = β,
3− α.mit = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.mit = δ,
5+ γ.brainrape = ε
66) =>
77{ build-idris-package =
88 { idrisDeps = [ζ];
99 meta =
1010 { description = String;
1111 homepage = String;
12− license = γ;
13− maintainers = [β];
12+ license = δ;
13+ maintainers = [ε];
1414 };
1515 name = String;
1616 src = η;
test/golden/importless/json-exporter.txt+1−1
@@ -7,7 +7,7 @@
77 ζ.json = θ
88) =>
99{ buildGoPackage =
10− { goDeps = Path;
10+ { goDeps = String;
1111 goPackagePath = String;
1212 meta =
1313 { description = String;
test/golden/importless/json.txt+5−5
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.json = β,
2+( α.services = β,
33 γ.mkOption = {description = String; type = δ;} -> ε,
44 γ.types = ζ,
5− η.exporters = α,
6− θ.prometheus = η,
7− ι.services = θ,
5+ β.prometheus = η,
6+ η.exporters = θ,
7+ θ.json = ι,
88 ζ.path = δ,
99 κ.str = λ
1010) =>
1111{config = α; lib = γ; options = μ; pkgs = ν;} ->
1212{ extraOpts = {configFile = ε; listenAddress = {}; url = ξ;};
13− port = Integer;
13+ port = Number;
1414 serviceOpts = {serviceConfig = {ExecStart = String;};};
1515}
test/golden/importless/jwm.txt+5−5
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.jwm = ε,
5+ β.services = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -12,10 +12,10 @@
1212 κ,
1313 γ.singleton = {name = String; start = String;} -> ι,
1414 δ.jwm = θ,
15− ε.enable = η,
16− λ.windowManager = β,
17− μ.xserver = λ,
18− ν.services = μ
15+ ε.xserver = λ,
16+ λ.windowManager = μ,
17+ μ.jwm = ν,
18+ ν.enable = η
1919) =>
2020α ->
2121{ config = κ;
test/golden/importless/kactivities-stats.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { boost = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { boost = δ;
33 extra-cmake-modules = ε;
44 kactivities = δ;
55 kconfig = δ;
66 lib = α;
77 mkDerivation =
88 { buildInputs = [δ];
9− meta = {maintainers = [β];};
9+ meta = {maintainers = [γ];};
1010 name = String;
1111 nativeBuildInputs = [ε];
1212 outputs = [String];
test/golden/importless/kactivities.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { boost = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { boost = δ;
33 extra-cmake-modules = ε;
44 kconfig = δ;
55 kcoreaddons = δ;
@@ -8,7 +8,7 @@
88 lib = α;
99 mkDerivation =
1010 { buildInputs = [δ];
11− meta = {maintainers = [β];};
11+ meta = {maintainers = [γ];};
1212 name = String;
1313 nativeBuildInputs = [ε];
1414 propagatedBuildInputs = [ζ];
test/golden/importless/kak-fzf.txt+18−19
@@ -1,34 +1,33 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
2−( α.assertOneOf = String -> β -> [String] -> Bool,
3− α.lib = γ,
2+( α.lib = β,
43 α.mkDerivation =
54 { configurePhase = String;
65 installPhase = String;
76 meta =
87 { description = String;
98 homepage = String;
10− license = δ;
11− maintainers = [ε];
12− platform = ζ;
9+ license = γ;
10+ maintainers = [δ];
11+ platform = ε;
1312 };
1413 name = String;
15− src = η;
14+ src = ζ;
1615 version = String;
1716 } ->
18− θ,
19− ι.pname = β,
20− κ.asserts = α,
21− λ.lib = κ,
22− γ.licenses = μ,
23− γ.maintainers = ν,
24− γ.nrdxp = ε,
25− γ.platforms = ξ,
26− μ.mit = δ,
27− ξ.all = ζ
17+ η,
18+ θ.pname = ι,
19+ β.asserts = κ,
20+ κ.assertOneOf = String -> ι -> [String] -> Bool,
21+ λ.licenses = μ,
22+ λ.maintainers = ν,
23+ λ.nrdxp = δ,
24+ λ.platforms = ξ,
25+ μ.mit = γ,
26+ ξ.all = ε
2827) =>
2928{ fetchFromGitHub =
30− {owner = String; repo = String; rev = String; sha256 = String;} -> η;
31− fzf = ι;
29+ {owner = String; repo = String; rev = String; sha256 = String;} -> ζ;
30+ fzf = θ;
3231 stdenv = α;
3332} ->
34−θ
33+η
test/golden/importless/kalarm.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−(α.licenses = β, α.rittelle = γ, β.gpl2 = δ, ε.maintainers = α) => { akonadi =
2+(α.licenses = β, α.maintainers = γ, β.gpl2 = δ, γ.rittelle = ε) => { akonadi =
33 ζ;
44 akonadi-contacts = ζ;
55 akonadi-mime = ζ;
@@ -40,7 +40,7 @@
4040 messagelib = ζ;
4141 mkDerivation =
4242 { buildInputs = [ζ];
43− meta = {license = [δ]; maintainers = [γ];};
43+ meta = {license = [δ]; maintainers = [ε];};
4444 name = String;
4545 nativeBuildInputs = [ζ];
4646 propagatedUserEnvPkgs = [η];
test/golden/importless/kapidox.txt+2−2
@@ -1,8 +1,8 @@
11∀ α β γ δ ε.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 lib = α;
44 mkDerivation =
5− { meta = {maintainers = [β];};
5+ { meta = {maintainers = [γ];};
66 name = String;
77 nativeBuildInputs = [δ];
88 postFixup = String;
test/golden/importless/karchive.txtnew file+18
@@ -0,0 +1,18 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { bzip2 = ζ;
3+ extra-cmake-modules = η;
4+ lib = α;
5+ lzma = ζ;
6+ mkDerivation =
7+ { buildInputs = [ζ];
8+ meta = {broken = Bool; maintainers = [ε];};
9+ name = String;
10+ nativeBuildInputs = [η];
11+ outputs = [String];
12+ propagatedBuildInputs = [γ];
13+ } ->
14+ θ;
15+ qtbase = γ;
16+ zlib = ζ;
17+} ->
18+θ
test/golden/importless/kate.txt+3−3
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.licenses = β,
3− α.ttuegel = γ,
3+ α.maintainers = γ,
44 β.gpl3 = δ,
55 β.lgpl2 = δ,
66 β.lgpl3 = δ,
7− ε.maintainers = α
7+ γ.ttuegel = ε
88) =>
99{ extra-cmake-modules = ζ;
1010 kactivities = η;
@@ -31,7 +31,7 @@
3131 libgit2 = η;
3232 mkDerivation =
3333 { buildInputs = [η];
34− meta = {license = [δ]; maintainers = [γ];};
34+ meta = {license = [δ]; maintainers = [ε];};
3535 name = String;
3636 nativeBuildInputs = [ζ];
3737 postPatch = String;
test/golden/importless/kbdlight.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.kbdlight = ε,
5+ β.programs = ε,
66 γ.mkEnableOption = String -> ζ,
77 γ.mkIf =
88 η ->
@@ -11,7 +11,7 @@
1111 } ->
1212 ι,
1313 δ.kbdlight = θ,
14− ε.enable = η,
15− κ.programs = β
14+ ε.kbdlight = κ,
15+ κ.enable = η
1616) =>
1717α -> {config = ι; options = {programs = {kbdlight = {enable = ζ;};};};}
test/golden/importless/kbookmarks.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kcodecs = ε;
44 kconfig = ε;
55 kconfigwidgets = ε;
@@ -10,7 +10,7 @@
1010 lib = α;
1111 mkDerivation =
1212 { buildInputs = [ε];
13− meta = {maintainers = [β];};
13+ meta = {maintainers = [γ];};
1414 name = String;
1515 nativeBuildInputs = [δ];
1616 outputs = [String];
test/golden/importless/kcalc.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.fridh = β,
3− α.licenses = γ,
4− γ.gpl2 = δ,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2 = δ,
5+ γ.fridh = ε
66) =>
77{ extra-cmake-modules = ζ;
88 gmp = η;
@@ -18,7 +18,7 @@
1818 lib = α;
1919 mkDerivation =
2020 { buildInputs = [η];
21− meta = {license = [δ]; maintainers = [β];};
21+ meta = {license = [δ]; maintainers = [ε];};
2222 name = String;
2323 nativeBuildInputs = [ζ];
2424 } ->
test/golden/importless/kcalendarcore.txt+2−2
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ.
2−(α.nyanloutre = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.nyanloutre = γ) => { extra-cmake-modules = δ;
33 lib = α;
44 libical = ε;
55 mkDerivation =
6− { meta = {maintainers = [β];};
6+ { meta = {maintainers = [γ];};
77 name = String;
88 nativeBuildInputs = [δ];
99 outputs = [String];
test/golden/importless/kcharselect.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.gpl2Plus = β,
3− α.schmittlauch = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2Plus = δ,
5+ γ.schmittlauch = ε
66) =>
77{ extra-cmake-modules = ζ;
88 kbookmarks = η;
@@ -18,7 +18,7 @@
1818 mkDerivation =
1919 { buildInputs = [η];
2020 enableParallelBuilding = Bool;
21− meta = {description = String; license = β; maintainers = [γ];};
21+ meta = {description = String; license = δ; maintainers = [ε];};
2222 name = String;
2323 nativeBuildInputs = [ζ];
2424 } ->
test/golden/importless/kcodecs.txtnew file+17
@@ -0,0 +1,17 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ gperf = η;
4+ lib = α;
5+ mkDerivation =
6+ { buildInputs = [η];
7+ meta = {broken = Bool; maintainers = [ε];};
8+ name = String;
9+ nativeBuildInputs = [ζ];
10+ outputs = [String];
11+ propagatedBuildInputs = [γ];
12+ } ->
13+ θ;
14+ qtbase = γ;
15+ qttools = η;
16+} ->
17+θ
test/golden/importless/kcolorchooser.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
22( α.licenses = β,
3− α.ttuegel = γ,
3+ α.maintainers = γ,
44 β.mit = δ,
5− ε.maintainers = α
5+ γ.ttuegel = ε
66) =>
77{ extra-cmake-modules = ζ;
88 ki18n = η;
@@ -11,7 +11,7 @@
1111 lib = α;
1212 mkDerivation =
1313 { buildInputs = [η];
14− meta = {license = [δ]; maintainers = [γ];};
14+ meta = {license = [δ]; maintainers = [ε];};
1515 name = String;
1616 nativeBuildInputs = [ζ];
1717 } ->
test/golden/importless/kcompletion.txt+2−2
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kconfig = ε;
44 kwidgetsaddons = ε;
55 lib = α;
66 mkDerivation =
77 { buildInputs = [ε];
8− meta = {maintainers = [β];};
8+ meta = {maintainers = [γ];};
99 name = String;
1010 nativeBuildInputs = [δ];
1111 outputs = [String];
test/golden/importless/kconfig.txtnew file+15
@@ -0,0 +1,15 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ propagatedBuildInputs = [γ];
10+ } ->
11+ θ;
12+ qtbase = γ;
13+ qttools = η;
14+} ->
15+θ
test/golden/importless/kcontacts.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ.
2−(α.lgpl21 = β, γ.licenses = α) => { extra-cmake-modules = δ;
2+(α.licenses = β, β.lgpl21 = γ) => { extra-cmake-modules = δ;
33 kcodecs = ε;
44 kconfig = ε;
55 kcoreaddons = ε;
@@ -7,7 +7,7 @@
77 lib = α;
88 mkDerivation =
99 { buildInputs = [ε];
10− meta = {license = [β];};
10+ meta = {license = [γ];};
1111 name = String;
1212 nativeBuildInputs = [δ];
1313 outputs = [String];
test/golden/importless/kcoreaddons.txtnew file+16
@@ -0,0 +1,16 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ propagatedBuildInputs = [γ];
10+ } ->
11+ θ;
12+ qtbase = γ;
13+ qttools = η;
14+ shared-mime-info = η;
15+} ->
16+θ
test/golden/importless/kcrash.txt+2−2
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kcoreaddons = ε;
44 kwindowsystem = ε;
55 lib = α;
66 mkDerivation =
77 { buildInputs = [ε];
8− meta = {maintainers = [β];};
8+ meta = {maintainers = [γ];};
99 name = String;
1010 nativeBuildInputs = [δ];
1111 outputs = [String];
test/golden/importless/kdbusaddons.txtnew file+16
@@ -0,0 +1,16 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ propagatedBuildInputs = [γ];
10+ } ->
11+ θ;
12+ qtbase = γ;
13+ qttools = η;
14+ qtx11extras = η;
15+} ->
16+θ
test/golden/importless/kdebugsettings.txt+4−4
@@ -1,8 +1,8 @@
11∀ β γ δ ε ζ η θ ι.
22( β.licenses = γ,
3− β.rittelle = δ,
3+ β.maintainers = δ,
44 γ.gpl2 = ε,
5− ζ.maintainers = β
5+ δ.rittelle = ζ
66) =>
77{ extra-cmake-modules = η;
88 gettext = θ;
@@ -16,10 +16,10 @@
1616 lib = β;
1717 mkDerivation =
1818 { buildInputs = [θ];
19− meta = {license = [ε]; maintainers = [δ];};
19+ meta = {license = [ε]; maintainers = [ζ];};
2020 name = String;
2121 nativeBuildInputs = [η];
22− propagatedUserEnvPkgs = ∀ α. α;
22+ propagatedUserEnvPkgs = ∀ α. [α];
2323 } ->
2424 ι;
2525 python = θ;
test/golden/importless/kdeclarative.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { epoxy = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { epoxy = δ;
33 extra-cmake-modules = ε;
44 kconfig = ζ;
55 kglobalaccel = δ;
@@ -13,7 +13,7 @@
1313 lib = α;
1414 mkDerivation =
1515 { buildInputs = [δ];
16− meta = {maintainers = [β];};
16+ meta = {maintainers = [γ];};
1717 name = String;
1818 nativeBuildInputs = [ε];
1919 propagatedBuildInputs = [ζ];
test/golden/importless/kdecoration.txtnew file+15
@@ -0,0 +1,15 @@
1+∀ α β γ δ.
2+(α.version = β) => { extra-cmake-modules = γ;
3+ ki18n = α;
4+ mkDerivation =
5+ { broken = Bool;
6+ buildInputs = [α];
7+ meta = {broken = Bool;};
8+ name = String;
9+ nativeBuildInputs = [γ];
10+ outputs = [String];
11+ } ->
12+ δ;
13+ qtbase = α;
14+} ->
15+δ
test/golden/importless/kded.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kconfig = ε;
44 kcoreaddons = ε;
55 kcrash = ε;
@@ -10,7 +10,7 @@
1010 lib = α;
1111 mkDerivation =
1212 { buildInputs = [ε];
13− meta = {maintainers = [β];};
13+ meta = {maintainers = [γ];};
1414 name = String;
1515 nativeBuildInputs = [δ];
1616 outputs = [String];
test/golden/importless/kdegraphics-mobipocket.txt+5−5
@@ -1,15 +1,15 @@
11∀ α β γ δ ε ζ η θ.
2−( α.gpl2Plus = β,
3− α.ttuegel = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2Plus = δ,
5+ γ.ttuegel = ε
66) =>
77{ extra-cmake-modules = ζ;
88 kio = η;
99 lib = α;
1010 mkDerivation =
1111 { buildInputs = [η];
12− meta = {license = [β]; maintainers = [γ];};
12+ meta = {license = [δ]; maintainers = [ε];};
1313 name = String;
1414 nativeBuildInputs = [ζ];
1515 outputs = [String];
test/golden/importless/kdegraphics-thumbnailers.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.lgpl21 = β,
3− α.ttuegel = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.lgpl21 = δ,
5+ γ.ttuegel = ε
66) =>
77{ extra-cmake-modules = ζ;
88 fetchpatch = η;
@@ -13,7 +13,7 @@
1313 libkexiv2 = θ;
1414 mkDerivation =
1515 { buildInputs = [θ];
16− meta = {license = [β]; maintainers = [γ];};
16+ meta = {license = [δ]; maintainers = [ε];};
1717 name = String;
1818 nativeBuildInputs = [ζ];
1919 } ->
test/golden/importless/kdenetwork-filesharing.txt+6−7
@@ -1,10 +1,9 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.gpl2 = β,
3− α.lgpl21 = β,
4− α.ttuegel = γ,
5− δ.licenses = α,
6− ε.licenses = α,
7− ζ.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2 = δ,
5+ ε.lgpl21 = δ,
6+ γ.ttuegel = ζ
87) =>
98{ extra-cmake-modules = η;
109 kcoreaddons = θ;
@@ -15,7 +14,7 @@
1514 lib = α;
1615 mkDerivation =
1716 { buildInputs = [θ];
18− meta = {license = [β]; maintainers = [γ];};
17+ meta = {license = [δ]; maintainers = [ζ];};
1918 name = String;
2019 nativeBuildInputs = [η];
2120 } ->
test/golden/importless/kdenlive.txt+1−1
@@ -31,7 +31,7 @@
3131 mlt = δ;
3232 name = String;
3333 nativeBuildInputs = [ε];
34− patches = [Path];
34+ patches = [String];
3535 postPatch = String;
3636 preFixup = String;
3737 qtWrapperArgs = [String];
test/golden/importless/kdesignerplugin.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kcompletion = ε;
44 kconfig = ε;
55 kconfigwidgets = ε;
@@ -15,7 +15,7 @@
1515 lib = α;
1616 mkDerivation =
1717 { buildInputs = [ε];
18− meta = {maintainers = [β];};
18+ meta = {maintainers = [γ];};
1919 name = String;
2020 nativeBuildInputs = [δ];
2121 propagatedBuildInputs = [ζ];
test/golden/importless/kdevelop-pg-qt.txt+19−20
@@ -1,33 +1,32 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν.
22( α.lib = β,
3− α.licenses = γ,
43 α.mkDerivation =
5− { buildInputs = [δ];
4+ { buildInputs = [γ];
65 meta =
76 { description = String;
87 homepage = String;
9− license = [ε];
8+ license = [δ];
109 longDescription = String;
11− maintainers = [ζ];
12− platforms = η;
10+ maintainers = [ε];
11+ platforms = ζ;
1312 };
1413 name = String;
15− nativeBuildInputs = [θ];
16− src = ι;
14+ nativeBuildInputs = [η];
15+ src = θ;
1716 } ->
18− κ,
19− β.lgpl2Plus = ε,
20− β.maintainers = λ,
21− β.platforms = μ,
22− ν.lib = α,
23− λ.ambrop72 = ζ,
24− μ.linux = η
17+ ι,
18+ β.lgpl2Plus = δ,
19+ β.maintainers = κ,
20+ β.platforms = λ,
21+ μ.licenses = ν,
22+ κ.ambrop72 = ε,
23+ λ.linux = ζ
2524) =>
26−{ cmake = θ;
27− extra-cmake-modules = θ;
28− fetchurl = {sha256 = String; url = String;} -> ι;
29− pkgconfig = θ;
30− qtbase = δ;
25+{ cmake = η;
26+ extra-cmake-modules = η;
27+ fetchurl = {sha256 = String; url = String;} -> θ;
28+ pkgconfig = η;
29+ qtbase = γ;
3130 stdenv = α;
3231} ->
33−κ
32+ι
test/golden/importless/kdf.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
22( α.licenses = β,
3− α.peterhoeg = γ,
3+ α.maintainers = γ,
44 β.gpl2 = δ,
5− ε.maintainers = α
5+ γ.peterhoeg = ε
66) =>
77{ extra-cmake-modules = ζ;
88 kcmutils = η;
@@ -15,7 +15,7 @@
1515 lib = α;
1616 mkDerivation =
1717 { buildInputs = [η];
18− meta = {license = [δ]; maintainers = [γ];};
18+ meta = {license = [δ]; maintainers = [ε];};
1919 name = String;
2020 nativeBuildInputs = [ζ];
2121 } ->
test/golden/importless/kdnssd.txtnew file+17
@@ -0,0 +1,17 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { avahi = ζ;
3+ extra-cmake-modules = η;
4+ lib = α;
5+ mkDerivation =
6+ { buildInputs = [ζ];
7+ meta = {broken = Bool; maintainers = [ε];};
8+ name = String;
9+ nativeBuildInputs = [η];
10+ outputs = [String];
11+ propagatedBuildInputs = [γ];
12+ } ->
13+ θ;
14+ qtbase = γ;
15+ qttools = ζ;
16+} ->
17+θ
test/golden/importless/kemoticons.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 karchive = ε;
44 kcoreaddons = ε;
55 kservice = ζ;
66 lib = α;
77 mkDerivation =
88 { buildInputs = [ε];
9− meta = {maintainers = [β];};
9+ meta = {maintainers = [γ];};
1010 name = String;
1111 nativeBuildInputs = [δ];
1212 propagatedBuildInputs = [ζ];
test/golden/importless/kexec.txt+12−13
@@ -1,19 +1,19 @@
11∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ.
22( α.lib = β,
33 α.pkgs = γ,
4− γ.hostPlatform = δ,
5− γ.kexectools = ε,
6− γ.platforms = ζ,
7− β.any = η -> ζ -> θ,
4+ γ.kexectools = δ,
5+ γ.stdenv = ε,
6+ β.any = ζ -> η -> θ,
7+ β.meta = ι,
88 β.mkIf =
99 θ ->
10− { environment = {systemPackages = [ε];};
10+ { environment = {systemPackages = [κ];};
1111 systemd =
1212 { services =
1313 { prepare-kexec =
1414 { before = [String];
1515 description = String;
16− path = [ι];
16+ path = [λ];
1717 script = String;
1818 serviceConfig = {Type = String;};
1919 unitConfig = {DefaultDependencies = Bool;};
@@ -22,11 +22,10 @@
2222 };
2323 };
2424 } ->
25− κ,
26− β.platformMatch = δ -> η,
27− λ.meta = β,
28− μ.stdenv = γ,
29− ν.meta = γ,
30− ξ.kexectools = ν
25+ μ,
26+ ι.platformMatch = ν -> ζ,
27+ ε.hostPlatform = ν,
28+ δ.meta = ξ,
29+ ξ.platforms = η
3130) =>
32−α -> {config = κ;}
31+α -> {config = μ;}
test/golden/importless/keybase.txt+3−3
@@ -2,7 +2,7 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.keybase = ε,
5+ β.services = ε,
66 γ.mkIf =
77 ζ ->
88 { environment = {systemPackages = [η];};
@@ -30,8 +30,8 @@
3030 γ.mkOption = {default = Bool; description = String; type = ι;} -> κ,
3131 γ.types = λ,
3232 δ.keybase = η,
33− ε.enable = ζ,
34− μ.services = β,
33+ ε.keybase = μ,
34+ μ.enable = ζ,
3535 λ.bool = ι
3636) =>
3737α -> {config = θ; options = {services = {keybase = {enable = κ;};};};}
test/golden/importless/keylight.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.keylight = β,
3− γ.exporters = α,
4− δ.prometheus = γ,
5− ε.services = δ
2+( α.services = β,
3+ β.prometheus = γ,
4+ γ.exporters = δ,
5+ δ.keylight = ε
66) =>
77{config = α; lib = ζ; options = η; pkgs = θ;} ->
8−{port = Integer; serviceOpts = {serviceConfig = {ExecStart = String;};};}
8+{port = Number; serviceOpts = {serviceConfig = {ExecStart = String;};};}
test/golden/importless/kfind.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.iblech = β,
3− α.licenses = γ,
4− γ.gpl2 = δ,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2 = δ,
5+ γ.iblech = ε
66) =>
77{ extra-cmake-modules = ζ;
88 karchive = η;
@@ -15,7 +15,7 @@
1515 lib = α;
1616 mkDerivation =
1717 { buildInputs = [η];
18− meta = {license = [δ]; maintainers = [β];};
18+ meta = {license = [δ]; maintainers = [ε];};
1919 name = String;
2020 nativeBuildInputs = [ζ];
2121 } ->
test/golden/importless/kgeography.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η θ.
2−(α.globin = β, α.licenses = γ, γ.gpl2 = δ, ε.maintainers = α) => { cmake = ζ;
2+(α.licenses = β, α.maintainers = γ, β.gpl2 = δ, γ.globin = ε) => { cmake = ζ;
33 extra-cmake-modules = ζ;
44 kconfigwidgets = η;
55 kcrash = η;
@@ -9,7 +9,7 @@
99 lib = α;
1010 mkDerivation =
1111 { buildInputs = [η];
12− meta = {license = [δ]; maintainers = [β];};
12+ meta = {license = [δ]; maintainers = [ε];};
1313 name = String;
1414 nativeBuildInputs = [ζ];
1515 } ->
test/golden/importless/kgpg.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.gpl2 = β,
3− α.ttuegel = γ,
4− δ.licenses = α,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.gpl2 = δ,
5+ γ.ttuegel = ε
66) =>
77{ akonadi-contacts = ζ;
88 extra-cmake-modules = η;
@@ -28,7 +28,7 @@
2828 makeWrapper = η;
2929 mkDerivation =
3030 { buildInputs = [ζ];
31− meta = {license = [β]; maintainers = [γ];};
31+ meta = {license = [δ]; maintainers = [ε];};
3232 name = String;
3333 nativeBuildInputs = [η];
3434 postFixup = String;
test/golden/importless/kguiaddons.txtnew file+16
@@ -0,0 +1,16 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ outputs = [String];
10+ propagatedBuildInputs = [γ];
11+ } ->
12+ θ;
13+ qtbase = γ;
14+ qtx11extras = η;
15+} ->
16+θ
test/golden/importless/khtml.txt+2−2
@@ -1,5 +1,5 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 giflib = ε;
44 gperf = ε;
55 karchive = ε;
@@ -19,7 +19,7 @@
1919 lib = α;
2020 mkDerivation =
2121 { buildInputs = [ε];
22− meta = {maintainers = [β];};
22+ meta = {maintainers = [γ];};
2323 name = String;
2424 nativeBuildInputs = [δ];
2525 propagatedBuildInputs = [ζ];
test/golden/importless/ki18n.txtnew file+18
@@ -0,0 +1,18 @@
1+∀ α β γ δ ε ζ η θ ι.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ gettext = η;
4+ lib = α;
5+ mkDerivation =
6+ { buildInputs = [θ];
7+ meta = {broken = Bool; maintainers = [ε];};
8+ name = String;
9+ nativeBuildInputs = [ζ];
10+ propagatedNativeBuildInputs = [η];
11+ } ->
12+ ι;
13+ python3 = η;
14+ qtbase = γ;
15+ qtdeclarative = θ;
16+ qtscript = θ;
17+} ->
18+ι
test/golden/importless/kidletime.txtnew file+15
@@ -0,0 +1,15 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ propagatedBuildInputs = [γ];
10+ } ->
11+ θ;
12+ qtbase = γ;
13+ qtx11extras = η;
14+} ->
15+θ
test/golden/importless/kimageformats.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η θ.
2−(α.getDev = β, α.ttuegel = γ, δ.maintainers = α) => { extra-cmake-modules = ε;
2+(α.getDev = β, α.maintainers = γ, γ.ttuegel = δ) => { extra-cmake-modules = ε;
33 ilmbase = ζ;
44 karchive = η;
55 lib = α;
66 mkDerivation =
77 { CXXFLAGS = String;
88 buildInputs = [η];
9− meta = {maintainers = [γ];};
9+ meta = {maintainers = [δ];};
1010 name = String;
1111 nativeBuildInputs = [ε];
1212 outputs = [String];
test/golden/importless/kio-extras.txt+3−3
@@ -1,9 +1,9 @@
11∀ α β γ δ ε ζ η θ ι.
22( α.licenses = β,
3− α.ttuegel = γ,
3+ α.maintainers = γ,
44 β.gpl2 = δ,
55 β.lgpl21 = δ,
6− ε.maintainers = α
6+ γ.ttuegel = ε
77) =>
88{ exiv2 = ζ;
99 extra-cmake-modules = η;
@@ -32,7 +32,7 @@
3232 mkDerivation =
3333 { CXXFLAGS = [String];
3434 buildInputs = [ζ];
35− meta = {license = [δ]; maintainers = [γ];};
35+ meta = {license = [δ]; maintainers = [ε];};
3636 name = String;
3737 nativeBuildInputs = [η];
3838 } ->
test/golden/importless/kipi-plugins.txt+3−3
@@ -1,7 +1,7 @@
11∀ α β γ δ ε ζ η θ.
2−( α.gpl2 = β,
2+( α.licenses = β,
33 α.maintainers = γ,
4− δ.licenses = α,
4+ β.gpl2 = δ,
55 γ.ttuegel = ε
66) =>
77{ extra-cmake-modules = ζ;
@@ -20,7 +20,7 @@
2020 meta =
2121 { description = String;
2222 homepage = String;
23− license = β;
23+ license = δ;
2424 maintainers = [ε];
2525 };
2626 name = String;
test/golden/importless/kirigami2.txtnew file+15
@@ -0,0 +1,15 @@
1+∀ α β γ δ.
2+(α.version = β) => { extra-cmake-modules = γ;
3+ mkDerivation =
4+ { buildInputs = [α];
5+ meta = {broken = Bool;};
6+ name = String;
7+ nativeBuildInputs = [γ];
8+ outputs = [String];
9+ } ->
10+ δ;
11+ qtbase = α;
12+ qtquickcontrols2 = α;
13+ qttranslations = α;
14+} ->
15+δ
test/golden/importless/kitemmodels.txtnew file+14
@@ -0,0 +1,14 @@
1+∀ α β γ δ ε ζ η.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { meta = {broken = Bool; maintainers = [ε];};
6+ name = String;
7+ nativeBuildInputs = [ζ];
8+ outputs = [String];
9+ propagatedBuildInputs = [γ];
10+ } ->
11+ η;
12+ qtbase = γ;
13+} ->
14+η
test/golden/importless/kitemviews.txtnew file+16
@@ -0,0 +1,16 @@
1+∀ α β γ δ ε ζ η θ.
2+(α.maintainers = β, γ.version = δ, β.ttuegel = ε) => { extra-cmake-modules = ζ;
3+ lib = α;
4+ mkDerivation =
5+ { buildInputs = [η];
6+ meta = {broken = Bool; maintainers = [ε];};
7+ name = String;
8+ nativeBuildInputs = [ζ];
9+ outputs = [String];
10+ propagatedBuildInputs = [γ];
11+ } ->
12+ θ;
13+ qtbase = γ;
14+ qttools = η;
15+} ->
16+θ
test/golden/importless/kitinerary.txt+5−5
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ.
2−( α.bkchr = β,
3− α.licenses = γ,
4− γ.lgpl21 = δ,
5− ε.maintainers = α
2+( α.licenses = β,
3+ α.maintainers = γ,
4+ β.lgpl21 = δ,
5+ γ.bkchr = ε
66) =>
77{ extra-cmake-modules = ζ;
88 kcalendarcore = η;
@@ -13,7 +13,7 @@
1313 lib = α;
1414 mkDerivation =
1515 { buildInputs = [η];
16− meta = {license = [δ]; maintainers = [β];};
16+ meta = {license = [δ]; maintainers = [ε];};
1717 name = String;
1818 nativeBuildInputs = [ζ];
1919 outputs = [String];
test/golden/importless/kjobwidgets.txt+2−2
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kcoreaddons = ε;
44 kwidgetsaddons = ε;
55 lib = α;
66 mkDerivation =
77 { buildInputs = [ε];
8− meta = {maintainers = [β];};
8+ meta = {maintainers = [γ];};
99 name = String;
1010 nativeBuildInputs = [δ];
1111 } ->
test/golden/importless/kjs.txt+2−2
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kdoctools = δ;
44 lib = α;
55 mkDerivation =
66 { buildInputs = [ε];
7− meta = {maintainers = [β];};
7+ meta = {maintainers = [γ];};
88 name = String;
99 nativeBuildInputs = [δ];
1010 } ->
test/golden/importless/kjsembed.txt+2−2
@@ -1,12 +1,12 @@
11∀ α β γ δ ε ζ η.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kdoctools = δ;
44 ki18n = ε;
55 kjs = ζ;
66 lib = α;
77 mkDerivation =
88 { buildInputs = [ε];
9− meta = {maintainers = [β];};
9+ meta = {maintainers = [γ];};
1010 name = String;
1111 nativeBuildInputs = [δ];
1212 propagatedBuildInputs = [ζ];
test/golden/importless/klogd.txt+16−16
@@ -2,16 +2,16 @@
22( α.config = β,
33 α.lib = γ,
44 α.pkgs = δ,
5− β.enable = ε,
6− β.kernel = ζ,
7− γ.getVersion = ζ -> η,
5+ β.boot = ε,
6+ β.services = ζ,
7+ γ.getVersion = η -> θ,
88 γ.mkIf =
9− ε ->
9+ ι ->
1010 { systemd =
1111 { services =
1212 { klogd =
1313 { description = String;
14− path = [θ];
14+ path = [κ];
1515 script = String;
1616 unitConfig = {ConditionVirtualization = String;};
1717 wantedBy = [String];
@@ -19,15 +19,15 @@
1919 };
2020 };
2121 } ->
22− ι,
23− γ.mkOption = {default = κ; description = String; type = λ;} -> μ,
24− γ.types = ν,
25− γ.versionOlder = η -> String -> κ,
26− δ.sysklogd = θ,
27− ξ.klogd = β,
28− ο.services = ξ,
29− π.kernelPackages = β,
30− ρ.boot = π,
31− ν.bool = λ
22+ λ,
23+ γ.mkOption = {default = μ; description = String; type = ν;} -> ξ,
24+ γ.types = ο,
25+ γ.versionOlder = θ -> String -> μ,
26+ δ.sysklogd = κ,
27+ ζ.klogd = π,
28+ π.enable = ι,
29+ ε.kernelPackages = ρ,
30+ ρ.kernel = η,
31+ ο.bool = ν
3232) =>
33−α -> {config = ι; options = {services = {klogd = {enable = μ;};};};}
33+α -> {config = λ; options = {services = {klogd = {enable = ξ;};};};}
test/golden/importless/kmediaplayer.txt+2−2
@@ -1,11 +1,11 @@
11∀ α β γ δ ε ζ.
2−(α.ttuegel = β, γ.maintainers = α) => { extra-cmake-modules = δ;
2+(α.maintainers = β, β.ttuegel = γ) => { extra-cmake-modules = δ;
33 kparts = ε;
44 kxmlgui = ε;
55 lib = α;
66 mkDerivation =
77 { buildInputs = [ε];
8− meta = {maintainers = [β];};
8+ meta = {maintainers = [γ];};
99 name = String;
1010 nativeBuildInputs = [δ];
1111 } ->
test/golden/importless/kmime.txt+3−3
@@ -1,8 +1,8 @@
11∀ α β γ δ ε ζ η θ ι.
2−( α.lgpl21 = β,
2+( α.licenses = β,
33 α.versionOlder = γ -> String -> δ,
44 ε.version = γ,
5− ζ.licenses = α
5+ β.lgpl21 = ζ
66) =>
77{ extra-cmake-modules = η;
88 kcodecs = ε;
@@ -11,7 +11,7 @@
1111 lib = α;
1212 mkDerivation =
1313 { buildInputs = [ε];
14− meta = {broken = δ; license = [β]; maintainers = θ;};
14+ meta = {broken = δ; license = [ζ]; maintainers = θ;};
1515 name = String;
1616 nativeBuildInputs = [η];
1717 outputs = [String];
test/golden/importless/kmix.txt+3−3
@@ -1,10 +1,10 @@
11∀ α β γ δ ε ζ η θ.
22( α.licenses = β,
3− α.rongcuid = γ,
3+ α.maintainers = γ,
44 β.fdl12 = δ,
55 β.gpl2 = δ,
66 β.lgpl21 = δ,
7− ε.maintainers = α
7+ γ.rongcuid = ε
88) =>
99{ alsaLib = ζ;
1010 extra-cmake-modules = η;
@@ -19,7 +19,7 @@
1919 mkDerivation =
2020 { buildInputs = [ζ];
2121 cmakeFlags = [String];
22− meta = {license = [δ]; maintainers = [γ];};
22+ meta = {license = [δ]; maintainers = [ε];};
2323 name = String;
2424 nativeBuildInputs = [η];
2525 } ->
test/golden/importless/kmod.txt+24−24

This diff is too big to show here.

test/golden/importless/kmplot.txt+3−3

This diff is too big to show here.

test/golden/importless/kmrcl.txt+1−1

This diff is too big to show here.

test/golden/importless/knewstuff.txt+2−2

This diff is too big to show here.

test/golden/importless/knotifications.txt+2−2

This diff is too big to show here.

test/golden/importless/knotifyconfig.txt+2−2

This diff is too big to show here.

test/golden/importless/kodi.txt+5−5

This diff is too big to show here.

test/golden/importless/kolourpaint.txt+5−5

This diff is too big to show here.

test/golden/importless/konqueror.txt+1−1

This diff is too big to show here.

test/golden/importless/kparts.txt+2−2

This diff is too big to show here.

test/golden/importless/kpeople.txt+2−2

This diff is too big to show here.

test/golden/importless/kpkpass.txt+5−5

This diff is too big to show here.

test/golden/importless/kplotting.txtnew file+15

This diff is too big to show here.

test/golden/importless/kpty.txt+2−2

This diff is too big to show here.

test/golden/importless/kqtquickcharts.txt+3−3

This diff is too big to show here.

test/golden/importless/kquickcharts.txt+2−2

This diff is too big to show here.

test/golden/importless/kross.txt+2−2

This diff is too big to show here.

test/golden/importless/kruler.txt+3−3

This diff is too big to show here.

test/golden/importless/krunner.txt+2−2

This diff is too big to show here.

test/golden/importless/ktexteditor.txt+2−2

This diff is too big to show here.

test/golden/importless/ktextwidgets.txt+2−2

This diff is too big to show here.

test/golden/importless/ktouch.txt+5−5

This diff is too big to show here.

test/golden/importless/kunitconversion.txt+2−2

This diff is too big to show here.

test/golden/importless/kvm.txt+1−1

This diff is too big to show here.

test/golden/importless/kwallet.txt+2−2

This diff is too big to show here.

test/golden/importless/kwayland.txtnew file+19

This diff is too big to show here.

test/golden/importless/kwidgetsaddons.txtnew file+16

This diff is too big to show here.

test/golden/importless/kxmlgui.txt+2−2

This diff is too big to show here.

test/golden/importless/kxmlrpcclient.txt+2−2

This diff is too big to show here.

test/golden/importless/lack-component.txt+1−1

This diff is too big to show here.

test/golden/importless/ladspah.txt+11−13

This diff is too big to show here.

test/golden/importless/layout-manager.txt+23−24

This diff is too big to show here.

test/golden/importless/ledger.txt+3−3

This diff is too big to show here.

test/golden/importless/leftwm.txt+5−5

This diff is too big to show here.

test/golden/importless/legacy.txt+8−10

This diff is too big to show here.

test/golden/importless/lens.txt+6−6

This diff is too big to show here.

test/golden/importless/libc++abi.txt+27−31

This diff is too big to show here.

test/golden/importless/libcroco.txt+1−2

This diff is too big to show here.

test/golden/importless/libdislocator.txt+13−15

This diff is too big to show here.

test/golden/importless/libkdcraw.txt+3−3

This diff is too big to show here.

test/golden/importless/libkexiv2.txt+3−3

This diff is too big to show here.

test/golden/importless/libkipi.txt+3−3

This diff is too big to show here.

test/golden/importless/libmaa.txt+1−1

This diff is too big to show here.

test/golden/importless/libnvc.txt+1−1

This diff is too big to show here.

test/golden/importless/liboping.txt+3−3

This diff is too big to show here.

test/golden/importless/library.txt+21−22

This diff is too big to show here.

test/golden/importless/libtokencap.txt+13−15

This diff is too big to show here.

test/golden/importless/libtool2.txt+1−1

This diff is too big to show here.

test/golden/importless/libunwind.txt+14−14

This diff is too big to show here.

test/golden/importless/libusb1.txt+8−11

This diff is too big to show here.

test/golden/importless/libxkbcommon_7.txt+6−7

This diff is too big to show here.

test/golden/importless/libxpdf.txt+3−3

This diff is too big to show here.

test/golden/importless/licenses.txt+25−37

This diff is too big to show here.

test/golden/importless/lift.txt+1−1

This diff is too big to show here.

test/golden/importless/light.txt+3−3

This diff is too big to show here.

test/golden/importless/lightyear.txt+3−3

This diff is too big to show here.

test/golden/importless/limesdr.txt+5−6

This diff is too big to show here.

test/golden/importless/linux-4.14.txt+10−13

This diff is too big to show here.

test/golden/importless/linux-4.19.txt+10−13

This diff is too big to show here.

test/golden/importless/linux-4.4.txt+2−2

This diff is too big to show here.

test/golden/importless/linux-4.9.txt+2−2

This diff is too big to show here.

test/golden/importless/linux-5.4.txt+10−13

This diff is too big to show here.

test/golden/importless/linux-5.8.txt+10−13

This diff is too big to show here.

test/golden/importless/linux-5.9.txt+10−13

This diff is too big to show here.

test/golden/importless/linux-hardkernel-4.14.txt+11−14

This diff is too big to show here.

test/golden/importless/linux-testing-bcachefs.txt+18−21

This diff is too big to show here.

test/golden/importless/linux-testing.txtdeleted−23

This diff is too big to show here.

test/golden/importless/linux-zen.txt+12−15

This diff is too big to show here.

test/golden/importless/linux.txt+7−8

This diff is too big to show here.

test/golden/importless/liquidsoap.txtdeleted−68

This diff is too big to show here.

test/golden/importless/lld.txt+14−15

This diff is too big to show here.

test/golden/importless/lldb.txt+18−22

This diff is too big to show here.

test/golden/importless/lldpd.txt+5−5

This diff is too big to show here.

test/golden/importless/llvm.txt+21−24

This diff is too big to show here.

test/golden/importless/locales.txt+3−3

This diff is too big to show here.

test/golden/importless/localtime.txt+6−6

This diff is too big to show here.

test/golden/importless/lock-fancy.txt+23−24

This diff is too big to show here.

test/golden/importless/lock-kernel-modules.txt+18−18

This diff is too big to show here.

test/golden/importless/logic.txt+6−6

This diff is too big to show here.

test/golden/importless/logkeys.txt+3−3

This diff is too big to show here.

test/golden/importless/logmein-hamachi.txt+3−3

This diff is too big to show here.

test/golden/importless/ltc.txt+1−1

This diff is too big to show here.

test/golden/importless/luarocks-nix.txt+1−1

This diff is too big to show here.

test/golden/importless/lumina.txt+9−11

This diff is too big to show here.

test/golden/importless/lvm2.txt+12−12

This diff is too big to show here.

test/golden/importless/lwm.txt+5−5

This diff is too big to show here.

test/golden/importless/lwt-unix.txt+3−3

This diff is too big to show here.

test/golden/importless/lxcfs.txt+4−4

This diff is too big to show here.

test/golden/importless/lxmenu-data.txt+11−12

This diff is too big to show here.

test/golden/importless/m32edit.txt+9−12

This diff is too big to show here.

test/golden/importless/machine.txt+1−1

This diff is too big to show here.

test/golden/importless/macport.txt+1−1

This diff is too big to show here.

test/golden/importless/macvim.txt+2−2

This diff is too big to show here.

test/golden/importless/magic-wormhole-mailbox-server.txt+5−5

This diff is too big to show here.

test/golden/importless/mail-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/mailhog.txt+4−4

This diff is too big to show here.

test/golden/importless/mailpile.txt+21−21

This diff is too big to show here.

test/golden/importless/mainline.txt+3−2

This diff is too big to show here.

test/golden/importless/maintainer-list.txt+1490−1705

This diff is too big to show here.

test/golden/importless/make-channel.txt+8−8

This diff is too big to show here.

test/golden/importless/make-dbus-conf.txt+2−2

This diff is too big to show here.

test/golden/importless/make-ext4-fs.txt+15−15

This diff is too big to show here.

test/golden/importless/make-peer.txt+4−6

This diff is too big to show here.

test/golden/importless/make-squashfs.txt+1−1

This diff is too big to show here.

test/golden/importless/malcontent.txt+9−9

This diff is too big to show here.

test/golden/importless/malloc.txt+3−3

This diff is too big to show here.

test/golden/importless/man.txt+1−1

This diff is too big to show here.

test/golden/importless/map-set.txt+1−1

This diff is too big to show here.

test/golden/importless/mapping.txt+6−6

This diff is too big to show here.

test/golden/importless/marshal.txt+1−1

This diff is too big to show here.

test/golden/importless/masq.txt+6−6

This diff is too big to show here.

test/golden/importless/master.txtdeleted−56

This diff is too big to show here.

test/golden/importless/material-theme.txt+1−1

This diff is too big to show here.

test/golden/importless/maven-build.txt+24−27

This diff is too big to show here.

test/golden/importless/mavenPlugins.txt+1−1

This diff is too big to show here.

test/golden/importless/mcelog.txt+12−12

This diff is too big to show here.

test/golden/importless/md5.txt+1−1

This diff is too big to show here.

test/golden/importless/mem.txt+1−1

This diff is too big to show here.

test/golden/importless/menus.txt+13−13

This diff is too big to show here.

test/golden/importless/metabang-bind.txt+1−1

This diff is too big to show here.

test/golden/importless/metacity.txt+5−5

This diff is too big to show here.

test/golden/importless/metaocaml-3.09.txt+4−4

This diff is too big to show here.

test/golden/importless/metatilities-base.txt+1−1

This diff is too big to show here.

test/golden/importless/mhd.txt+6−6

This diff is too big to show here.

test/golden/importless/mime.txt+16−16

This diff is too big to show here.

test/golden/importless/minimal.txt+4−4

This diff is too big to show here.

test/golden/importless/mininet.txt+7−7

This diff is too big to show here.

test/golden/importless/minion.txtdeleted−53

This diff is too big to show here.

test/golden/importless/misc-extensions.txt+1−1

This diff is too big to show here.

test/golden/importless/mjpg-streamer.txt+22−21

This diff is too big to show here.

test/golden/importless/mk-string-metrics.txt+1−1

This diff is too big to show here.

test/golden/importless/moarvm.txt+8−9

This diff is too big to show here.

test/golden/importless/mod.txt+20−22

This diff is too big to show here.

test/golden/importless/modemmanager-qt.txtnew file+15

This diff is too big to show here.

test/golden/importless/modemmanager.txt+5−5

This diff is too big to show here.

test/golden/importless/module-list.txt+1−1

This diff is too big to show here.

test/golden/importless/modules-closure.txt+1−1

This diff is too big to show here.

test/golden/importless/modules.txt+163−163

This diff is too big to show here.

test/golden/importless/mom.txt+4−4

This diff is too big to show here.

test/golden/importless/monit.txt+14−14

This diff is too big to show here.

test/golden/importless/moodle-utils.txt+16−19

This diff is too big to show here.

test/golden/importless/mptcp-config.txt+3−3

This diff is too big to show here.

test/golden/importless/mspdebug.txtnew file+55

This diff is too big to show here.

test/golden/importless/mstpd.txt+3−3

This diff is too big to show here.

test/golden/importless/mt19937.txt+1−1

This diff is too big to show here.

test/golden/importless/mtr.txt+4−4

This diff is too big to show here.

test/golden/importless/muchsync.txt+14−16

This diff is too big to show here.

test/golden/importless/mullvad-vpn.txt+6−6

This diff is too big to show here.

test/golden/importless/multi.txtnew file+12

This diff is too big to show here.

test/golden/importless/multilib.txt+6−6

This diff is too big to show here.

test/golden/importless/multipath-tools.txt+10−10

This diff is too big to show here.

test/golden/importless/munge.txt+3−3

This diff is too big to show here.

test/golden/importless/mwm.txt+5−5

This diff is too big to show here.

test/golden/importless/mwprocapture.txt+8−8

This diff is too big to show here.

test/golden/importless/nabi.txt+7−7

This diff is too big to show here.

test/golden/importless/nacl.txt+5−6

This diff is too big to show here.

test/golden/importless/named-readtables.txt+1−1

This diff is too big to show here.

test/golden/importless/nanonote.txt+10−10

This diff is too big to show here.

test/golden/importless/neard.txt+10−10

This diff is too big to show here.

test/golden/importless/net_dot_didierverna_dot_asdf-flv.txt+1−1

This diff is too big to show here.

test/golden/importless/netboot.txt+23−24

This diff is too big to show here.

test/golden/importless/networkmanager-qt.txtnew file+15

This diff is too big to show here.

test/golden/importless/new-api.txt+6−7

This diff is too big to show here.

test/golden/importless/news-updater.txt+8−9

This diff is too big to show here.

test/golden/importless/nextcloud-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/nginxlog-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/nix-generate-from-cpan.txt+6−7

This diff is too big to show here.

test/golden/importless/nixops-v1_6_1.txt+19−19

This diff is too big to show here.

test/golden/importless/nixpkgs-lint.txt+9−10

This diff is too big to show here.

test/golden/importless/nm-applet.txt+10−10

This diff is too big to show here.

test/golden/importless/no-x-libs.txt+45−35

This diff is too big to show here.

test/golden/importless/node.txt+7−6

This diff is too big to show here.

test/golden/importless/notion.txt+5−5

This diff is too big to show here.

test/golden/importless/novacomd.txt+5−5

This diff is too big to show here.

test/golden/importless/npm.txt+18−19

This diff is too big to show here.

test/golden/importless/nscd.txtdeleted−62

This diff is too big to show here.

test/golden/importless/ntfs.txt+6−6

This diff is too big to show here.

test/golden/importless/nullidentdmod.txt+3−3

This diff is too big to show here.

test/golden/importless/nvidia-optimus.txt+11−11

This diff is too big to show here.

test/golden/importless/nw12.txt+43−43

This diff is too big to show here.

test/golden/importless/oauth2_proxy_nginx.txt+14−15

This diff is too big to show here.

test/golden/importless/obs-ndi.txt+1−1

This diff is too big to show here.

test/golden/importless/ocserv.txt+4−4

This diff is too big to show here.

test/golden/importless/ofono.txt+5−5

This diff is too big to show here.

test/golden/importless/oidentd.txt+16−16

This diff is too big to show here.

test/golden/importless/okular.txt+38−38

This diff is too big to show here.

test/golden/importless/openbox.txt+5−5

This diff is too big to show here.

test/golden/importless/openfire.txt+19−20

This diff is too big to show here.

test/golden/importless/openmp.txt+17−18

This diff is too big to show here.

test/golden/importless/openvpn_learnaddress.txt+17−18

This diff is too big to show here.

test/golden/importless/org-generated.txt+4−4

This diff is too big to show here.

test/golden/importless/oroborus.txt+5−5

This diff is too big to show here.

test/golden/importless/osmosdr.txt+9−10

This diff is too big to show here.

test/golden/importless/otf.txt+13−15

This diff is too big to show here.

test/golden/importless/overlay.txt+9−9

This diff is too big to show here.

test/golden/importless/owamp.txt+3−3

This diff is too big to show here.

test/golden/importless/oxygen-icons5.txt+5−5

This diff is too big to show here.

test/golden/importless/pack.txt+1−1

This diff is too big to show here.

test/golden/importless/packagekit.txt+3−3

This diff is too big to show here.

test/golden/importless/pacman.txt+2−2

This diff is too big to show here.

test/golden/importless/pam_usb.txt+9−10

This diff is too big to show here.

test/golden/importless/parse-declarations-1_dot_0.txt+1−1

This diff is too big to show here.

test/golden/importless/parse-number.txt+1−1

This diff is too big to show here.

test/golden/importless/parser.txt+9−9

This diff is too big to show here.

test/golden/importless/parted.txtnew file+42

This diff is too big to show here.

test/golden/importless/paste.txt+1−1

This diff is too big to show here.

test/golden/importless/patricia.txt+6−6

This diff is too big to show here.

test/golden/importless/pdf_sets.txt+13−13

This diff is too big to show here.

test/golden/importless/pdnsd.txt+3−3

This diff is too big to show here.

test/golden/importless/pekwm.txt+5−5

This diff is too big to show here.

test/golden/importless/perf.txt+10−12

This diff is too big to show here.

test/golden/importless/periods.txt+7−7

This diff is too big to show here.

test/golden/importless/permutations.txt+6−6

This diff is too big to show here.

test/golden/importless/persistenced.txt+10−10

This diff is too big to show here.

test/golden/importless/pfds.txt+6−6

This diff is too big to show here.

test/golden/importless/pflogsumm.txt+10−11

This diff is too big to show here.

test/golden/importless/pg_auto_failover.txt+8−8

This diff is too big to show here.

test/golden/importless/pg_bigm.txt+6−6

This diff is too big to show here.

test/golden/importless/pg_cron.txt+5−5

This diff is too big to show here.

test/golden/importless/pg_ed25519.txt+6−6

This diff is too big to show here.

test/golden/importless/pg_hll.txt+5−5

This diff is too big to show here.

test/golden/importless/pg_partman.txt+5−5

This diff is too big to show here.

test/golden/importless/pg_safeupdate.txt+4−4

This diff is too big to show here.

test/golden/importless/pg_similarity.txt+13−13

This diff is too big to show here.

test/golden/importless/pg_topn.txt+5−5

This diff is too big to show here.

test/golden/importless/pgjwt.txt+5−5

This diff is too big to show here.

test/golden/importless/pgroonga.txt+5−5

This diff is too big to show here.

test/golden/importless/pgrouting.txt+6−6

This diff is too big to show here.

test/golden/importless/pipelinedb.txt+8−8

This diff is too big to show here.

test/golden/importless/pipes.txt+6−6

This diff is too big to show here.

test/golden/importless/pk.txt+1−1

This diff is too big to show here.

test/golden/importless/platform-flags.txt+20−14

This diff is too big to show here.

test/golden/importless/platform.txt+6−7

This diff is too big to show here.

test/golden/importless/plotinus.txt+7−7

This diff is too big to show here.

test/golden/importless/plpgsql_check.txt+6−6

This diff is too big to show here.

test/golden/importless/plump-lexer.txt+1−1

This diff is too big to show here.

test/golden/importless/pony-stable.txt+12−14

This diff is too big to show here.

test/golden/importless/port.txtnew file+59

This diff is too big to show here.

test/golden/importless/posix.txt+2−2

This diff is too big to show here.

test/golden/importless/postfix-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/postgis.txt+8−9

This diff is too big to show here.

test/golden/importless/powerdns.txt+7−8

This diff is too big to show here.

test/golden/importless/powertop.txt+3−3

This diff is too big to show here.

test/golden/importless/ppx.txt+6−6

This diff is too big to show here.

test/golden/importless/pre-configure.txt+2−1

This diff is too big to show here.

test/golden/importless/pressureaudio.txt+1−1

This diff is too big to show here.

test/golden/importless/print-manager.txt+2−2

This diff is too big to show here.

test/golden/importless/prison.txtnew file+17

This diff is too big to show here.

test/golden/importless/process-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/protobuf.txt+6−6

This diff is too big to show here.

test/golden/importless/protocols.txt+14−14

This diff is too big to show here.

test/golden/importless/prove-asdf.txt+1−1

This diff is too big to show here.

test/golden/importless/ptester.txt+1−1

This diff is too big to show here.

test/golden/importless/pure.txt+1−1

This diff is too big to show here.

test/golden/importless/purpose.txt+2−2

This diff is too big to show here.

test/golden/importless/pyblock.txt+9−9

This diff is too big to show here.

test/golden/importless/pykickstart.txt+2−2

This diff is too big to show here.

test/golden/importless/pyparted.txt+8−10

This diff is too big to show here.

test/golden/importless/qemu-guest-agent.txt+4−4

This diff is too big to show here.

test/golden/importless/qemu.txtnew file+49

This diff is too big to show here.

test/golden/importless/qpaeq.txt+6−6

This diff is too big to show here.

test/golden/importless/qt-5.txt+16−18

This diff is too big to show here.

test/golden/importless/qt4.txt+1−1

This diff is too big to show here.

test/golden/importless/qt5ct.txt+12−12

This diff is too big to show here.

test/golden/importless/qtModule.txt+38−41

This diff is too big to show here.

test/golden/importless/qtconnectivity.txt+2−2

This diff is too big to show here.

test/golden/importless/qtgamepad.txt+1−1

This diff is too big to show here.

test/golden/importless/qtile.txt+5−5

This diff is too big to show here.

test/golden/importless/qtlocation.txt+2−2

This diff is too big to show here.

test/golden/importless/qtspeech.txt+2−1

This diff is too big to show here.

test/golden/importless/qtwebengine.txt+77−79

This diff is too big to show here.

test/golden/importless/qtwebview.txt+6−7

This diff is too big to show here.

test/golden/importless/quantities.txt+5−5

This diff is too big to show here.

test/golden/importless/rabbitmq-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/racoon.txt+3−3

This diff is too big to show here.

test/golden/importless/raptor.txt+14−16

This diff is too big to show here.

test/golden/importless/raspberrypi-builder.txt+1−1

This diff is too big to show here.

test/golden/importless/rasqal.txt+25−27

This diff is too big to show here.

test/golden/importless/ratbagd.txt+3−3

This diff is too big to show here.

test/golden/importless/rationals.txt+2−2

This diff is too big to show here.

test/golden/importless/ratpoison.txt+5−5

This diff is too big to show here.

test/golden/importless/rdnssd.txt+18−17

This diff is too big to show here.

test/golden/importless/rds.txt+1−2

This diff is too big to show here.

test/golden/importless/rebar3-release.txt+25−28

This diff is too big to show here.

test/golden/importless/recursion_schemes.txt+6−6

This diff is too big to show here.

test/golden/importless/redis-exporter.txt+1−1

This diff is too big to show here.

test/golden/importless/redis.txt+2−2

This diff is too big to show here.

test/golden/importless/redland.txt+13−15

This diff is too big to show here.

test/golden/importless/refined.txt+6−6

This diff is too big to show here.

test/golden/importless/repmgr.txt+5−5

This diff is too big to show here.

test/golden/importless/require_exceptions.txt+8−8

This diff is too big to show here.

test/golden/importless/rfc2388.txt+1−1

This diff is too big to show here.

test/golden/importless/rng-mirage.txt+1−1

This diff is too big to show here.

test/golden/importless/rng.txt+1−1

This diff is too big to show here.

test/golden/importless/rngd.txt+4−4

This diff is too big to show here.

test/golden/importless/roboschool-fork.txt+15−17

This diff is too big to show here.

test/golden/importless/robustirc-bridge.txt+4−4

This diff is too big to show here.

test/golden/importless/rocs.txt+4−4

This diff is too big to show here.

test/golden/importless/rofi-pass.txt+23−25

This diff is too big to show here.

test/golden/importless/rpcbind.txt+16−16

This diff is too big to show here.

test/golden/importless/rt.txt+1−1

This diff is too big to show here.

test/golden/importless/rtkit.txt+17−17

This diff is too big to show here.

test/golden/importless/ruby-packages.txt+253−253

This diff is too big to show here.

test/golden/importless/ruby-version.txt+1−1

This diff is too big to show here.

test/golden/importless/rustfmt.txt+20−21

This diff is too big to show here.

test/golden/importless/rxe.txt+5−5

This diff is too big to show here.

test/golden/importless/rygel.txt+22−22

This diff is too big to show here.

test/golden/importless/s-sysdeps.txt+1−1

This diff is too big to show here.

test/golden/importless/s-xml.txt+1−1

This diff is too big to show here.

test/golden/importless/sabnzbd.txt+17−16

This diff is too big to show here.

test/golden/importless/safeeyes.txt+6−6

This diff is too big to show here.

test/golden/importless/sage-env.txt+1−1

This diff is too big to show here.

test/golden/importless/sagenb.txt+1−1

This diff is too big to show here.

test/golden/importless/salza2.txt+1−1

This diff is too big to show here.

test/golden/importless/samtools_0_1_19.txt+1−1

This diff is too big to show here.

test/golden/importless/sawfish.txt+5−5

This diff is too big to show here.

test/golden/importless/sbv-7.13.txt+2−2

This diff is too big to show here.

test/golden/importless/schema.txt+1−1

This diff is too big to show here.

test/golden/importless/screen.txt+3−3

This diff is too big to show here.

test/golden/importless/scripts.txt+14−15

This diff is too big to show here.

test/golden/importless/sdk-pkgs.txt+26−30

This diff is too big to show here.

test/golden/importless/sdl.txt+2−2

This diff is too big to show here.

test/golden/importless/sedutil.txt+3−3

This diff is too big to show here.

test/golden/importless/semidirect.txt+2−2

This diff is too big to show here.

test/golden/importless/server.txt+4−4

This diff is too big to show here.

test/golden/importless/setoids.txt+2−2

This diff is too big to show here.

test/golden/importless/shadow.txt+24−28

This diff is too big to show here.

test/golden/importless/share.txt+13−13

This diff is too big to show here.

test/golden/importless/shared.txt+59−62

This diff is too big to show here.

test/golden/importless/shiboken.txtnew file+43

This diff is too big to show here.

test/golden/importless/sickgear.txt+16−17

This diff is too big to show here.

test/golden/importless/sickrage.txt+14−14

This diff is too big to show here.

test/golden/importless/singularity.txt+9−8

This diff is too big to show here.

test/golden/importless/skeinjar.txt+1−1

This diff is too big to show here.

test/golden/importless/skeinrepo.txt+1−1

This diff is too big to show here.

test/golden/importless/slock.txt+3−3

This diff is too big to show here.

test/golden/importless/smallwm.txt+5−5

This diff is too big to show here.

test/golden/importless/smlar.txt+6−6

This diff is too big to show here.

test/golden/importless/smproc.txt+6−6

This diff is too big to show here.

test/golden/importless/snippets.txt+6−6

This diff is too big to show here.

test/golden/importless/socket.txt+1−1

This diff is too big to show here.

test/golden/importless/sockets.txt+7−7

This diff is too big to show here.

test/golden/importless/softmaker_office.txt+12−15

This diff is too big to show here.

test/golden/importless/software_foundations.txt+2−2

This diff is too big to show here.

test/golden/importless/solid.txtnew file+20

This diff is too big to show here.

test/golden/importless/sonnet.txtnew file+16

This diff is too big to show here.

test/golden/importless/sounds.txt+14−14

This diff is too big to show here.

test/golden/importless/source-from-head-fun.txt+1−1

This diff is too big to show here.

test/golden/importless/spago.txt+2−2

This diff is too big to show here.

test/golden/importless/specdris.txt+2−2

This diff is too big to show here.

test/golden/importless/spectrwm.txt+5−5

This diff is too big to show here.

test/golden/importless/spice-vdagentd.txt+3−3

This diff is too big to show here.

test/golden/importless/spotify.txt+2−2

This diff is too big to show here.

test/golden/importless/spotifyd.txt+4−4

This diff is too big to show here.

test/golden/importless/springlobby.txt+1−1

This diff is too big to show here.

test/golden/importless/sqlite.txt+10−10

This diff is too big to show here.

test/golden/importless/squeezelite.txt+13−15

This diff is too big to show here.

test/golden/importless/ssh-keys.txt+3−3

This diff is too big to show here.

test/golden/importless/ssm-agent.txt+6−6

This diff is too big to show here.

test/golden/importless/stable.txt+3−2

This diff is too big to show here.

test/golden/importless/staging.txt+15−17

This diff is too big to show here.

test/golden/importless/standalone.txt+50−51

This diff is too big to show here.

test/golden/importless/startx.txt+5−5

This diff is too big to show here.

test/golden/importless/status.txt+24−25

This diff is too big to show here.

test/golden/importless/steam-hardware.txt+5−5

This diff is too big to show here.

test/golden/importless/steam.txt+11−11

This diff is too big to show here.

test/golden/importless/stellar-core.txt+1−1

This diff is too big to show here.

test/golden/importless/string-case.txt+1−1

This diff is too big to show here.

test/golden/importless/stumpwm.txt+7−7

This diff is too big to show here.

test/golden/importless/sundtek.txt+3−3

This diff is too big to show here.

test/golden/importless/surfboard.txt+5−5

This diff is too big to show here.

test/golden/importless/sushi.txt+20−20

This diff is too big to show here.

test/golden/importless/swank.txt+1−1

This diff is too big to show here.

test/golden/importless/syndication.txt+2−2

This diff is too big to show here.

test/golden/importless/syntax-highlighting.txtnew file+16

This diff is too big to show here.

test/golden/importless/sysdig.txt+13−12

This diff is too big to show here.

test/golden/importless/sysprof.txt+13−14

This diff is too big to show here.

test/golden/importless/sysstat.txt+4−4

This diff is too big to show here.

test/golden/importless/system-config-printer.txt+8−8

This diff is too big to show here.

test/golden/importless/systemtap.txt+17−16

This diff is too big to show here.

test/golden/importless/tailscale.txt+8−10

This diff is too big to show here.

test/golden/importless/tap.txt+6−6

This diff is too big to show here.

test/golden/importless/tcpcrypt.txt+12−12

This diff is too big to show here.

test/golden/importless/tds_fdw.txt+8−8

This diff is too big to show here.

test/golden/importless/teamviewer.txt+3−3

This diff is too big to show here.

test/golden/importless/telepathy.txt+17−17

This diff is too big to show here.

test/golden/importless/temporal_tables.txt+5−5

This diff is too big to show here.

test/golden/importless/terminal-server.txt+6−7

This diff is too big to show here.

test/golden/importless/tes3mp.txt+1−1

This diff is too big to show here.

test/golden/importless/tesseract3.txt+17−19

This diff is too big to show here.

test/golden/importless/tesseract4.txt+17−19

This diff is too big to show here.

test/golden/importless/test-case.txt+1−1

This diff is too big to show here.

test/golden/importless/test.txt+1−1

This diff is too big to show here.

test/golden/importless/tfrandom.txt+6−6

This diff is too big to show here.

test/golden/importless/threadweaver.txtnew file+14

This diff is too big to show here.

test/golden/importless/throttled.txt+4−4

This diff is too big to show here.

test/golden/importless/tiddlywiki.txt+4−4

This diff is too big to show here.

test/golden/importless/timescaledb.txt+5−5

This diff is too big to show here.

test/golden/importless/tinywm.txt+5−5

This diff is too big to show here.

test/golden/importless/tlaps.txt+21−23

This diff is too big to show here.

test/golden/importless/tlhydra.txt+2−2

This diff is too big to show here.

test/golden/importless/tls-submodule.txt+5−5

This diff is too big to show here.

test/golden/importless/tmp.txt+7−8

This diff is too big to show here.

test/golden/importless/todo.txt+1−1

This diff is too big to show here.

test/golden/importless/tomladris.txt+6−6

This diff is too big to show here.

test/golden/importless/tool.txt+21−22

This diff is too big to show here.

test/golden/importless/toolbox.txt+15−16

This diff is too big to show here.

test/golden/importless/tools.txt+2−2

This diff is too big to show here.

test/golden/importless/tor-arm.txt+18−20

This diff is too big to show here.

test/golden/importless/tp.txt+6−6

This diff is too big to show here.

test/golden/importless/tparsec.txt+6−6

This diff is too big to show here.

test/golden/importless/tptp.txt+21−21

This diff is too big to show here.

test/golden/importless/traceroute.txt+3−3

This diff is too big to show here.

test/golden/importless/tracker-miners.txt+17−17

This diff is too big to show here.

test/golden/importless/tracker.txt+17−17

This diff is too big to show here.

test/golden/importless/transducers.txt+6−6

This diff is too big to show here.

test/golden/importless/trees.txt+2−2

This diff is too big to show here.

test/golden/importless/trivial-backtrace.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-cltl2.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-features.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-gray-streams.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-indent.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-macroexpand-all.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-mimes.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-types.txt+1−1

This diff is too big to show here.

test/golden/importless/trivial-utf-8.txt+1−1

This diff is too big to show here.

test/golden/importless/tsearch_extras.txt+5−5

This diff is too big to show here.

test/golden/importless/tuxedo-keyboard.txt+9−8

This diff is too big to show here.

test/golden/importless/tvheadend.txt+16−15

This diff is too big to show here.

test/golden/importless/twm.txt+7−7

This diff is too big to show here.

test/golden/importless/tzupdate.txt+3−3

This diff is too big to show here.

test/golden/importless/udev.txt+1−1

This diff is too big to show here.

test/golden/importless/udev_rules_type1.txt+10−12

This diff is too big to show here.

test/golden/importless/udevil.txt+3−3

This diff is too big to show here.

test/golden/importless/udisks2.txt+13−13

This diff is too big to show here.

test/golden/importless/uffi.txt+1−1

This diff is too big to show here.

test/golden/importless/ui.txt+1−1

This diff is too big to show here.

test/golden/importless/uim.txt+5−6

This diff is too big to show here.

test/golden/importless/uinput.txt+3−3

This diff is too big to show here.

test/golden/importless/uiop.txt+1−1

This diff is too big to show here.

test/golden/importless/union_type.txt+6−6

This diff is too big to show here.

test/golden/importless/unit-test.txt+1−1

This diff is too big to show here.

test/golden/importless/unix-odbc-drivers.txt+4−4

This diff is too big to show here.

test/golden/importless/unix-opts.txt+1−1

This diff is too big to show here.

test/golden/importless/unix.txt+1−1

This diff is too big to show here.

test/golden/importless/unstable.txt+22−25

This diff is too big to show here.

test/golden/importless/unwrapped.txt+3−3

This diff is too big to show here.

test/golden/importless/updateSettings.txtnew file+12

This diff is too big to show here.

test/golden/importless/uptimed.txt+14−13

This diff is too big to show here.

test/golden/importless/urserver.txt+5−7

This diff is too big to show here.

test/golden/importless/usb-wwan.txt+13−13

This diff is too big to show here.

test/golden/importless/usbtop.txt+3−3

This diff is too big to show here.

test/golden/importless/user-account.txt+1−1

This diff is too big to show here.

test/golden/importless/utils.txt+21−21

This diff is too big to show here.

test/golden/importless/v10.txt+1−1

This diff is too big to show here.

test/golden/importless/v12.txt+1−1

This diff is too big to show here.

test/golden/importless/v14.txt+1−1

This diff is too big to show here.

test/golden/importless/v3_4.txt+3−3

This diff is too big to show here.

test/golden/importless/v3_6.txt+4−4

This diff is too big to show here.

test/golden/importless/v4_0.txt+4−4

This diff is too big to show here.

test/golden/importless/v4_2.txt+4−4

This diff is too big to show here.

test/golden/importless/varnish-exporter.txt+6−6

This diff is too big to show here.

test/golden/importless/vdom.txt+6−6

This diff is too big to show here.

test/golden/importless/vecspace.txt+2−2

This diff is too big to show here.

test/golden/importless/vhba.txt+14−15

This diff is too big to show here.

test/golden/importless/viewer.txt+7−9

This diff is too big to show here.

test/golden/importless/vim.txt+4−4

This diff is too big to show here.

test/golden/importless/virtualbox-guest.txt+20−21

This diff is too big to show here.

test/golden/importless/vnstat.txt+3−3

This diff is too big to show here.

test/golden/importless/vom.txt+1−1

This diff is too big to show here.

test/golden/importless/vulkan.txt+23−24

This diff is too big to show here.

test/golden/importless/wacom.txt+4−4

This diff is too big to show here.

test/golden/importless/wakeonlan.txt+8−7

This diff is too big to show here.

test/golden/importless/wavemon.txt+3−3

This diff is too big to show here.

test/golden/importless/waybar.txt+3−3

This diff is too big to show here.

test/golden/importless/webgl.txt+6−6

This diff is too big to show here.

test/golden/importless/wicd.txt+12−12

This diff is too big to show here.

test/golden/importless/windowlab.txt+5−5

This diff is too big to show here.

test/golden/importless/windowmaker.txt+5−5

This diff is too big to show here.

test/golden/importless/winetricks.txt+25−27

This diff is too big to show here.

test/golden/importless/with-extensions.txt+2−2

This diff is too big to show here.

test/golden/importless/with-fonts.txt+14−14

This diff is too big to show here.

test/golden/importless/with-packages.txt+7−8

This diff is too big to show here.

test/golden/importless/wl-pprint.txt+2−2

This diff is too big to show here.

test/golden/importless/wmcalclock.txt+20−22

This diff is too big to show here.

test/golden/importless/wmii.txt+5−5

This diff is too big to show here.

test/golden/importless/wmsm.app.txt+17−18

This diff is too big to show here.

test/golden/importless/wmsystemtray.txt+22−24

This diff is too big to show here.

test/golden/importless/wooting.txt+10−10

This diff is too big to show here.

test/golden/importless/wyvern.txt+6−6

This diff is too big to show here.

test/golden/importless/x32edit.txt+9−12

This diff is too big to show here.

test/golden/importless/xbanish.txt+3−3

This diff is too big to show here.

test/golden/importless/xe-guest-utilities.txt+3−3

This diff is too big to show here.

test/golden/importless/xen-domU.txt+1−1

This diff is too big to show here.

test/golden/importless/xfce4-mailwatch-plugin.txt+1−1

This diff is too big to show here.

test/golden/importless/xfce4-mpc-plugin.txt+1−1

This diff is too big to show here.

test/golden/importless/xfce4-timer-plugin.txt+1−1

This diff is too big to show here.

test/golden/importless/xfce4-windowck-plugin.txt+8−8

This diff is too big to show here.

test/golden/importless/xfs.txt+16−16

This diff is too big to show here.

test/golden/importless/xft.txt+8−8

This diff is too big to show here.

test/golden/importless/xhr.txt+6−6

This diff is too big to show here.

test/golden/importless/xlib.txt+2−2

This diff is too big to show here.

test/golden/importless/xmpp-alerts.txtdeleted−54

This diff is too big to show here.

test/golden/importless/xow.txt+4−4

This diff is too big to show here.

test/golden/importless/xsane.txt+9−12

This diff is too big to show here.

test/golden/importless/xsubseq.txt+1−1

This diff is too big to show here.

test/golden/importless/xterm.txt+12−13

This diff is too big to show here.

test/golden/importless/yacc.txt+1−1

This diff is too big to show here.

test/golden/importless/yakuake.txt+3−3

This diff is too big to show here.

test/golden/importless/yaml.txt+6−6

This diff is too big to show here.

test/golden/importless/yampa.txt+2−2

This diff is too big to show here.

test/golden/importless/yeahwm.txt+5−5

This diff is too big to show here.

test/golden/importless/z3.txt+2−2

This diff is too big to show here.

test/golden/importless/zeitgeist.txt+12−12

This diff is too big to show here.

test/golden/importless/zmap.txt+3−3

This diff is too big to show here.

test/golden/importless/zpaqd.txt+18−21

This diff is too big to show here.

test/golden/importless/zpb-ttf.txt+1−1

This diff is too big to show here.

test/golden/importless/zsh-autoenv.txt+4−4

This diff is too big to show here.

test/golden/mine/0.9.txt+1−1

This diff is too big to show here.

test/golden/mine/curry.txt+1−1

This diff is too big to show here.

test/golden/mine/define-option-dependently-nested.nixnew file+12

This diff is too big to show here.

test/golden/mine/define-option-dependently-nested.txtnew file+3

This diff is too big to show here.

test/golden/mine/inftype.txt+1−1

This diff is too big to show here.

test/golden/mine/nums.nixnew file+5

This diff is too big to show here.

test/golden/mine/nums.txtnew file+1

This diff is too big to show here.

test/golden/mine/other.txt+1−1

This diff is too big to show here.

test/golden/mine/other_row.txt+3−3

This diff is too big to show here.

test/golden/mine/polyApply.txt+1−1

This diff is too big to show here.

test/golden/mine/row.nixdeleted−5

This diff is too big to show here.

test/golden/mine/subsumption.nixnew file+6

This diff is too big to show here.

test/golden/mine/subsumption.txtnew file+4

This diff is too big to show here.

test/golden/mine/subsumption_other.nixnew file+5

This diff is too big to show here.

test/golden/mine/subsumption_other.txtnew file+1

This diff is too big to show here.

test/golden/mine/unionfs.nixdeleted−21

This diff is too big to show here.

test/golden/mine/variadic.txt+4−1

This diff is too big to show here.

test/golden/mine/with.txt+1−1

This diff is too big to show here.