Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
f061cfd767
@ -6,29 +6,313 @@
|
|||||||
|
|
||||||
"portals.conf(5)": "https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in",
|
"portals.conf(5)": "https://github.com/flatpak/xdg-desktop-portal/blob/1.18.1/doc/portals.conf.rst.in",
|
||||||
|
|
||||||
|
"bootctl(1)": "https://www.freedesktop.org/software/systemd/man/bootctl.html",
|
||||||
|
"busctl(1)": "https://www.freedesktop.org/software/systemd/man/busctl.html",
|
||||||
|
"coredumpctl(1)": "https://www.freedesktop.org/software/systemd/man/coredumpctl.html",
|
||||||
|
"homectl(1)": "https://www.freedesktop.org/software/systemd/man/homectl.html",
|
||||||
|
"hostnamectl(1)": "https://www.freedesktop.org/software/systemd/man/hostnamectl.html",
|
||||||
|
"init(1)": "https://www.freedesktop.org/software/systemd/man/init.html",
|
||||||
|
"journalctl(1)": "https://www.freedesktop.org/software/systemd/man/journalctl.html",
|
||||||
|
"localectl(1)": "https://www.freedesktop.org/software/systemd/man/localectl.html",
|
||||||
|
"loginctl(1)": "https://www.freedesktop.org/software/systemd/man/loginctl.html",
|
||||||
|
"machinectl(1)": "https://www.freedesktop.org/software/systemd/man/machinectl.html",
|
||||||
|
"mount.ddi(1)": "https://www.freedesktop.org/software/systemd/man/mount.ddi.html",
|
||||||
|
"networkctl(1)": "https://www.freedesktop.org/software/systemd/man/networkctl.html",
|
||||||
|
"oomctl(1)": "https://www.freedesktop.org/software/systemd/man/oomctl.html",
|
||||||
|
"portablectl(1)": "https://www.freedesktop.org/software/systemd/man/portablectl.html",
|
||||||
|
"resolvconf(1)": "https://www.freedesktop.org/software/systemd/man/resolvconf.html",
|
||||||
|
"resolvectl(1)": "https://www.freedesktop.org/software/systemd/man/resolvectl.html",
|
||||||
|
"systemctl(1)": "https://www.freedesktop.org/software/systemd/man/systemctl.html",
|
||||||
|
"systemd-ac-power(1)": "https://www.freedesktop.org/software/systemd/man/systemd-ac-power.html",
|
||||||
|
"systemd-analyze(1)": "https://www.freedesktop.org/software/systemd/man/systemd-analyze.html",
|
||||||
|
"systemd-ask-password(1)": "https://www.freedesktop.org/software/systemd/man/systemd-ask-password.html",
|
||||||
|
"systemd-cat(1)": "https://www.freedesktop.org/software/systemd/man/systemd-cat.html",
|
||||||
|
"systemd-cgls(1)": "https://www.freedesktop.org/software/systemd/man/systemd-cgls.html",
|
||||||
|
"systemd-cgtop(1)": "https://www.freedesktop.org/software/systemd/man/systemd-cgtop.html",
|
||||||
|
"systemd-creds(1)": "https://www.freedesktop.org/software/systemd/man/systemd-creds.html",
|
||||||
|
"systemd-cryptenroll(1)": "https://www.freedesktop.org/software/systemd/man/systemd-cryptenroll.html",
|
||||||
|
"systemd-delta(1)": "https://www.freedesktop.org/software/systemd/man/systemd-delta.html",
|
||||||
|
"systemd-detect-virt(1)": "https://www.freedesktop.org/software/systemd/man/systemd-detect-virt.html",
|
||||||
|
"systemd-dissect(1)": "https://www.freedesktop.org/software/systemd/man/systemd-dissect.html",
|
||||||
|
"systemd-escape(1)": "https://www.freedesktop.org/software/systemd/man/systemd-escape.html",
|
||||||
|
"systemd-id128(1)": "https://www.freedesktop.org/software/systemd/man/systemd-id128.html",
|
||||||
|
"systemd-inhibit(1)": "https://www.freedesktop.org/software/systemd/man/systemd-inhibit.html",
|
||||||
|
"systemd-machine-id-setup(1)": "https://www.freedesktop.org/software/systemd/man/systemd-machine-id-setup.html",
|
||||||
|
"systemd-measure(1)": "https://www.freedesktop.org/software/systemd/man/systemd-measure.html",
|
||||||
|
"systemd-mount(1)": "https://www.freedesktop.org/software/systemd/man/systemd-mount.html",
|
||||||
|
"systemd-notify(1)": "https://www.freedesktop.org/software/systemd/man/systemd-notify.html",
|
||||||
|
"systemd-nspawn(1)": "https://www.freedesktop.org/software/systemd/man/systemd-nspawn.html",
|
||||||
|
"systemd-path(1)": "https://www.freedesktop.org/software/systemd/man/systemd-path.html",
|
||||||
|
"systemd-run(1)": "https://www.freedesktop.org/software/systemd/man/systemd-run.html",
|
||||||
|
"systemd-socket-activate(1)": "https://www.freedesktop.org/software/systemd/man/systemd-socket-activate.html",
|
||||||
|
"systemd-stdio-bridge(1)": "https://www.freedesktop.org/software/systemd/man/systemd-stdio-bridge.html",
|
||||||
|
"systemd-tty-ask-password-agent(1)": "https://www.freedesktop.org/software/systemd/man/systemd-tty-ask-password-agent.html",
|
||||||
|
"systemd-umount(1)": "https://www.freedesktop.org/software/systemd/man/systemd-umount.html",
|
||||||
|
"systemd(1)": "https://www.freedesktop.org/software/systemd/man/systemd.html",
|
||||||
|
"timedatectl(1)": "https://www.freedesktop.org/software/systemd/man/timedatectl.html",
|
||||||
|
"userdbctl(1)": "https://www.freedesktop.org/software/systemd/man/userdbctl.html",
|
||||||
|
"binfmt.d(5)": "https://www.freedesktop.org/software/systemd/man/binfmt.d.html",
|
||||||
|
"coredump.conf(5)": "https://www.freedesktop.org/software/systemd/man/coredump.conf.html",
|
||||||
|
"coredump.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/coredump.conf.d.html",
|
||||||
|
"crypttab(5)": "https://www.freedesktop.org/software/systemd/man/crypttab.html",
|
||||||
|
"dnssec-trust-anchors.d(5)": "https://www.freedesktop.org/software/systemd/man/dnssec-trust-anchors.d.html",
|
||||||
|
"environment.d(5)": "https://www.freedesktop.org/software/systemd/man/environment.d.html",
|
||||||
|
"extension-release(5)": "https://www.freedesktop.org/software/systemd/man/extension-release.html",
|
||||||
|
"homed.conf(5)": "https://www.freedesktop.org/software/systemd/man/homed.conf.html",
|
||||||
|
"homed.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/homed.conf.d.html",
|
||||||
|
"hostname(5)": "https://www.freedesktop.org/software/systemd/man/hostname.html",
|
||||||
|
"initrd-release(5)": "https://www.freedesktop.org/software/systemd/man/initrd-release.html",
|
||||||
|
"integritytab(5)": "https://www.freedesktop.org/software/systemd/man/integritytab.html",
|
||||||
|
"iocost.conf(5)": "https://www.freedesktop.org/software/systemd/man/iocost.conf.html",
|
||||||
|
"journal-remote.conf(5)": "https://www.freedesktop.org/software/systemd/man/journal-remote.conf.html",
|
||||||
|
"journal-remote.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/journal-remote.conf.d.html",
|
||||||
|
"journal-upload.conf(5)": "https://www.freedesktop.org/software/systemd/man/journal-upload.conf.html",
|
||||||
|
"journal-upload.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/journal-upload.conf.d.html",
|
||||||
"journald.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.html",
|
"journald.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.html",
|
||||||
|
"journald.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.d.html",
|
||||||
|
"journald@.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald@.conf.html",
|
||||||
|
"loader.conf(5)": "https://www.freedesktop.org/software/systemd/man/loader.conf.html",
|
||||||
|
"locale.conf(5)": "https://www.freedesktop.org/software/systemd/man/locale.conf.html",
|
||||||
|
"localtime(5)": "https://www.freedesktop.org/software/systemd/man/localtime.html",
|
||||||
"logind.conf(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.html",
|
"logind.conf(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.html",
|
||||||
|
"logind.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.d.html",
|
||||||
|
"machine-id(5)": "https://www.freedesktop.org/software/systemd/man/machine-id.html",
|
||||||
|
"machine-info(5)": "https://www.freedesktop.org/software/systemd/man/machine-info.html",
|
||||||
|
"modules-load.d(5)": "https://www.freedesktop.org/software/systemd/man/modules-load.d.html",
|
||||||
"networkd.conf(5)": "https://www.freedesktop.org/software/systemd/man/networkd.conf.html",
|
"networkd.conf(5)": "https://www.freedesktop.org/software/systemd/man/networkd.conf.html",
|
||||||
|
"networkd.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/networkd.conf.d.html",
|
||||||
|
"oomd.conf(5)": "https://www.freedesktop.org/software/systemd/man/oomd.conf.html",
|
||||||
|
"oomd.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/oomd.conf.d.html",
|
||||||
|
"org.freedesktop.LogControl1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.LogControl1.html",
|
||||||
|
"org.freedesktop.home1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.home1.html",
|
||||||
|
"org.freedesktop.hostname1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.hostname1.html",
|
||||||
|
"org.freedesktop.import1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.import1.html",
|
||||||
|
"org.freedesktop.locale1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.locale1.html",
|
||||||
|
"org.freedesktop.login1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.login1.html",
|
||||||
|
"org.freedesktop.machine1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.machine1.html",
|
||||||
|
"org.freedesktop.network1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.network1.html",
|
||||||
|
"org.freedesktop.oom1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.oom1.html",
|
||||||
|
"org.freedesktop.portable1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.portable1.html",
|
||||||
|
"org.freedesktop.resolve1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.resolve1.html",
|
||||||
|
"org.freedesktop.systemd1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.systemd1.html",
|
||||||
|
"org.freedesktop.timedate1(5)": "https://www.freedesktop.org/software/systemd/man/org.freedesktop.timedate1.html",
|
||||||
|
"os-release(5)": "https://www.freedesktop.org/software/systemd/man/os-release.html",
|
||||||
|
"pstore.conf(5)": "https://www.freedesktop.org/software/systemd/man/pstore.conf.html",
|
||||||
|
"pstore.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/pstore.conf.d.html",
|
||||||
|
"repart.d(5)": "https://www.freedesktop.org/software/systemd/man/repart.d.html",
|
||||||
|
"resolved.conf(5)": "https://www.freedesktop.org/software/systemd/man/resolved.conf.html",
|
||||||
|
"resolved.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/resolved.conf.d.html",
|
||||||
|
"sleep.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/sleep.conf.d.html",
|
||||||
|
"sysctl.d(5)": "https://www.freedesktop.org/software/systemd/man/sysctl.d.html",
|
||||||
|
"system.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/system.conf.d.html",
|
||||||
|
"systemd-sleep.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-sleep.conf.html",
|
||||||
|
"systemd-system.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html",
|
||||||
|
"systemd-user-runtime-dir(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user-runtime-dir.html",
|
||||||
|
"systemd-user.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user.conf.html",
|
||||||
"systemd.automount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.automount.html",
|
"systemd.automount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.automount.html",
|
||||||
|
"systemd.device(5)": "https://www.freedesktop.org/software/systemd/man/systemd.device.html",
|
||||||
|
"systemd.dnssd(5)": "https://www.freedesktop.org/software/systemd/man/systemd.dnssd.html",
|
||||||
"systemd.exec(5)": "https://www.freedesktop.org/software/systemd/man/systemd.exec.html",
|
"systemd.exec(5)": "https://www.freedesktop.org/software/systemd/man/systemd.exec.html",
|
||||||
|
"systemd.kill(5)": "https://www.freedesktop.org/software/systemd/man/systemd.kill.html",
|
||||||
"systemd.link(5)": "https://www.freedesktop.org/software/systemd/man/systemd.link.html",
|
"systemd.link(5)": "https://www.freedesktop.org/software/systemd/man/systemd.link.html",
|
||||||
"systemd.mount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.mount.html",
|
"systemd.mount(5)": "https://www.freedesktop.org/software/systemd/man/systemd.mount.html",
|
||||||
|
"systemd.negative(5)": "https://www.freedesktop.org/software/systemd/man/systemd.negative.html",
|
||||||
"systemd.netdev(5)": "https://www.freedesktop.org/software/systemd/man/systemd.netdev.html",
|
"systemd.netdev(5)": "https://www.freedesktop.org/software/systemd/man/systemd.netdev.html",
|
||||||
"systemd.network(5)": "https://www.freedesktop.org/software/systemd/man/systemd.network.html",
|
"systemd.network(5)": "https://www.freedesktop.org/software/systemd/man/systemd.network.html",
|
||||||
"systemd.nspawn(5)": "https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html",
|
"systemd.nspawn(5)": "https://www.freedesktop.org/software/systemd/man/systemd.nspawn.html",
|
||||||
"systemd.path(5)": "https://www.freedesktop.org/software/systemd/man/systemd.path.html",
|
"systemd.path(5)": "https://www.freedesktop.org/software/systemd/man/systemd.path.html",
|
||||||
|
"systemd.positive(5)": "https://www.freedesktop.org/software/systemd/man/systemd.positive.html",
|
||||||
|
"systemd.preset(5)": "https://www.freedesktop.org/software/systemd/man/systemd.preset.html",
|
||||||
"systemd.resource-control(5)": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html",
|
"systemd.resource-control(5)": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html",
|
||||||
"systemd.scope(5)": "https://www.freedesktop.org/software/systemd/man/systemd.scope.html",
|
"systemd.scope(5)": "https://www.freedesktop.org/software/systemd/man/systemd.scope.html",
|
||||||
"systemd.service(5)": "https://www.freedesktop.org/software/systemd/man/systemd.service.html",
|
"systemd.service(5)": "https://www.freedesktop.org/software/systemd/man/systemd.service.html",
|
||||||
"systemd.slice(5)": "https://www.freedesktop.org/software/systemd/man/systemd.slice.html",
|
"systemd.slice(5)": "https://www.freedesktop.org/software/systemd/man/systemd.slice.html",
|
||||||
"systemd.socket(5)": "https://www.freedesktop.org/software/systemd/man/systemd.socket.html",
|
"systemd.socket(5)": "https://www.freedesktop.org/software/systemd/man/systemd.socket.html",
|
||||||
|
"systemd.swap(5)": "https://www.freedesktop.org/software/systemd/man/systemd.swap.html",
|
||||||
|
"systemd.target(5)": "https://www.freedesktop.org/software/systemd/man/systemd.target.html",
|
||||||
"systemd.timer(5)": "https://www.freedesktop.org/software/systemd/man/systemd.timer.html",
|
"systemd.timer(5)": "https://www.freedesktop.org/software/systemd/man/systemd.timer.html",
|
||||||
"systemd.unit(5)": "https://www.freedesktop.org/software/systemd/man/systemd.unit.html",
|
"systemd.unit(5)": "https://www.freedesktop.org/software/systemd/man/systemd.unit.html",
|
||||||
"systemd-system.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-system.conf.html",
|
"sysupdate.d(5)": "https://www.freedesktop.org/software/systemd/man/sysupdate.d.html",
|
||||||
"systemd-user.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user.conf.html",
|
"sysusers.d(5)": "https://www.freedesktop.org/software/systemd/man/sysusers.d.html",
|
||||||
"timesyncd.conf(5)": "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html",
|
"timesyncd.conf(5)": "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html",
|
||||||
|
"timesyncd.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/timesyncd.conf.d.html",
|
||||||
"tmpfiles.d(5)": "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html",
|
"tmpfiles.d(5)": "https://www.freedesktop.org/software/systemd/man/tmpfiles.d.html",
|
||||||
|
"udev.conf(5)": "https://www.freedesktop.org/software/systemd/man/udev.conf.html",
|
||||||
|
"user-runtime-dir@.service(5)": "https://www.freedesktop.org/software/systemd/man/user-runtime-dir@.service.html",
|
||||||
|
"user.conf.d(5)": "https://www.freedesktop.org/software/systemd/man/user.conf.d.html",
|
||||||
|
"user@.service(5)": "https://www.freedesktop.org/software/systemd/man/user@.service.html",
|
||||||
|
"vconsole.conf(5)": "https://www.freedesktop.org/software/systemd/man/vconsole.conf.html",
|
||||||
|
"veritytab(5)": "https://www.freedesktop.org/software/systemd/man/veritytab.html",
|
||||||
|
"bootup(7)": "https://www.freedesktop.org/software/systemd/man/bootup.html",
|
||||||
|
"daemon(7)": "https://www.freedesktop.org/software/systemd/man/daemon.html",
|
||||||
|
"file-hierarchy(7)": "https://www.freedesktop.org/software/systemd/man/file-hierarchy.html",
|
||||||
|
"hwdb(7)": "https://www.freedesktop.org/software/systemd/man/hwdb.html",
|
||||||
|
"kernel-command-line(7)": "https://www.freedesktop.org/software/systemd/man/kernel-command-line.html",
|
||||||
|
"linuxaa64.efi.stub(7)": "https://www.freedesktop.org/software/systemd/man/linuxaa64.efi.stub.html",
|
||||||
|
"linuxia32.efi.stub(7)": "https://www.freedesktop.org/software/systemd/man/linuxia32.efi.stub.html",
|
||||||
|
"linuxx64.efi.stub(7)": "https://www.freedesktop.org/software/systemd/man/linuxx64.efi.stub.html",
|
||||||
|
"sd-boot(7)": "https://www.freedesktop.org/software/systemd/man/sd-boot.html",
|
||||||
|
"sd-stub(7)": "https://www.freedesktop.org/software/systemd/man/sd-stub.html",
|
||||||
|
"smbios-type-11(7)": "https://www.freedesktop.org/software/systemd/man/smbios-type-11.html",
|
||||||
|
"systemd-boot(7)": "https://www.freedesktop.org/software/systemd/man/systemd-boot.html",
|
||||||
|
"systemd-stub(7)": "https://www.freedesktop.org/software/systemd/man/systemd-stub.html",
|
||||||
|
"systemd.directives(7)": "https://www.freedesktop.org/software/systemd/man/systemd.directives.html",
|
||||||
|
"systemd.environment-generator(7)": "https://www.freedesktop.org/software/systemd/man/systemd.environment-generator.html",
|
||||||
|
"systemd.generator(7)": "https://www.freedesktop.org/software/systemd/man/systemd.generator.html",
|
||||||
|
"systemd.image-policy(7)": "https://www.freedesktop.org/software/systemd/man/systemd.image-policy.html",
|
||||||
|
"systemd.index(7)": "https://www.freedesktop.org/software/systemd/man/systemd.index.html",
|
||||||
|
"systemd.journal-fields(7)": "https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html",
|
||||||
|
"systemd.net-naming-scheme(7)": "https://www.freedesktop.org/software/systemd/man/systemd.net-naming-scheme.html",
|
||||||
|
"systemd.offline-updates(7)": "https://www.freedesktop.org/software/systemd/man/systemd.offline-updates.html",
|
||||||
|
"systemd.special(7)": "https://www.freedesktop.org/software/systemd/man/systemd.special.html",
|
||||||
|
"systemd.syntax(7)": "https://www.freedesktop.org/software/systemd/man/systemd.syntax.html",
|
||||||
|
"systemd.system-credentials(7)": "https://www.freedesktop.org/software/systemd/man/systemd.system-credentials.html",
|
||||||
"systemd.time(7)": "https://www.freedesktop.org/software/systemd/man/systemd.time.html",
|
"systemd.time(7)": "https://www.freedesktop.org/software/systemd/man/systemd.time.html",
|
||||||
|
"udev(7)": "https://www.freedesktop.org/software/systemd/man/udev.html",
|
||||||
|
"30-systemd-environment-d-generator(8)": "https://www.freedesktop.org/software/systemd/man/30-systemd-environment-d-generator.html",
|
||||||
|
"halt(8)": "https://www.freedesktop.org/software/systemd/man/halt.html",
|
||||||
|
"kernel-install(8)": "https://www.freedesktop.org/software/systemd/man/kernel-install.html",
|
||||||
|
"libnss_myhostname.so.2(8)": "https://www.freedesktop.org/software/systemd/man/libnss_myhostname.so.2.html",
|
||||||
|
"libnss_mymachines.so.2(8)": "https://www.freedesktop.org/software/systemd/man/libnss_mymachines.so.2.html",
|
||||||
|
"libnss_resolve.so.2(8)": "https://www.freedesktop.org/software/systemd/man/libnss_resolve.so.2.html",
|
||||||
|
"libnss_systemd.so.2(8)": "https://www.freedesktop.org/software/systemd/man/libnss_systemd.so.2.html",
|
||||||
|
"nss-myhostname(8)": "https://www.freedesktop.org/software/systemd/man/nss-myhostname.html",
|
||||||
|
"nss-mymachines(8)": "https://www.freedesktop.org/software/systemd/man/nss-mymachines.html",
|
||||||
|
"nss-resolve(8)": "https://www.freedesktop.org/software/systemd/man/nss-resolve.html",
|
||||||
|
"nss-systemd(8)": "https://www.freedesktop.org/software/systemd/man/nss-systemd.html",
|
||||||
|
"pam_systemd(8)": "https://www.freedesktop.org/software/systemd/man/pam_systemd.html",
|
||||||
|
"pam_systemd_home(8)": "https://www.freedesktop.org/software/systemd/man/pam_systemd_home.html",
|
||||||
|
"poweroff(8)": "https://www.freedesktop.org/software/systemd/man/poweroff.html",
|
||||||
|
"reboot(8)": "https://www.freedesktop.org/software/systemd/man/reboot.html",
|
||||||
|
"shutdown(8)": "https://www.freedesktop.org/software/systemd/man/shutdown.html",
|
||||||
|
"systemd-ask-password-console.path(8)": "https://www.freedesktop.org/software/systemd/man/systemd-ask-password-console.path.html",
|
||||||
|
"systemd-ask-password-console.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-ask-password-console.service.html",
|
||||||
|
"systemd-ask-password-wall.path(8)": "https://www.freedesktop.org/software/systemd/man/systemd-ask-password-wall.path.html",
|
||||||
|
"systemd-ask-password-wall.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-ask-password-wall.service.html",
|
||||||
|
"systemd-backlight(8)": "https://www.freedesktop.org/software/systemd/man/systemd-backlight.html",
|
||||||
|
"systemd-backlight@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html",
|
||||||
|
"systemd-battery-check(8)": "https://www.freedesktop.org/software/systemd/man/systemd-battery-check.html",
|
||||||
|
"systemd-binfmt(8)": "https://www.freedesktop.org/software/systemd/man/systemd-binfmt.html",
|
||||||
|
"systemd-bless-boot-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-bless-boot-generator.html",
|
||||||
|
"systemd-bless-boot(8)": "https://www.freedesktop.org/software/systemd/man/systemd-bless-boot.html",
|
||||||
|
"systemd-boot-check-no-failures(8)": "https://www.freedesktop.org/software/systemd/man/systemd-boot-check-no-failures.html",
|
||||||
|
"systemd-boot-random-seed.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-boot-random-seed.service.html",
|
||||||
|
"systemd-confext(8)": "https://www.freedesktop.org/software/systemd/man/systemd-confext.html",
|
||||||
|
"systemd-confext.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-confext.service.html",
|
||||||
|
"systemd-coredump(8)": "https://www.freedesktop.org/software/systemd/man/systemd-coredump.html",
|
||||||
|
"systemd-coredump.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-coredump.socket.html",
|
||||||
|
"systemd-coredump@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-coredump@.service.html",
|
||||||
|
"systemd-cryptsetup-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-cryptsetup-generator.html",
|
||||||
|
"systemd-cryptsetup(8)": "https://www.freedesktop.org/software/systemd/man/systemd-cryptsetup.html",
|
||||||
|
"systemd-cryptsetup@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-cryptsetup@.service.html",
|
||||||
|
"systemd-debug-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-debug-generator.html",
|
||||||
|
"systemd-environment-d-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-environment-d-generator.html",
|
||||||
|
"systemd-fsck-root.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fsck-root.service.html",
|
||||||
|
"systemd-fsck-usr.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fsck-usr.service.html",
|
||||||
|
"systemd-fsck(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fsck.html",
|
||||||
|
"systemd-fsck@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fsck@.service.html",
|
||||||
"systemd-fstab-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html",
|
"systemd-fstab-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html",
|
||||||
"systemd-networkd-wait-online.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html"
|
"systemd-getty-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-getty-generator.html",
|
||||||
|
"systemd-gpt-auto-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html",
|
||||||
|
"systemd-growfs-root.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-growfs-root.service.html",
|
||||||
|
"systemd-growfs(8)": "https://www.freedesktop.org/software/systemd/man/systemd-growfs.html",
|
||||||
|
"systemd-growfs@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-growfs@.service.html",
|
||||||
|
"systemd-halt.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-halt.service.html",
|
||||||
|
"systemd-hibernate-resume-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hibernate-resume-generator.html",
|
||||||
|
"systemd-hibernate-resume(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hibernate-resume.html",
|
||||||
|
"systemd-hibernate.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hibernate.service.html",
|
||||||
|
"systemd-homed(8)": "https://www.freedesktop.org/software/systemd/man/systemd-homed.html",
|
||||||
|
"systemd-hostnamed(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hostnamed.html",
|
||||||
|
"systemd-hwdb(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hwdb.html",
|
||||||
|
"systemd-hybrid-sleep.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-hybrid-sleep.service.html",
|
||||||
|
"systemd-importd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-importd.html",
|
||||||
|
"systemd-integritysetup-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-integritysetup-generator.html",
|
||||||
|
"systemd-integritysetup(8)": "https://www.freedesktop.org/software/systemd/man/systemd-integritysetup.html",
|
||||||
|
"systemd-integritysetup@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-integritysetup@.service.html",
|
||||||
|
"systemd-journal-gatewayd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.html",
|
||||||
|
"systemd-journal-gatewayd.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.socket.html",
|
||||||
|
"systemd-journal-remote(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.html",
|
||||||
|
"systemd-journal-remote.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journal-remote.socket.html",
|
||||||
|
"systemd-journal-upload(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journal-upload.html",
|
||||||
|
"systemd-journald-audit.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald-audit.socket.html",
|
||||||
|
"systemd-journald-dev-log.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald-dev-log.socket.html",
|
||||||
|
"systemd-journald-varlink@.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald-varlink@.socket.html",
|
||||||
|
"systemd-journald(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald.html",
|
||||||
|
"systemd-journald.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald.socket.html",
|
||||||
|
"systemd-journald@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald@.service.html",
|
||||||
|
"systemd-journald@.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-journald@.socket.html",
|
||||||
|
"systemd-kexec.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-kexec.service.html",
|
||||||
|
"systemd-localed(8)": "https://www.freedesktop.org/software/systemd/man/systemd-localed.html",
|
||||||
|
"systemd-logind(8)": "https://www.freedesktop.org/software/systemd/man/systemd-logind.html",
|
||||||
|
"systemd-machine-id-commit.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-machine-id-commit.service.html",
|
||||||
|
"systemd-machined(8)": "https://www.freedesktop.org/software/systemd/man/systemd-machined.html",
|
||||||
|
"systemd-makefs(8)": "https://www.freedesktop.org/software/systemd/man/systemd-makefs.html",
|
||||||
|
"systemd-makefs@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-makefs@.service.html",
|
||||||
|
"systemd-mkswap@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-mkswap@.service.html",
|
||||||
|
"systemd-modules-load(8)": "https://www.freedesktop.org/software/systemd/man/systemd-modules-load.html",
|
||||||
|
"systemd-network-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-network-generator.html",
|
||||||
|
"systemd-networkd-wait-online(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.html",
|
||||||
|
"systemd-networkd-wait-online@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online@.service.html",
|
||||||
|
"systemd-networkd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-networkd.html",
|
||||||
|
"systemd-oomd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-oomd.html",
|
||||||
|
"systemd-pcrfs-root.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrfs-root.service.html",
|
||||||
|
"systemd-pcrfs@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrfs@.service.html",
|
||||||
|
"systemd-pcrmachine.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrmachine.service.html",
|
||||||
|
"systemd-pcrphase-initrd.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrphase-initrd.service.html",
|
||||||
|
"systemd-pcrphase-sysinit.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrphase-sysinit.service.html",
|
||||||
|
"systemd-pcrphase(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pcrphase.html",
|
||||||
|
"systemd-portabled(8)": "https://www.freedesktop.org/software/systemd/man/systemd-portabled.html",
|
||||||
|
"systemd-poweroff.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-poweroff.service.html",
|
||||||
|
"systemd-pstore(8)": "https://www.freedesktop.org/software/systemd/man/systemd-pstore.html",
|
||||||
|
"systemd-random-seed(8)": "https://www.freedesktop.org/software/systemd/man/systemd-random-seed.html",
|
||||||
|
"systemd-reboot.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-reboot.service.html",
|
||||||
|
"systemd-remount-fs(8)": "https://www.freedesktop.org/software/systemd/man/systemd-remount-fs.html",
|
||||||
|
"systemd-repart(8)": "https://www.freedesktop.org/software/systemd/man/systemd-repart.html",
|
||||||
|
"systemd-repart.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html",
|
||||||
|
"systemd-resolved(8)": "https://www.freedesktop.org/software/systemd/man/systemd-resolved.html",
|
||||||
|
"systemd-rfkill(8)": "https://www.freedesktop.org/software/systemd/man/systemd-rfkill.html",
|
||||||
|
"systemd-rfkill.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-rfkill.socket.html",
|
||||||
|
"systemd-run-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-run-generator.html",
|
||||||
|
"systemd-shutdown(8)": "https://www.freedesktop.org/software/systemd/man/systemd-shutdown.html",
|
||||||
|
"systemd-sleep(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sleep.html",
|
||||||
|
"systemd-socket-proxyd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-socket-proxyd.html",
|
||||||
|
"systemd-soft-reboot.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-soft-reboot.service.html",
|
||||||
|
"systemd-suspend-then-hibernate.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-suspend-then-hibernate.service.html",
|
||||||
|
"systemd-suspend.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-suspend.service.html",
|
||||||
|
"systemd-sysctl(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysctl.html",
|
||||||
|
"systemd-sysext(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysext.html",
|
||||||
|
"systemd-sysext.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysext.service.html",
|
||||||
|
"systemd-system-update-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-system-update-generator.html",
|
||||||
|
"systemd-sysupdate-reboot.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysupdate-reboot.service.html",
|
||||||
|
"systemd-sysupdate-reboot.timer(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysupdate-reboot.timer.html",
|
||||||
|
"systemd-sysupdate(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html",
|
||||||
|
"systemd-sysupdate.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.service.html",
|
||||||
|
"systemd-sysupdate.timer(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.timer.html",
|
||||||
|
"systemd-sysusers(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysusers.html",
|
||||||
|
"systemd-sysusers.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-sysusers.service.html",
|
||||||
|
"systemd-time-wait-sync(8)": "https://www.freedesktop.org/software/systemd/man/systemd-time-wait-sync.html",
|
||||||
|
"systemd-timedated(8)": "https://www.freedesktop.org/software/systemd/man/systemd-timedated.html",
|
||||||
|
"systemd-timesyncd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html",
|
||||||
|
"systemd-tmpfiles-clean.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles-clean.service.html",
|
||||||
|
"systemd-tmpfiles-clean.timer(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles-clean.timer.html",
|
||||||
|
"systemd-tmpfiles-setup-dev-early.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles-setup-dev-early.service.html",
|
||||||
|
"systemd-tmpfiles-setup-dev.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles-setup-dev.service.html",
|
||||||
|
"systemd-tmpfiles-setup.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles-setup.service.html",
|
||||||
|
"systemd-tmpfiles(8)": "https://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html",
|
||||||
|
"systemd-udev-settle.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-udev-settle.service.html",
|
||||||
|
"systemd-udevd-control.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-udevd-control.socket.html",
|
||||||
|
"systemd-udevd-kernel.socket(8)": "https://www.freedesktop.org/software/systemd/man/systemd-udevd-kernel.socket.html",
|
||||||
|
"systemd-udevd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-udevd.html",
|
||||||
|
"systemd-update-done(8)": "https://www.freedesktop.org/software/systemd/man/systemd-update-done.html",
|
||||||
|
"systemd-update-utmp-runlevel.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-update-utmp-runlevel.service.html",
|
||||||
|
"systemd-update-utmp(8)": "https://www.freedesktop.org/software/systemd/man/systemd-update-utmp.html",
|
||||||
|
"systemd-user-sessions(8)": "https://www.freedesktop.org/software/systemd/man/systemd-user-sessions.html",
|
||||||
|
"systemd-userdbd(8)": "https://www.freedesktop.org/software/systemd/man/systemd-userdbd.html",
|
||||||
|
"systemd-vconsole-setup(8)": "https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.html",
|
||||||
|
"systemd-veritysetup-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-veritysetup-generator.html",
|
||||||
|
"systemd-veritysetup(8)": "https://www.freedesktop.org/software/systemd/man/systemd-veritysetup.html",
|
||||||
|
"systemd-veritysetup@.service(8)": "https://www.freedesktop.org/software/systemd/man/systemd-veritysetup@.service.html",
|
||||||
|
"systemd-volatile-root(8)": "https://www.freedesktop.org/software/systemd/man/systemd-volatile-root.html",
|
||||||
|
"systemd-xdg-autostart-generator(8)": "https://www.freedesktop.org/software/systemd/man/systemd-xdg-autostart-generator.html",
|
||||||
|
"udevadm(8)": "https://www.freedesktop.org/software/systemd/man/udevadm.html"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,6 +14,14 @@ rec {
|
|||||||
|
|
||||||
/* Return an attribute from nested attribute sets.
|
/* Return an attribute from nested attribute sets.
|
||||||
|
|
||||||
|
Nix has an [attribute selection operator `. or`](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
(x.a.b or 6) == attrByPath ["a" "b"] 6 x
|
||||||
|
# and
|
||||||
|
(x.${f p}."example.com" or 6) == attrByPath [ (f p) "example.com" ] 6 x
|
||||||
|
```
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
x = { a = { b = 3; }; }
|
x = { a = { b = 3; }; }
|
||||||
# ["a" "b"] is equivalent to x.a.b
|
# ["a" "b"] is equivalent to x.a.b
|
||||||
@ -51,6 +59,14 @@ rec {
|
|||||||
|
|
||||||
/* Return if an attribute from nested attribute set exists.
|
/* Return if an attribute from nested attribute set exists.
|
||||||
|
|
||||||
|
Nix has a [has attribute operator `?`](https://nixos.org/manual/nix/stable/language/operators#has-attribute), which is sufficient for such queries, as long as the number of attributes is static. For example:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
(x?a.b) == hasAttryByPath ["a" "b"] x
|
||||||
|
# and
|
||||||
|
(x?${f p}."example.com") == hasAttryByPath [ (f p) "example.com" ] x
|
||||||
|
```
|
||||||
|
|
||||||
**Laws**:
|
**Laws**:
|
||||||
1. ```nix
|
1. ```nix
|
||||||
hasAttrByPath [] x == true
|
hasAttrByPath [] x == true
|
||||||
@ -177,6 +193,14 @@ rec {
|
|||||||
/* Like `attrByPath`, but without a default value. If it doesn't find the
|
/* Like `attrByPath`, but without a default value. If it doesn't find the
|
||||||
path it will throw an error.
|
path it will throw an error.
|
||||||
|
|
||||||
|
Nix has an [attribute selection operator](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example:
|
||||||
|
|
||||||
|
```nix
|
||||||
|
x.a.b == getAttrByPath ["a" "b"] x
|
||||||
|
# and
|
||||||
|
x.${f p}."example.com" == getAttrByPath [ (f p) "example.com" ] x
|
||||||
|
```
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
x = { a = { b = 3; }; }
|
x = { a = { b = 3; }; }
|
||||||
getAttrFromPath ["a" "b"] x
|
getAttrFromPath ["a" "b"] x
|
||||||
|
|||||||
@ -107,7 +107,7 @@ let
|
|||||||
_printFileset
|
_printFileset
|
||||||
_intersection
|
_intersection
|
||||||
_difference
|
_difference
|
||||||
_mirrorStorePath
|
_fromFetchGit
|
||||||
_fetchGitSubmodulesMinver
|
_fetchGitSubmodulesMinver
|
||||||
_emptyWithoutBase
|
_emptyWithoutBase
|
||||||
;
|
;
|
||||||
@ -148,7 +148,6 @@ let
|
|||||||
inherit (lib.trivial)
|
inherit (lib.trivial)
|
||||||
isFunction
|
isFunction
|
||||||
pipe
|
pipe
|
||||||
inPureEvalMode
|
|
||||||
;
|
;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
@ -754,18 +753,11 @@ in {
|
|||||||
This directory must contain a `.git` file or subdirectory.
|
This directory must contain a `.git` file or subdirectory.
|
||||||
*/
|
*/
|
||||||
path:
|
path:
|
||||||
# See the gitTrackedWith implementation for more explanatory comments
|
_fromFetchGit
|
||||||
let
|
"gitTracked"
|
||||||
fetchResult = builtins.fetchGit path;
|
"argument"
|
||||||
in
|
path
|
||||||
if inPureEvalMode then
|
{};
|
||||||
throw "lib.fileset.gitTracked: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292."
|
|
||||||
else if ! isPath path then
|
|
||||||
throw "lib.fileset.gitTracked: Expected the argument to be a path, but it's a ${typeOf path} instead."
|
|
||||||
else if ! pathExists (path + "/.git") then
|
|
||||||
throw "lib.fileset.gitTracked: Expected the argument (${toString path}) to point to a local working tree of a Git repository, but it's not."
|
|
||||||
else
|
|
||||||
_mirrorStorePath path fetchResult.outPath;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository.
|
Create a file set containing all [Git-tracked files](https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) in a repository.
|
||||||
@ -807,35 +799,19 @@ in {
|
|||||||
This directory must contain a `.git` file or subdirectory.
|
This directory must contain a `.git` file or subdirectory.
|
||||||
*/
|
*/
|
||||||
path:
|
path:
|
||||||
let
|
if ! isBool recurseSubmodules then
|
||||||
# This imports the files unnecessarily, which currently can't be avoided
|
|
||||||
# because `builtins.fetchGit` is the only function exposing which files are tracked by Git.
|
|
||||||
# With the [lazy trees PR](https://github.com/NixOS/nix/pull/6530),
|
|
||||||
# the unnecessarily import could be avoided.
|
|
||||||
# However a simpler alternative still would be [a builtins.gitLsFiles](https://github.com/NixOS/nix/issues/2944).
|
|
||||||
fetchResult = builtins.fetchGit {
|
|
||||||
url = path;
|
|
||||||
|
|
||||||
# This is the only `fetchGit` parameter that makes sense in this context.
|
|
||||||
# We can't just pass `submodules = recurseSubmodules` here because
|
|
||||||
# this would fail for Nix versions that don't support `submodules`.
|
|
||||||
${if recurseSubmodules then "submodules" else null} = true;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
if inPureEvalMode then
|
|
||||||
throw "lib.fileset.gitTrackedWith: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292."
|
|
||||||
else if ! isBool recurseSubmodules then
|
|
||||||
throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead."
|
throw "lib.fileset.gitTrackedWith: Expected the attribute `recurseSubmodules` of the first argument to be a boolean, but it's a ${typeOf recurseSubmodules} instead."
|
||||||
else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then
|
else if recurseSubmodules && versionOlder nixVersion _fetchGitSubmodulesMinver then
|
||||||
throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used."
|
throw "lib.fileset.gitTrackedWith: Setting the attribute `recurseSubmodules` to `true` is only supported for Nix version ${_fetchGitSubmodulesMinver} and after, but Nix version ${nixVersion} is used."
|
||||||
else if ! isPath path then
|
|
||||||
throw "lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it's a ${typeOf path} instead."
|
|
||||||
# We can identify local working directories by checking for .git,
|
|
||||||
# see https://git-scm.com/docs/gitrepository-layout#_description.
|
|
||||||
# Note that `builtins.fetchGit` _does_ work for bare repositories (where there's no `.git`),
|
|
||||||
# even though `git ls-files` wouldn't return any files in that case.
|
|
||||||
else if ! pathExists (path + "/.git") then
|
|
||||||
throw "lib.fileset.gitTrackedWith: Expected the second argument (${toString path}) to point to a local working tree of a Git repository, but it's not."
|
|
||||||
else
|
else
|
||||||
_mirrorStorePath path fetchResult.outPath;
|
_fromFetchGit
|
||||||
|
"gitTrackedWith"
|
||||||
|
"second argument"
|
||||||
|
path
|
||||||
|
# This is the only `fetchGit` parameter that makes sense in this context.
|
||||||
|
# We can't just pass `submodules = recurseSubmodules` here because
|
||||||
|
# this would fail for Nix versions that don't support `submodules`.
|
||||||
|
(lib.optionalAttrs recurseSubmodules {
|
||||||
|
submodules = true;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ let
|
|||||||
split
|
split
|
||||||
trace
|
trace
|
||||||
typeOf
|
typeOf
|
||||||
|
fetchGit
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit (lib.attrsets)
|
inherit (lib.attrsets)
|
||||||
@ -55,6 +56,9 @@ let
|
|||||||
hasSuffix
|
hasSuffix
|
||||||
;
|
;
|
||||||
|
|
||||||
|
inherit (lib.trivial)
|
||||||
|
inPureEvalMode
|
||||||
|
;
|
||||||
in
|
in
|
||||||
# Rare case of justified usage of rec:
|
# Rare case of justified usage of rec:
|
||||||
# - This file is internal, so the return value doesn't matter, no need to make things overridable
|
# - This file is internal, so the return value doesn't matter, no need to make things overridable
|
||||||
@ -852,4 +856,33 @@ rec {
|
|||||||
in
|
in
|
||||||
_create localPath
|
_create localPath
|
||||||
(recurse storePath);
|
(recurse storePath);
|
||||||
|
|
||||||
|
# Create a file set from the files included in the result of a fetchGit call
|
||||||
|
# Type: String -> String -> Path -> Attrs -> FileSet
|
||||||
|
_fromFetchGit = function: argument: path: extraFetchGitAttrs:
|
||||||
|
let
|
||||||
|
# This imports the files unnecessarily, which currently can't be avoided
|
||||||
|
# because `builtins.fetchGit` is the only function exposing which files are tracked by Git.
|
||||||
|
# With the [lazy trees PR](https://github.com/NixOS/nix/pull/6530),
|
||||||
|
# the unnecessarily import could be avoided.
|
||||||
|
# However a simpler alternative still would be [a builtins.gitLsFiles](https://github.com/NixOS/nix/issues/2944).
|
||||||
|
fetchResult = fetchGit ({
|
||||||
|
url = path;
|
||||||
|
} // extraFetchGitAttrs);
|
||||||
|
in
|
||||||
|
if inPureEvalMode then
|
||||||
|
throw "lib.fileset.${function}: This function is currently not supported in pure evaluation mode, since it currently relies on `builtins.fetchGit`. See https://github.com/NixOS/nix/issues/9292."
|
||||||
|
else if ! isPath path then
|
||||||
|
throw "lib.fileset.${function}: Expected the ${argument} to be a path, but it's a ${typeOf path} instead."
|
||||||
|
else if pathType path != "directory" then
|
||||||
|
throw "lib.fileset.${function}: Expected the ${argument} (${toString path}) to be a directory, but it's a file instead."
|
||||||
|
# We can identify local working directories by checking for .git,
|
||||||
|
# see https://git-scm.com/docs/gitrepository-layout#_description.
|
||||||
|
# Note that `builtins.fetchGit` _does_ work for bare repositories (where there's no `.git`),
|
||||||
|
# even though `git ls-files` wouldn't return any files in that case.
|
||||||
|
else if ! pathExists (path + "/.git") then
|
||||||
|
throw "lib.fileset.${function}: Expected the ${argument} (${toString path}) to point to a local working tree of a Git repository, but it's not."
|
||||||
|
else
|
||||||
|
_mirrorStorePath path fetchResult.outPath;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1317,6 +1317,12 @@ rm -rf -- *
|
|||||||
expectFailure 'gitTracked null' 'lib.fileset.gitTracked: Expected the argument to be a path, but it'\''s a null instead.'
|
expectFailure 'gitTracked null' 'lib.fileset.gitTracked: Expected the argument to be a path, but it'\''s a null instead.'
|
||||||
expectFailure 'gitTrackedWith {} null' 'lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it'\''s a null instead.'
|
expectFailure 'gitTrackedWith {} null' 'lib.fileset.gitTrackedWith: Expected the second argument to be a path, but it'\''s a null instead.'
|
||||||
|
|
||||||
|
# The path must be a directory
|
||||||
|
touch a
|
||||||
|
expectFailure 'gitTracked ./a' 'lib.fileset.gitTracked: Expected the argument \('"$work"'/a\) to be a directory, but it'\''s a file instead'
|
||||||
|
expectFailure 'gitTrackedWith {} ./a' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'/a\) to be a directory, but it'\''s a file instead'
|
||||||
|
rm -rf -- *
|
||||||
|
|
||||||
# The path has to contain a .git directory
|
# The path has to contain a .git directory
|
||||||
expectFailure 'gitTracked ./.' 'lib.fileset.gitTracked: Expected the argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.'
|
expectFailure 'gitTracked ./.' 'lib.fileset.gitTracked: Expected the argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.'
|
||||||
expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.'
|
expectFailure 'gitTrackedWith {} ./.' 'lib.fileset.gitTrackedWith: Expected the second argument \('"$work"'\) to point to a local working tree of a Git repository, but it'\''s not.'
|
||||||
|
|||||||
34
lib/meta.nix
34
lib/meta.nix
@ -4,8 +4,8 @@
|
|||||||
{ lib }:
|
{ lib }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) matchAttrs any all;
|
inherit (lib) matchAttrs any all isDerivation getBin assertMsg;
|
||||||
inherit (builtins) isString;
|
inherit (builtins) isString match typeOf;
|
||||||
|
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
@ -154,16 +154,12 @@ rec {
|
|||||||
getExe pkgs.mustache-go
|
getExe pkgs.mustache-go
|
||||||
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
|
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
|
||||||
*/
|
*/
|
||||||
getExe = x:
|
getExe = x: getExe' x (x.meta.mainProgram or (
|
||||||
let
|
# This could be turned into an error when 23.05 is at end of life
|
||||||
y = x.meta.mainProgram or (
|
lib.warn "getExe: Package ${lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name} does not have the meta.mainProgram attribute. We'll assume that the main program has the same name for now, but this behavior is deprecated, because it leads to surprising errors when the assumption does not hold. If the package has a main program, please set `meta.mainProgram` in its definition to make this warning go away. Otherwise, if the package does not have a main program, or if you don't control its definition, use getExe' to specify the name to the program, such as lib.getExe' foo \"bar\"."
|
||||||
# This could be turned into an error when 23.05 is at end of life
|
lib.getName
|
||||||
lib.warn "getExe: Package ${lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name} does not have the meta.mainProgram attribute. We'll assume that the main program has the same name for now, but this behavior is deprecated, because it leads to surprising errors when the assumption does not hold. If the package has a main program, please set `meta.mainProgram` in its definition to make this warning go away. Otherwise, if the package does not have a main program, or if you don't control its definition, use getExe' to specify the name to the program, such as lib.getExe' foo \"bar\"."
|
x
|
||||||
lib.getName
|
));
|
||||||
x
|
|
||||||
);
|
|
||||||
in
|
|
||||||
getExe' x y;
|
|
||||||
|
|
||||||
/* Get the path of a program of a derivation.
|
/* Get the path of a program of a derivation.
|
||||||
|
|
||||||
@ -175,11 +171,11 @@ rec {
|
|||||||
=> "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert"
|
=> "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert"
|
||||||
*/
|
*/
|
||||||
getExe' = x: y:
|
getExe' = x: y:
|
||||||
assert lib.assertMsg (lib.isDerivation x)
|
assert assertMsg (isDerivation x)
|
||||||
"lib.meta.getExe': The first argument is of type ${builtins.typeOf x}, but it should be a derivation instead.";
|
"lib.meta.getExe': The first argument is of type ${typeOf x}, but it should be a derivation instead.";
|
||||||
assert lib.assertMsg (lib.isString y)
|
assert assertMsg (isString y)
|
||||||
"lib.meta.getExe': The second argument is of type ${builtins.typeOf y}, but it should be a string instead.";
|
"lib.meta.getExe': The second argument is of type ${typeOf y}, but it should be a string instead.";
|
||||||
assert lib.assertMsg (builtins.length (lib.splitString "/" y) == 1)
|
assert assertMsg (match ".*\/.*" y == null)
|
||||||
"lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead.";
|
"lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead.";
|
||||||
"${lib.getBin x}/bin/${y}";
|
"${getBin x}/bin/${y}";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,7 @@ let
|
|||||||
split
|
split
|
||||||
match
|
match
|
||||||
typeOf
|
typeOf
|
||||||
|
storeDir
|
||||||
;
|
;
|
||||||
|
|
||||||
inherit (lib.lists)
|
inherit (lib.lists)
|
||||||
@ -24,6 +25,8 @@ let
|
|||||||
drop
|
drop
|
||||||
;
|
;
|
||||||
|
|
||||||
|
listHasPrefix = lib.lists.hasPrefix;
|
||||||
|
|
||||||
inherit (lib.strings)
|
inherit (lib.strings)
|
||||||
concatStringsSep
|
concatStringsSep
|
||||||
substring
|
substring
|
||||||
@ -120,6 +123,28 @@ let
|
|||||||
else recurse ([ (baseNameOf base) ] ++ components) (dirOf base);
|
else recurse ([ (baseNameOf base) ] ++ components) (dirOf base);
|
||||||
in recurse [];
|
in recurse [];
|
||||||
|
|
||||||
|
# The components of the store directory, typically [ "nix" "store" ]
|
||||||
|
storeDirComponents = splitRelPath ("./" + storeDir);
|
||||||
|
# The number of store directory components, typically 2
|
||||||
|
storeDirLength = length storeDirComponents;
|
||||||
|
|
||||||
|
# Type: [ String ] -> Bool
|
||||||
|
#
|
||||||
|
# Whether path components have a store path as a prefix, according to
|
||||||
|
# https://nixos.org/manual/nix/stable/store/store-path.html#store-path.
|
||||||
|
componentsHaveStorePathPrefix = components:
|
||||||
|
# path starts with the store directory (typically /nix/store)
|
||||||
|
listHasPrefix storeDirComponents components
|
||||||
|
# is not the store directory itself, meaning there's at least one extra component
|
||||||
|
&& storeDirComponents != components
|
||||||
|
# and the first component after the store directory has the expected format.
|
||||||
|
# NOTE: We could change the hash regex to be [0-9a-df-np-sv-z],
|
||||||
|
# because these are the actual ASCII characters used by Nix's base32 implementation,
|
||||||
|
# but this is not fully specified, so let's tie this too much to the currently implemented concept of store paths.
|
||||||
|
# Similar reasoning applies to the validity of the name part.
|
||||||
|
# We care more about discerning store path-ness on realistic values. Making it airtight would be fragile and slow.
|
||||||
|
&& match ".{32}-.+" (elemAt components storeDirLength) != null;
|
||||||
|
|
||||||
in /* No rec! Add dependencies on this file at the top. */ {
|
in /* No rec! Add dependencies on this file at the top. */ {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -321,6 +346,62 @@ in /* No rec! Add dependencies on this file at the top. */ {
|
|||||||
subpath = joinRelPath deconstructed.components;
|
subpath = joinRelPath deconstructed.components;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
Whether a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path)
|
||||||
|
has a [store path](https://nixos.org/manual/nix/stable/store/store-path.html#store-path)
|
||||||
|
as a prefix.
|
||||||
|
|
||||||
|
:::{.note}
|
||||||
|
As with all functions of this `lib.path` library, it does not work on paths in strings,
|
||||||
|
which is how you'd typically get store paths.
|
||||||
|
|
||||||
|
Instead, this function only handles path values themselves,
|
||||||
|
which occur when Nix files in the store use relative path expressions.
|
||||||
|
:::
|
||||||
|
|
||||||
|
Type:
|
||||||
|
hasStorePathPrefix :: Path -> Bool
|
||||||
|
|
||||||
|
Example:
|
||||||
|
# Subpaths of derivation outputs have a store path as a prefix
|
||||||
|
hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz
|
||||||
|
=> true
|
||||||
|
|
||||||
|
# The store directory itself is not a store path
|
||||||
|
hasStorePathPrefix /nix/store
|
||||||
|
=> false
|
||||||
|
|
||||||
|
# Derivation outputs are store paths themselves
|
||||||
|
hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo
|
||||||
|
=> true
|
||||||
|
|
||||||
|
# Paths outside the Nix store don't have a store path prefix
|
||||||
|
hasStorePathPrefix /home/user
|
||||||
|
=> false
|
||||||
|
|
||||||
|
# Not all paths under the Nix store are store paths
|
||||||
|
hasStorePathPrefix /nix/store/.links/10gg8k3rmbw8p7gszarbk7qyd9jwxhcfq9i6s5i0qikx8alkk4hq
|
||||||
|
=> false
|
||||||
|
|
||||||
|
# Store derivations are also store paths themselves
|
||||||
|
hasStorePathPrefix /nix/store/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo.drv
|
||||||
|
=> true
|
||||||
|
*/
|
||||||
|
hasStorePathPrefix = path:
|
||||||
|
let
|
||||||
|
deconstructed = deconstructPath path;
|
||||||
|
in
|
||||||
|
assert assertMsg
|
||||||
|
(isPath path)
|
||||||
|
"lib.path.hasStorePathPrefix: Argument is of type ${typeOf path}, but a path was expected";
|
||||||
|
assert assertMsg
|
||||||
|
# This function likely breaks or needs adjustment if used with other filesystem roots, if they ever get implemented.
|
||||||
|
# Let's try to error nicely in such a case, though it's unclear how an implementation would work even and whether this could be detected.
|
||||||
|
# See also https://github.com/NixOS/nix/pull/6530#discussion_r1422843117
|
||||||
|
(deconstructed.root == /. && toString deconstructed.root == "/")
|
||||||
|
"lib.path.hasStorePathPrefix: Argument has a filesystem root (${toString deconstructed.root}) that's not /, which is currently not supported.";
|
||||||
|
componentsHaveStorePathPrefix deconstructed.components;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Whether a value is a valid subpath string.
|
Whether a value is a valid subpath string.
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,10 @@
|
|||||||
{ libpath }:
|
{ libpath }:
|
||||||
let
|
let
|
||||||
lib = import libpath;
|
lib = import libpath;
|
||||||
inherit (lib.path) hasPrefix removePrefix append splitRoot subpath;
|
inherit (lib.path) hasPrefix removePrefix append splitRoot hasStorePathPrefix subpath;
|
||||||
|
|
||||||
|
# This is not allowed generally, but we're in the tests here, so we'll allow ourselves.
|
||||||
|
storeDirPath = /. + builtins.storeDir;
|
||||||
|
|
||||||
cases = lib.runTests {
|
cases = lib.runTests {
|
||||||
# Test examples from the lib.path.append documentation
|
# Test examples from the lib.path.append documentation
|
||||||
@ -91,6 +94,31 @@ let
|
|||||||
expected = false;
|
expected = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
testHasStorePathPrefixExample1 = {
|
||||||
|
expr = hasStorePathPrefix (storeDirPath + "/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo/bar/baz");
|
||||||
|
expected = true;
|
||||||
|
};
|
||||||
|
testHasStorePathPrefixExample2 = {
|
||||||
|
expr = hasStorePathPrefix storeDirPath;
|
||||||
|
expected = false;
|
||||||
|
};
|
||||||
|
testHasStorePathPrefixExample3 = {
|
||||||
|
expr = hasStorePathPrefix (storeDirPath + "/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo");
|
||||||
|
expected = true;
|
||||||
|
};
|
||||||
|
testHasStorePathPrefixExample4 = {
|
||||||
|
expr = hasStorePathPrefix /home/user;
|
||||||
|
expected = false;
|
||||||
|
};
|
||||||
|
testHasStorePathPrefixExample5 = {
|
||||||
|
expr = hasStorePathPrefix (storeDirPath + "/.links/10gg8k3rmbw8p7gszarbk7qyd9jwxhcfq9i6s5i0qikx8alkk4hq");
|
||||||
|
expected = false;
|
||||||
|
};
|
||||||
|
testHasStorePathPrefixExample6 = {
|
||||||
|
expr = hasStorePathPrefix (storeDirPath + "/nvl9ic0pj1fpyln3zaqrf4cclbqdfn1j-foo.drv");
|
||||||
|
expected = true;
|
||||||
|
};
|
||||||
|
|
||||||
# Test examples from the lib.path.subpath.isValid documentation
|
# Test examples from the lib.path.subpath.isValid documentation
|
||||||
testSubpathIsValidExample1 = {
|
testSubpathIsValidExample1 = {
|
||||||
expr = subpath.isValid null;
|
expr = subpath.isValid null;
|
||||||
|
|||||||
@ -89,6 +89,13 @@ rec {
|
|||||||
# is why we use the more obscure "bfd" and not "binutils" for this
|
# is why we use the more obscure "bfd" and not "binutils" for this
|
||||||
# choice.
|
# choice.
|
||||||
else "bfd";
|
else "bfd";
|
||||||
|
# The standard lib directory name that non-nixpkgs binaries distributed
|
||||||
|
# for this platform normally assume.
|
||||||
|
libDir = if final.isLinux then
|
||||||
|
if final.isx86_64 || final.isMips64 || final.isPower64
|
||||||
|
then "lib64"
|
||||||
|
else "lib"
|
||||||
|
else null;
|
||||||
extensions = lib.optionalAttrs final.hasSharedLibraries {
|
extensions = lib.optionalAttrs final.hasSharedLibraries {
|
||||||
sharedLibrary =
|
sharedLibrary =
|
||||||
if final.isDarwin then ".dylib"
|
if final.isDarwin then ".dylib"
|
||||||
|
|||||||
@ -13510,7 +13510,8 @@
|
|||||||
name = "Nathan Viets";
|
name = "Nathan Viets";
|
||||||
};
|
};
|
||||||
nyanbinary = {
|
nyanbinary = {
|
||||||
email = "vextium@skiff.com";
|
email = "nyanbinary@keemail.me";
|
||||||
|
matrix = "@niko:conduit.rs";
|
||||||
github = "nyabinary";
|
github = "nyabinary";
|
||||||
githubId = 97130632;
|
githubId = 97130632;
|
||||||
name = "Niko";
|
name = "Niko";
|
||||||
|
|||||||
33
maintainers/scripts/doc/list-systemd-manpages.zsh
Executable file
33
maintainers/scripts/doc/list-systemd-manpages.zsh
Executable file
@ -0,0 +1,33 @@
|
|||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i zsh -p zsh
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# cd into nixpkgs' root, get the store path of `systemd.man`
|
||||||
|
cd "$(dirname "$0")/../../.."
|
||||||
|
SYSTEMD_MAN_DIR="$(nix-build -A systemd.man)/share/man"
|
||||||
|
|
||||||
|
# For each manual section
|
||||||
|
for section in {1..8}; do
|
||||||
|
sec_dir="${SYSTEMD_MAN_DIR}/man${section}"
|
||||||
|
|
||||||
|
# skip section 3 (library calls)
|
||||||
|
! [[ $section -eq 3 ]] || continue
|
||||||
|
|
||||||
|
# for each manpage in that section (potentially none)
|
||||||
|
for manpage in ${sec_dir}/*(N); do
|
||||||
|
# strip the directory prefix and (compressed) manpage suffix
|
||||||
|
page="$(basename "$manpage" ".${section}.gz")"
|
||||||
|
|
||||||
|
# if this is the manpage of a service unit
|
||||||
|
if [[ "$page" =~ ".*\.service" ]]; then
|
||||||
|
# ... and a manpage exists without the `.service` suffix
|
||||||
|
potential_alias="${sec_dir}/${page%\.service}.${section}.gz"
|
||||||
|
! [[ -e "${potential_alias}" &&
|
||||||
|
# ... which points to the same file, then skip
|
||||||
|
"$(gunzip -c "${potential_alias}")" == ".so ${page}.${section}" ]] || continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# else produce a JSON fragment, with the link to the upstream manpage (as HTML)
|
||||||
|
echo " \"${page}(${section})\": \"https://www.freedesktop.org/software/systemd/man/${page}.html\","
|
||||||
|
done
|
||||||
|
done
|
||||||
28
nixos/doc/manual/administration/nixos-state.section.md
Normal file
28
nixos/doc/manual/administration/nixos-state.section.md
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
# NixOS {#sec-nixos-state}
|
||||||
|
|
||||||
|
## `/nix` {#sec-state-nix}
|
||||||
|
|
||||||
|
NixOS needs the entirety of `/nix` to be persistent, as it includes:
|
||||||
|
- `/nix/store`, which contains all the system's executables, libraries, and supporting data;
|
||||||
|
- `/nix/var/nix`, which contains:
|
||||||
|
- the Nix daemon's database;
|
||||||
|
- roots whose transitive closure is preserved when garbage-collecting the Nix store;
|
||||||
|
- system-wide and per-user profiles.
|
||||||
|
|
||||||
|
## `/boot` {#sec-state-boot}
|
||||||
|
|
||||||
|
`/boot` should also be persistent, as it contains:
|
||||||
|
- the kernel and initrd which the bootloader loads,
|
||||||
|
- the bootloader's configuration, including the kernel's command-line which
|
||||||
|
determines the store path to use as system environment.
|
||||||
|
|
||||||
|
|
||||||
|
## Users and groups {#sec-state-users}
|
||||||
|
|
||||||
|
- `/var/lib/nixos` should persist: it holds state needed to generate stable
|
||||||
|
uids and gids for declaratively-managed users and groups, etc.
|
||||||
|
- `users.mutableUsers` should be false, *or* the following files under `/etc`
|
||||||
|
should all persist:
|
||||||
|
- {manpage}`passwd(5)` and {manpage}`group(5)`,
|
||||||
|
- {manpage}`shadow(5)` and {manpage}`gshadow(5)`,
|
||||||
|
- {manpage}`subuid(5)` and {manpage}`subgid(5)`.
|
||||||
@ -8,6 +8,7 @@ rebooting.chapter.md
|
|||||||
user-sessions.chapter.md
|
user-sessions.chapter.md
|
||||||
control-groups.chapter.md
|
control-groups.chapter.md
|
||||||
logging.chapter.md
|
logging.chapter.md
|
||||||
|
system-state.chapter.md
|
||||||
cleaning-store.chapter.md
|
cleaning-store.chapter.md
|
||||||
containers.chapter.md
|
containers.chapter.md
|
||||||
troubleshooting.chapter.md
|
troubleshooting.chapter.md
|
||||||
|
|||||||
17
nixos/doc/manual/administration/system-state.chapter.md
Normal file
17
nixos/doc/manual/administration/system-state.chapter.md
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
# Necessary system state {#ch-system-state}
|
||||||
|
|
||||||
|
Normally — on systems with a persistent `rootfs` — system services can persist state to
|
||||||
|
the filesystem without administrator intervention.
|
||||||
|
|
||||||
|
However, it is possible and not-uncommon to create [impermanent systems], whose
|
||||||
|
`rootfs` is either a `tmpfs` or reset during boot. While NixOS itself supports
|
||||||
|
this kind of configuration, special care needs to be taken.
|
||||||
|
|
||||||
|
[impermanent systems]: https://nixos.wiki/wiki/Impermanence
|
||||||
|
|
||||||
|
|
||||||
|
```{=include=} sections
|
||||||
|
nixos-state.section.md
|
||||||
|
systemd-state.section.md
|
||||||
|
zfs-state.section.md
|
||||||
|
```
|
||||||
52
nixos/doc/manual/administration/systemd-state.section.md
Normal file
52
nixos/doc/manual/administration/systemd-state.section.md
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
# systemd {#sec-systemd-state}
|
||||||
|
|
||||||
|
## `machine-id(5)` {#sec-machine-id}
|
||||||
|
|
||||||
|
`systemd` uses per-machine identifier — {manpage}`machine-id(5)` — which must be
|
||||||
|
unique and persistent; otherwise, the system journal may fail to list earlier
|
||||||
|
boots, etc.
|
||||||
|
|
||||||
|
`systemd` generates a random `machine-id(5)` during boot if it does not already exist,
|
||||||
|
and persists it in `/etc/machine-id`. As such, it suffices to make that file persistent.
|
||||||
|
|
||||||
|
Alternatively, it is possible to generate a random `machine-id(5)`; while the
|
||||||
|
specification allows for *any* hex-encoded 128b value, systemd itself uses
|
||||||
|
[UUIDv4], *i.e.* random UUIDs, and it is thus preferable to do so as well, in
|
||||||
|
case some software assumes `machine-id(5)` to be a UUIDv4. Those can be
|
||||||
|
generated with `uuidgen -r | tr -d -` (`tr` being used to remove the dashes).
|
||||||
|
|
||||||
|
Such a `machine-id(5)` can be set by writing it to `/etc/machine-id` or through
|
||||||
|
the kernel's command-line, though NixOS' systemd maintainers [discourage] the
|
||||||
|
latter approach.
|
||||||
|
|
||||||
|
[UUIDv4]: https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_(random)
|
||||||
|
[discourage]: https://github.com/NixOS/nixpkgs/pull/268995
|
||||||
|
|
||||||
|
|
||||||
|
## `/var/lib/systemd` {#sec-var-systemd}
|
||||||
|
|
||||||
|
Moreover, `systemd` expects its state directory — `/var/lib/systemd` — to persist, for:
|
||||||
|
- {manpage}`systemd-random-seed(8)`, which loads a 256b “seed” into the kernel's RNG
|
||||||
|
at boot time, and saves a fresh one during shutdown;
|
||||||
|
- {manpage}`systemd.timer(5)` with `Persistent=yes`, which are then run after boot if
|
||||||
|
the timer would have triggered during the time the system was shut down;
|
||||||
|
- {manpage}`systemd-coredump(8)` to store core dumps there by default;
|
||||||
|
(see {manpage}`coredump.conf(5)`)
|
||||||
|
- {manpage}`systemd-timesyncd(8)`;
|
||||||
|
- {manpage}`systemd-backlight(8)` and {manpage}`systemd-rfkill(8)` persist hardware-related
|
||||||
|
state;
|
||||||
|
- possibly other things, this list is not meant to be exhaustive.
|
||||||
|
|
||||||
|
In any case, making `/var/lib/systemd` persistent is recommended.
|
||||||
|
|
||||||
|
|
||||||
|
## `/var/log/journal/{machine-id}` {#sec-var-journal}
|
||||||
|
|
||||||
|
Lastly, {manpage}`systemd-journald(8)` writes the system's journal in binary
|
||||||
|
form to `/var/log/journal/{machine-id}`; if (locally) persisting the entire log
|
||||||
|
is desired, it is recommended to make all of `/var/log/journal` persistent.
|
||||||
|
|
||||||
|
If not, one can set `Storage=volatile` in {manpage}`journald.conf(5)`
|
||||||
|
([`services.journald.storage = "volatile";`](#opt-services.journald.storage)),
|
||||||
|
which disables journal persistence and causes it to be written to
|
||||||
|
`/run/log/journal`.
|
||||||
16
nixos/doc/manual/administration/zfs-state.section.md
Normal file
16
nixos/doc/manual/administration/zfs-state.section.md
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
# ZFS {#sec-zfs-state}
|
||||||
|
|
||||||
|
When using ZFS, `/etc/zfs/zpool.cache` should be persistent (or a symlink to a persistent
|
||||||
|
location) as it is the default value for the `cachefile` [property](man:zpoolprops(7)).
|
||||||
|
|
||||||
|
This cachefile is used on system startup to discover ZFS pools, so ZFS pools
|
||||||
|
holding the `rootfs` and/or early-boot datasets such as `/nix` can be set to
|
||||||
|
`cachefile=none`.
|
||||||
|
|
||||||
|
In principle, if there are no other pools attached to the system, `zpool.cache`
|
||||||
|
does not need to be persisted; it is however *strongly recommended* to persist
|
||||||
|
it, in case additional pools are added later on, temporarily or permanently:
|
||||||
|
|
||||||
|
While mishandling the cachefile does not lead to data loss by itself, it may
|
||||||
|
cause zpools not to be imported during boot, and services may then write to a
|
||||||
|
location where a dataset was expected to be mounted.
|
||||||
@ -10,6 +10,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||||||
|
|
||||||
- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.
|
- `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment.
|
||||||
|
|
||||||
|
- NixOS now installs a stub ELF loader that prints an informative error message when users attempt to run binaries not made for NixOS.
|
||||||
|
- This can be disabled through the `environment.stub-ld.enable` option.
|
||||||
|
- If you use `programs.nix-ld.enable`, no changes are needed. The stub will be disabled automatically.
|
||||||
|
|
||||||
## New Services {#sec-release-24.05-new-services}
|
## New Services {#sec-release-24.05-new-services}
|
||||||
|
|
||||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||||
|
|||||||
58
nixos/modules/config/ldso.nix
Normal file
58
nixos/modules/config/ldso.nix
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) last splitString mkOption types mdDoc optionals;
|
||||||
|
|
||||||
|
libDir = pkgs.stdenv.hostPlatform.libDir;
|
||||||
|
ldsoBasename = last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
|
||||||
|
|
||||||
|
pkgs32 = pkgs.pkgsi686Linux;
|
||||||
|
libDir32 = pkgs32.stdenv.hostPlatform.libDir;
|
||||||
|
ldsoBasename32 = last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
environment.ldso = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
default = null;
|
||||||
|
description = mdDoc ''
|
||||||
|
The executable to link into the normal FHS location of the ELF loader.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.ldso32 = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
default = null;
|
||||||
|
description = mdDoc ''
|
||||||
|
The executable to link into the normal FHS location of the 32-bit ELF loader.
|
||||||
|
|
||||||
|
This currently only works on x86_64 architectures.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
assertions = [
|
||||||
|
{ assertion = isNull config.environment.ldso32 || pkgs.stdenv.isx86_64;
|
||||||
|
message = "Option environment.ldso32 currently only works on x86_64.";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules = (
|
||||||
|
if isNull config.environment.ldso then [
|
||||||
|
"r /${libDir}/${ldsoBasename} - - - - -"
|
||||||
|
] else [
|
||||||
|
"d /${libDir} 0755 root root - -"
|
||||||
|
"L+ /${libDir}/${ldsoBasename} - - - - ${config.environment.ldso}"
|
||||||
|
]
|
||||||
|
) ++ optionals pkgs.stdenv.isx86_64 (
|
||||||
|
if isNull config.environment.ldso32 then [
|
||||||
|
"r /${libDir32}/${ldsoBasename32} - - - - -"
|
||||||
|
] else [
|
||||||
|
"d /${libDir32} 0755 root root - -"
|
||||||
|
"L+ /${libDir32}/${ldsoBasename32} - - - - ${config.environment.ldso32}"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with lib.maintainers; [ tejing ];
|
||||||
|
}
|
||||||
56
nixos/modules/config/stub-ld.nix
Normal file
56
nixos/modules/config/stub-ld.nix
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (lib) optionalString mkOption types mdDoc mkIf mkDefault;
|
||||||
|
|
||||||
|
cfg = config.environment.stub-ld;
|
||||||
|
|
||||||
|
message = ''
|
||||||
|
NixOS cannot run dynamically linked executables intended for generic
|
||||||
|
linux environments out of the box. For more information, see:
|
||||||
|
https://nix.dev/permalink/stub-ld
|
||||||
|
'';
|
||||||
|
|
||||||
|
stub-ld-for = pkgsArg: messageArg: pkgsArg.pkgsStatic.runCommandCC "stub-ld" {
|
||||||
|
nativeBuildInputs = [ pkgsArg.unixtools.xxd ];
|
||||||
|
inherit messageArg;
|
||||||
|
} ''
|
||||||
|
printf "%s" "$messageArg" | xxd -i -n message >main.c
|
||||||
|
cat <<EOF >>main.c
|
||||||
|
#include <stdio.h>
|
||||||
|
int main(int argc, char * argv[]) {
|
||||||
|
fprintf(stderr, "Could not start dynamically linked executable: %s\n", argv[0]);
|
||||||
|
fwrite(message, sizeof(unsigned char), message_len, stderr);
|
||||||
|
return 127; // matches behavior of bash and zsh without a loader. fish uses 139
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
$CC -Os main.c -o $out
|
||||||
|
'';
|
||||||
|
|
||||||
|
pkgs32 = pkgs.pkgsi686Linux;
|
||||||
|
|
||||||
|
stub-ld = stub-ld-for pkgs message;
|
||||||
|
stub-ld32 = stub-ld-for pkgs32 message;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
environment.stub-ld = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = true;
|
||||||
|
example = false;
|
||||||
|
description = mdDoc ''
|
||||||
|
Install a stub ELF loader to print an informative error message
|
||||||
|
in the event that a user attempts to run an ELF binary not
|
||||||
|
compiled for NixOS.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.ldso = mkDefault stub-ld;
|
||||||
|
environment.ldso32 = mkIf pkgs.stdenv.isx86_64 (mkDefault stub-ld32);
|
||||||
|
};
|
||||||
|
|
||||||
|
meta.maintainers = with lib.maintainers; [ tejing ];
|
||||||
|
}
|
||||||
@ -12,6 +12,7 @@
|
|||||||
./config/iproute2.nix
|
./config/iproute2.nix
|
||||||
./config/krb5/default.nix
|
./config/krb5/default.nix
|
||||||
./config/ldap.nix
|
./config/ldap.nix
|
||||||
|
./config/ldso.nix
|
||||||
./config/locale.nix
|
./config/locale.nix
|
||||||
./config/malloc.nix
|
./config/malloc.nix
|
||||||
./config/mysql.nix
|
./config/mysql.nix
|
||||||
@ -28,6 +29,7 @@
|
|||||||
./config/resolvconf.nix
|
./config/resolvconf.nix
|
||||||
./config/shells-environment.nix
|
./config/shells-environment.nix
|
||||||
./config/stevenblack.nix
|
./config/stevenblack.nix
|
||||||
|
./config/stub-ld.nix
|
||||||
./config/swap.nix
|
./config/swap.nix
|
||||||
./config/sysctl.nix
|
./config/sysctl.nix
|
||||||
./config/system-environment.nix
|
./config/system-environment.nix
|
||||||
|
|||||||
@ -21,6 +21,8 @@ with lib;
|
|||||||
# Perl is a default package.
|
# Perl is a default package.
|
||||||
environment.defaultPackages = mkDefault [ ];
|
environment.defaultPackages = mkDefault [ ];
|
||||||
|
|
||||||
|
environment.stub-ld.enable = false;
|
||||||
|
|
||||||
# The lessopen package pulls in Perl.
|
# The lessopen package pulls in Perl.
|
||||||
programs.less.lessopen = mkDefault null;
|
programs.less.lessopen = mkDefault null;
|
||||||
|
|
||||||
|
|||||||
@ -30,7 +30,6 @@ in
|
|||||||
readOnly = true;
|
readOnly = true;
|
||||||
default = cfg.package.override {
|
default = cfg.package.override {
|
||||||
enableXWayland = cfg.xwayland.enable;
|
enableXWayland = cfg.xwayland.enable;
|
||||||
enableNvidiaPatches = cfg.enableNvidiaPatches;
|
|
||||||
};
|
};
|
||||||
defaultText = literalExpression
|
defaultText = literalExpression
|
||||||
"`programs.hyprland.package` with applied configuration";
|
"`programs.hyprland.package` with applied configuration";
|
||||||
@ -42,8 +41,6 @@ in
|
|||||||
portalPackage = mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
|
portalPackage = mkPackageOption pkgs "xdg-desktop-portal-hyprland" { };
|
||||||
|
|
||||||
xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
|
xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
|
||||||
|
|
||||||
enableNvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
@ -73,9 +70,13 @@ in
|
|||||||
[ "programs" "hyprland" "xwayland" "hidpi" ]
|
[ "programs" "hyprland" "xwayland" "hidpi" ]
|
||||||
"XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
|
"XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
|
||||||
)
|
)
|
||||||
(mkRenamedOptionModule
|
(mkRemovedOptionModule
|
||||||
[ "programs" "hyprland" "nvidiaPatches" ]
|
|
||||||
[ "programs" "hyprland" "enableNvidiaPatches" ]
|
[ "programs" "hyprland" "enableNvidiaPatches" ]
|
||||||
|
"Nvidia patches are no longer needed"
|
||||||
|
)
|
||||||
|
(mkRemovedOptionModule
|
||||||
|
[ "programs" "hyprland" "nvidiaPatches" ]
|
||||||
|
"Nvidia patches are no longer needed"
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,7 +47,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf config.programs.nix-ld.enable {
|
config = lib.mkIf config.programs.nix-ld.enable {
|
||||||
systemd.tmpfiles.packages = [ cfg.package ];
|
environment.ldso = "${cfg.package}/libexec/nix-ld";
|
||||||
|
|
||||||
environment.systemPackages = [ nix-ld-libraries ];
|
environment.systemPackages = [ nix-ld-libraries ];
|
||||||
|
|
||||||
|
|||||||
@ -384,10 +384,11 @@ in
|
|||||||
${lib.optionalString (backup.environmentFile != null) "source ${backup.environmentFile}"}
|
${lib.optionalString (backup.environmentFile != null) "source ${backup.environmentFile}"}
|
||||||
# set same environment variables as the systemd service
|
# set same environment variables as the systemd service
|
||||||
${lib.pipe config.systemd.services."restic-backups-${name}".environment [
|
${lib.pipe config.systemd.services."restic-backups-${name}".environment [
|
||||||
(lib.filterAttrs (_: v: v != null))
|
(lib.filterAttrs (n: v: v != null && n != "PATH"))
|
||||||
(lib.mapAttrsToList (n: v: "${n}=${v}"))
|
(lib.mapAttrsToList (n: v: "${n}=${v}"))
|
||||||
(lib.concatStringsSep "\n")
|
(lib.concatStringsSep "\n")
|
||||||
]}
|
]}
|
||||||
|
PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH
|
||||||
|
|
||||||
exec ${resticCmd} $@
|
exec ${resticCmd} $@
|
||||||
'') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups);
|
'') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups);
|
||||||
|
|||||||
@ -236,6 +236,7 @@ in {
|
|||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
|
StateDirectory = mkIf (hasPrefix "/var/lib/jenkins" cfg.home) "jenkins";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -373,7 +373,6 @@ in
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
|
|
||||||
MemoryDenyWriteExecute = true;
|
|
||||||
PrivateDevices = true;
|
PrivateDevices = true;
|
||||||
PrivateNetworks = true;
|
PrivateNetworks = true;
|
||||||
ProtectControlGroups = true;
|
ProtectControlGroups = true;
|
||||||
|
|||||||
@ -1435,6 +1435,10 @@ let
|
|||||||
remote_timeout = mkOpt types.str ''
|
remote_timeout = mkOpt types.str ''
|
||||||
Timeout for requests to the remote write endpoint.
|
Timeout for requests to the remote write endpoint.
|
||||||
'';
|
'';
|
||||||
|
headers = mkOpt (types.attrsOf types.str) ''
|
||||||
|
Custom HTTP headers to be sent along with each remote write request.
|
||||||
|
Be aware that headers that are set by Prometheus itself can't be overwritten.
|
||||||
|
'';
|
||||||
write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) ''
|
write_relabel_configs = mkOpt (types.listOf promTypes.relabel_config) ''
|
||||||
List of remote write relabel configurations.
|
List of remote write relabel configurations.
|
||||||
'';
|
'';
|
||||||
@ -1530,6 +1534,10 @@ let
|
|||||||
remote_timeout = mkOpt types.str ''
|
remote_timeout = mkOpt types.str ''
|
||||||
Timeout for requests to the remote read endpoint.
|
Timeout for requests to the remote read endpoint.
|
||||||
'';
|
'';
|
||||||
|
headers = mkOpt (types.attrsOf types.str) ''
|
||||||
|
Custom HTTP headers to be sent along with each remote read request.
|
||||||
|
Be aware that headers that are set by Prometheus itself can't be overwritten.
|
||||||
|
'';
|
||||||
read_recent = mkOpt types.bool ''
|
read_recent = mkOpt types.bool ''
|
||||||
Whether reads should be made for queries for time ranges that
|
Whether reads should be made for queries for time ranges that
|
||||||
the local storage should have complete data for.
|
the local storage should have complete data for.
|
||||||
|
|||||||
@ -196,7 +196,7 @@ in
|
|||||||
before = [ "sshd.service" ];
|
before = [ "sshd.service" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "notify";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
|
ExecStart = "${netCfg.package}/bin/nebula -config ${configFile}";
|
||||||
UMask = "0027";
|
UMask = "0027";
|
||||||
|
|||||||
@ -559,6 +559,15 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
databaseDir = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
description = lib.mdDoc ''
|
||||||
|
The directory containing the database and logs.
|
||||||
|
'';
|
||||||
|
default = cfg.configDir;
|
||||||
|
defaultText = literalExpression "config.${opt.configDir}";
|
||||||
|
};
|
||||||
|
|
||||||
extraFlags = mkOption {
|
extraFlags = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [];
|
default = [];
|
||||||
@ -660,7 +669,7 @@ in {
|
|||||||
-no-browser \
|
-no-browser \
|
||||||
-gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \
|
-gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \
|
||||||
-config=${cfg.configDir} \
|
-config=${cfg.configDir} \
|
||||||
-data=${cfg.dataDir} \
|
-data=${cfg.databaseDir} \
|
||||||
${escapeShellArgs cfg.extraFlags}
|
${escapeShellArgs cfg.extraFlags}
|
||||||
'';
|
'';
|
||||||
MemoryDenyWriteExecute = true;
|
MemoryDenyWriteExecute = true;
|
||||||
|
|||||||
@ -85,7 +85,7 @@ in
|
|||||||
User = "tinyproxy";
|
User = "tinyproxy";
|
||||||
Group = "tinyproxy";
|
Group = "tinyproxy";
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${getExe pkgs.tinyproxy} -d -c ${configFile}";
|
ExecStart = "${getExe cfg.package} -d -c ${configFile}";
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
||||||
KillSignal = "SIGINT";
|
KillSignal = "SIGINT";
|
||||||
TimeoutStopSec = "30s";
|
TimeoutStopSec = "30s";
|
||||||
|
|||||||
@ -788,6 +788,7 @@ in {
|
|||||||
step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};
|
step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {};
|
||||||
stratis = handleTest ./stratis {};
|
stratis = handleTest ./stratis {};
|
||||||
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
|
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
|
||||||
|
stub-ld = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stub-ld.nix {};
|
||||||
stunnel = handleTest ./stunnel.nix {};
|
stunnel = handleTest ./stunnel.nix {};
|
||||||
sudo = handleTest ./sudo.nix {};
|
sudo = handleTest ./sudo.nix {};
|
||||||
sudo-rs = handleTest ./sudo-rs.nix {};
|
sudo-rs = handleTest ./sudo-rs.nix {};
|
||||||
|
|||||||
@ -11,7 +11,10 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: {
|
|||||||
|
|
||||||
nodes.machine = { config, ... }: {
|
nodes.machine = { config, ... }: {
|
||||||
environment.etc."guix/scripts".source = ./scripts;
|
environment.etc."guix/scripts".source = ./scripts;
|
||||||
services.guix.enable = true;
|
services.guix = {
|
||||||
|
enable = true;
|
||||||
|
gc.enable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
@ -19,6 +22,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: {
|
|||||||
|
|
||||||
machine.wait_for_unit("multi-user.target")
|
machine.wait_for_unit("multi-user.target")
|
||||||
machine.wait_for_unit("guix-daemon.service")
|
machine.wait_for_unit("guix-daemon.service")
|
||||||
|
machine.succeed("systemctl start guix-gc.service")
|
||||||
|
|
||||||
# Can't do much here since the environment has restricted network access.
|
# Can't do much here since the environment has restricted network access.
|
||||||
with subtest("Guix basic package management"):
|
with subtest("Guix basic package management"):
|
||||||
|
|||||||
@ -144,7 +144,6 @@ in
|
|||||||
|
|
||||||
restartAndCheckNebula = name: ip: ''
|
restartAndCheckNebula = name: ip: ''
|
||||||
${name}.systemctl("restart nebula@smoke.service")
|
${name}.systemctl("restart nebula@smoke.service")
|
||||||
${name}.wait_for_unit("nebula@smoke.service")
|
|
||||||
${name}.succeed("ping -c5 ${ip}")
|
${name}.succeed("ping -c5 ${ip}")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -180,8 +179,6 @@ in
|
|||||||
${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP")
|
${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP")
|
||||||
${nodeA}.systemctl("restart nebula@smoke.service")
|
${nodeA}.systemctl("restart nebula@smoke.service")
|
||||||
${nodeB}.systemctl("restart nebula@smoke.service")
|
${nodeB}.systemctl("restart nebula@smoke.service")
|
||||||
${nodeA}.wait_for_unit("nebula@smoke.service")
|
|
||||||
${nodeB}.wait_for_unit("nebula@smoke.service")
|
|
||||||
'';
|
'';
|
||||||
allowTrafficBetween = nodeA: nodeB: ''
|
allowTrafficBetween = nodeA: nodeB: ''
|
||||||
node_a = ${getPublicIp nodeA}
|
node_a = ${getPublicIp nodeA}
|
||||||
@ -190,8 +187,6 @@ in
|
|||||||
${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP")
|
${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP")
|
||||||
${nodeA}.systemctl("restart nebula@smoke.service")
|
${nodeA}.systemctl("restart nebula@smoke.service")
|
||||||
${nodeB}.systemctl("restart nebula@smoke.service")
|
${nodeB}.systemctl("restart nebula@smoke.service")
|
||||||
${nodeA}.wait_for_unit("nebula@smoke.service")
|
|
||||||
${nodeB}.wait_for_unit("nebula@smoke.service")
|
|
||||||
'';
|
'';
|
||||||
in ''
|
in ''
|
||||||
# Create the certificate and sign the lighthouse's keys.
|
# Create the certificate and sign the lighthouse's keys.
|
||||||
|
|||||||
73
nixos/tests/stub-ld.nix
Normal file
73
nixos/tests/stub-ld.nix
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||||
|
name = "stub-ld";
|
||||||
|
|
||||||
|
nodes.machine = { lib, ... }:
|
||||||
|
{
|
||||||
|
environment.stub-ld.enable = true;
|
||||||
|
|
||||||
|
specialisation.nostub = {
|
||||||
|
inheritParentConfig = true;
|
||||||
|
|
||||||
|
configuration = { ... }: {
|
||||||
|
environment.stub-ld.enable = lib.mkForce false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = let
|
||||||
|
libDir = pkgs.stdenv.hostPlatform.libDir;
|
||||||
|
ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
|
||||||
|
|
||||||
|
check32 = pkgs.stdenv.isx86_64;
|
||||||
|
pkgs32 = pkgs.pkgsi686Linux;
|
||||||
|
|
||||||
|
libDir32 = pkgs32.stdenv.hostPlatform.libDir;
|
||||||
|
ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
|
||||||
|
|
||||||
|
test-exec = builtins.mapAttrs (n: v: pkgs.runCommand "test-exec-${n}" { src = pkgs.fetchurl v; } "mkdir -p $out;cd $out;tar -xzf $src") {
|
||||||
|
x86_64-linux.url = "https://github.com/rustic-rs/rustic/releases/download/v0.6.1/rustic-v0.6.1-x86_64-unknown-linux-gnu.tar.gz";
|
||||||
|
x86_64-linux.hash = "sha256-3zySzx8MKFprMOi++yr2ZGASE0aRfXHQuG3SN+kWUCI=";
|
||||||
|
i686-linux.url = "https://github.com/rustic-rs/rustic/releases/download/v0.6.1/rustic-v0.6.1-i686-unknown-linux-gnu.tar.gz";
|
||||||
|
i686-linux.hash = "sha256-fWNiATFeg0B2pfB5zndlnzGn7Ztl8diVS1rFLEDnSLU=";
|
||||||
|
aarch64-linux.url = "https://github.com/rustic-rs/rustic/releases/download/v0.6.1/rustic-v0.6.1-aarch64-unknown-linux-gnu.tar.gz";
|
||||||
|
aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs=";
|
||||||
|
};
|
||||||
|
exec-name = "rustic";
|
||||||
|
|
||||||
|
if32 = pythonStatement: if check32 then pythonStatement else "pass";
|
||||||
|
in
|
||||||
|
''
|
||||||
|
machine.start()
|
||||||
|
machine.wait_for_unit("multi-user.target")
|
||||||
|
|
||||||
|
with subtest("Check for stub (enabled, initial)"):
|
||||||
|
machine.succeed('test -L /${libDir}/${ldsoBasename}')
|
||||||
|
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
|
||||||
|
|
||||||
|
with subtest("Try FHS executable"):
|
||||||
|
machine.copy_from_host('${test-exec.${pkgs.system}}','test-exec')
|
||||||
|
machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
|
||||||
|
machine.succeed('grep -qi nixos outfile')
|
||||||
|
${if32 "machine.copy_from_host('${test-exec.${pkgs32.system}}','test-exec32')"}
|
||||||
|
${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
|
||||||
|
${if32 "machine.succeed('grep -qi nixos outfile32')"}
|
||||||
|
|
||||||
|
with subtest("Disable stub"):
|
||||||
|
machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test")
|
||||||
|
|
||||||
|
with subtest("Check for stub (disabled)"):
|
||||||
|
machine.fail('test -e /${libDir}/${ldsoBasename}')
|
||||||
|
${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"}
|
||||||
|
|
||||||
|
with subtest("Create file in stub location (to be overwritten)"):
|
||||||
|
machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}')
|
||||||
|
${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"}
|
||||||
|
|
||||||
|
with subtest("Re-enable stub"):
|
||||||
|
machine.succeed("/run/booted-system/bin/switch-to-configuration test")
|
||||||
|
|
||||||
|
with subtest("Check for stub (enabled, final)"):
|
||||||
|
machine.succeed('test -L /${libDir}/${ldsoBasename}')
|
||||||
|
${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
|
||||||
|
'';
|
||||||
|
})
|
||||||
@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||||||
services.telegraf.extraConfig = {
|
services.telegraf.extraConfig = {
|
||||||
agent.interval = "1s";
|
agent.interval = "1s";
|
||||||
agent.flush_interval = "1s";
|
agent.flush_interval = "1s";
|
||||||
inputs.procstat = {};
|
|
||||||
inputs.exec = {
|
inputs.exec = {
|
||||||
commands = [
|
commands = [
|
||||||
"${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'"
|
"${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'"
|
||||||
|
|||||||
@ -14,14 +14,14 @@ let
|
|||||||
# If an update breaks things, one of those might have valuable info:
|
# If an update breaks things, one of those might have valuable info:
|
||||||
# https://aur.archlinux.org/packages/spotify/
|
# https://aur.archlinux.org/packages/spotify/
|
||||||
# https://community.spotify.com/t5/Desktop-Linux
|
# https://community.spotify.com/t5/Desktop-Linux
|
||||||
version = "1.2.25.1011.g0348b2ea";
|
version = "1.2.26.1187.g36b715a1";
|
||||||
# To get the latest stable revision:
|
# To get the latest stable revision:
|
||||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
||||||
# To get general information:
|
# To get general information:
|
||||||
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
||||||
# More examples of api usage:
|
# More examples of api usage:
|
||||||
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
||||||
rev = "73";
|
rev = "74";
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
alsa-lib
|
alsa-lib
|
||||||
@ -87,7 +87,7 @@ stdenv.mkDerivation {
|
|||||||
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
|
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
||||||
hash = "sha512-93A+0YfP2/HnQOhSMw3UZ374bpS5ccQqb7a+e4RPSKvyT54wcI6hpmRn8CVo02oLo0yI2hho3Bu3ggsJLVgzbw==";
|
hash = "sha512-Muurn4ih54oVTvLGuRfTPCgGSRImE8O0S5k7gZ4Utgrz3TKgVrthY9AXldP8v+qLcfIrrYwixJy2WGuur9E0jg==";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
|
nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ];
|
||||||
|
|||||||
@ -9,13 +9,13 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "unstable-2023-10-30";
|
version = "unstable-2023-12-01";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zbelial";
|
owner = "zbelial";
|
||||||
repo = "lspce";
|
repo = "lspce";
|
||||||
rev = "34c59787bcdbf414c92d9b3bf0a0f5306cb98d64";
|
rev = "1958b6fcdfb6288aa17fa42360315d6c4aa85991";
|
||||||
hash = "sha256-kUHGdeJo2zXA410FqXGclgXmgWrll30Zv8fSprcmnIo=";
|
hash = "sha256-HUIRm1z6xNJWgX7ykujzniBrOTh76D3dJHrm0LR3nuQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
@ -30,17 +30,19 @@ let
|
|||||||
inherit version src meta;
|
inherit version src meta;
|
||||||
pname = "lspce-module";
|
pname = "lspce-module";
|
||||||
|
|
||||||
cargoHash = "sha256-eqSromwJrFhtJWedDVJivfbKpAtSFEtuCP098qOxFgI=";
|
cargoHash = "sha256-qMLwdZwqrK7bPXL1bIbOqM7xQPpeiO8FDoje0CEJeXQ=";
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
# flaky test
|
# flaky test
|
||||||
"--skip=msg::tests::serialize_request_with_null_params"
|
"--skip=msg::tests::serialize_request_with_null_params"
|
||||||
];
|
];
|
||||||
|
|
||||||
postFixup = ''
|
postInstall = ''
|
||||||
|
mkdir -p $out/share/emacs/site-lisp
|
||||||
for f in $out/lib/*; do
|
for f in $out/lib/*; do
|
||||||
mv $f $out/lib/lspce-module.''${f##*.}
|
mv $f $out/share/emacs/site-lisp/lspce-module.''${f##*.}
|
||||||
done
|
done
|
||||||
|
rmdir $out/lib
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@ -48,25 +50,16 @@ trivialBuild rec {
|
|||||||
inherit version src meta;
|
inherit version src meta;
|
||||||
pname = "lspce";
|
pname = "lspce";
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
ln -s ${lspce-module}/lib/lspce-module* .
|
|
||||||
|
|
||||||
# Fix byte-compilation
|
|
||||||
substituteInPlace lspce-util.el \
|
|
||||||
--replace "(require 'yasnippet)" "(require 'yasnippet)(require 'url-util)"
|
|
||||||
substituteInPlace lspce-calltree.el \
|
|
||||||
--replace "(require 'compile)" "(require 'compile)(require 'cl-lib)"
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = propagatedUserEnvPkgs;
|
buildInputs = propagatedUserEnvPkgs;
|
||||||
|
|
||||||
propagatedUserEnvPkgs = [
|
propagatedUserEnvPkgs = [
|
||||||
f
|
f
|
||||||
markdown-mode
|
markdown-mode
|
||||||
yasnippet
|
yasnippet
|
||||||
|
lspce-module
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
passthru = {
|
||||||
install lspce-module* $LISPDIR
|
inherit lspce-module;
|
||||||
'';
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,492 +3,492 @@
|
|||||||
"clion": {
|
"clion": {
|
||||||
"update-channel": "CLion RELEASE",
|
"update-channel": "CLion RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "941036313c618dcfc62cc36b605ce680a36add52a7e37ee9b1981e52e35e52a3",
|
"sha256": "0bfee58106140aeac826ee92faf7528ec30319c59a1c566d36f367a3251f2e70",
|
||||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.tar.gz",
|
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.tar.gz",
|
||||||
"build_number": "232.9921.42"
|
"build_number": "233.11799.238"
|
||||||
},
|
},
|
||||||
"datagrip": {
|
"datagrip": {
|
||||||
"update-channel": "DataGrip RELEASE",
|
"update-channel": "DataGrip RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "5917b88c9deeeee6019c1e5d82e4a90174bf2d9299a4bc8dac286029e4ae5d03",
|
"sha256": "04379c0b9c4b7dbb38bf90d163761890dbfb33b02d353accab2dd65657e7b493",
|
||||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.tar.gz",
|
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.15"
|
"build_number": "233.11799.235"
|
||||||
},
|
},
|
||||||
"dataspell": {
|
"dataspell": {
|
||||||
"update-channel": "DataSpell RELEASE",
|
"update-channel": "DataSpell RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "3f1ddc7290af60df6c58ebc5b27b3f10bda972920508bed00182487a6c57f1cc",
|
"sha256": "90e73da5236d3f60d6c7d45662981a4893243b3170866127e0ab8b5457ba52eb",
|
||||||
"url": "https://download.jetbrains.com/python/dataspell-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/python/dataspell-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.29"
|
"build_number": "233.11799.244"
|
||||||
},
|
},
|
||||||
"gateway": {
|
"gateway": {
|
||||||
"update-channel": "Gateway RELEASE",
|
"update-channel": "Gateway RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "ec10da775003055527c9b2cbf64d49524be878d06e18510acde2065ce0736b99",
|
"sha256": "ecf0cdc671d83ba6b9251ab1ad0d40bc6ca86ea577437aa2d4b9fe5aa0449fad",
|
||||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.240"
|
||||||
},
|
},
|
||||||
"goland": {
|
"goland": {
|
||||||
"update-channel": "GoLand RELEASE",
|
"update-channel": "GoLand RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b34fd9a42d82bcc61052f72ed75f6c1e1d7e37163de38933ee0f124ef6e6bb60",
|
"sha256": "9ec2ab3e4f0194e43493fd9ad9f8514f5c283b631bd2ec6106ee2ddc5ce5f870",
|
||||||
"url": "https://download.jetbrains.com/go/goland-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/go/goland-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.228"
|
||||||
},
|
},
|
||||||
"idea-community": {
|
"idea-community": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "4b34fdaabb5907656ac87d50df85f13ace804d8684f3886dac07f62a93706b2e",
|
"sha256": "822dae9284a9432e110ee36a217d1da508061bf1fc17e38fb59c6912a9c8aef7",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"idea-ultimate": {
|
"idea-ultimate": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b395e37c797c10c0fd0c4ccf6e735852fb40bec5fbbc98705f481f6f068c7993",
|
"sha256": "bbd3d84dc2df0b4c85850c6de1ef703892828b7cbb3fd2bdc251d32430c91f3b",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"mps": {
|
"mps": {
|
||||||
"update-channel": "MPS RELEASE",
|
"update-channel": "MPS RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||||
"version": "2022.3",
|
"version": "2023.2",
|
||||||
"sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b",
|
"sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014",
|
||||||
"url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz",
|
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz",
|
||||||
"build_number": "223.8836.1185"
|
"build_number": "232.10072.781"
|
||||||
},
|
},
|
||||||
"phpstorm": {
|
"phpstorm": {
|
||||||
"update-channel": "PhpStorm RELEASE",
|
"update-channel": "PhpStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "dd8d771508b277ab2a713b8f546c2ec6dbb261ba8c23072e46ec6ce2ea9ab2a0",
|
"sha256": "71ea19a11c1b62e83b4719160b2808f0de412910e3faf20690bfe53778785e2b",
|
||||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.32",
|
"build_number": "233.11799.232",
|
||||||
"version-major-minor": "2022.3"
|
"version-major-minor": "2022.3"
|
||||||
},
|
},
|
||||||
"pycharm-community": {
|
"pycharm-community": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "d59dd88c1eb51cdd756433d415588c573ca944ebf6f08844b8ac8cd2e3d9937b",
|
"sha256": "8d182dac3aa65b465c5a57c87ffb258dbcad7c3c6dc4b8df9a734a3b6b4a2371",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"pycharm-professional": {
|
"pycharm-professional": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "e625fea80b72c9e12f986a8eb918425c6ef1d3f7b31117b40d122e3ce76046b1",
|
"sha256": "cc4752cc185fc114121d2bab13eb8066e825cb6f0c1cf8027927355e9add8e53",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"rider": {
|
"rider": {
|
||||||
"update-channel": "Rider RELEASE",
|
"update-channel": "Rider RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "a32b2d0682613f3afacd11eac1a79f022c99e17ef9ab23fe26c5d8d34b093ad8",
|
"sha256": "5c769632ba4d022e66d9e3f55a8561cb345d17f84752673703c072d3e34c05d7",
|
||||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.tar.gz",
|
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.tar.gz",
|
||||||
"build_number": "232.9921.83"
|
"build_number": "233.11799.261"
|
||||||
},
|
},
|
||||||
"ruby-mine": {
|
"ruby-mine": {
|
||||||
"update-channel": "RubyMine RELEASE",
|
"update-channel": "RubyMine RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "068b8c486cd61755787538ea036608a9aa590a3b49cd9003dd5edce28d322c02",
|
"sha256": "d4b061430c743cd5956b0ee3959b1f30d28c4ae18a38bb3ed691cb9d8ac80f72",
|
||||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.21"
|
"build_number": "233.11799.227"
|
||||||
},
|
},
|
||||||
"rust-rover": {
|
"rust-rover": {
|
||||||
"update-channel": "RustRover EAP",
|
"update-channel": "RustRover EAP",
|
||||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
|
||||||
"version": "2023.3 EAP",
|
"version": "2023.3 EAP",
|
||||||
"sha256": "3dd8e99b066164efc11e86e3289e444c5238dfce8e9142fe2d3a8c340eeeb175",
|
"sha256": "8f523786bcfb0f112d1112c7c65f2fbda0112952357c931f215b628530c550cf",
|
||||||
"url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.tar.gz",
|
"url": "https://download.jetbrains.com/rustrover/RustRover-233.10527.212.tar.gz",
|
||||||
"build_number": "233.8264.22"
|
"build_number": "233.10527.212"
|
||||||
},
|
},
|
||||||
"webstorm": {
|
"webstorm": {
|
||||||
"update-channel": "WebStorm RELEASE",
|
"update-channel": "WebStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b57f4a71361a224aeb0e80f2f311f632ab1757356a2de3627ade3e9dd4ee0899",
|
"sha256": "f9f1356cf2a49516013a4a3ead18e0bf018973e0de8e6c8da5f6e29adb2c754b",
|
||||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.tar.gz",
|
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.tar.gz",
|
||||||
"build_number": "232.10072.28"
|
"build_number": "233.11799.229"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"aarch64-linux": {
|
"aarch64-linux": {
|
||||||
"clion": {
|
"clion": {
|
||||||
"update-channel": "CLion RELEASE",
|
"update-channel": "CLion RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "9ceeda2fc4f99e160f7402e0cc0712e480eaa1c12b86feac028bb0d191806d41",
|
"sha256": "e83d3f9ebac39ee918d56d9611160bdb28eabe97b3cb1722f35ff5bc93e5f205",
|
||||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/cpp/CLion-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.9921.42"
|
"build_number": "233.11799.238"
|
||||||
},
|
},
|
||||||
"datagrip": {
|
"datagrip": {
|
||||||
"update-channel": "DataGrip RELEASE",
|
"update-channel": "DataGrip RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "8b4372405832cf377cf4e4af4b240383231f62397249c9aee7eda54052410bd2",
|
"sha256": "732eff9240d253fa616ba56bc92bdd1e25bb90aeb98ae45f06f043824a666027",
|
||||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.15"
|
"build_number": "233.11799.235"
|
||||||
},
|
},
|
||||||
"dataspell": {
|
"dataspell": {
|
||||||
"update-channel": "DataSpell RELEASE",
|
"update-channel": "DataSpell RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "43f9f4e7c1d19c077aa0cfc76561477955f7b61414ec4fa12b7079870ef0bf1b",
|
"sha256": "95974bce1bc776658e0cb1cbccdcfb7fee9a51bbeb59972dbab443c99b684a8f",
|
||||||
"url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/python/dataspell-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.29"
|
"build_number": "233.11799.244"
|
||||||
},
|
},
|
||||||
"gateway": {
|
"gateway": {
|
||||||
"update-channel": "Gateway RELEASE",
|
"update-channel": "Gateway RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "c186170fd0d6322a61cb1233c2827691aebd86ab06f3cd1b3733dcc422c9290e",
|
"sha256": "053f72669c30583b0cc4dce08b56cfcdd3252087e8f4b71986178e364c69b585",
|
||||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.240"
|
||||||
},
|
},
|
||||||
"goland": {
|
"goland": {
|
||||||
"update-channel": "GoLand RELEASE",
|
"update-channel": "GoLand RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "60ef96e70ee2fab3ce04f30ba887cc7f4f62d499811e2050f534ede06a23cbb6",
|
"sha256": "fe7fb133eda9c8608605bece69ead145cc00403d2b427ef4006daaadbb69a0c1",
|
||||||
"url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/go/goland-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.228"
|
||||||
},
|
},
|
||||||
"idea-community": {
|
"idea-community": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "9e6402c323d74f9c88aaea13d0fb0027786a1ac3dbee232794d071132bf7a5ce",
|
"sha256": "6c0990d8b81d4c7c1e2783c0af5c01ff022ebac1a187036f413ef7572f77a9d2",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"idea-ultimate": {
|
"idea-ultimate": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b895aebe1803a1d8d58f8ae29a5072bcd496ca75ecdf8f554390a2c90b76fa3b",
|
"sha256": "a868d3e3aa86fa88036d933be0ab577fa5ad7b07e936cc26c73517c0fbacc7e4",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"mps": {
|
"mps": {
|
||||||
"update-channel": "MPS RELEASE",
|
"update-channel": "MPS RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||||
"version": "2022.3",
|
"version": "2023.2",
|
||||||
"sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b",
|
"sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014",
|
||||||
"url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz",
|
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz",
|
||||||
"build_number": "223.8836.1185"
|
"build_number": "232.10072.781"
|
||||||
},
|
},
|
||||||
"phpstorm": {
|
"phpstorm": {
|
||||||
"update-channel": "PhpStorm RELEASE",
|
"update-channel": "PhpStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "577bea15c1208e0b842bcdb2ff0f0205144a8800fcadf87f873af7c067e0ce73",
|
"sha256": "14b7203e089512b7d692068688ff59b8c8169f79111a929c94e91bdfdc36d6a0",
|
||||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.32",
|
"build_number": "233.11799.232",
|
||||||
"version-major-minor": "2022.3"
|
"version-major-minor": "2022.3"
|
||||||
},
|
},
|
||||||
"pycharm-community": {
|
"pycharm-community": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "6fdc5238ffa4767834b11b52b650107f1c64d6a53d0e2bbc23581b6c90b67ab5",
|
"sha256": "c4e41ea443e051f4129749d4514ca0415e8fb2dafe458f6ea36e68f368f72130",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"pycharm-professional": {
|
"pycharm-professional": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "578ecbd059ccb010682cf602e959454b296ec2e741202f236fbdb38897b296dd",
|
"sha256": "49dbcf16b894d3e673105e64c07c69ffe6f07beb7ac4caab52370eefd39a95b1",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"rider": {
|
"rider": {
|
||||||
"update-channel": "Rider RELEASE",
|
"update-channel": "Rider RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "a41f97a86c84157cb36b085ad3c526263414e6c8157be311f38491e715631daa",
|
"sha256": "bab897d57c11f874f157678fba89912cf5bbf981b9a4bb00fcd9971b977bed9f",
|
||||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.9921.83"
|
"build_number": "233.11799.261"
|
||||||
},
|
},
|
||||||
"ruby-mine": {
|
"ruby-mine": {
|
||||||
"update-channel": "RubyMine RELEASE",
|
"update-channel": "RubyMine RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "613732ccdb38e1bc0d2ecd2ead464c74ed643f1b6d99695987c1bcc78784fbf3",
|
"sha256": "fdd2f9d2000512c6a08b3fc646e2a9e33a04ed683bdc75bd2199a0ff1ca597e2",
|
||||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.21"
|
"build_number": "233.11799.227"
|
||||||
},
|
},
|
||||||
"rust-rover": {
|
"rust-rover": {
|
||||||
"update-channel": "RustRover EAP",
|
"update-channel": "RustRover EAP",
|
||||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.3 EAP",
|
"version": "2023.3 EAP",
|
||||||
"sha256": "812c33f46f8c7e309e777f10b6806b3658d7f90f95aa1a776c686aafabb290e7",
|
"sha256": "6a3937bad6e5c5b9db477fad1baf891fff3701c9496e9d49a6d5407585a83969",
|
||||||
"url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/rustrover/RustRover-233.10527.212-aarch64.tar.gz",
|
||||||
"build_number": "233.8264.22"
|
"build_number": "233.10527.212"
|
||||||
},
|
},
|
||||||
"webstorm": {
|
"webstorm": {
|
||||||
"update-channel": "WebStorm RELEASE",
|
"update-channel": "WebStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
|
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "2b0ead390f94c6b1d2069a078d6882e7ff3d0af280ff15b8481606d3f500fe0d",
|
"sha256": "8996ad43685c4804b3c79a848892f348967bc9912116a1ae035fb325fc442471",
|
||||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.tar.gz",
|
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3-aarch64.tar.gz",
|
||||||
"build_number": "232.10072.28"
|
"build_number": "233.11799.229"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"x86_64-darwin": {
|
"x86_64-darwin": {
|
||||||
"clion": {
|
"clion": {
|
||||||
"update-channel": "CLion RELEASE",
|
"update-channel": "CLion RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "a4049fd02a9ebe459634ceb47f389a6f8536fcdeb162587d6896991b94023c3f",
|
"sha256": "5d02a4c3502d830999bad4c72eabc5ce0d246009e74ba125f46d63f14e7fbfff",
|
||||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.dmg",
|
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.dmg",
|
||||||
"build_number": "232.9921.42"
|
"build_number": "233.11799.238"
|
||||||
},
|
},
|
||||||
"datagrip": {
|
"datagrip": {
|
||||||
"update-channel": "DataGrip RELEASE",
|
"update-channel": "DataGrip RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "cafd9cfbdd4453a587674324e617977c9f9536bbe7aa290cc39b0c3c5c842bba",
|
"sha256": "ca92bc25ebdfca785eed74da713ffdd0c2cb9b1d4038b6e6db0044d71cc94e92",
|
||||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2.dmg",
|
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.3.dmg",
|
||||||
"build_number": "232.10072.15"
|
"build_number": "233.11799.235"
|
||||||
},
|
},
|
||||||
"dataspell": {
|
"dataspell": {
|
||||||
"update-channel": "DataSpell RELEASE",
|
"update-channel": "DataSpell RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "f8d4b3a7a36fbbd77a4b6e965cd159f4adeff54933df1e8caf2e4f341e3443c7",
|
"sha256": "92c0c609a65577e5e74c6aff50ecee32480caf35adf91040f889a211ea0fa83b",
|
||||||
"url": "https://download.jetbrains.com/python/dataspell-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/python/dataspell-2023.3.dmg",
|
||||||
"build_number": "232.10072.29"
|
"build_number": "233.11799.244"
|
||||||
},
|
},
|
||||||
"gateway": {
|
"gateway": {
|
||||||
"update-channel": "Gateway RELEASE",
|
"update-channel": "Gateway RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "25780bcbb57ebc1a7a05bec24abf21b2a96b22f80a91de89c94926799da3183f",
|
"sha256": "17fb60d9a13fc561e24054a651b2576426df43e4ec6ea6a07a7ce65648d9df5d",
|
||||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.240"
|
||||||
},
|
},
|
||||||
"goland": {
|
"goland": {
|
||||||
"update-channel": "GoLand RELEASE",
|
"update-channel": "GoLand RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "5e78a73a69481fd63ad53d99371b3e7e534731c6116ee6d7fee127c533bc644a",
|
"sha256": "fbaaf5172fbfa5a12611f089e95551594224a930a47cb1208652b68a4cdfdd36",
|
||||||
"url": "https://download.jetbrains.com/go/goland-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/go/goland-2023.3.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.228"
|
||||||
},
|
},
|
||||||
"idea-community": {
|
"idea-community": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "dbdda6a0df334a402103d3ee1e70cd5f514cc9353efcdd49395a736c9a640730",
|
"sha256": "2457dabee48b0b4c7276b00d48c6fdf55990cd7feeecf3b6a4da8e38bd8566de",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"idea-ultimate": {
|
"idea-ultimate": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "fddefd00d6a96ec8c3bd81f9183f3b70d4df71d460f9c704519abffb95246e0f",
|
"sha256": "bfd3cdafc26c08a7a245498d5d711f04dae85d63050393dbe9e9510649510d1d",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"mps": {
|
"mps": {
|
||||||
"update-channel": "MPS RELEASE",
|
"update-channel": "MPS RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
|
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
|
||||||
"version": "2022.3",
|
"version": "2023.2",
|
||||||
"sha256": "17cb973af11118c246d4144ba0071ce31fe3f276be7029f613cdb0fa60b752cc",
|
"sha256": "11a635432beaca5809fe0253303d07444a0bfd6fac287c72e7b03e7a9f1a59e4",
|
||||||
"url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos.dmg",
|
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos.dmg",
|
||||||
"build_number": "223.8836.1185"
|
"build_number": "232.10072.781"
|
||||||
},
|
},
|
||||||
"phpstorm": {
|
"phpstorm": {
|
||||||
"update-channel": "PhpStorm RELEASE",
|
"update-channel": "PhpStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "7ce4ff6b344ff8ce18ef8a821ba3fd1d222f9222a9b3e65744a796379d92417e",
|
"sha256": "5d27e955217e438806e4405f144330afd38e73e6105b6622ee07bdc5871e961f",
|
||||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.dmg",
|
||||||
"build_number": "232.10072.32",
|
"build_number": "233.11799.232",
|
||||||
"version-major-minor": "2022.3"
|
"version-major-minor": "2022.3"
|
||||||
},
|
},
|
||||||
"pycharm-community": {
|
"pycharm-community": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b914bd3c0018f951bef5da9c04907355a88546ce983dcf4115bbf11556015ec7",
|
"sha256": "8efb2617c2354e9f58b26651a3d55541311873d682c700dedc17eada1cc50b6d",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.dmg",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"pycharm-professional": {
|
"pycharm-professional": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b33bbd30222363cdc3091aee923ed1c309edba799616a3a681cd9a1ca94e822a",
|
"sha256": "6a9595e40cafe3575d0966d4b3b6005d4eb414ed82eaa9f15402cd6f76784a77",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.dmg",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"rider": {
|
"rider": {
|
||||||
"update-channel": "Rider RELEASE",
|
"update-channel": "Rider RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "8fa1c224eccfffe896de8b375160e5d9f63103912f935748199cca758448fc9e",
|
"sha256": "f4c74366b31db0853dd92364d3aeb866dbc49daee77f7d343ade960cd0bb9c12",
|
||||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2.dmg",
|
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.dmg",
|
||||||
"build_number": "232.9921.83"
|
"build_number": "233.11799.261"
|
||||||
},
|
},
|
||||||
"ruby-mine": {
|
"ruby-mine": {
|
||||||
"update-channel": "RubyMine RELEASE",
|
"update-channel": "RubyMine RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "eb0db28facbe7aed6de99dc97053cdfbeea845ce73b6b9efa6c95caaf68204e9",
|
"sha256": "1523f99ad685a47c02b53bedd58a3af0e9f299d44975b4eef2b79a5ff2686094",
|
||||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.dmg",
|
||||||
"build_number": "232.10072.21"
|
"build_number": "233.11799.227"
|
||||||
},
|
},
|
||||||
"rust-rover": {
|
"rust-rover": {
|
||||||
"update-channel": "RustRover EAP",
|
"update-channel": "RustRover EAP",
|
||||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
|
||||||
"version": "2023.3 EAP",
|
"version": "2023.3 EAP",
|
||||||
"sha256": "889ed748efbd44b76da03186efac063baf36c2208d919550dd97cf2dae8f40e3",
|
"sha256": "1573cb95ff2f8afcb5ac8c38ffdad68e9c49dbdaf3750bd19afe4081deafeb98",
|
||||||
"url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22.dmg",
|
"url": "https://download.jetbrains.com/rustrover/RustRover-233.10527.212.dmg",
|
||||||
"build_number": "233.8264.22"
|
"build_number": "233.10527.212"
|
||||||
},
|
},
|
||||||
"webstorm": {
|
"webstorm": {
|
||||||
"update-channel": "WebStorm RELEASE",
|
"update-channel": "WebStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "918bb2061d623f736c73b67db929ced2a83013f64d57406af09f5c9df9c7d8cd",
|
"sha256": "0813cf3e0677824c83bef46d7f04c08eece9538e323262bd29db45ea7f63877a",
|
||||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3.dmg",
|
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.dmg",
|
||||||
"build_number": "232.10072.28"
|
"build_number": "233.11799.229"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"aarch64-darwin": {
|
"aarch64-darwin": {
|
||||||
"clion": {
|
"clion": {
|
||||||
"update-channel": "CLion RELEASE",
|
"update-channel": "CLion RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "2820b59efbb028a861c3912b83a659fc22a136396a7199dd887f7dc28d6fba61",
|
"sha256": "30dae459a21c346157c0412a0b99031445eeb90c466c25d44f60923042f7379e",
|
||||||
"url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.dmg",
|
"url": "https://download.jetbrains.com/cpp/CLion-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.9921.42"
|
"build_number": "233.11799.238"
|
||||||
},
|
},
|
||||||
"datagrip": {
|
"datagrip": {
|
||||||
"update-channel": "DataGrip RELEASE",
|
"update-channel": "DataGrip RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "30458ba96e1a518a40c0fc89d35f70ea96803cccd5ce8aca72e2363745214c87",
|
"sha256": "c6e9db660fd877c49587497ebfc03dd92621358aa23af5a9b358d55f0ce2026f",
|
||||||
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.2-aarch64.dmg",
|
"url": "https://download.jetbrains.com/datagrip/datagrip-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.15"
|
"build_number": "233.11799.235"
|
||||||
},
|
},
|
||||||
"dataspell": {
|
"dataspell": {
|
||||||
"update-channel": "DataSpell RELEASE",
|
"update-channel": "DataSpell RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "4f26303afa3d2359ea4b0bcee875b605dcaadaece3d1b0e16e5c37b8ea46afe3",
|
"sha256": "10ce5a942322b254791220c45f8ede74e693d6112ad3e48f3f8657bc291d7212",
|
||||||
"url": "https://download.jetbrains.com/python/dataspell-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/python/dataspell-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.29"
|
"build_number": "233.11799.244"
|
||||||
},
|
},
|
||||||
"gateway": {
|
"gateway": {
|
||||||
"update-channel": "Gateway RELEASE",
|
"update-channel": "Gateway RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "b4c1167303ed8985c5439d6a07f9d2970074e3748c21e9155b2c76a508fe0a15",
|
"sha256": "917a01af3f455fc8c6e72f838b9fe449f100ff0b7c93631cb7e778c5edee09ba",
|
||||||
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.240"
|
||||||
},
|
},
|
||||||
"goland": {
|
"goland": {
|
||||||
"update-channel": "GoLand RELEASE",
|
"update-channel": "GoLand RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "3ad91c136fd840dbc596f2873ccc4c2df14f7ec2a435f8a61acfdc3a97660e32",
|
"sha256": "f5befd461b03cc1a6622c3d2cb8825a4d3ee6d3e66d365e7b12d9b742deec211",
|
||||||
"url": "https://download.jetbrains.com/go/goland-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/go/goland-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.228"
|
||||||
},
|
},
|
||||||
"idea-community": {
|
"idea-community": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "563d2189f1ae0310abd108f256edca786ca732100344b3519a7201245e4af781",
|
"sha256": "16bd80724fdf92384e388add0c5aeaf7ad1b1114b4d5bab7105f039496886992",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIC-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"idea-ultimate": {
|
"idea-ultimate": {
|
||||||
"update-channel": "IntelliJ IDEA RELEASE",
|
"update-channel": "IntelliJ IDEA RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "4ee862a5f5b2f8d9276744bd67cd024a5c6740601e2168a985a5c66cb43e18ea",
|
"sha256": "c72a95df4476fa79aaff75b3a135444a32c35eb3639c2d1116768af482c818ee",
|
||||||
"url": "https://download.jetbrains.com/idea/ideaIU-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.27"
|
"build_number": "233.11799.241"
|
||||||
},
|
},
|
||||||
"mps": {
|
"mps": {
|
||||||
"update-channel": "MPS RELEASE",
|
"update-channel": "MPS RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
|
||||||
"version": "2022.3",
|
"version": "2023.2",
|
||||||
"url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos-aarch64.dmg",
|
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos-aarch64.dmg",
|
||||||
"sha256": "40d8a928a1c1703544c9905a3f8e6a7d0ade3b17302782da2ed68fd1dcdafef9",
|
"sha256": "a19ecd8a109783e9d2260cc18f48ac97e52a0bc00ee29df5ccf711a80d1701eb",
|
||||||
"build_number": "223.8836.1185"
|
"build_number": "232.10072.781"
|
||||||
},
|
},
|
||||||
"phpstorm": {
|
"phpstorm": {
|
||||||
"update-channel": "PhpStorm RELEASE",
|
"update-channel": "PhpStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "68d543fb2a79cd0b07ddb94a4c00d8c0c1aca7f604bc838ac92e232e763489b3",
|
"sha256": "42312418f029dcb88ef1453f0bd3549846fe11f87a226b742c4f3c5063bae7bb",
|
||||||
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.32",
|
"build_number": "233.11799.232",
|
||||||
"version-major-minor": "2022.3"
|
"version-major-minor": "2022.3"
|
||||||
},
|
},
|
||||||
"pycharm-community": {
|
"pycharm-community": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "08c45adbb0dca219955f511993ca8150dcca235bdba3ac24c67ae035c68ba992",
|
"sha256": "e39b65d012ebce438b77a271645472c112046ae32502b92b3c16ece0ca58284b",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-community-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"pycharm-professional": {
|
"pycharm-professional": {
|
||||||
"update-channel": "PyCharm RELEASE",
|
"update-channel": "PyCharm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "63d68b20963575f76937ca0ce18a8150639c47b8cf8f3d6e96fa3306191cd076",
|
"sha256": "1c1549915ee1ae93008d0c1e672f5aa8cae791f3cc4b101351495472e0574dac",
|
||||||
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.31"
|
"build_number": "233.11799.259"
|
||||||
},
|
},
|
||||||
"rider": {
|
"rider": {
|
||||||
"update-channel": "Rider RELEASE",
|
"update-channel": "Rider RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.2",
|
"version": "2023.3",
|
||||||
"sha256": "89c30f905216480ba0e379705542d81beac6e7467d26fe3aa882e9b008de42c2",
|
"sha256": "a2d271e9f76924404ad3fafc1c8ed605bf4aefcf0b23260837b38cdd3487ba80",
|
||||||
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.2-aarch64.dmg",
|
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.9921.83"
|
"build_number": "233.11799.261"
|
||||||
},
|
},
|
||||||
"ruby-mine": {
|
"ruby-mine": {
|
||||||
"update-channel": "RubyMine RELEASE",
|
"update-channel": "RubyMine RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "db571f72488e299d700670c546fb5ae9e1b1bc1eff3f2b26ef8520a22b1fb407",
|
"sha256": "bdadf38bd459436b0d221bc91d6bcd4020487fd5118010070c09e6aa6787cf30",
|
||||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.21"
|
"build_number": "233.11799.227"
|
||||||
},
|
},
|
||||||
"rust-rover": {
|
"rust-rover": {
|
||||||
"update-channel": "RustRover EAP",
|
"update-channel": "RustRover EAP",
|
||||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
|
||||||
"version": "2023.3 EAP",
|
"version": "2023.3 EAP",
|
||||||
"sha256": "9c4f26089697f6cb394e971dac8ef4fe974b5ecffd63311fcf0be66d4b4aec59",
|
"sha256": "d98eb787a95dcf35ab8948e7b98dca4e769ed3d08405ed69376c33e7e33f4085",
|
||||||
"url": "https://download.jetbrains.com/rustrover/RustRover-233.8264.22-aarch64.dmg",
|
"url": "https://download.jetbrains.com/rustrover/RustRover-233.10527.212-aarch64.dmg",
|
||||||
"build_number": "233.8264.22"
|
"build_number": "233.10527.212"
|
||||||
},
|
},
|
||||||
"webstorm": {
|
"webstorm": {
|
||||||
"update-channel": "WebStorm RELEASE",
|
"update-channel": "WebStorm RELEASE",
|
||||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
||||||
"version": "2023.2.3",
|
"version": "2023.3",
|
||||||
"sha256": "8811624166bf11d591bcf24fee0087861c3193a79aecb7159cced17737d88517",
|
"sha256": "f3090bc7218d8e24403e8e8c0b2035d8200991f6600e9958afe7c9608ca4d050",
|
||||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.3-aarch64.dmg",
|
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3-aarch64.dmg",
|
||||||
"build_number": "232.10072.28"
|
"build_number": "233.11799.229"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,13 +21,13 @@
|
|||||||
, libgcc
|
, libgcc
|
||||||
, lttng-ust_2_12
|
, lttng-ust_2_12
|
||||||
, xz
|
, xz
|
||||||
|
, xorg
|
||||||
|
, libGL
|
||||||
|
|
||||||
, vmopts ? null
|
, vmopts ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
|
||||||
|
|
||||||
inherit (stdenv.hostPlatform) system;
|
inherit (stdenv.hostPlatform) system;
|
||||||
|
|
||||||
# `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata
|
# `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata
|
||||||
@ -149,7 +149,7 @@ rec {
|
|||||||
# fortify source breaks build since delve compiles with -O0
|
# fortify source breaks build since delve compiles with -O0
|
||||||
''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"''
|
''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"''
|
||||||
];
|
];
|
||||||
extraBuildInputs = [ libgcc ];
|
extraBuildInputs = [ libgcc stdenv.cc.cc ];
|
||||||
}).overrideAttrs
|
}).overrideAttrs
|
||||||
(attrs: {
|
(attrs: {
|
||||||
postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
|
postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
|
||||||
@ -201,6 +201,7 @@ rec {
|
|||||||
--replace-needed libcrypt.so.1 libcrypt.so
|
--replace-needed libcrypt.so.1 libcrypt.so
|
||||||
|
|
||||||
for dir in lib/ReSharperHost/linux-*; do
|
for dir in lib/ReSharperHost/linux-*; do
|
||||||
|
rm -rf $dir/dotnet
|
||||||
ln -s ${dotnet-sdk_7} $dir/dotnet
|
ln -s ${dotnet-sdk_7} $dir/dotnet
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
@ -215,6 +216,9 @@ rec {
|
|||||||
python3
|
python3
|
||||||
openssl
|
openssl
|
||||||
libxcrypt-legacy
|
libxcrypt-legacy
|
||||||
|
fontconfig
|
||||||
|
xorg.libX11
|
||||||
|
libGL
|
||||||
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||||
expat
|
expat
|
||||||
libxml2
|
libxml2
|
||||||
|
|||||||
@ -17,16 +17,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip"
|
||||||
},
|
},
|
||||||
"name": "ideavim"
|
"name": "ideavim"
|
||||||
},
|
},
|
||||||
@ -35,37 +36,19 @@
|
|||||||
"idea-ultimate"
|
"idea-ultimate"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/631/448205/python-233.11799.241.zip"
|
||||||
},
|
},
|
||||||
"name": "python"
|
"name": "python"
|
||||||
},
|
},
|
||||||
"6954": {
|
"6954": {
|
||||||
"compatible": [
|
"compatible": [
|
||||||
"clion",
|
|
||||||
"datagrip",
|
|
||||||
"goland",
|
|
||||||
"idea-community",
|
"idea-community",
|
||||||
"idea-ultimate",
|
"idea-ultimate",
|
||||||
"mps",
|
"mps"
|
||||||
"phpstorm",
|
|
||||||
"pycharm-community",
|
|
||||||
"pycharm-professional",
|
|
||||||
"rider",
|
|
||||||
"ruby-mine",
|
|
||||||
"rust-rover",
|
|
||||||
"webstorm"
|
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/6954/442937/kotlin-plugin-232-1.9.21-release-633-IJ10072.27.zip",
|
||||||
"232.10072.15": null,
|
"233.11799.241": null
|
||||||
"232.10072.21": null,
|
|
||||||
"232.10072.27": null,
|
|
||||||
"232.10072.28": null,
|
|
||||||
"232.10072.31": null,
|
|
||||||
"232.10072.32": null,
|
|
||||||
"232.9921.42": null,
|
|
||||||
"232.9921.83": null,
|
|
||||||
"233.8264.22": null
|
|
||||||
},
|
},
|
||||||
"name": "kotlin"
|
"name": "kotlin"
|
||||||
},
|
},
|
||||||
@ -86,16 +69,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": null,
|
"232.10072.781": null,
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/6981/433032/ini-233.10527.39.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip"
|
||||||
},
|
},
|
||||||
"name": "ini"
|
"name": "ini"
|
||||||
},
|
},
|
||||||
@ -105,8 +89,8 @@
|
|||||||
"phpstorm"
|
"phpstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip"
|
||||||
},
|
},
|
||||||
"name": "symfony-support"
|
"name": "symfony-support"
|
||||||
},
|
},
|
||||||
@ -116,8 +100,8 @@
|
|||||||
"phpstorm"
|
"phpstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
|
||||||
},
|
},
|
||||||
"name": "php-annotations"
|
"name": "php-annotations"
|
||||||
},
|
},
|
||||||
@ -130,10 +114,11 @@
|
|||||||
"rust-rover"
|
"rust-rover"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/7322/423134/python-ce-233.10527.20.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/7322/448211/python-ce-233.11799.241.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/7322/448211/python-ce-233.11799.241.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/7322/448211/python-ce-233.11799.241.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/7322/448211/python-ce-233.11799.241.zip"
|
||||||
},
|
},
|
||||||
"name": "python-community-edition"
|
"name": "python-community-edition"
|
||||||
},
|
},
|
||||||
@ -153,15 +138,16 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip"
|
||||||
},
|
},
|
||||||
"name": "-deprecated-rust"
|
"name": "-deprecated-rust"
|
||||||
},
|
},
|
||||||
@ -181,15 +167,16 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": null,
|
"232.10072.781": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip"
|
||||||
},
|
},
|
||||||
"name": "-deprecated-rust-beta"
|
"name": "-deprecated-rust-beta"
|
||||||
},
|
},
|
||||||
@ -204,10 +191,11 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip",
|
||||||
|
"233.11799.259": "https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip"
|
||||||
},
|
},
|
||||||
"name": "ide-features-trainer"
|
"name": "ide-features-trainer"
|
||||||
},
|
},
|
||||||
@ -228,16 +216,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
"233.8264.22": null
|
"233.11799.259": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip"
|
||||||
},
|
},
|
||||||
"name": "nixidea"
|
"name": "nixidea"
|
||||||
},
|
},
|
||||||
@ -246,7 +235,7 @@
|
|||||||
"idea-ultimate"
|
"idea-ultimate"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/9568/445967/go-plugin-233.11799.196.zip"
|
||||||
},
|
},
|
||||||
"name": "go"
|
"name": "go"
|
||||||
},
|
},
|
||||||
@ -267,16 +256,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip"
|
||||||
},
|
},
|
||||||
"name": "csv-editor"
|
"name": "csv-editor"
|
||||||
},
|
},
|
||||||
@ -297,16 +287,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": null,
|
"232.10072.781": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/12062/421207/keymap-vscode-233.10527.7.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip"
|
||||||
},
|
},
|
||||||
"name": "vscode-keymap"
|
"name": "vscode-keymap"
|
||||||
},
|
},
|
||||||
@ -327,16 +318,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": null,
|
"232.10072.781": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/12559/421371/keymap-eclipse-233.10527.14.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip"
|
||||||
},
|
},
|
||||||
"name": "eclipse-keymap"
|
"name": "eclipse-keymap"
|
||||||
},
|
},
|
||||||
@ -357,16 +349,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": null,
|
"232.10072.781": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/13017/421405/keymap-visualStudio-233.10527.14.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip"
|
||||||
},
|
},
|
||||||
"name": "visual-studio-keymap"
|
"name": "visual-studio-keymap"
|
||||||
},
|
},
|
||||||
@ -387,16 +380,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"232.10072.781": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.10527.212": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.227": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.228": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.229": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.232": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.235": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.238": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
"233.11799.241": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
"233.11799.259": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||||
},
|
},
|
||||||
"name": "darcula-pitch-black"
|
"name": "darcula-pitch-black"
|
||||||
},
|
},
|
||||||
@ -417,16 +411,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip"
|
||||||
},
|
},
|
||||||
"name": "github-copilot"
|
"name": "github-copilot"
|
||||||
},
|
},
|
||||||
@ -447,16 +442,17 @@
|
|||||||
"webstorm"
|
"webstorm"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"232.10072.781": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.227": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.228": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.229": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.232": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.10072.32": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.235": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"232.9921.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
"233.11799.241": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
"233.11799.259": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||||
|
"233.11799.261": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||||
},
|
},
|
||||||
"name": "netbeans-6-5-keymap"
|
"name": "netbeans-6-5-keymap"
|
||||||
},
|
},
|
||||||
@ -467,45 +463,42 @@
|
|||||||
"rust-rover"
|
"rust-rover"
|
||||||
],
|
],
|
||||||
"builds": {
|
"builds": {
|
||||||
"232.10072.27": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip",
|
"233.10527.212": "https://plugins.jetbrains.com/files/22407/445095/intellij-rust-233.20527.212.zip",
|
||||||
"232.9921.42": "https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip",
|
"233.11799.238": "https://plugins.jetbrains.com/files/22407/445095/intellij-rust-233.20527.212.zip",
|
||||||
"233.8264.22": "https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip"
|
"233.11799.241": "https://plugins.jetbrains.com/files/22407/445095/intellij-rust-233.20527.212.zip"
|
||||||
},
|
},
|
||||||
"name": "rust"
|
"name": "rust"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"files": {
|
"files": {
|
||||||
"https://plugins.jetbrains.com/files/10037/417699/CSVEditor-3.2.2-232.zip": "sha256-3bHSRhzvVO07mvuD6tpkiKFXTF66zCK/wpXFVb8IkfY=",
|
"https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip": "sha256-H/LRD/5Q9qtYCq4CSonqQcJ4IcdefI/vg2Jlmc0vaJY=",
|
||||||
"https://plugins.jetbrains.com/files/10037/417700/CSVEditor-3.2.2-223.zip": "sha256-4Y/DZpCWKljaslJFsaqItq1DVJVVRlQjWpM6GLRo8QA=",
|
"https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip": "sha256-qbQ2ArW1NcER+LbiVqpB+Sdmi5s78u8jfNmEb+2Nmrg=",
|
||||||
"https://plugins.jetbrains.com/files/10037/417702/CSVEditor-3.2.2-233.zip": "sha256-n4psF9fFFU8ohtbOndRx6i20EntjEzL3BvMObAZyOOw=",
|
|
||||||
"https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
|
"https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
|
||||||
"https://plugins.jetbrains.com/files/12062/405118/keymap-vscode-233.8264.3.zip": "sha256-cB3DTeWhDgAwHlxwYogd0/DuYBzo5DqaRtBvEC/p8I4=",
|
"https://plugins.jetbrains.com/files/12062/421207/keymap-vscode-233.10527.7.zip": "sha256-ao0YYoDH5766u9L3Af4UnUNshugFWyATiq4sA02iFYs=",
|
||||||
|
"https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=",
|
||||||
"https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
|
"https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
|
||||||
"https://plugins.jetbrains.com/files/12559/405631/keymap-eclipse-233.8264.9.zip": "sha256-d54ipHXOwl3AZD5k72s1vTHzevRA4v+WfGUItGtUIn8=",
|
"https://plugins.jetbrains.com/files/12559/421371/keymap-eclipse-233.10527.14.zip": "sha256-hDBCh9RQ2fh7zhnpAspKsjmWPiUmTmNHkxAQvMzwmu8=",
|
||||||
|
"https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=",
|
||||||
"https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
|
"https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
|
||||||
"https://plugins.jetbrains.com/files/13017/405636/keymap-visualStudio-233.8264.9.zip": "sha256-A3qx1stw9cTaD/dUmJ8q4j7yLnlvdq6yINZGuA9zDBQ=",
|
"https://plugins.jetbrains.com/files/13017/421405/keymap-visualStudio-233.10527.14.zip": "sha256-hmYWPmdH5SvGxhTwzqrzLAx6lhLWCy5AlT5vWyJolRc=",
|
||||||
|
"https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=",
|
||||||
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
||||||
"https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=",
|
"https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip": "sha256-MiF8MVWBEQqupoYyI+QOyXhSvJcoSgptePENByURphI=",
|
||||||
"https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=",
|
"https://plugins.jetbrains.com/files/17718/450592/github-copilot-intellij-1.4.4.3955.zip": "sha256-JmME4MEN6nK1ueiz12VefCQHaE629jXYqYM5jxIyfGQ=",
|
||||||
"https://plugins.jetbrains.com/files/17718/415524/github-copilot-intellij-1.3.2.3479.zip": "sha256-K+crYlCWZaHfBYXM4gFhEcEVW00EznfFibPo2ycAIAs=",
|
|
||||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||||
"https://plugins.jetbrains.com/files/22407/414871/intellij-rust-233.18264.22.zip": "sha256-5gTCC+3ZhxQtu2dxc1U5WuYY6NswaSs29n+EOnVn/1U=",
|
"https://plugins.jetbrains.com/files/22407/445095/intellij-rust-233.20527.212.zip": "sha256-Dvppw1U6PrkigeUjOsb/AMYIZEQ+e4cJIgwdUp3aePk=",
|
||||||
"https://plugins.jetbrains.com/files/22407/414874/intellij-rust-232.18264.22.zip": "sha256-V8xmXBe9R/lOyk6ryaUxCr9UCZTxDiFFp7iR9KH0G/A=",
|
"https://plugins.jetbrains.com/files/631/448205/python-233.11799.241.zip": "sha256-t5GTy6IFk2HP7kuOvSynchwaAdl6uJvItRYHITZCfDc=",
|
||||||
"https://plugins.jetbrains.com/files/631/414912/python-232.10072.27.zip": "sha256-avd+FtL7thr3btczmG/d5tsXzi7pVLd6B1mQhL/U6ts=",
|
"https://plugins.jetbrains.com/files/6954/442937/kotlin-plugin-232-1.9.21-release-633-IJ10072.27.zip": "sha256-fDIY4qolt/XZ3EMSKm3qCvrvknoLrxUd8XgiyMkYRto=",
|
||||||
"https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=",
|
"https://plugins.jetbrains.com/files/6981/433032/ini-233.10527.39.zip": "sha256-R+jrykFkx96cbwqYzTteV0WPJW3pFFRLCSO5qX41hRo=",
|
||||||
"https://plugins.jetbrains.com/files/6981/407738/ini-233.8264.9.zip": "sha256-E3xWjwTxtLkOtm9748BbkKGaS4l8SlZOkj3w6VgqlFQ=",
|
"https://plugins.jetbrains.com/files/6981/448153/ini-233.11799.244.zip": "sha256-YkSM8FpNrD5KwFLP5AQatkEf7HfhFJHgWAP6emG0cUs=",
|
||||||
"https://plugins.jetbrains.com/files/6981/407868/ini-232.9921.89.zip": "sha256-XIdhTQMxl/nJnntfQlHLlcyA79IS3hnGEGrXhKBFgY0=",
|
"https://plugins.jetbrains.com/files/7219/447835/Symfony_Plugin-2022.1.261.zip": "sha256-aHD22UQFtBjT9g6ZUe+jGvmpNtYXSVnREm8vljFx2eM=",
|
||||||
"https://plugins.jetbrains.com/files/6981/418297/ini-232.10072.32.zip": "sha256-eC5Zs6ph/4C3Xf6e07DfyqhBmsG3bAFLnvae1JiFzpE=",
|
|
||||||
"https://plugins.jetbrains.com/files/7219/419684/Symfony_Plugin-2022.1.259.zip": "sha256-3UxSPvEXXhAf3zYg2H/jja4F5fuDFWQ6SWFRvcWJ0Iw=",
|
|
||||||
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
|
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
|
||||||
"https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=",
|
"https://plugins.jetbrains.com/files/7322/423134/python-ce-233.10527.20.zip": "sha256-Ik9bVJxAxgU8rFZDqIU6j+9FglPsewcvGQljYeVZsIY=",
|
||||||
"https://plugins.jetbrains.com/files/7322/405773/python-ce-233.8264.8.zip": "sha256-LjN0BkcnX8mVHh2dPULddVwooi9fcABkrRVhTPA7XSo=",
|
"https://plugins.jetbrains.com/files/7322/448211/python-ce-233.11799.241.zip": "sha256-6VimHRLX3xl5fnF5VFIUjHqimzNLJr8zUwvsnOrQB4U=",
|
||||||
"https://plugins.jetbrains.com/files/7322/414919/python-ce-232.10072.27.zip": "sha256-R+5/E65OaEZxHY4FBUJtJUvcNYfrNHKID497FNc/R3g=",
|
|
||||||
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
|
|
||||||
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=",
|
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=",
|
||||||
"https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=",
|
"https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=",
|
||||||
"https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=",
|
"https://plugins.jetbrains.com/files/8554/445635/featuresTrainer-233.11799.172.zip": "sha256-xN0FUCIa4KcqFAGwaOWf74qpIEY2f/QtksEeNTKG7zw=",
|
||||||
"https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=",
|
"https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=",
|
||||||
"https://plugins.jetbrains.com/files/9568/414896/go-plugin-232.10072.27.zip": "sha256-uWAy/ugmFQBvYEQvSuuNS7xDYkzZgYGyQdSQbuvt0Lk="
|
"https://plugins.jetbrains.com/files/9568/445967/go-plugin-233.11799.196.zip": "sha256-d8O5VRNdw7ru20l0VOicVJRUcVxje5A2Gua1O9yXogM="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -93,6 +93,8 @@ mapAliases (with prev; {
|
|||||||
neoinclude = neoinclude-vim;
|
neoinclude = neoinclude-vim;
|
||||||
neomru = neomru-vim;
|
neomru = neomru-vim;
|
||||||
neosnippet = neosnippet-vim;
|
neosnippet = neosnippet-vim;
|
||||||
|
nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
|
||||||
|
nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
|
||||||
The_NERD_Commenter = nerdcommenter;
|
The_NERD_Commenter = nerdcommenter;
|
||||||
The_NERD_tree = nerdtree;
|
The_NERD_tree = nerdtree;
|
||||||
open-browser = open-browser-vim;
|
open-browser = open-browser-vim;
|
||||||
|
|||||||
@ -29,12 +29,12 @@ final: prev:
|
|||||||
|
|
||||||
ChatGPT-nvim = buildVimPlugin {
|
ChatGPT-nvim = buildVimPlugin {
|
||||||
pname = "ChatGPT.nvim";
|
pname = "ChatGPT.nvim";
|
||||||
version = "2023-11-14";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jackMort";
|
owner = "jackMort";
|
||||||
repo = "ChatGPT.nvim";
|
repo = "ChatGPT.nvim";
|
||||||
rev = "b50fdaf7836c18e0de2f1def0c1f39d56ef8bced";
|
rev = "f189c51d03316b4ab02766c5fed6f876f5d57cbb";
|
||||||
sha256 = "1xmnzr1hccgdaadjc8i207bz44272ng5aaaypdacaag2pciapq3s";
|
sha256 = "1h6fggfqifx47vhd3n0c4vldrx5lqbizkijm14nkj55224sq5i61";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
|
meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
|
||||||
};
|
};
|
||||||
@ -787,12 +787,12 @@ final: prev:
|
|||||||
|
|
||||||
asynctasks-vim = buildVimPlugin {
|
asynctasks-vim = buildVimPlugin {
|
||||||
pname = "asynctasks.vim";
|
pname = "asynctasks.vim";
|
||||||
version = "2023-09-21";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "skywind3000";
|
owner = "skywind3000";
|
||||||
repo = "asynctasks.vim";
|
repo = "asynctasks.vim";
|
||||||
rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3";
|
rev = "851da4282ffb2ce3d5e4c2f70d2d09da7839d48f";
|
||||||
sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l";
|
sha256 = "12xm92dz599w0imd7flpvay4d73hfvj0hrnz90aq6xvfrry8mzpq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";
|
meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";
|
||||||
};
|
};
|
||||||
@ -1171,12 +1171,12 @@ final: prev:
|
|||||||
|
|
||||||
bufferline-nvim = buildVimPlugin {
|
bufferline-nvim = buildVimPlugin {
|
||||||
pname = "bufferline.nvim";
|
pname = "bufferline.nvim";
|
||||||
version = "2023-12-08";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "bufferline.nvim";
|
repo = "bufferline.nvim";
|
||||||
rev = "ac788fbc493839c1e76daa8d119934b715fdb90e";
|
rev = "e48ce1805697e4bb97bc171c081e849a65859244";
|
||||||
sha256 = "0zy8z80s32hqa6jsffh9wygb77dnp7zhsp2zqgbl63lpyy0ffrvc";
|
sha256 = "06af2lvydw7c2yswin968vdh2f06s5xmwx6pip45c4am8q68a2y6";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
|
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
|
||||||
};
|
};
|
||||||
@ -2287,12 +2287,12 @@ final: prev:
|
|||||||
|
|
||||||
conform-nvim = buildVimPlugin {
|
conform-nvim = buildVimPlugin {
|
||||||
pname = "conform.nvim";
|
pname = "conform.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "stevearc";
|
owner = "stevearc";
|
||||||
repo = "conform.nvim";
|
repo = "conform.nvim";
|
||||||
rev = "fb9b0500270ba05b89cc27cd8b7762443bcfae22";
|
rev = "8b407bb6175846cdc4c499e2a8d28109615a2089";
|
||||||
sha256 = "0acy9r36p6xh4xyh0p7a3sw3mmfih8bgixx3qb9ikq3sbmdqmnh3";
|
sha256 = "1lxm759ig6qi4l1ffw5kdy1agfwv8c8r91gs9iilc2igj90lxwwj";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/stevearc/conform.nvim/";
|
meta.homepage = "https://github.com/stevearc/conform.nvim/";
|
||||||
@ -2360,12 +2360,12 @@ final: prev:
|
|||||||
|
|
||||||
copilot-vim = buildVimPlugin {
|
copilot-vim = buildVimPlugin {
|
||||||
pname = "copilot.vim";
|
pname = "copilot.vim";
|
||||||
version = "2023-11-23";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "github";
|
owner = "github";
|
||||||
repo = "copilot.vim";
|
repo = "copilot.vim";
|
||||||
rev = "2c31989063b145830d5f0bea8ab529d2aef2427b";
|
rev = "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f";
|
||||||
sha256 = "0icjjxgmi1v8jsidvh3lhnn04nkqpgfgr83mg2qa9603f1a34fqw";
|
sha256 = "0m6s01in8bkfviq7p0xq9x5ldgj826ixbnz4586bgg9pzkr0lz4q";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/github/copilot.vim/";
|
meta.homepage = "https://github.com/github/copilot.vim/";
|
||||||
};
|
};
|
||||||
@ -2576,12 +2576,12 @@ final: prev:
|
|||||||
|
|
||||||
debugprint-nvim = buildVimPlugin {
|
debugprint-nvim = buildVimPlugin {
|
||||||
pname = "debugprint.nvim";
|
pname = "debugprint.nvim";
|
||||||
version = "2023-11-28";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "andrewferrier";
|
owner = "andrewferrier";
|
||||||
repo = "debugprint.nvim";
|
repo = "debugprint.nvim";
|
||||||
rev = "8a6d66bd6162e9c49804e9286a7d4ceba60355d5";
|
rev = "7eec2b7ddf98b462de02f8ad521327a7736aaf28";
|
||||||
sha256 = "0ykxdjsffx1fz82ayl5mb0j1syqk3b6cjw7a6qcfcgh2w4dmijvm";
|
sha256 = "13mi4a4gdnbxbdf0z5l7bz6p0danlwl7xf0m9knzlkagqwdd10cn";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
|
meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
|
||||||
};
|
};
|
||||||
@ -3034,12 +3034,12 @@ final: prev:
|
|||||||
|
|
||||||
dracula-nvim = buildVimPlugin {
|
dracula-nvim = buildVimPlugin {
|
||||||
pname = "dracula.nvim";
|
pname = "dracula.nvim";
|
||||||
version = "2023-10-26";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Mofiqul";
|
owner = "Mofiqul";
|
||||||
repo = "dracula.nvim";
|
repo = "dracula.nvim";
|
||||||
rev = "7200e64c589f899d29f8963aad7543856d1c2545";
|
rev = "084cb4a282b2cb51d1c1c76c377abe08d0649818";
|
||||||
sha256 = "095jnw5wmphr7fp4n63sdjh787hlvhpz4baqcvcy7n90aiq3r3sq";
|
sha256 = "1fg9z7cqfanxrqplw9b1lfn5r4v84g5lpnqmignrbbz2dac8blyc";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
|
||||||
};
|
};
|
||||||
@ -3360,12 +3360,12 @@ final: prev:
|
|||||||
|
|
||||||
fidget-nvim = buildVimPlugin {
|
fidget-nvim = buildVimPlugin {
|
||||||
pname = "fidget.nvim";
|
pname = "fidget.nvim";
|
||||||
version = "2023-12-09";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "j-hui";
|
owner = "j-hui";
|
||||||
repo = "fidget.nvim";
|
repo = "fidget.nvim";
|
||||||
rev = "7dc62b9ce32ac0f21cfb510f243644ce28a39299";
|
rev = "7b9c383438a2e490e37d57b07ddeae3ab4f4cf69";
|
||||||
sha256 = "15llm2qy0bgsb0gbyk0p841182cyx3rxa3m3ij378av9kcmcr9kf";
|
sha256 = "01pj57fhyac3bid8f66gs5g9b64v5jjzgpfnn3nb5scf0bchlzbk";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
|
meta.homepage = "https://github.com/j-hui/fidget.nvim/";
|
||||||
};
|
};
|
||||||
@ -3382,6 +3382,18 @@ final: prev:
|
|||||||
meta.homepage = "https://github.com/bogado/file-line/";
|
meta.homepage = "https://github.com/bogado/file-line/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fileline-nvim = buildVimPlugin {
|
||||||
|
pname = "fileline.nvim";
|
||||||
|
version = "2023-08-30";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "lewis6991";
|
||||||
|
repo = "fileline.nvim";
|
||||||
|
rev = "64fc4b24f559467ff7fdbf4b3d9eaf4724f331e4";
|
||||||
|
sha256 = "0q68mz6kd3zbf2blwz84q39wn2kq9svl8516p5vyn9jpn70rnmgv";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/lewis6991/fileline.nvim/";
|
||||||
|
};
|
||||||
|
|
||||||
firenvim = buildVimPlugin {
|
firenvim = buildVimPlugin {
|
||||||
pname = "firenvim";
|
pname = "firenvim";
|
||||||
version = "2023-08-18";
|
version = "2023-08-18";
|
||||||
@ -3649,12 +3661,12 @@ final: prev:
|
|||||||
|
|
||||||
fzf-lua = buildVimPlugin {
|
fzf-lua = buildVimPlugin {
|
||||||
pname = "fzf-lua";
|
pname = "fzf-lua";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ibhagwan";
|
owner = "ibhagwan";
|
||||||
repo = "fzf-lua";
|
repo = "fzf-lua";
|
||||||
rev = "46b5be64aa9e7b1cf7d9c29a0e80f7f9a2250007";
|
rev = "209e9405d2df949cbffe5b7b9329756b83bf2339";
|
||||||
sha256 = "070q3yh2cy210z36k5zycxnga83r1hdalg2y7sgmamc6yfyc7gz0";
|
sha256 = "0pkqxkgbg7bwla627k89mx5p055760d1icqjkc701cgx6jnrafiy";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
|
||||||
};
|
};
|
||||||
@ -3817,12 +3829,12 @@ final: prev:
|
|||||||
|
|
||||||
gitsigns-nvim = buildNeovimPlugin {
|
gitsigns-nvim = buildNeovimPlugin {
|
||||||
pname = "gitsigns.nvim";
|
pname = "gitsigns.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lewis6991";
|
owner = "lewis6991";
|
||||||
repo = "gitsigns.nvim";
|
repo = "gitsigns.nvim";
|
||||||
rev = "6e05045fb1a4845fe44f5c54aafe024444c422ba";
|
rev = "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9";
|
||||||
sha256 = "0wj7cbh9rf77zzzylnx6fahvs7ygnjmqpkm95vaixbg5v5f0hdwj";
|
sha256 = "0n1pdil0di93sfmlxnw80xvwxgz36m3hllhzg16bmlcjwgagwclp";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
|
||||||
};
|
};
|
||||||
@ -4057,12 +4069,12 @@ final: prev:
|
|||||||
|
|
||||||
hardtime-nvim = buildVimPlugin {
|
hardtime-nvim = buildVimPlugin {
|
||||||
pname = "hardtime.nvim";
|
pname = "hardtime.nvim";
|
||||||
version = "2023-11-19";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "m4xshen";
|
owner = "m4xshen";
|
||||||
repo = "hardtime.nvim";
|
repo = "hardtime.nvim";
|
||||||
rev = "ddf9c8d1028ce318e8c6a0acece6bad31b6f49c5";
|
rev = "dbb0b135fa69017e455d48c65109c634a425f067";
|
||||||
sha256 = "0qyr7az1nmcmsv4dchaa52fkziqvx2k3yx0ifwlhj4v6ipi9vbm4";
|
sha256 = "06hyrwnz1nvika14mpvblxdfwhcfhj54a6cazq7pxxl08dxm5wz0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
|
meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
|
||||||
};
|
};
|
||||||
@ -4092,12 +4104,12 @@ final: prev:
|
|||||||
|
|
||||||
haskell-tools-nvim = buildNeovimPlugin {
|
haskell-tools-nvim = buildNeovimPlugin {
|
||||||
pname = "haskell-tools.nvim";
|
pname = "haskell-tools.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MrcJkb";
|
owner = "MrcJkb";
|
||||||
repo = "haskell-tools.nvim";
|
repo = "haskell-tools.nvim";
|
||||||
rev = "488283589a6c12184099bfa0d6e1626399d7f3e0";
|
rev = "7168f8e133abf55d30772a7c3b6519c85fbeff33";
|
||||||
sha256 = "0ab8b6qvpdjh2hmpnhp15rfah54kdj6aqx8bvd9rbgs1ir6vzk39";
|
sha256 = "15p1gvbvzlymhzas3ckm357ilfk43mlbkc11b1fwgxyizy1dmsyw";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
|
||||||
};
|
};
|
||||||
@ -4824,12 +4836,12 @@ final: prev:
|
|||||||
|
|
||||||
lean-nvim = buildVimPlugin {
|
lean-nvim = buildVimPlugin {
|
||||||
pname = "lean.nvim";
|
pname = "lean.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Julian";
|
owner = "Julian";
|
||||||
repo = "lean.nvim";
|
repo = "lean.nvim";
|
||||||
rev = "1bfcbea057c7daa81427c07440145a065339474a";
|
rev = "a5daac8ebccb93af25ace2a2041b503f18ff3dcb";
|
||||||
sha256 = "0y5cdk8p0dkqx44h7kzs9f7j4jjmqcg7d029wj00m6wvb81618f3";
|
sha256 = "1a2qgmpg2j49v5pz8j4bfa5n8q8kiyixfz3jxhh41jkw7myxcqwh";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
meta.homepage = "https://github.com/Julian/lean.nvim/";
|
||||||
};
|
};
|
||||||
@ -4860,12 +4872,12 @@ final: prev:
|
|||||||
|
|
||||||
leap-nvim = buildVimPlugin {
|
leap-nvim = buildVimPlugin {
|
||||||
pname = "leap.nvim";
|
pname = "leap.nvim";
|
||||||
version = "2023-12-09";
|
version = "2023-12-10";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ggandor";
|
owner = "ggandor";
|
||||||
repo = "leap.nvim";
|
repo = "leap.nvim";
|
||||||
rev = "f91c7386e310aacd0505c69b9e69318c9ed320e1";
|
rev = "e27bc4fd2e8c8282f91359ec0bbc3c686573d245";
|
||||||
sha256 = "0bi082kyclyzxarlg82yizgv3ipgs705gxy5yli2806yg487ighj";
|
sha256 = "0ki14k4q52cjgd8g1kr187i836jbrjawfrz66y7sy0k83g6djn05";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ggandor/leap.nvim/";
|
meta.homepage = "https://github.com/ggandor/leap.nvim/";
|
||||||
};
|
};
|
||||||
@ -5484,12 +5496,12 @@ final: prev:
|
|||||||
|
|
||||||
material-nvim = buildVimPlugin {
|
material-nvim = buildVimPlugin {
|
||||||
pname = "material.nvim";
|
pname = "material.nvim";
|
||||||
version = "2023-11-24";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "marko-cerovac";
|
owner = "marko-cerovac";
|
||||||
repo = "material.nvim";
|
repo = "material.nvim";
|
||||||
rev = "d61da5decc7768769314c121a3232b6eadc73f2d";
|
rev = "e6059169795ebdc9256ad1d104860b2c1a229384";
|
||||||
sha256 = "1jsjshi8hwiyazpchhc5smsp2p9n7g54i7px4crc0gdnm3sxk5q0";
|
sha256 = "0gvfc0bdqnvknmzc1w9yvnd8dyn9jclqgrqg0wfdq3g027nfw8pk";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
|
meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
|
||||||
};
|
};
|
||||||
@ -5556,12 +5568,12 @@ final: prev:
|
|||||||
|
|
||||||
mini-nvim = buildVimPlugin {
|
mini-nvim = buildVimPlugin {
|
||||||
pname = "mini.nvim";
|
pname = "mini.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "echasnovski";
|
owner = "echasnovski";
|
||||||
repo = "mini.nvim";
|
repo = "mini.nvim";
|
||||||
rev = "c87d3b73d763d4222cdef19323e6a2c4bee33013";
|
rev = "333d2d1090c80ac936b960469a6e93982cbaeb21";
|
||||||
sha256 = "1dd5k3pbd8fnnb8smbfi2af3d21190w587slixljzym2vhkm3072";
|
sha256 = "1r9s3c3m99r6xslwm4xi8zg908rhqh19xsmzw9jvyjhkgb7pn82l";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
|
||||||
};
|
};
|
||||||
@ -5592,12 +5604,12 @@ final: prev:
|
|||||||
|
|
||||||
mkdnflow-nvim = buildVimPlugin {
|
mkdnflow-nvim = buildVimPlugin {
|
||||||
pname = "mkdnflow.nvim";
|
pname = "mkdnflow.nvim";
|
||||||
version = "2023-12-07";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jakewvincent";
|
owner = "jakewvincent";
|
||||||
repo = "mkdnflow.nvim";
|
repo = "mkdnflow.nvim";
|
||||||
rev = "aae9a1f7ea5c9e1ad8ae22d4841a336d9f3945bb";
|
rev = "cefce2a0dc243645fe70096fa083e6d93575a0ce";
|
||||||
sha256 = "0cm9g5czzwfqj1km5vddknfhp1w5aab42w7jfxiandadpk09wrki";
|
sha256 = "132c76dhhj3g2f8v96mmmi1mz0qikcgwzp3i54ilhgq35jqaglnr";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
|
meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/";
|
||||||
};
|
};
|
||||||
@ -6048,12 +6060,12 @@ final: prev:
|
|||||||
|
|
||||||
neogit = buildVimPlugin {
|
neogit = buildVimPlugin {
|
||||||
pname = "neogit";
|
pname = "neogit";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NeogitOrg";
|
owner = "NeogitOrg";
|
||||||
repo = "neogit";
|
repo = "neogit";
|
||||||
rev = "cebebcde2af56522249199f375513cc1d74430ac";
|
rev = "a2361d2c6caaecbe2565836f94e7945df22963ab";
|
||||||
sha256 = "0bmvisz5swgxzxh6hw986cmx5a5h63yzn7fx4mgf9cxnba9vpy7k";
|
sha256 = "0vf9pz7mpc3kyh75xmbzxvnz8fvpw1ivx8nnd09bbwvqfnxd9d13";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||||
};
|
};
|
||||||
@ -6265,12 +6277,12 @@ final: prev:
|
|||||||
|
|
||||||
neotest-haskell = buildVimPlugin {
|
neotest-haskell = buildVimPlugin {
|
||||||
pname = "neotest-haskell";
|
pname = "neotest-haskell";
|
||||||
version = "2023-12-10";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MrcJkb";
|
owner = "MrcJkb";
|
||||||
repo = "neotest-haskell";
|
repo = "neotest-haskell";
|
||||||
rev = "b9c002e5926c14d8627839756b1710b87bd70990";
|
rev = "25c447f2597df5344c790ef3d85ff55e26c5339e";
|
||||||
sha256 = "0v33jlzc363vblnn4f38fydry0lz7szk9akmq6p5iz4vjs0ypwj9";
|
sha256 = "07vxlpgy7h12abgfrbvifck82x2g0l4vz1ylw6n0z2f1krdc9z7p";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
|
||||||
};
|
};
|
||||||
@ -6515,6 +6527,18 @@ final: prev:
|
|||||||
meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
|
meta.homepage = "https://github.com/fiatjaf/neuron.vim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nfnl = buildVimPlugin {
|
||||||
|
pname = "nfnl";
|
||||||
|
version = "2023-09-08";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Olical";
|
||||||
|
repo = "nfnl";
|
||||||
|
rev = "979dbfc48bcb601a9107764a99f9459cb5bd4051";
|
||||||
|
sha256 = "0m1yf62w4r75amva8708c4i0qvhgfia2i9p64z6i6589mq4mw6ip";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/Olical/nfnl/";
|
||||||
|
};
|
||||||
|
|
||||||
nginx-vim = buildVimPlugin {
|
nginx-vim = buildVimPlugin {
|
||||||
pname = "nginx.vim";
|
pname = "nginx.vim";
|
||||||
version = "2023-11-26";
|
version = "2023-11-26";
|
||||||
@ -6601,12 +6625,12 @@ final: prev:
|
|||||||
|
|
||||||
no-neck-pain-nvim = buildVimPlugin {
|
no-neck-pain-nvim = buildVimPlugin {
|
||||||
pname = "no-neck-pain.nvim";
|
pname = "no-neck-pain.nvim";
|
||||||
version = "2023-12-01";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shortcuts";
|
owner = "shortcuts";
|
||||||
repo = "no-neck-pain.nvim";
|
repo = "no-neck-pain.nvim";
|
||||||
rev = "968ad52ee472e950d104303c4c0bfcd3de664fe1";
|
rev = "ba409c31b8d8ae9a36f560f38cfb6b718acfa6ea";
|
||||||
sha256 = "0lqhi74fjvsflx642g04k2zf8i8dxfycmgd7hh0nkc6012b1ma3x";
|
sha256 = "166rxrh67w5wg4a06cxyyd2xhi6syvkm0rzjllx98yyznrlbdzp5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
|
meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
|
||||||
};
|
};
|
||||||
@ -6853,12 +6877,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-code-action-menu = buildVimPlugin {
|
nvim-code-action-menu = buildVimPlugin {
|
||||||
pname = "nvim-code-action-menu";
|
pname = "nvim-code-action-menu";
|
||||||
version = "2022-12-20";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "weilbith";
|
owner = "weilbith";
|
||||||
repo = "nvim-code-action-menu";
|
repo = "nvim-code-action-menu";
|
||||||
rev = "e4399dbaf6eabff998d3d5f1cbcd8d9933710027";
|
rev = "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b";
|
||||||
sha256 = "01pbr8z8fn16vsdlsxrhd83rbx41pah477xr6p01lnmsqzwg3k7f";
|
sha256 = "13rjzsw44151gk9zwl7gmmmdysb6hz1i5mcw1mprif41v0zrm3x5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/";
|
meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/";
|
||||||
};
|
};
|
||||||
@ -7200,12 +7224,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-lilypond-suite = buildVimPlugin {
|
nvim-lilypond-suite = buildVimPlugin {
|
||||||
pname = "nvim-lilypond-suite";
|
pname = "nvim-lilypond-suite";
|
||||||
version = "2023-11-24";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "martineausimon";
|
owner = "martineausimon";
|
||||||
repo = "nvim-lilypond-suite";
|
repo = "nvim-lilypond-suite";
|
||||||
rev = "463b8190db2455d3bc764d234076b8b42e405c28";
|
rev = "d05bcf2b9766c2f5217eea50fa8b35cdc47aa3f3";
|
||||||
sha256 = "1v024pi0xanax2q3blmq7cz8cl1vnb7shpzk4agda823qxm9kc3i";
|
sha256 = "0n2gpdyzx356ciraqgamfyy1kx0mszhjnn025jk0ah2q4hdgs9k4";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
|
meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
|
||||||
};
|
};
|
||||||
@ -7248,12 +7272,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-lspconfig = buildVimPlugin {
|
nvim-lspconfig = buildVimPlugin {
|
||||||
pname = "nvim-lspconfig";
|
pname = "nvim-lspconfig";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "neovim";
|
owner = "neovim";
|
||||||
repo = "nvim-lspconfig";
|
repo = "nvim-lspconfig";
|
||||||
rev = "bd405e45c5fb122c16af8f87fa2dd7ab1981b243";
|
rev = "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9";
|
||||||
sha256 = "1jfjy8j91b66i2kkzikkybl56b62ybj8kshxyjjwlvlz9vaqd06j";
|
sha256 = "1cf0vzdk2jmj63x7cg9p5m2lhi5ch7p8mrsidclx9h4qpf4vl0ns";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
|
||||||
};
|
};
|
||||||
@ -7536,12 +7560,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-spider = buildVimPlugin {
|
nvim-spider = buildVimPlugin {
|
||||||
pname = "nvim-spider";
|
pname = "nvim-spider";
|
||||||
version = "2023-11-07";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "chrisgrieser";
|
owner = "chrisgrieser";
|
||||||
repo = "nvim-spider";
|
repo = "nvim-spider";
|
||||||
rev = "e0eeac5480704cc3fdd5bdadd4901ca5409d7838";
|
rev = "c11e469cc1a6d099bcac7e15a7bfc0720b8e96b5";
|
||||||
sha256 = "09nl8id8adhk8qz8jz7ygwx5dmh96237gkp6fw2qdhvv4x7w843j";
|
sha256 = "07jkw02vqipwhz0c3ybfmf6ld12dz5w4s54lvs7g87q6lmdzk41s";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
|
meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
|
||||||
};
|
};
|
||||||
@ -7608,12 +7632,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-treesitter = buildVimPlugin {
|
nvim-treesitter = buildVimPlugin {
|
||||||
pname = "nvim-treesitter";
|
pname = "nvim-treesitter";
|
||||||
version = "2023-12-10";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-treesitter";
|
owner = "nvim-treesitter";
|
||||||
repo = "nvim-treesitter";
|
repo = "nvim-treesitter";
|
||||||
rev = "b6b9ca448b7f236e2e60f8393a729902511f9db9";
|
rev = "42381aae7c1f785e4658cdb34a750be9851ba9af";
|
||||||
sha256 = "0q6zp43wm8370j6m75avq8xz92hmxa5aiww2y34ypzgdw91s1wxr";
|
sha256 = "1kfa6677p277crw7h9g563b951jlcbqklxl48vja4cvpvn1l0qza";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
|
||||||
};
|
};
|
||||||
@ -7714,29 +7738,6 @@ final: prev:
|
|||||||
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
|
meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
|
||||||
};
|
};
|
||||||
|
|
||||||
nvim-ts-rainbow = buildVimPlugin {
|
|
||||||
pname = "nvim-ts-rainbow";
|
|
||||||
version = "2023-06-07";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "mrjones2014";
|
|
||||||
repo = "nvim-ts-rainbow";
|
|
||||||
rev = "8312b513ce930e7669a1721befbe56f2e1853301";
|
|
||||||
sha256 = "16s8kppsn9m831ymcz5w3kpnq40sxg98nykd0gz3hfj27hinqag5";
|
|
||||||
};
|
|
||||||
meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/";
|
|
||||||
};
|
|
||||||
|
|
||||||
nvim-ts-rainbow2 = buildVimPlugin {
|
|
||||||
pname = "nvim-ts-rainbow2";
|
|
||||||
version = "2023-07-12";
|
|
||||||
src = fetchgit {
|
|
||||||
url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
|
||||||
rev = "b3120cd5ae9ca524af9cb602f41e12e301fa985f";
|
|
||||||
sha256 = "0mjg0pkd8wv8cfar30lkyywdrd3g5lz36bbsfb7lrqi7kbksyzxv";
|
|
||||||
};
|
|
||||||
meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2";
|
|
||||||
};
|
|
||||||
|
|
||||||
nvim-ufo = buildVimPlugin {
|
nvim-ufo = buildVimPlugin {
|
||||||
pname = "nvim-ufo";
|
pname = "nvim-ufo";
|
||||||
version = "2023-12-02";
|
version = "2023-12-02";
|
||||||
@ -7763,12 +7764,12 @@ final: prev:
|
|||||||
|
|
||||||
nvim-web-devicons = buildVimPlugin {
|
nvim-web-devicons = buildVimPlugin {
|
||||||
pname = "nvim-web-devicons";
|
pname = "nvim-web-devicons";
|
||||||
version = "2023-12-08";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nvim-tree";
|
owner = "nvim-tree";
|
||||||
repo = "nvim-web-devicons";
|
repo = "nvim-web-devicons";
|
||||||
rev = "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5";
|
rev = "a1425903ab52a0a0460622519e827f224e5b4fee";
|
||||||
sha256 = "0s7vhlr71f3n8in2dnpqj1p1jgncn0mdl1y6a7ksl8yx2vrxqdyl";
|
sha256 = "11ag1v91b6pbrvrrmw4dvi9r46zrni9pgg1a5ndli5w5wdy7sf67";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
|
meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
|
||||||
};
|
};
|
||||||
@ -7871,12 +7872,12 @@ final: prev:
|
|||||||
|
|
||||||
octo-nvim = buildVimPlugin {
|
octo-nvim = buildVimPlugin {
|
||||||
pname = "octo.nvim";
|
pname = "octo.nvim";
|
||||||
version = "2023-11-24";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "pwntester";
|
owner = "pwntester";
|
||||||
repo = "octo.nvim";
|
repo = "octo.nvim";
|
||||||
rev = "1ce62d9a29b5eca2c63fb955359f5212e4d1bc7b";
|
rev = "6825996fc73546f1df50dbf8a6b9ddc11c0f011d";
|
||||||
sha256 = "12yykcj8g1xrl7xlyvfb6jkqyxd17ixnfsrqym0y3lva01gs44zl";
|
sha256 = "0wxm76skvaxw1wz1gxwqhsk5yayp6icjrys434h1mcaamzkr7j72";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
meta.homepage = "https://github.com/pwntester/octo.nvim/";
|
||||||
};
|
};
|
||||||
@ -7944,12 +7945,12 @@ final: prev:
|
|||||||
|
|
||||||
onedarkpro-nvim = buildVimPlugin {
|
onedarkpro-nvim = buildVimPlugin {
|
||||||
pname = "onedarkpro.nvim";
|
pname = "onedarkpro.nvim";
|
||||||
version = "2023-11-15";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "olimorris";
|
owner = "olimorris";
|
||||||
repo = "onedarkpro.nvim";
|
repo = "onedarkpro.nvim";
|
||||||
rev = "c9d7e5f9a40e9a3aa578b40361577315cbbfdeea";
|
rev = "4dd6d6b4f11a021c913532ad461b61af29b75fa9";
|
||||||
sha256 = "0p285mjng1graa1lciama8qh163csi38cqxzf8kwdbd2dxxma91g";
|
sha256 = "164bqvcqkrpdai50np9lld7nppc9ba1qld94n0fsafj0y4c89fb5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
|
||||||
};
|
};
|
||||||
@ -8535,11 +8536,11 @@ final: prev:
|
|||||||
|
|
||||||
rainbow-delimiters-nvim = buildVimPlugin {
|
rainbow-delimiters-nvim = buildVimPlugin {
|
||||||
pname = "rainbow-delimiters.nvim";
|
pname = "rainbow-delimiters.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-13";
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
||||||
rev = "cc5f3a00819b3bef2789f95443057613ed7c42f8";
|
rev = "0b4c1ab6724062f3582746c6a5a8c0636bf7ed81";
|
||||||
sha256 = "054ivgg3ybrbacyz0blcsj3idy5is040vmljm2w61r6v80rf6h69";
|
sha256 = "0xz7m7xr6v467hglncdqc6jayh7qj4fyh3f7sgv8yyxlm8bf8prd";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
|
||||||
};
|
};
|
||||||
@ -8786,12 +8787,12 @@ final: prev:
|
|||||||
|
|
||||||
rustaceanvim = buildNeovimPlugin {
|
rustaceanvim = buildNeovimPlugin {
|
||||||
pname = "rustaceanvim";
|
pname = "rustaceanvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mrcjkb";
|
owner = "mrcjkb";
|
||||||
repo = "rustaceanvim";
|
repo = "rustaceanvim";
|
||||||
rev = "0afbc229f179ed31d8379e5ace0f13d93cd34446";
|
rev = "1e6d6c93cddaaf7b97a5c22771b2a4bf877eeea8";
|
||||||
sha256 = "102f7p9szvz4ykr5h7icwsw3hf2r5vhb9zqsmzy0sjxnqwxcvimp";
|
sha256 = "0qbsirbjvbyhl08ij23lyangixrr8im7pxp9vcalri75vnsc0r73";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
|
meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
|
||||||
};
|
};
|
||||||
@ -8954,12 +8955,12 @@ final: prev:
|
|||||||
|
|
||||||
sg-nvim = buildVimPlugin {
|
sg-nvim = buildVimPlugin {
|
||||||
pname = "sg.nvim";
|
pname = "sg.nvim";
|
||||||
version = "2023-11-15";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sourcegraph";
|
owner = "sourcegraph";
|
||||||
repo = "sg.nvim";
|
repo = "sg.nvim";
|
||||||
rev = "41378567217097a3d78b624c9f11d29436381e99";
|
rev = "9eeb00c758a394cccd2828720b0eaadce6f1ad51";
|
||||||
sha256 = "0dwh7zb8l83d8l63ps6qc5am7r95bnyavz5r8qpxnzgzdic2r5nv";
|
sha256 = "085vpy7vrmzcx5143gcxsgan99g6g9p05rljs0pkrw5kn7fw6szb";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
|
meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
|
||||||
};
|
};
|
||||||
@ -9027,12 +9028,12 @@ final: prev:
|
|||||||
|
|
||||||
smart-splits-nvim = buildVimPlugin {
|
smart-splits-nvim = buildVimPlugin {
|
||||||
pname = "smart-splits.nvim";
|
pname = "smart-splits.nvim";
|
||||||
version = "2023-12-02";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mrjones2014";
|
owner = "mrjones2014";
|
||||||
repo = "smart-splits.nvim";
|
repo = "smart-splits.nvim";
|
||||||
rev = "c970c7a3cc7ba635fd73d43c81b40f04c00f5058";
|
rev = "f0003bf9c3f11b8b9209264f865b8864453ca926";
|
||||||
sha256 = "0ri4b6q4qqy1cwyhknysnldbrg2yx4cfi2ddgvnn6snq8jhkmjbw";
|
sha256 = "08wfsxz6a6lzd2brnr2z8zanfnkik494ggq6my6nn9npbalkgdr0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
|
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
|
||||||
};
|
};
|
||||||
@ -9316,12 +9317,12 @@ final: prev:
|
|||||||
|
|
||||||
stan-vim = buildVimPlugin {
|
stan-vim = buildVimPlugin {
|
||||||
pname = "stan-vim";
|
pname = "stan-vim";
|
||||||
version = "2023-12-09";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "eigenfoo";
|
owner = "eigenfoo";
|
||||||
repo = "stan-vim";
|
repo = "stan-vim";
|
||||||
rev = "10b80f31f50622f3e18d18401894cbff7ad67e2c";
|
rev = "d14f7f5f96e802c48bd2b6e087cf7956054d9f38";
|
||||||
sha256 = "11l0d10vkm93g6v1clvblp45hbrdigxf7azh8jm6p285wvjjjrwb";
|
sha256 = "0dvszn4d9xia3qxr3f8l43m1iqfjwl12s4k6igzj2mq4kdq132f0";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/eigenfoo/stan-vim/";
|
meta.homepage = "https://github.com/eigenfoo/stan-vim/";
|
||||||
};
|
};
|
||||||
@ -9350,6 +9351,18 @@ final: prev:
|
|||||||
meta.homepage = "https://github.com/darfink/starsearch.vim/";
|
meta.homepage = "https://github.com/darfink/starsearch.vim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
startup-nvim = buildVimPlugin {
|
||||||
|
pname = "startup.nvim";
|
||||||
|
version = "2023-11-02";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "startup-nvim";
|
||||||
|
repo = "startup.nvim";
|
||||||
|
rev = "088de9f5af8a10dfc39f8e397e3e9646940c7323";
|
||||||
|
sha256 = "09hhl8l2b4q53i2scig6rx3zq7mcsa6f5za0ahmn3s9vh9862iqz";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/startup-nvim/startup.nvim/";
|
||||||
|
};
|
||||||
|
|
||||||
statuscol-nvim = buildVimPlugin {
|
statuscol-nvim = buildVimPlugin {
|
||||||
pname = "statuscol.nvim";
|
pname = "statuscol.nvim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-10";
|
||||||
@ -9509,12 +9522,12 @@ final: prev:
|
|||||||
|
|
||||||
tabby-nvim = buildVimPlugin {
|
tabby-nvim = buildVimPlugin {
|
||||||
pname = "tabby.nvim";
|
pname = "tabby.nvim";
|
||||||
version = "2023-09-21";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nanozuki";
|
owner = "nanozuki";
|
||||||
repo = "tabby.nvim";
|
repo = "tabby.nvim";
|
||||||
rev = "9e537762cbb7647357eab22c61c7c5dda00138dd";
|
rev = "f283ca1e8c1827b657d87865e97bfe2199432c90";
|
||||||
sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb";
|
sha256 = "1mns6mxwp9s4bzr5p1c9ck89azj4b3ilcmgr23ba8d8nmw2s71k2";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
|
meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
|
||||||
};
|
};
|
||||||
@ -9678,12 +9691,12 @@ final: prev:
|
|||||||
|
|
||||||
telekasten-nvim = buildVimPlugin {
|
telekasten-nvim = buildVimPlugin {
|
||||||
pname = "telekasten.nvim";
|
pname = "telekasten.nvim";
|
||||||
version = "2023-10-12";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "renerocksai";
|
owner = "renerocksai";
|
||||||
repo = "telekasten.nvim";
|
repo = "telekasten.nvim";
|
||||||
rev = "3fd50c62c1ed2f973ce8639c1218445e4e91a962";
|
rev = "8c2b3889eb31009ae510a43384d1957b37654176";
|
||||||
sha256 = "0r7fcl8w93amzi4i30mp2amqnv3xahi62djzalfj11w6p3fbrg4l";
|
sha256 = "1isbz68lbdm50x9mid0l1jid8q11msfsaayw8ravac0z5ybdb8k3";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/renerocksai/telekasten.nvim/";
|
meta.homepage = "https://github.com/renerocksai/telekasten.nvim/";
|
||||||
@ -10222,12 +10235,12 @@ final: prev:
|
|||||||
|
|
||||||
toggleterm-nvim = buildVimPlugin {
|
toggleterm-nvim = buildVimPlugin {
|
||||||
pname = "toggleterm.nvim";
|
pname = "toggleterm.nvim";
|
||||||
version = "2023-12-06";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "akinsho";
|
owner = "akinsho";
|
||||||
repo = "toggleterm.nvim";
|
repo = "toggleterm.nvim";
|
||||||
rev = "cbd041d91b90cd3c02df03fe6133208888f8e008";
|
rev = "91be5f327e42aa016da13b277540de8dba0b14e3";
|
||||||
sha256 = "004sa4y23y3aa48fkmyj2z20s6gsl735kpw9yjbh7nyqnp1jk45w";
|
sha256 = "08pvns6275c1vjgnppcvz8jl0irqgwwf9135ck07fxxl1x2h3yw5";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
|
||||||
};
|
};
|
||||||
@ -10402,12 +10415,12 @@ final: prev:
|
|||||||
|
|
||||||
typst-vim = buildVimPlugin {
|
typst-vim = buildVimPlugin {
|
||||||
pname = "typst.vim";
|
pname = "typst.vim";
|
||||||
version = "2023-12-10";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kaarmu";
|
owner = "kaarmu";
|
||||||
repo = "typst.vim";
|
repo = "typst.vim";
|
||||||
rev = "d905047f8a173dae8d86bc3ab83b54b2da56845b";
|
rev = "308e7737d09de8c1100320ddc6bc270615ae791a";
|
||||||
sha256 = "1rxpj90q1xck6rnmmzl2klssaiykllpf6r3ckvbhg7abms1i0zcf";
|
sha256 = "076ylgny48bl5iajw0hh3bqwlchj9pygq2bf3y0qlwckrzq05nbn";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/kaarmu/typst.vim/";
|
meta.homepage = "https://github.com/kaarmu/typst.vim/";
|
||||||
};
|
};
|
||||||
@ -10450,12 +10463,12 @@ final: prev:
|
|||||||
|
|
||||||
unison = buildVimPlugin {
|
unison = buildVimPlugin {
|
||||||
pname = "unison";
|
pname = "unison";
|
||||||
version = "2023-12-09";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "unisonweb";
|
owner = "unisonweb";
|
||||||
repo = "unison";
|
repo = "unison";
|
||||||
rev = "edd9ab2adfad86169e532208d31030be677ec692";
|
rev = "a91e3c32060862ea2ba1ebdedd3d3eaa636edcdd";
|
||||||
sha256 = "07fi49wwzmfzzwq00vb6npxznp6cfnm436w8hks3smwnbhxpn69h";
|
sha256 = "15wm2jx6vrrx8f00g7p0w3jzqgpg6c0jbzj2n7h6vl93s7d65207";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/unisonweb/unison/";
|
meta.homepage = "https://github.com/unisonweb/unison/";
|
||||||
};
|
};
|
||||||
@ -12346,11 +12359,11 @@ final: prev:
|
|||||||
|
|
||||||
vim-graphql = buildVimPlugin {
|
vim-graphql = buildVimPlugin {
|
||||||
pname = "vim-graphql";
|
pname = "vim-graphql";
|
||||||
version = "2023-09-11";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jparise";
|
owner = "jparise";
|
||||||
repo = "vim-graphql";
|
repo = "vim-graphql";
|
||||||
rev = "6089a44e89e76f9eba138fb68bfd132420404ff7";
|
rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1";
|
||||||
sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2";
|
sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/jparise/vim-graphql/";
|
meta.homepage = "https://github.com/jparise/vim-graphql/";
|
||||||
@ -12900,12 +12913,12 @@ final: prev:
|
|||||||
|
|
||||||
vim-just = buildVimPlugin {
|
vim-just = buildVimPlugin {
|
||||||
pname = "vim-just";
|
pname = "vim-just";
|
||||||
version = "2023-12-08";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NoahTheDuke";
|
owner = "NoahTheDuke";
|
||||||
repo = "vim-just";
|
repo = "vim-just";
|
||||||
rev = "ee884dc7d45251d92f5972c4556c12fc101419c0";
|
rev = "db122b74305993402150e18fad9568a5a0b542e8";
|
||||||
sha256 = "1lxb62wscfn50kpikz39q6fmywn8xdy46yc1ll5chmllrg48w8kq";
|
sha256 = "0d1m1nda6r8wpbywl27xg3dwjfxnxy1vwiq9pp3m77d9blcnwgwf";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||||
};
|
};
|
||||||
@ -13128,12 +13141,12 @@ final: prev:
|
|||||||
|
|
||||||
vim-lsp = buildVimPlugin {
|
vim-lsp = buildVimPlugin {
|
||||||
pname = "vim-lsp";
|
pname = "vim-lsp";
|
||||||
version = "2023-11-25";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "prabirshrestha";
|
owner = "prabirshrestha";
|
||||||
repo = "vim-lsp";
|
repo = "vim-lsp";
|
||||||
rev = "3af8f3b38effc4a631a15bb283a4b701c251275d";
|
rev = "dd862d343029d869e5d6bc9fdc89d258f5270a1d";
|
||||||
sha256 = "1qca60s39q0w7l4zhj63jarh26dkqik8pw8ncwlbkinvfv5h3dbi";
|
sha256 = "04n6hjgg4lsgazyz4s0w4ww8xy25plsmlvbpg86mg9q8si0p6k7z";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
|
||||||
};
|
};
|
||||||
@ -13273,12 +13286,12 @@ final: prev:
|
|||||||
|
|
||||||
vim-markdown-toc = buildVimPlugin {
|
vim-markdown-toc = buildVimPlugin {
|
||||||
pname = "vim-markdown-toc";
|
pname = "vim-markdown-toc";
|
||||||
version = "2022-08-29";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mzlogin";
|
owner = "mzlogin";
|
||||||
repo = "vim-markdown-toc";
|
repo = "vim-markdown-toc";
|
||||||
rev = "7ec05df27b4922830ace2246de36ac7e53bea1db";
|
rev = "0e2c7cdc3ac1d067eb309a10220d001bb7be39cd";
|
||||||
sha256 = "1806c3g07gbggj5xv30v78c6czarl5v11aa2rxb7igizfsn13vwv";
|
sha256 = "0ggdbvv4mca4z0xhkdybimc4yy3bah1v21660wjs8n2v4f5rvslx";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/";
|
meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/";
|
||||||
};
|
};
|
||||||
@ -14581,12 +14594,12 @@ final: prev:
|
|||||||
|
|
||||||
vim-snippets = buildVimPlugin {
|
vim-snippets = buildVimPlugin {
|
||||||
pname = "vim-snippets";
|
pname = "vim-snippets";
|
||||||
version = "2023-11-29";
|
version = "2023-12-11";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "honza";
|
owner = "honza";
|
||||||
repo = "vim-snippets";
|
repo = "vim-snippets";
|
||||||
rev = "ec4ff7e9c9b274e93295924e59c82b4f51e2ae42";
|
rev = "a8dc763b3f534ec1a0c0ae5082689c10dcaf9d5f";
|
||||||
sha256 = "04gsma772cf6rxig2b3d37pvmv3y7sg7qjczkr5fjahsxafr4rpg";
|
sha256 = "1qavvd6hx4r898dpn70h805crgx8s2n9ldrd17z7ir6zp6c6gp0m";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/honza/vim-snippets/";
|
meta.homepage = "https://github.com/honza/vim-snippets/";
|
||||||
};
|
};
|
||||||
@ -15482,12 +15495,12 @@ final: prev:
|
|||||||
|
|
||||||
vimade = buildVimPlugin {
|
vimade = buildVimPlugin {
|
||||||
pname = "vimade";
|
pname = "vimade";
|
||||||
version = "2022-01-31";
|
version = "2023-12-12";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TaDaa";
|
owner = "TaDaa";
|
||||||
repo = "vimade";
|
repo = "vimade";
|
||||||
rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3";
|
rev = "31dd31c96fc03fb158e1f40f72f3661ef5a9152d";
|
||||||
sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd";
|
sha256 = "0wph29fkp5hcziy3ym9854dds9lrm0g7w4b98bx1ks05lgx6wxzq";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/TaDaa/vimade/";
|
meta.homepage = "https://github.com/TaDaa/vimade/";
|
||||||
};
|
};
|
||||||
@ -15925,6 +15938,18 @@ final: prev:
|
|||||||
meta.homepage = "https://github.com/guns/xterm-color-table.vim/";
|
meta.homepage = "https://github.com/guns/xterm-color-table.vim/";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
yanky-nvim = buildVimPlugin {
|
||||||
|
pname = "yanky.nvim";
|
||||||
|
version = "2023-11-27";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "gbprod";
|
||||||
|
repo = "yanky.nvim";
|
||||||
|
rev = "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f";
|
||||||
|
sha256 = "01pd9xgw9wh9xa4sk80g0n61ra4l9xvssqak6vv03kgrpyb1qizw";
|
||||||
|
};
|
||||||
|
meta.homepage = "https://github.com/gbprod/yanky.nvim/";
|
||||||
|
};
|
||||||
|
|
||||||
yats-vim = buildVimPlugin {
|
yats-vim = buildVimPlugin {
|
||||||
pname = "yats.vim";
|
pname = "yats.vim";
|
||||||
version = "2023-08-24";
|
version = "2023-08-24";
|
||||||
@ -16132,12 +16157,12 @@ final: prev:
|
|||||||
|
|
||||||
harpoon2 = buildVimPlugin {
|
harpoon2 = buildVimPlugin {
|
||||||
pname = "harpoon2";
|
pname = "harpoon2";
|
||||||
version = "2023-12-11";
|
version = "2023-12-13";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ThePrimeagen";
|
owner = "ThePrimeagen";
|
||||||
repo = "harpoon";
|
repo = "harpoon";
|
||||||
rev = "bb806acff3ceaec3b94bd3c92bc52945040004bf";
|
rev = "8f67088e9d479397347b63e69920ee861a9838cd";
|
||||||
sha256 = "1vfcp18s3pkfdhq5riw6fdwhyjb3q6m2kglp3wyganv8qrh7w1sh";
|
sha256 = "0j5m4hm3fzkfwf1mjy3mq9askf3jkb9d5bfy8v50k2z4l9imbvz1";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
|
meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
|
||||||
};
|
};
|
||||||
|
|||||||
@ -803,12 +803,12 @@
|
|||||||
};
|
};
|
||||||
gomod = buildGrammar {
|
gomod = buildGrammar {
|
||||||
language = "gomod";
|
language = "gomod";
|
||||||
version = "0.0.0+rev=f41a273";
|
version = "0.0.0+rev=af4270a";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "camdencheek";
|
owner = "camdencheek";
|
||||||
repo = "tree-sitter-go-mod";
|
repo = "tree-sitter-go-mod";
|
||||||
rev = "f41a27386f1cfa1271122db5f0ff59b910520007";
|
rev = "af4270aed18500af1d24e6de5f6e7d243e2c8b05";
|
||||||
hash = "sha256-U/kpBEgUqJzJ3qQ40TMBuM1UKI9+HxnFEmmN8FfvS5w=";
|
hash = "sha256-H4IrEXdGGa0GQEMcteKgIBl+bkAoOy64Om2uc6Aany0=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
|
meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
|
||||||
};
|
};
|
||||||
@ -902,12 +902,12 @@
|
|||||||
};
|
};
|
||||||
haskell = buildGrammar {
|
haskell = buildGrammar {
|
||||||
language = "haskell";
|
language = "haskell";
|
||||||
version = "0.0.0+rev=ca10c43";
|
version = "0.0.0+rev=d70b321";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "tree-sitter";
|
owner = "tree-sitter";
|
||||||
repo = "tree-sitter-haskell";
|
repo = "tree-sitter-haskell";
|
||||||
rev = "ca10c43a4c9bfe588c480d2941726c2fadcae699";
|
rev = "d70b321b8b702939d722c2c15f4c28d14e91a400";
|
||||||
hash = "sha256-HyS9Q6+WSUgyQ9mL5sZvQ4CHW+3MypT2U9b1X5NnMHc=";
|
hash = "sha256-CJ6xwEUhh/rGr07edmx99nY4eHdBdsysaOzmuKM6SDE=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell";
|
||||||
};
|
};
|
||||||
@ -979,12 +979,12 @@
|
|||||||
};
|
};
|
||||||
hoon = buildGrammar {
|
hoon = buildGrammar {
|
||||||
language = "hoon";
|
language = "hoon";
|
||||||
version = "0.0.0+rev=1d5df35";
|
version = "0.0.0+rev=0135187";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "urbit-pilled";
|
owner = "urbit-pilled";
|
||||||
repo = "tree-sitter-hoon";
|
repo = "tree-sitter-hoon";
|
||||||
rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6";
|
rev = "0135187126370cbf112d759a50eab4a5c913a827";
|
||||||
hash = "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U=";
|
hash = "sha256-9FHCBaHQ/iXL3asJ3OZD9Gc02kPtWPNlPyRXiaEhkMU=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
|
meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon";
|
||||||
};
|
};
|
||||||
@ -1455,12 +1455,12 @@
|
|||||||
};
|
};
|
||||||
nim = buildGrammar {
|
nim = buildGrammar {
|
||||||
language = "nim";
|
language = "nim";
|
||||||
version = "0.0.0+rev=1f9308c";
|
version = "0.0.0+rev=d41fd3e";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alaviss";
|
owner = "alaviss";
|
||||||
repo = "tree-sitter-nim";
|
repo = "tree-sitter-nim";
|
||||||
rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281";
|
rev = "d41fd3e4c1f83a0e6429c2d035209e107e80e6f8";
|
||||||
hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc=";
|
hash = "sha256-2OqwU10JW7l87v2QXtBn5znP8Ptq9GZ/1PNAQOXJPVA=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
|
meta.homepage = "https://github.com/alaviss/tree-sitter-nim";
|
||||||
};
|
};
|
||||||
@ -2087,12 +2087,12 @@
|
|||||||
};
|
};
|
||||||
slang = buildGrammar {
|
slang = buildGrammar {
|
||||||
language = "slang";
|
language = "slang";
|
||||||
version = "0.0.0+rev=11526ab";
|
version = "0.0.0+rev=ac07aa2";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "theHamsta";
|
owner = "theHamsta";
|
||||||
repo = "tree-sitter-slang";
|
repo = "tree-sitter-slang";
|
||||||
rev = "11526ab1a2514c7302f3c4af60b0ebc992cee086";
|
rev = "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7";
|
||||||
hash = "sha256-iDj2H1ScR478eE/ppxIDiLOx1Bb8e2KsWcWrKhlHACM=";
|
hash = "sha256-wWCXk7HnORmD1M761rv31yvPGLGynUyNYzrhZDNwzFs=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
|
meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
|
||||||
};
|
};
|
||||||
@ -2188,12 +2188,12 @@
|
|||||||
};
|
};
|
||||||
sql = buildGrammar {
|
sql = buildGrammar {
|
||||||
language = "sql";
|
language = "sql";
|
||||||
version = "0.0.0+rev=1b7d451";
|
version = "0.0.0+rev=b599f6a";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "derekstride";
|
owner = "derekstride";
|
||||||
repo = "tree-sitter-sql";
|
repo = "tree-sitter-sql";
|
||||||
rev = "1b7d451554f435d28c3217724acf00cdc627ee73";
|
rev = "b599f6a1ca37cb5bae827a424cd98371a0d91bdc";
|
||||||
hash = "sha256-d/nAvvvfTg91pKfN3iHvqD+wb/2Qk/OSl7MOq3n+yH4=";
|
hash = "sha256-GwDkAgWcMyASzfd8layZjjEigXelJbtQTgWe7VBLgwM=";
|
||||||
};
|
};
|
||||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||||
};
|
};
|
||||||
@ -2558,12 +2558,12 @@
|
|||||||
};
|
};
|
||||||
v = buildGrammar {
|
v = buildGrammar {
|
||||||
language = "v";
|
language = "v";
|
||||||
version = "0.0.0+rev=ce3481c";
|
version = "0.0.0+rev=fdd1374";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "v-analyzer";
|
owner = "v-analyzer";
|
||||||
repo = "v-analyzer";
|
repo = "v-analyzer";
|
||||||
rev = "ce3481c10eabed0ba36cfa9f72957c4d3f88689d";
|
rev = "fdd137445c50d73767548c1b2386e5f560d5d042";
|
||||||
hash = "sha256-Ro+Ft82dgfrFKZJI5GO+aLZS2qwgEh1pJMI9S6Z/8rU=";
|
hash = "sha256-LjO0gRuvu8i4JZ71KKJVdEb5xvE56JP+5wL9Hua/eRg=";
|
||||||
};
|
};
|
||||||
location = "tree_sitter_v";
|
location = "tree_sitter_v";
|
||||||
meta.homepage = "https://github.com/v-analyzer/v-analyzer";
|
meta.homepage = "https://github.com/v-analyzer/v-analyzer";
|
||||||
@ -2658,12 +2658,12 @@
|
|||||||
};
|
};
|
||||||
wing = buildGrammar {
|
wing = buildGrammar {
|
||||||
language = "wing";
|
language = "wing";
|
||||||
version = "0.0.0+rev=55f5626";
|
version = "0.0.0+rev=693ee4b";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "winglang";
|
owner = "winglang";
|
||||||
repo = "wing";
|
repo = "wing";
|
||||||
rev = "55f5626617726954a1a95aa93e363a6a04913fa1";
|
rev = "693ee4b3a995a9c305479b32c10e0a87013ff125";
|
||||||
hash = "sha256-vcSD1Dz4HUTaU3LtRfqRtryGHvuA7aSu5poLyD6UyLw=";
|
hash = "sha256-WgCeDShSDUJRSY3LcX8zT+JlJIxHwLhD7lKDIBLoIfc=";
|
||||||
};
|
};
|
||||||
location = "libs/tree-sitter-wing";
|
location = "libs/tree-sitter-wing";
|
||||||
generate = true;
|
generate = true;
|
||||||
|
|||||||
@ -1007,7 +1007,7 @@ self: super: {
|
|||||||
pname = "sg-nvim-rust";
|
pname = "sg-nvim-rust";
|
||||||
inherit (old) version src;
|
inherit (old) version src;
|
||||||
|
|
||||||
cargoHash = "sha256-ITrjY15Haz8hEztWym4q8YW2h0R8/kOYPaIYJu87sN4=";
|
cargoHash = "sha256-XaCBFAq/T17fz4Zn1OtG9Or3p4UwxXYKr+PTkl+Ho3k=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
@ -1113,6 +1113,10 @@ self: super: {
|
|||||||
dependencies = with self; [ nvim-treesitter ];
|
dependencies = with self; [ nvim-treesitter ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
startup-nvim = super.startup-nvim.overrideAttrs {
|
||||||
|
dependencies = with super; [ plenary-nvim ];
|
||||||
|
};
|
||||||
|
|
||||||
statix = buildVimPlugin rec {
|
statix = buildVimPlugin rec {
|
||||||
inherit (statix) pname src meta;
|
inherit (statix) pname src meta;
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
|||||||
@ -281,6 +281,7 @@ https://github.com/lambdalisue/fern.vim/,,
|
|||||||
https://github.com/wincent/ferret/,,
|
https://github.com/wincent/ferret/,,
|
||||||
https://github.com/j-hui/fidget.nvim/,,
|
https://github.com/j-hui/fidget.nvim/,,
|
||||||
https://github.com/bogado/file-line/,,
|
https://github.com/bogado/file-line/,,
|
||||||
|
https://github.com/lewis6991/fileline.nvim/,,
|
||||||
https://github.com/glacambre/firenvim/,HEAD,
|
https://github.com/glacambre/firenvim/,HEAD,
|
||||||
https://github.com/andviro/flake8-vim/,,
|
https://github.com/andviro/flake8-vim/,,
|
||||||
https://github.com/folke/flash.nvim/,HEAD,
|
https://github.com/folke/flash.nvim/,HEAD,
|
||||||
@ -547,6 +548,7 @@ https://github.com/Xuyuanp/nerdtree-git-plugin/,,
|
|||||||
https://github.com/miversen33/netman.nvim/,HEAD,
|
https://github.com/miversen33/netman.nvim/,HEAD,
|
||||||
https://github.com/oberblastmeister/neuron.nvim/,,
|
https://github.com/oberblastmeister/neuron.nvim/,,
|
||||||
https://github.com/fiatjaf/neuron.vim/,,
|
https://github.com/fiatjaf/neuron.vim/,,
|
||||||
|
https://github.com/Olical/nfnl/,main,
|
||||||
https://github.com/chr4/nginx.vim/,,
|
https://github.com/chr4/nginx.vim/,,
|
||||||
https://github.com/EdenEast/nightfox.nvim/,,
|
https://github.com/EdenEast/nightfox.nvim/,,
|
||||||
https://github.com/zah/nim.vim/,,
|
https://github.com/zah/nim.vim/,,
|
||||||
@ -648,8 +650,6 @@ https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
|
|||||||
https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
|
https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
|
||||||
https://github.com/windwp/nvim-ts-autotag/,,
|
https://github.com/windwp/nvim-ts-autotag/,,
|
||||||
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
|
https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
|
||||||
https://github.com/mrjones2014/nvim-ts-rainbow/,,
|
|
||||||
https://gitlab.com/HiPhish/nvim-ts-rainbow2,HEAD,
|
|
||||||
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
|
https://github.com/kevinhwang91/nvim-ufo/,HEAD,
|
||||||
https://github.com/samjwill/nvim-unception/,HEAD,
|
https://github.com/samjwill/nvim-unception/,HEAD,
|
||||||
https://github.com/kyazdani42/nvim-web-devicons/,,
|
https://github.com/kyazdani42/nvim-web-devicons/,,
|
||||||
@ -785,6 +785,7 @@ https://github.com/luukvbaal/stabilize.nvim/,,
|
|||||||
https://github.com/eigenfoo/stan-vim/,,
|
https://github.com/eigenfoo/stan-vim/,,
|
||||||
https://github.com/josegamez82/starrynight/,HEAD,
|
https://github.com/josegamez82/starrynight/,HEAD,
|
||||||
https://github.com/darfink/starsearch.vim/,,
|
https://github.com/darfink/starsearch.vim/,,
|
||||||
|
https://github.com/startup-nvim/startup.nvim/,HEAD,
|
||||||
https://github.com/luukvbaal/statuscol.nvim/,,
|
https://github.com/luukvbaal/statuscol.nvim/,,
|
||||||
https://github.com/teto/stylish.nvim/,HEAD,
|
https://github.com/teto/stylish.nvim/,HEAD,
|
||||||
https://github.com/gbprod/substitute.nvim/,HEAD,
|
https://github.com/gbprod/substitute.nvim/,HEAD,
|
||||||
@ -1341,6 +1342,7 @@ https://github.com/tweekmonster/wstrip.vim/,,
|
|||||||
https://github.com/piersolenski/wtf.nvim/,HEAD,
|
https://github.com/piersolenski/wtf.nvim/,HEAD,
|
||||||
https://github.com/drmingdrmer/xptemplate/,,
|
https://github.com/drmingdrmer/xptemplate/,,
|
||||||
https://github.com/guns/xterm-color-table.vim/,,
|
https://github.com/guns/xterm-color-table.vim/,,
|
||||||
|
https://github.com/gbprod/yanky.nvim/,HEAD,
|
||||||
https://github.com/HerringtonDarkholme/yats.vim/,,
|
https://github.com/HerringtonDarkholme/yats.vim/,,
|
||||||
https://github.com/lucasew/yescapsquit.vim/,HEAD,
|
https://github.com/lucasew/yescapsquit.vim/,HEAD,
|
||||||
https://github.com/elkowar/yuck.vim/,HEAD,
|
https://github.com/elkowar/yuck.vim/,HEAD,
|
||||||
|
|||||||
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gum";
|
pname = "gum";
|
||||||
version = "0.12.0";
|
version = "0.13.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "charmbracelet";
|
owner = "charmbracelet";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-hJuFfdUeUUIjTBRtUo2x24BDuMPPkkReGLFDZSHR9pA=";
|
hash = "sha256-NgMEgSfHVLCEKZ3MmNV571ySMUD8wj+kq5EccGrxtZc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-tEeP8i2I9/Q4tuswkeV1S3jpc7saLxtzzLQxcPUh1sM=";
|
vendorHash = "sha256-fmc6nbS/Xmn/YRwToRH7EhP4SFRMf8hjZ/rLtaP/USo=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
installShellFiles
|
installShellFiles
|
||||||
|
|||||||
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
|||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "process-compose";
|
pname = "process-compose";
|
||||||
version = "0.69.0";
|
version = "0.77.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "F1bonacc1";
|
owner = "F1bonacc1";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c=";
|
hash = "sha256-uouF43SokBD+LCMqSDWJ3pj2LznfJYJoUkoTQ1TyYyI=";
|
||||||
# populate values that require us to use git. By doing this in postFetch we
|
# populate values that require us to use git. By doing this in postFetch we
|
||||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
@ -43,7 +43,7 @@ buildGoModule rec {
|
|||||||
installShellFiles
|
installShellFiles
|
||||||
];
|
];
|
||||||
|
|
||||||
vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4=";
|
vendorHash = "sha256-0On/Rg8c9g45qbLuwhP/ZIGosu0X1uzXfAoddgTCDkg=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|||||||
@ -8,16 +8,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "avalanchego";
|
pname = "avalanchego";
|
||||||
version = "1.10.15";
|
version = "1.10.17";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ava-labs";
|
owner = "ava-labs";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-vx9Vfbdxd3Y0fdjpKC6LFAUEej1RHszyM5GUUGKy0zU=";
|
hash = "sha256-KttDsSOrnaFsGHoKnYkj94U6WbHXJP2RJNtqSMs3PTo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-br/z6k1D1r9JEECKNy7BOZzfHaaveCMUA1bKos0+p0Q=";
|
vendorHash = "sha256-B4UuVmUf1aFu+7gFAdTLcm+iZoTwVFmBcckOXQxRuI0=";
|
||||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||||
proxyVendor = true;
|
proxyVendor = true;
|
||||||
|
|
||||||
|
|||||||
@ -8,13 +8,13 @@
|
|||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "bosh-cli";
|
pname = "bosh-cli";
|
||||||
|
|
||||||
version = "7.5.0";
|
version = "7.5.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cloudfoundry";
|
owner = "cloudfoundry";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-LWfS722V0ubh4QaUNuGwrvFsVAzA9Hd5xLlDfTG0PBs=";
|
sha256 = "sha256-rgqs7L0V4OFOfHZw6poS/DxcCgxmcKZAc3TAal7B8FA=";
|
||||||
};
|
};
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|
||||||
|
|||||||
@ -1,89 +0,0 @@
|
|||||||
{ lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
|
|
||||||
, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
|
|
||||||
, libGL, xcbutilkeysyms, xdg-utils, libtool }:
|
|
||||||
|
|
||||||
let
|
|
||||||
version = "4.30.5.1682";
|
|
||||||
|
|
||||||
rpath = lib.makeLibraryPath [
|
|
||||||
xdg-utils
|
|
||||||
xorg.libXext
|
|
||||||
xorg.libSM
|
|
||||||
xorg.libICE
|
|
||||||
xorg.libX11
|
|
||||||
xorg.libXrandr
|
|
||||||
xorg.libXdamage
|
|
||||||
xorg.libXrender
|
|
||||||
xorg.libXfixes
|
|
||||||
xorg.libXcomposite
|
|
||||||
xorg.libXcursor
|
|
||||||
xorg.libxcb
|
|
||||||
xorg.libXi
|
|
||||||
xorg.libXScrnSaver
|
|
||||||
xorg.libXtst
|
|
||||||
freetype
|
|
||||||
fontconfig
|
|
||||||
openssl
|
|
||||||
glib
|
|
||||||
nss
|
|
||||||
nspr
|
|
||||||
dbus
|
|
||||||
alsa-lib
|
|
||||||
zlib
|
|
||||||
libtool
|
|
||||||
libxml2
|
|
||||||
libxslt
|
|
||||||
expat
|
|
||||||
xcbutilkeysyms
|
|
||||||
systemd
|
|
||||||
libGL
|
|
||||||
] + ":${stdenv.cc.cc.lib}/lib64";
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
pname = "hipchat";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";
|
|
||||||
sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
|
||||||
|
|
||||||
buildCommand = ''
|
|
||||||
ar x $src
|
|
||||||
tar xfvz data.tar.gz
|
|
||||||
|
|
||||||
mkdir -p $out/libexec/hipchat
|
|
||||||
d=$out/libexec/hipchat/lib
|
|
||||||
mv opt/HipChat4/* $out/libexec/hipchat/
|
|
||||||
mv usr/share $out
|
|
||||||
|
|
||||||
for file in $(find $d -type f); do
|
|
||||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true
|
|
||||||
patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true
|
|
||||||
done
|
|
||||||
|
|
||||||
patchShebangs $d/linuxbrowserlaunch.sh
|
|
||||||
|
|
||||||
substituteInPlace $out/share/applications/hipchat4.desktop \
|
|
||||||
--replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat
|
|
||||||
|
|
||||||
makeWrapper $d/HipChat.bin $out/bin/hipchat \
|
|
||||||
--run 'export HIPCHAT_LD_LIBRARY_PATH=$LD_LIBRARY_PATH' \
|
|
||||||
--run 'export HIPCHAT_QT_PLUGIN_PATH=$QT_PLUGIN_PATH' \
|
|
||||||
--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb \
|
|
||||||
--set QTWEBENGINEPROCESS_PATH $d/QtWebEngineProcess
|
|
||||||
|
|
||||||
makeWrapper $d/QtWebEngineProcess.bin $d/QtWebEngineProcess \
|
|
||||||
--set QT_PLUGIN_PATH "$d/plugins"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Desktop client for HipChat services";
|
|
||||||
homepage = "http://www.hipchat.com";
|
|
||||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
|
||||||
license = licenses.unfree;
|
|
||||||
platforms = [ "x86_64-linux" ];
|
|
||||||
maintainers = with maintainers; [ puffnfresh ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -2,5 +2,5 @@
|
|||||||
signal-desktop = if hostPlatform.system == "aarch64-linux"
|
signal-desktop = if hostPlatform.system == "aarch64-linux"
|
||||||
then callPackage ./signal-desktop-aarch64.nix { }
|
then callPackage ./signal-desktop-aarch64.nix { }
|
||||||
else callPackage ./signal-desktop.nix { };
|
else callPackage ./signal-desktop.nix { };
|
||||||
signal-desktop-beta = ./signal-desktop-beta.nix;
|
signal-desktop-beta = callPackage ./signal-desktop-beta.nix{ };
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env nix-shell
|
#!/usr/bin/env nix-shell
|
||||||
#!nix-shell -i bash -p bash nix-update curl coreutils
|
#!nix-shell -i bash -p bash nix-update curl coreutils jq
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
@ -18,7 +18,7 @@ signal-desktop)
|
|||||||
echo "Updating signal-desktop for x86_64-linux"
|
echo "Updating signal-desktop for x86_64-linux"
|
||||||
nix-update --version "$latestVersion" \
|
nix-update --version "$latestVersion" \
|
||||||
--system x86_64-linux \
|
--system x86_64-linux \
|
||||||
--override-filename "$SCRIPT_DIR/signal-desktop.nix"
|
--override-filename "$SCRIPT_DIR/signal-desktop.nix" \
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
|
||||||
echo "Updating signal-desktop for aarch64-linux"
|
echo "Updating signal-desktop for aarch64-linux"
|
||||||
|
|||||||
@ -7,16 +7,16 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "iroh";
|
pname = "iroh";
|
||||||
version = "0.5.1";
|
version = "0.11.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "n0-computer";
|
owner = "n0-computer";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${pname}-v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-p1OvXso5szo8ZCnCTKgDzCEMJgiePXQMhVYOkWVZrbE=";
|
hash = "sha256-b3XpKAV/K+69tQmjM1CGzoOTcaQHB6q3gpoSa/YFwak=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-QqMBEYaIQ6PqO7w7Yd1jVr0zHARsVaJtZzWytmDksZQ=";
|
cargoHash = "sha256-dnEEque40qi7vuUxY/UDZ5Kz8LTuz0GvYVjTxl8eMvI=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin (
|
buildInputs = lib.optionals stdenv.isDarwin (
|
||||||
with darwin.apple_sdk.frameworks; [
|
with darwin.apple_sdk.frameworks; [
|
||||||
|
|||||||
150
pkgs/applications/office/zotero/zotero_7.nix
Normal file
150
pkgs/applications/office/zotero/zotero_7.nix
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, wrapGAppsHook
|
||||||
|
, autoPatchelfHook
|
||||||
|
, makeDesktopItem
|
||||||
|
, atk
|
||||||
|
, cairo
|
||||||
|
, coreutils
|
||||||
|
, curl
|
||||||
|
, cups
|
||||||
|
, dbus-glib
|
||||||
|
, dbus
|
||||||
|
, dconf
|
||||||
|
, fontconfig
|
||||||
|
, freetype
|
||||||
|
, gdk-pixbuf
|
||||||
|
, glib
|
||||||
|
, glibc
|
||||||
|
, gtk3
|
||||||
|
, libX11
|
||||||
|
, libXScrnSaver
|
||||||
|
, libxcb
|
||||||
|
, libXcomposite
|
||||||
|
, libXcursor
|
||||||
|
, libXdamage
|
||||||
|
, libXext
|
||||||
|
, libXfixes
|
||||||
|
, libXi
|
||||||
|
, libXinerama
|
||||||
|
, libXrender
|
||||||
|
, libXt
|
||||||
|
, libnotify
|
||||||
|
, gnome
|
||||||
|
, libGLU
|
||||||
|
, libGL
|
||||||
|
, nspr
|
||||||
|
, nss
|
||||||
|
, pango
|
||||||
|
, gsettings-desktop-schemas
|
||||||
|
, alsa-lib
|
||||||
|
, libXtst
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "zotero";
|
||||||
|
version = "7.0.0-beta";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://download.zotero.org/client/beta/${version}.51%2B7c5600913/Zotero-${version}.51%2B7c5600913_linux-x86_64.tar.bz2";
|
||||||
|
hash = "sha256-zJ+jG7zlvWq+WEYOPyMIhqHPfsUe9tn0cbRyibQ7bFw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
wrapGAppsHook
|
||||||
|
autoPatchelfHook
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
gsettings-desktop-schemas
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
gnome.adwaita-icon-theme
|
||||||
|
dconf
|
||||||
|
libXtst
|
||||||
|
alsa-lib
|
||||||
|
stdenv.cc.cc
|
||||||
|
atk
|
||||||
|
cairo
|
||||||
|
curl
|
||||||
|
cups
|
||||||
|
dbus-glib
|
||||||
|
dbus
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
gdk-pixbuf
|
||||||
|
glib
|
||||||
|
glibc
|
||||||
|
gtk3
|
||||||
|
libX11
|
||||||
|
libXScrnSaver
|
||||||
|
libXcomposite
|
||||||
|
libXcursor
|
||||||
|
libxcb
|
||||||
|
libXdamage
|
||||||
|
libXext
|
||||||
|
libXfixes
|
||||||
|
libXi
|
||||||
|
libXinerama
|
||||||
|
libXrender
|
||||||
|
libXt
|
||||||
|
libnotify
|
||||||
|
libGLU
|
||||||
|
libGL
|
||||||
|
nspr
|
||||||
|
nss
|
||||||
|
pango
|
||||||
|
];
|
||||||
|
|
||||||
|
dontConfigure = true;
|
||||||
|
dontBuild = true;
|
||||||
|
dontStrip = true;
|
||||||
|
|
||||||
|
|
||||||
|
desktopItem = makeDesktopItem {
|
||||||
|
name = "zotero";
|
||||||
|
exec = "zotero -url %U";
|
||||||
|
icon = "zotero";
|
||||||
|
comment = meta.description;
|
||||||
|
desktopName = "Zotero";
|
||||||
|
genericName = "Reference Management";
|
||||||
|
categories = [ "Office" "Database" ];
|
||||||
|
startupNotify = true;
|
||||||
|
mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
|
||||||
|
cp -r * "$prefix/usr/lib/zotero-bin-${version}"
|
||||||
|
mkdir -p "$out/bin"
|
||||||
|
ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
|
||||||
|
|
||||||
|
# install desktop file and icons.
|
||||||
|
mkdir -p $out/share/applications
|
||||||
|
cp ${desktopItem}/share/applications/* $out/share/applications/
|
||||||
|
for size in 16 32 48 256; do
|
||||||
|
install -Dm444 chrome/icons/default/default$size.png \
|
||||||
|
$out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
|
||||||
|
done
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
gappsWrapperArgs+=(
|
||||||
|
--prefix PATH : ${lib.makeBinPath [ coreutils ]}
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://www.zotero.org";
|
||||||
|
description = "Collect, organize, cite, and share your research sources";
|
||||||
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
|
license = licenses.agpl3Only;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ atila ];
|
||||||
|
};
|
||||||
|
}
|
||||||
1021
pkgs/applications/system/asusctl/Cargo.lock
generated
1021
pkgs/applications/system/asusctl/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, e2fsprogs
|
|
||||||
, systemd
|
, systemd
|
||||||
, coreutils
|
, coreutils
|
||||||
, pkg-config
|
, pkg-config
|
||||||
@ -9,17 +8,18 @@
|
|||||||
, fontconfig
|
, fontconfig
|
||||||
, gtk3
|
, gtk3
|
||||||
, libappindicator
|
, libappindicator
|
||||||
|
, libGL
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "asusctl";
|
pname = "asusctl";
|
||||||
version = "4.7.2";
|
version = "5.0.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "asus-linux";
|
owner = "asus-linux";
|
||||||
repo = "asusctl";
|
repo = "asusctl";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-q4V0Cn6kZeyIMGxu/blVi/Ot8LIcv+GlZhpkTQNTjRU=";
|
hash = "sha256-ZdPSUXchQ19awvlNFVih38p6AU7KQ2RttUnm8zQnTWs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "";
|
cargoHash = "";
|
||||||
@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec {
|
|||||||
substituteInPlace $file --replace /usr/share $out/share
|
substituteInPlace $file --replace /usr/share $out/share
|
||||||
done
|
done
|
||||||
|
|
||||||
substituteInPlace asusd/src/ctrl_platform.rs --replace /usr/bin/chattr ${e2fsprogs}/bin/chattr
|
|
||||||
|
|
||||||
substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl
|
substituteInPlace data/asusd.rules --replace systemctl ${systemd}/bin/systemctl
|
||||||
substituteInPlace data/asusd.service \
|
substituteInPlace data/asusd.service \
|
||||||
--replace /usr/bin/asusd $out/bin/asusd \
|
--replace /usr/bin/asusd $out/bin/asusd \
|
||||||
@ -67,7 +65,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
patchelf --add-rpath "${libappindicator}/lib" "$out/bin/rog-control-center"
|
patchelf --add-rpath "${libappindicator}/lib:${libGL}/lib" "$out/bin/rog-control-center"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@ -1,33 +1,22 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchpatch
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, systemd
|
, systemd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "supergfxctl";
|
pname = "supergfxctl";
|
||||||
version = "5.1.1";
|
version = "5.1.2";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "asus-linux";
|
owner = "asus-linux";
|
||||||
repo = "supergfxctl";
|
repo = "supergfxctl";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
|
hash = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# fix reported version in Cargo.lock
|
cargoSha256 = "sha256-wPqCXbpSYXwsUi1mv9ZBSxdhDgDqsjKxnPzQcURlnDU=";
|
||||||
# submitted upstream: https://gitlab.com/asus-linux/supergfxctl/-/merge_requests/31
|
|
||||||
# FIXME: remove for next update
|
|
||||||
cargoPatches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.com/asus-linux/supergfxctl/-/commit/8812dd208791d162881d72f785650a3344ec5151.diff";
|
|
||||||
hash = "sha256-eFFj2nIwGXHV1vMIpZvdvFPtfNLDfgqyGRt+VvB03LE=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
cargoSha256 = "sha256-gbRGUWfpCQjCxuTdQ+qwOeCDU17G3nNFkIPAgzmeL+E=";
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd
|
substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd
|
||||||
|
|||||||
@ -51,16 +51,16 @@ let
|
|||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rio";
|
pname = "rio";
|
||||||
version = "0.0.30";
|
version = "0.0.32";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "raphamorim";
|
owner = "raphamorim";
|
||||||
repo = "rio";
|
repo = "rio";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-H5kFgLHw1UXJksrlDO/Owhm/O3+vpohl4h6XYokNWPA=";
|
hash = "sha256-lMqtXST7IuSfdiVl3bkKOhWhigFCulg9/r4jf5bTfXo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-FACRG25ORnSu4pPpn5ibUqtkylWiNBV88Pabqc81Gvg=";
|
cargoHash = "sha256-i+pS6eChSZBOqGXUJIqcOpDfOkrYNHqXV14lM0hZUdE=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
ncurses
|
ncurses
|
||||||
|
|||||||
@ -39,14 +39,14 @@ let
|
|||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "forgejo";
|
pname = "forgejo";
|
||||||
version = "1.21.2-0";
|
version = "1.21.2-1";
|
||||||
|
|
||||||
src = fetchFromGitea {
|
src = fetchFromGitea {
|
||||||
domain = "codeberg.org";
|
domain = "codeberg.org";
|
||||||
owner = "forgejo";
|
owner = "forgejo";
|
||||||
repo = "forgejo";
|
repo = "forgejo";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-kH4m958gmIYpIwYmT2kIj9FcfXdyh8no06E0WQII/6E=";
|
hash = "sha256-2dkl8QI82URhPV2f4cOUZfpAhlGwU197ZkLD9KitIiA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8=";
|
vendorHash = "sha256-+/wOEF44dSqy7ZThZyd66xyI3wVnFwZbsAd4ujyVku8=";
|
||||||
|
|||||||
@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bilibili";
|
pname = "bilibili";
|
||||||
version = "1.12.3-1";
|
version = "1.12.5-2";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
||||||
hash = "sha256-F2y5daIdNJZGNjOctN9iA6kHSRVSMWK8s80X+kXxzb4=";
|
hash = "sha256-oaQvJQVHXm7I+3rjt0DPMwGOXLhwgJP6wWu2bhaA1s4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
|
|||||||
@ -20,11 +20,17 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy
|
|||||||
, extraScripts ? []
|
, extraScripts ? []
|
||||||
, ... }@args:
|
, ... }@args:
|
||||||
let
|
let
|
||||||
|
strippedName = with builtins;
|
||||||
|
let groups = match "mpv[-_](.*)" pname; in
|
||||||
|
if groups != null
|
||||||
|
then head groups
|
||||||
|
else pname
|
||||||
|
;
|
||||||
# either passthru.scriptName, inferred from scriptPath, or from pname
|
# either passthru.scriptName, inferred from scriptPath, or from pname
|
||||||
scriptName = (args.passthru or {}).scriptName or (
|
scriptName = (args.passthru or {}).scriptName or (
|
||||||
if args ? scriptPath
|
if args ? scriptPath
|
||||||
then fileName args.scriptPath
|
then fileName args.scriptPath
|
||||||
else "${pname}.lua"
|
else "${strippedName}.lua"
|
||||||
);
|
);
|
||||||
scriptPath = args.scriptPath or "./${scriptName}";
|
scriptPath = args.scriptPath or "./${scriptName}";
|
||||||
in {
|
in {
|
||||||
|
|||||||
@ -14,7 +14,13 @@ buildLua {
|
|||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
description = "Automatically skips chapters based on title";
|
||||||
|
longDescription = ''
|
||||||
|
MPV script that skips chapters based on their title, categorized using regexes.
|
||||||
|
The set of skipped categories can be configured globally, or by an auto-profile.
|
||||||
|
'';
|
||||||
homepage = "https://github.com/po5/chapterskip";
|
homepage = "https://github.com/po5/chapterskip";
|
||||||
|
license = lib.licenses.unfree; # https://github.com/po5/chapterskip/issues/10
|
||||||
maintainers = with lib.maintainers; [ nicoo ];
|
maintainers = with lib.maintainers; [ nicoo ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,8 +17,6 @@ buildLua rec {
|
|||||||
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
|
'youtube_dl_executable = "${lib.getBin yt-dlp}/bin/yt-dlp"',
|
||||||
'';
|
'';
|
||||||
|
|
||||||
scriptPath = "playlistmanager.lua";
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Mpv lua script to create and manage playlists";
|
description = "Mpv lua script to create and manage playlists";
|
||||||
homepage = "https://github.com/jonniek/mpv-playlistmanager";
|
homepage = "https://github.com/jonniek/mpv-playlistmanager";
|
||||||
|
|||||||
@ -15,7 +15,6 @@ buildLua rec {
|
|||||||
hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns=";
|
hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns=";
|
||||||
};
|
};
|
||||||
|
|
||||||
scriptPath = "quality-menu.lua";
|
|
||||||
extraScripts = lib.optional oscSupport "quality-menu-osc.lua";
|
extraScripts = lib.optional oscSupport "quality-menu-osc.lua";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@ -11,8 +11,6 @@ buildLua {
|
|||||||
hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c=";
|
hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
scriptPath = "thumbfast.lua";
|
|
||||||
|
|
||||||
passthru.extraWrapperArgs = [
|
passthru.extraWrapperArgs = [
|
||||||
"--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin"
|
"--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin"
|
||||||
];
|
];
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
, cacert }:
|
, cacert }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.3.1";
|
version = "1.0.0";
|
||||||
withSubprojects = stdenv.mkDerivation {
|
withSubprojects = stdenv.mkDerivation {
|
||||||
name = "sources-with-subprojects";
|
name = "sources-with-subprojects";
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ let
|
|||||||
owner = "vivictorg";
|
owner = "vivictorg";
|
||||||
repo = "vivictpp";
|
repo = "vivictpp";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-6YfYeUrM7cq8hnOPMq0Uq/HToFBDri0N/r0SU0LeT/Y=";
|
hash = "sha256-dCtMjemEjXe63ELAfQhzJl3GecqWLcjL2y5Htn6hYgU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -33,7 +33,7 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = "sha256-lIm2Bwy61St9d1e6QSm5ZpSIDR9ucaQKBPHATTDEgW4=";
|
outputHash = "sha256-a7NBQJt5T+KwP8Djc8TQiVLNZF8UcXlXrv2G/dZ54aM=";
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "vivictpp";
|
pname = "vivictpp";
|
||||||
|
|||||||
@ -28,7 +28,6 @@
|
|||||||
, xcbutilwm
|
, xcbutilwm
|
||||||
, xwayland
|
, xwayland
|
||||||
, debug ? false
|
, debug ? false
|
||||||
, enableNvidiaPatches ? false
|
|
||||||
, enableXWayland ? true
|
, enableXWayland ? true
|
||||||
, legacyRenderer ? false
|
, legacyRenderer ? false
|
||||||
, withSystemd ? true
|
, withSystemd ? true
|
||||||
@ -36,18 +35,20 @@
|
|||||||
# deprecated flags
|
# deprecated flags
|
||||||
, nvidiaPatches ? false
|
, nvidiaPatches ? false
|
||||||
, hidpiXWayland ? false
|
, hidpiXWayland ? false
|
||||||
|
, enableNvidiaPatches ? false
|
||||||
}:
|
}:
|
||||||
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`";
|
assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
|
||||||
|
assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
|
||||||
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
|
assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||||
version = "0.32.3";
|
version = "0.33.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hyprwm";
|
owner = "hyprwm";
|
||||||
repo = finalAttrs.pname;
|
repo = finalAttrs.pname;
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
hash = "sha256-8PP26+ybmScq5WpFd2JPqUDzG2VggYOvD6/rzY9/CJ4=";
|
hash = "sha256-p7el5oQZPy9l1zyIrlHu6nA4BAu59eLoSqBjhkw2jaw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
wayland-protocols
|
wayland-protocols
|
||||||
pango
|
pango
|
||||||
pciutils
|
pciutils
|
||||||
(wlroots.override { inherit enableNvidiaPatches; })
|
wlroots
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]
|
++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ]
|
||||||
++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
|
++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
|
||||||
|
|||||||
@ -1,39 +1,9 @@
|
|||||||
{ fetchFromGitLab
|
{ fetchFromGitLab
|
||||||
, hyprland
|
|
||||||
, wlroots
|
, wlroots
|
||||||
, lib
|
|
||||||
, libdisplay-info
|
, libdisplay-info
|
||||||
, libliftoff
|
, libliftoff
|
||||||
, hwdata
|
, hwdata
|
||||||
, enableNvidiaPatches ? false
|
|
||||||
}:
|
}:
|
||||||
let
|
|
||||||
libdisplay-info-new = libdisplay-info.overrideAttrs (old: {
|
|
||||||
version = "0.1.1+date=2023-03-02";
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
domain = "gitlab.freedesktop.org";
|
|
||||||
owner = "emersion";
|
|
||||||
repo = old.pname;
|
|
||||||
rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
|
|
||||||
sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
libliftoff-new = libliftoff.overrideAttrs (old: {
|
|
||||||
version = "0.5.0-dev";
|
|
||||||
src = fetchFromGitLab {
|
|
||||||
domain = "gitlab.freedesktop.org";
|
|
||||||
owner = "emersion";
|
|
||||||
repo = old.pname;
|
|
||||||
rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
|
|
||||||
sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = toString [
|
|
||||||
"-Wno-error=sign-conversion"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
in
|
|
||||||
wlroots.overrideAttrs
|
wlroots.overrideAttrs
|
||||||
(old: {
|
(old: {
|
||||||
version = "0.17.0-dev";
|
version = "0.17.0-dev";
|
||||||
@ -42,29 +12,15 @@ wlroots.overrideAttrs
|
|||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "wlroots";
|
owner = "wlroots";
|
||||||
repo = "wlroots";
|
repo = "wlroots";
|
||||||
rev = "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1";
|
rev = "5d639394f3e83b01596dcd166a44a9a1a2583350";
|
||||||
hash = "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=";
|
hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pname =
|
pname = "${old.pname}-hyprland";
|
||||||
old.pname
|
|
||||||
+ "-hyprland"
|
|
||||||
+ lib.optionalString enableNvidiaPatches "-nvidia";
|
|
||||||
|
|
||||||
patches =
|
|
||||||
(old.patches or [ ])
|
|
||||||
++ (lib.optionals enableNvidiaPatches [
|
|
||||||
"${hyprland.src}/nix/patches/wlroots-nvidia.patch"
|
|
||||||
]);
|
|
||||||
|
|
||||||
# don't need old.postPatch for hwdata's path in wlroots 0.16
|
|
||||||
postPatch = lib.optionalString enableNvidiaPatches ''
|
|
||||||
substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = old.buildInputs ++ [
|
buildInputs = old.buildInputs ++ [
|
||||||
hwdata
|
hwdata
|
||||||
libdisplay-info-new
|
libdisplay-info
|
||||||
libliftoff-new
|
libliftoff
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|||||||
@ -49,6 +49,13 @@ stdenv.mkDerivation ({
|
|||||||
|
|
||||||
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
|
nativeImageBuildArgs = nativeImageBuildArgs ++ extraNativeImageBuildArgs ++ [ graalvmXmx ];
|
||||||
|
|
||||||
|
# Workaround GraalVM issue where the builder does not have access to the
|
||||||
|
# environment variables since 21.0.0
|
||||||
|
# https://github.com/oracle/graal/pull/6095
|
||||||
|
# https://github.com/oracle/graal/pull/6095
|
||||||
|
# https://github.com/oracle/graal/issues/7502
|
||||||
|
env.NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION = "true";
|
||||||
|
|
||||||
buildPhase = args.buildPhase or ''
|
buildPhase = args.buildPhase or ''
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
|
|||||||
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "ark-pixel-font";
|
pname = "ark-pixel-font";
|
||||||
version = "2023.08.15";
|
version = "2023.11.26";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "TakWolf";
|
owner = "TakWolf";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-Qaa3uuMCPrRG0wo2AGU0v+fonY1c/KuQYTGoyvITcio=";
|
hash = "sha256-6a9wNmcXlEesPthpMt+GrWyO3x6WVtemVTXP8rbWmLk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|||||||
46
pkgs/by-name/ff/ffsubsync/package.nix
Normal file
46
pkgs/by-name/ff/ffsubsync/package.nix
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
{ lib
|
||||||
|
, python3Packages
|
||||||
|
, fetchFromGitHub
|
||||||
|
}:
|
||||||
|
|
||||||
|
python3Packages.buildPythonApplication rec {
|
||||||
|
pname = "ffsubsync";
|
||||||
|
version = "0.4.25";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "smacke";
|
||||||
|
repo = "ffsubsync";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc=";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
auditok
|
||||||
|
charset-normalizer
|
||||||
|
faust-cchardet
|
||||||
|
ffmpeg-python
|
||||||
|
future
|
||||||
|
numpy
|
||||||
|
pysubs2
|
||||||
|
chardet
|
||||||
|
rich
|
||||||
|
six
|
||||||
|
srt
|
||||||
|
tqdm
|
||||||
|
typing-extensions
|
||||||
|
webrtcvad
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
|
||||||
|
|
||||||
|
pythonImportsCheck = [ "ffsubsync" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/smacke/ffsubsync";
|
||||||
|
description = "Automagically synchronize subtitles with video";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ Benjamin-L ];
|
||||||
|
mainProgram = "ffsubsync";
|
||||||
|
};
|
||||||
|
}
|
||||||
27
pkgs/by-name/fr/french-numbers/package.nix
Normal file
27
pkgs/by-name/fr/french-numbers/package.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, rustPlatform
|
||||||
|
, fetchCrate
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "french-numbers";
|
||||||
|
version = "1.2.0";
|
||||||
|
|
||||||
|
src = fetchCrate {
|
||||||
|
inherit pname version;
|
||||||
|
hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-YmG+4837j7g3iK/nsP2P+WVcOqaPxKiS0jhcxkpEGXw=";
|
||||||
|
|
||||||
|
cargoBuildFlags = [ "--features=cli" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Represent numbers in French language";
|
||||||
|
homepage = "https://github.com/evenfurther/french-numbers";
|
||||||
|
license = with licenses; [ asl20 /* or */ mit ];
|
||||||
|
mainProgram = "french-numbers";
|
||||||
|
maintainers = with maintainers; [ samueltardieu ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
buildNimPackage (finalAttrs: {
|
buildNimPackage (finalAttrs: {
|
||||||
pname = "mosdepth";
|
pname = "mosdepth";
|
||||||
version = "0.3.5";
|
version = "0.3.6";
|
||||||
|
|
||||||
requiredNimVersion = 1;
|
requiredNimVersion = 1;
|
||||||
|
|
||||||
@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: {
|
|||||||
owner = "brentp";
|
owner = "brentp";
|
||||||
repo = "mosdepth";
|
repo = "mosdepth";
|
||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc=";
|
sha256 = "sha256-7N42S3xfQRkrBmoLf0DsbLMpVULAFpHm5JugDMDzAgU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
lockFile = ./lock.json;
|
lockFile = ./lock.json;
|
||||||
|
|||||||
49
pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
Normal file
49
pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchFromGitHub
|
||||||
|
, nixosTests
|
||||||
|
, gitUpdater
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "noto-fonts-cjk-sans";
|
||||||
|
version = "2.004";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "notofonts";
|
||||||
|
repo = "noto-cjk";
|
||||||
|
rev = "Sans${version}";
|
||||||
|
hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
|
||||||
|
sparseCheckout = [ "Sans/Variable/OTC" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater {
|
||||||
|
rev-prefix = "Sans";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Beautiful and free fonts for CJK languages";
|
||||||
|
homepage = "https://www.google.com/get/noto/help/cjk/";
|
||||||
|
longDescription = ''
|
||||||
|
Noto Sans CJK is a sans typeface designed as
|
||||||
|
an intermediate style between the modern and traditional. It is
|
||||||
|
intended to be a multi-purpose digital font for user interface
|
||||||
|
designs, digital content, reading on laptops, mobile devices, and
|
||||||
|
electronic books. Noto Sans CJK comprehensively covers
|
||||||
|
Simplified Chinese, Traditional Chinese, Japanese, and Korean in a
|
||||||
|
unified font family. It supports regional variants of ideographic
|
||||||
|
characters for each of the four languages. In addition, it supports
|
||||||
|
Japanese kana, vertical forms, and variant characters (itaiji); it
|
||||||
|
supports Korean hangeul — both contemporary and archaic.
|
||||||
|
'';
|
||||||
|
license = lib.licenses.ofl;
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
maintainers = with lib.maintainers; [ mathnerd314 emily ];
|
||||||
|
};
|
||||||
|
}
|
||||||
49
pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
Normal file
49
pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchFromGitHub
|
||||||
|
, nixosTests
|
||||||
|
, gitUpdater
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "noto-fonts-cjk-serif";
|
||||||
|
version = "2.002";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "notofonts";
|
||||||
|
repo = "noto-cjk";
|
||||||
|
rev = "Serif${version}";
|
||||||
|
hash = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s=";
|
||||||
|
sparseCheckout = [ "Serif/Variable/OTC" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater {
|
||||||
|
rev-prefix = "Serif";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Beautiful and free fonts for CJK languages";
|
||||||
|
homepage = "https://www.google.com/get/noto/help/cjk/";
|
||||||
|
longDescription = ''
|
||||||
|
Noto Serif CJK is a serif typeface designed as
|
||||||
|
an intermediate style between the modern and traditional. It is
|
||||||
|
intended to be a multi-purpose digital font for user interface
|
||||||
|
designs, digital content, reading on laptops, mobile devices, and
|
||||||
|
electronic books. Noto Serif CJK comprehensively covers
|
||||||
|
Simplified Chinese, Traditional Chinese, Japanese, and Korean in a
|
||||||
|
unified font family. It supports regional variants of ideographic
|
||||||
|
characters for each of the four languages. In addition, it supports
|
||||||
|
Japanese kana, vertical forms, and variant characters (itaiji); it
|
||||||
|
supports Korean hangeul — both contemporary and archaic.
|
||||||
|
'';
|
||||||
|
license = licenses.ofl;
|
||||||
|
platforms = platforms.all;
|
||||||
|
maintainers = with maintainers; [ mathnerd314 emily ];
|
||||||
|
};
|
||||||
|
}
|
||||||
69
pkgs/by-name/no/noto-fonts-color-emoji/package.nix
Normal file
69
pkgs/by-name/no/noto-fonts-color-emoji/package.nix
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchFromGitHub
|
||||||
|
, buildPackages
|
||||||
|
, pkg-config
|
||||||
|
, cairo
|
||||||
|
, imagemagick
|
||||||
|
, zopfli
|
||||||
|
, pngquant
|
||||||
|
, which
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
emojiPythonEnv =
|
||||||
|
buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]);
|
||||||
|
in
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "noto-fonts-color-emoji";
|
||||||
|
version = "2.042";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "googlefonts";
|
||||||
|
repo = "noto-emoji";
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54=";
|
||||||
|
};
|
||||||
|
|
||||||
|
depsBuildBuild = [
|
||||||
|
buildPackages.stdenv.cc
|
||||||
|
pkg-config
|
||||||
|
cairo
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
imagemagick
|
||||||
|
zopfli
|
||||||
|
pngquant
|
||||||
|
which
|
||||||
|
emojiPythonEnv
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
patchShebangs *.py
|
||||||
|
patchShebangs third_party/color_emoji/*.py
|
||||||
|
# remove check for virtualenv, since we handle
|
||||||
|
# python requirements using python.withPackages
|
||||||
|
sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
|
||||||
|
# Make the build verbose so it won't get culled by Hydra thinking that
|
||||||
|
# it somehow got stuck doing nothing.
|
||||||
|
sed -i 's;\t@;\t;' Makefile
|
||||||
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
mkdir -p $out/share/fonts/noto
|
||||||
|
cp NotoColorEmoji.ttf $out/share/fonts/noto
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Color emoji font";
|
||||||
|
homepage = "https://github.com/googlefonts/noto-emoji";
|
||||||
|
license = with lib.licenses; [ ofl asl20 ];
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
maintainers = with lib.maintainers; [ mathnerd314 sternenseemann ];
|
||||||
|
};
|
||||||
|
}
|
||||||
30
pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
Normal file
30
pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchurl
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "noto-fonts-emoji-blob-bin";
|
||||||
|
version = "15.0";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf";
|
||||||
|
hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Noto Emoji with extended Blob support";
|
||||||
|
homepage = "https://github.com/C1710/blobmoji";
|
||||||
|
license = with lib.licenses; [ ofl asl20 ];
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
maintainers = with lib.maintainers; [ rileyinman jk ];
|
||||||
|
};
|
||||||
|
}
|
||||||
53
pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
Normal file
53
pkgs/by-name/no/noto-fonts-monochrome-emoji/package.nix
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchurl
|
||||||
|
}:
|
||||||
|
|
||||||
|
# Metadata fetched from
|
||||||
|
# https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji
|
||||||
|
let
|
||||||
|
metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items;
|
||||||
|
urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json);
|
||||||
|
in
|
||||||
|
stdenvNoCC.mkDerivation {
|
||||||
|
pname = "noto-fonts-monochrome-emoji";
|
||||||
|
version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}";
|
||||||
|
preferLocalBuild = true;
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
srcs =
|
||||||
|
let
|
||||||
|
weightNames = {
|
||||||
|
"300" = "Light";
|
||||||
|
regular = "Regular";
|
||||||
|
"500" = "Medium";
|
||||||
|
"600" = "SemiBold";
|
||||||
|
"700" = "Bold";
|
||||||
|
};
|
||||||
|
in
|
||||||
|
lib.mapAttrsToList
|
||||||
|
(variant: url: fetchurl {
|
||||||
|
name = "NotoEmoji-${weightNames.${variant}}.ttf";
|
||||||
|
hash = urlHashes.${url};
|
||||||
|
inherit url;
|
||||||
|
})
|
||||||
|
metadata.files;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
for src in $srcs; do
|
||||||
|
install -D $src $out/share/fonts/noto/$(stripHash $src)
|
||||||
|
done
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Monochrome emoji font";
|
||||||
|
homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji";
|
||||||
|
license = [ lib.licenses.ofl ];
|
||||||
|
maintainers = [ lib.maintainers.nicoo ];
|
||||||
|
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||||
|
};
|
||||||
|
}
|
||||||
73
pkgs/by-name/no/noto-fonts/package.nix
Normal file
73
pkgs/by-name/no/noto-fonts/package.nix
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
{ lib
|
||||||
|
, stdenvNoCC
|
||||||
|
, fetchFromGitHub
|
||||||
|
, gitUpdater
|
||||||
|
, variants ? [ ]
|
||||||
|
, suffix ? ""
|
||||||
|
, longDescription ? ''
|
||||||
|
When text is rendered by a computer, sometimes characters are
|
||||||
|
displayed as “tofu”. They are little boxes to indicate your device
|
||||||
|
doesn’t have a font to display the text.
|
||||||
|
Google has been developing a font family called Noto, which aims to
|
||||||
|
support all languages with a harmonious look and feel. Noto is
|
||||||
|
Google’s answer to tofu. The name noto is to convey the idea that
|
||||||
|
Google’s goal is to see “no more tofu”. Noto has multiple styles and
|
||||||
|
weights, and freely available to all.
|
||||||
|
''
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenvNoCC.mkDerivation rec {
|
||||||
|
pname = "noto-fonts${suffix}";
|
||||||
|
version = "23.11.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "notofonts";
|
||||||
|
repo = "notofonts.github.io";
|
||||||
|
rev = "noto-monthly-release-${version}";
|
||||||
|
hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8=";
|
||||||
|
};
|
||||||
|
|
||||||
|
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
# We check availability in order of variable -> otf -> ttf
|
||||||
|
# unhinted -- the hinted versions use autohint
|
||||||
|
# maintaining maximum coverage.
|
||||||
|
#
|
||||||
|
# We have a mix of otf and ttf fonts
|
||||||
|
local out_font=$out/share/fonts/noto
|
||||||
|
'' + (if _variants == [ ] then ''
|
||||||
|
for folder in $(ls -d fonts/*/); do
|
||||||
|
if [[ -d "$folder"unhinted/variable-ttf ]]; then
|
||||||
|
install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf
|
||||||
|
elif [[ -d "$folder"unhinted/otf ]]; then
|
||||||
|
install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf
|
||||||
|
else
|
||||||
|
install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'' else ''
|
||||||
|
for variant in $_variants; do
|
||||||
|
if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
|
||||||
|
install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
|
||||||
|
elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
|
||||||
|
install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf
|
||||||
|
else
|
||||||
|
install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'');
|
||||||
|
|
||||||
|
passthru.updateScript = gitUpdater {
|
||||||
|
rev-prefix = "noto-monthly-release-";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Beautiful and free fonts for many languages";
|
||||||
|
homepage = "https://www.google.com/get/noto/";
|
||||||
|
inherit longDescription;
|
||||||
|
license = lib.licenses.ofl;
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
maintainers = with lib.maintainers; [ mathnerd314 emily jopejoe1 ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -5,12 +5,13 @@
|
|||||||
}:
|
}:
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||||
pname = "warp-terminal";
|
pname = "warp-terminal";
|
||||||
version = "0.2023.11.07.08.02.stable_00";
|
version = "0.2023.12.05.08.02.stable_00";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg";
|
url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg";
|
||||||
hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis=";
|
hash = "sha256-9olAmczIPRXV15NYCOYmwuEmJ7lMeaQRTTfukaYXMR0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
|
||||||
nativeBuildInputs = [ undmg ];
|
nativeBuildInputs = [ undmg ];
|
||||||
|
|||||||
@ -1,305 +0,0 @@
|
|||||||
{ stdenv
|
|
||||||
, stdenvNoCC
|
|
||||||
, lib
|
|
||||||
, gitUpdater
|
|
||||||
, fetchFromGitHub
|
|
||||||
, fetchurl
|
|
||||||
, cairo
|
|
||||||
, nixosTests
|
|
||||||
, pkg-config
|
|
||||||
, pngquant
|
|
||||||
, which
|
|
||||||
, imagemagick
|
|
||||||
, zopfli
|
|
||||||
, buildPackages
|
|
||||||
, variants ? [ ]
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
notoLongDescription = ''
|
|
||||||
When text is rendered by a computer, sometimes characters are
|
|
||||||
displayed as “tofu”. They are little boxes to indicate your device
|
|
||||||
doesn’t have a font to display the text.
|
|
||||||
|
|
||||||
Google has been developing a font family called Noto, which aims to
|
|
||||||
support all languages with a harmonious look and feel. Noto is
|
|
||||||
Google’s answer to tofu. The name noto is to convey the idea that
|
|
||||||
Google’s goal is to see “no more tofu”. Noto has multiple styles and
|
|
||||||
weights, and freely available to all.
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
mkNoto =
|
|
||||||
{ pname
|
|
||||||
, variants ? [ ]
|
|
||||||
, longDescription ? notoLongDescription
|
|
||||||
}:
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
|
||||||
inherit pname;
|
|
||||||
version = "23.11.1";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "notofonts";
|
|
||||||
repo = "notofonts.github.io";
|
|
||||||
rev = "noto-monthly-release-${version}";
|
|
||||||
hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
_variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
# We check availability in order of variable -> otf -> ttf
|
|
||||||
# unhinted -- the hinted versions use autohint
|
|
||||||
# maintaining maximum coverage.
|
|
||||||
#
|
|
||||||
# We have a mix of otf and ttf fonts
|
|
||||||
local out_font=$out/share/fonts/noto
|
|
||||||
'' + (if _variants == [ ] then ''
|
|
||||||
for folder in $(ls -d fonts/*/); do
|
|
||||||
if [[ -d "$folder"unhinted/variable-ttf ]]; then
|
|
||||||
install -m444 -Dt $out_font "$folder"unhinted/variable-ttf/*.ttf
|
|
||||||
elif [[ -d "$folder"unhinted/otf ]]; then
|
|
||||||
install -m444 -Dt $out_font "$folder"unhinted/otf/*.otf
|
|
||||||
else
|
|
||||||
install -m444 -Dt $out_font "$folder"unhinted/ttf/*.ttf
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'' else ''
|
|
||||||
for variant in $_variants; do
|
|
||||||
if [[ -d fonts/"$variant"/unhinted/variable-ttf ]]; then
|
|
||||||
install -m444 -Dt $out_font fonts/"$variant"/unhinted/variable-ttf/*.ttf
|
|
||||||
elif [[ -d fonts/"$variant"/unhinted/otf ]]; then
|
|
||||||
install -m444 -Dt $out_font fonts/"$variant"/unhinted/otf/*.otf
|
|
||||||
else
|
|
||||||
install -m444 -Dt $out_font fonts/"$variant"/unhinted/ttf/*.ttf
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'');
|
|
||||||
|
|
||||||
passthru.updateScript = gitUpdater {
|
|
||||||
rev-prefix = "noto-monthly-release-";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Beautiful and free fonts for many languages";
|
|
||||||
homepage = "https://www.google.com/get/noto/";
|
|
||||||
inherit longDescription;
|
|
||||||
license = licenses.ofl;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ mathnerd314 emily jopejoe1 ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
mkNotoCJK = { typeface, version, sha256 }:
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "noto-fonts-cjk-${lib.toLower typeface}";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "googlefonts";
|
|
||||||
repo = "noto-cjk";
|
|
||||||
rev = "${typeface}${version}";
|
|
||||||
inherit sha256;
|
|
||||||
sparseCheckout = [ "${typeface}/Variable/OTC" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.tests.noto-fonts = nixosTests.noto-fonts;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Beautiful and free fonts for CJK languages";
|
|
||||||
homepage = "https://www.google.com/get/noto/help/cjk/";
|
|
||||||
longDescription = ''
|
|
||||||
Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as
|
|
||||||
an intermediate style between the modern and traditional. It is
|
|
||||||
intended to be a multi-purpose digital font for user interface
|
|
||||||
designs, digital content, reading on laptops, mobile devices, and
|
|
||||||
electronic books. Noto ${typeface} CJK comprehensively covers
|
|
||||||
Simplified Chinese, Traditional Chinese, Japanese, and Korean in a
|
|
||||||
unified font family. It supports regional variants of ideographic
|
|
||||||
characters for each of the four languages. In addition, it supports
|
|
||||||
Japanese kana, vertical forms, and variant characters (itaiji); it
|
|
||||||
supports Korean hangeul — both contemporary and archaic.
|
|
||||||
'';
|
|
||||||
license = licenses.ofl;
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ mathnerd314 emily ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts = mkNoto {
|
|
||||||
pname = "noto-fonts";
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-lgc-plus = mkNoto {
|
|
||||||
pname = "noto-fonts-lgc-plus";
|
|
||||||
variants = [
|
|
||||||
"Noto Sans"
|
|
||||||
"Noto Serif"
|
|
||||||
"Noto Sans Mono"
|
|
||||||
"Noto Music"
|
|
||||||
"Noto Sans Symbols"
|
|
||||||
"Noto Sans Symbols 2"
|
|
||||||
"Noto Sans Math"
|
|
||||||
];
|
|
||||||
longDescription = ''
|
|
||||||
This package provides the Noto Fonts, but only for latin, greek
|
|
||||||
and cyrillic scripts, as well as some extra fonts. To create a
|
|
||||||
custom Noto package with custom variants, see the `mkNoto`
|
|
||||||
helper function.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-cjk-sans = mkNotoCJK {
|
|
||||||
typeface = "Sans";
|
|
||||||
version = "2.004";
|
|
||||||
sha256 = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-cjk-serif = mkNotoCJK {
|
|
||||||
typeface = "Serif";
|
|
||||||
version = "2.002";
|
|
||||||
sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s=";
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-color-emoji =
|
|
||||||
let
|
|
||||||
version = "2.042";
|
|
||||||
emojiPythonEnv =
|
|
||||||
buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]);
|
|
||||||
in
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "noto-fonts-emoji";
|
|
||||||
inherit version;
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "googlefonts";
|
|
||||||
repo = "noto-emoji";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-otJQMXrBIPrxD1vCdgcrZ2h1a9XAMbqEBFumjz1XJ54=";
|
|
||||||
};
|
|
||||||
|
|
||||||
depsBuildBuild = [
|
|
||||||
buildPackages.stdenv.cc
|
|
||||||
pkg-config
|
|
||||||
cairo
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
imagemagick
|
|
||||||
zopfli
|
|
||||||
pngquant
|
|
||||||
which
|
|
||||||
emojiPythonEnv
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
patchShebangs *.py
|
|
||||||
patchShebangs third_party/color_emoji/*.py
|
|
||||||
# remove check for virtualenv, since we handle
|
|
||||||
# python requirements using python.withPackages
|
|
||||||
sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile
|
|
||||||
|
|
||||||
# Make the build verbose so it won't get culled by Hydra thinking that
|
|
||||||
# it somehow got stuck doing nothing.
|
|
||||||
sed -i 's;\t@;\t;' Makefile
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
mkdir -p $out/share/fonts/noto
|
|
||||||
cp NotoColorEmoji.ttf $out/share/fonts/noto
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Color emoji font";
|
|
||||||
homepage = "https://github.com/googlefonts/noto-emoji";
|
|
||||||
license = with licenses; [ ofl asl20 ];
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ mathnerd314 sternenseemann ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-monochrome-emoji =
|
|
||||||
# Metadata fetched from
|
|
||||||
# https://www.googleapis.com/webfonts/v1/webfonts?key=${GOOGLE_FONTS_TOKEN}&family=Noto+Emoji
|
|
||||||
let metadata = with builtins; head (fromJSON (readFile ./noto-emoji.json)).items;
|
|
||||||
urlHashes = with builtins; fromJSON (readFile ./noto-emoji.hashes.json);
|
|
||||||
|
|
||||||
in
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "noto-fonts-monochrome-emoji";
|
|
||||||
version = "${lib.removePrefix "v" metadata.version}.${metadata.lastModified}";
|
|
||||||
preferLocalBuild = true;
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
srcs = let
|
|
||||||
weightNames = {
|
|
||||||
"300" = "Light";
|
|
||||||
regular = "Regular";
|
|
||||||
"500" = "Medium";
|
|
||||||
"600" = "SemiBold";
|
|
||||||
"700" = "Bold";
|
|
||||||
};
|
|
||||||
in lib.mapAttrsToList
|
|
||||||
(variant: url: fetchurl { name = "NotoEmoji-${weightNames.${variant}}.ttf";
|
|
||||||
hash = urlHashes.${url};
|
|
||||||
inherit url; } )
|
|
||||||
metadata.files;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
for src in $srcs; do
|
|
||||||
install -D $src $out/share/fonts/noto/$(stripHash $src)
|
|
||||||
done
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Monochrome emoji font";
|
|
||||||
homepage = "https://fonts.google.com/noto/specimen/Noto+Emoji";
|
|
||||||
license = [ licenses.ofl ];
|
|
||||||
maintainers = [ maintainers.nicoo ];
|
|
||||||
|
|
||||||
platforms = platforms.all;
|
|
||||||
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
noto-fonts-emoji-blob-bin =
|
|
||||||
let
|
|
||||||
pname = "noto-fonts-emoji-blob-bin";
|
|
||||||
version = "15.0";
|
|
||||||
in
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
inherit pname version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf";
|
|
||||||
hash = "sha256-3MPWZ1A2ups171dNIiFTJ3C1vZiGy6I8ZF70aUfrePk=";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Noto Emoji with extended Blob support";
|
|
||||||
homepage = "https://github.com/C1710/blobmoji";
|
|
||||||
license = with licenses; [ ofl asl20 ];
|
|
||||||
platforms = platforms.all;
|
|
||||||
maintainers = with maintainers; [ rileyinman jk ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -27,12 +27,29 @@ lib.makeScope newScope (self: {
|
|||||||
"https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}";
|
"https://code.call-cc.org/cgi-bin/gitweb.cgi?p=eggs-5-latest.git;a=tree;f=${pname}/${version}";
|
||||||
meta.description = synopsis;
|
meta.description = synopsis;
|
||||||
meta.license = (lib.licenses // {
|
meta.license = (lib.licenses // {
|
||||||
|
"agpl" = lib.licenses.agpl3Only;
|
||||||
|
"artistic" = lib.licenses.artistic2;
|
||||||
|
"bsd" = lib.licenses.bsd3;
|
||||||
"bsd-1-clause" = lib.licenses.bsd1;
|
"bsd-1-clause" = lib.licenses.bsd1;
|
||||||
"bsd-2-clause" = lib.licenses.bsd2;
|
"bsd-2-clause" = lib.licenses.bsd2;
|
||||||
"bsd-3-clause" = lib.licenses.bsd3;
|
"bsd-3-clause" = lib.licenses.bsd3;
|
||||||
|
"gpl" = lib.licenses.gpl3Only;
|
||||||
|
"gpl-2" = lib.licenses.gpl2Only;
|
||||||
|
"gplv2" = lib.licenses.gpl2Only;
|
||||||
|
"gpl-3" = lib.licenses.gpl3Only;
|
||||||
|
"gpl-3.0" = lib.licenses.gpl3Only;
|
||||||
|
"gplv3" = lib.licenses.gpl3Only;
|
||||||
|
"lgpl" = lib.licenses.lgpl3Only;
|
||||||
|
"lgpl-2" = lib.licenses.lgpl2Only;
|
||||||
"lgpl-2.0+" = lib.licenses.lgpl2Plus;
|
"lgpl-2.0+" = lib.licenses.lgpl2Plus;
|
||||||
|
"lgpl-2.1" = lib.licenses.lgpl21Only;
|
||||||
"lgpl-2.1-or-later" = lib.licenses.lgpl21Plus;
|
"lgpl-2.1-or-later" = lib.licenses.lgpl21Plus;
|
||||||
|
"lgpl-3" = lib.licenses.lgpl3Only;
|
||||||
|
"lgplv3" = lib.licenses.lgpl3Only;
|
||||||
"public-domain" = lib.licenses.publicDomain;
|
"public-domain" = lib.licenses.publicDomain;
|
||||||
|
"srfi" = lib.licenses.bsd3;
|
||||||
|
"unicode" = lib.licenses.ucd;
|
||||||
|
"zlib-acknowledgement" = lib.licenses.zlib;
|
||||||
}).${license} or license;
|
}).${license} or license;
|
||||||
})
|
})
|
||||||
(lib.importTOML ./deps.toml))));
|
(lib.importTOML ./deps.toml))));
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001
|
From 86fc9ce2b381748813b372f7e86909be6f955cbd Mon Sep 17 00:00:00 2001
|
||||||
From: Yureka <yuka@yuka.dev>
|
From: Yureka <yuka@yuka.dev>
|
||||||
Date: Sat, 7 Aug 2021 09:16:46 +0200
|
Date: Sat, 7 Aug 2021 09:16:46 +0200
|
||||||
Subject: [PATCH] emulate clang 'sysroot + /include' logic
|
Subject: [PATCH] emulate clang 'sysroot + /include' logic
|
||||||
@ -16,27 +16,23 @@ in the include search order, right after the resource root.
|
|||||||
Hence usage of -idirafter. Clang also documents an -isystem-after flag
|
Hence usage of -idirafter. Clang also documents an -isystem-after flag
|
||||||
but it doesn't appear to work
|
but it doesn't appear to work
|
||||||
---
|
---
|
||||||
emcc.py | 7 ++++++-
|
emcc.py | 3 +++
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/emcc.py b/emcc.py
|
diff --git a/emcc.py b/emcc.py
|
||||||
index ba8d1b556..7d89644c5 100755
|
index 279f6d4d9..26e20e2cc 100644
|
||||||
--- a/emcc.py
|
--- a/emcc.py
|
||||||
+++ b/emcc.py
|
+++ b/emcc.py
|
||||||
@@ -883,7 +883,12 @@ def parse_s_args(args):
|
@@ -400,6 +400,9 @@ def get_cflags(user_args, is_cxx):
|
||||||
|
# We add these to the user's flags (newargs), but not when building .s or .S assembly files
|
||||||
|
cflags = get_clang_flags(user_args)
|
||||||
|
cflags.append('--sysroot=' + cache.get_sysroot(absolute=True))
|
||||||
|
+ cflags.append('-resource-dir=@resourceDir@')
|
||||||
|
+ cflags.append('-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'))
|
||||||
|
+ cflags.append('-iwithsysroot' + os.path.join('/include','c++','v1'))
|
||||||
|
|
||||||
|
if settings.EMSCRIPTEN_TRACING:
|
||||||
def emsdk_cflags(user_args):
|
cflags.append('-D__EMSCRIPTEN_TRACING__=1')
|
||||||
- cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)]
|
|
||||||
+ cflags = [
|
|
||||||
+ '--sysroot=' + cache.get_sysroot(absolute=True),
|
|
||||||
+ '-resource-dir=@resourceDir@',
|
|
||||||
+ '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'),
|
|
||||||
+ '-iwithsysroot' + os.path.join('/include','c++','v1')
|
|
||||||
+ ]
|
|
||||||
|
|
||||||
def array_contains_any_of(hay, needles):
|
|
||||||
for n in needles:
|
|
||||||
--
|
--
|
||||||
2.40.0
|
2.42.0
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "emscripten";
|
pname = "emscripten";
|
||||||
version = "3.1.47";
|
version = "3.1.50";
|
||||||
|
|
||||||
llvmEnv = symlinkJoin {
|
llvmEnv = symlinkJoin {
|
||||||
name = "emscripten-llvm-${version}";
|
name = "emscripten-llvm-${version}";
|
||||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "emscripten-core";
|
owner = "emscripten-core";
|
||||||
repo = "emscripten";
|
repo = "emscripten";
|
||||||
hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI=";
|
hash = "sha256-iFZF+DxGaq279QPPugoLhYmoXmyLPkmn1x4rBCkdW+I=";
|
||||||
rev = version;
|
rev = version;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./0001-emulate-clang-sysroot-include-logic.patch;
|
src = ./0001-emulate-clang-sysroot-include-logic.patch;
|
||||||
resourceDir = "${llvmEnv}/lib/clang/16/";
|
resourceDir = "${llvmEnv}/lib/clang/17/";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -51,6 +51,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
|
||||||
|
# emscripten 3.1.50 requires LLVM tip-of-tree instead of LLVM 17
|
||||||
|
sed -i -e "s/EXPECTED_LLVM_VERSION = 18/EXPECTED_LLVM_VERSION = 17.0/g" tools/shared.py
|
||||||
|
|
||||||
# fixes cmake support
|
# fixes cmake support
|
||||||
sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
|
sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
|
||||||
|
|
||||||
@ -106,7 +109,11 @@ stdenv.mkDerivation rec {
|
|||||||
# TODO: get library cache to build with both enabled and function exported
|
# TODO: get library cache to build with both enabled and function exported
|
||||||
$out/bin/emcc $LTO $BIND test.c
|
$out/bin/emcc $LTO $BIND test.c
|
||||||
$out/bin/emcc $LTO $BIND -s RELOCATABLE test.c
|
$out/bin/emcc $LTO $BIND -s RELOCATABLE test.c
|
||||||
$out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c
|
# starting with emscripten 3.1.48+,
|
||||||
|
# to use pthreads, _emscripten_check_mailbox must be exported
|
||||||
|
# (see https://github.com/emscripten-core/emscripten/pull/20604)
|
||||||
|
# TODO: get library cache to build with pthreads at all
|
||||||
|
# $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
@ -131,7 +138,7 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "https://github.com/emscripten-core/emscripten";
|
homepage = "https://github.com/emscripten-core/emscripten";
|
||||||
description = "An LLVM-to-JavaScript Compiler";
|
description = "An LLVM-to-JavaScript Compiler";
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ qknight matthewbauer raitobezarius ];
|
maintainers = with maintainers; [ qknight matthewbauer raitobezarius willcohen ];
|
||||||
license = licenses.ncsa;
|
license = licenses.ncsa;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -106,6 +106,9 @@ stdenv.mkDerivation rec {
|
|||||||
./install.sh
|
./install.sh
|
||||||
(cd $out/bin ; ln -s ../gerbil/bin/* .)
|
(cd $out/bin ; ln -s ../gerbil/bin/* .)
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
libgerbil="$(realpath "$out/gerbil/lib/libgerbil.so")"
|
||||||
|
install_name_tool -id "$libgerbil" "$libgerbil"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|||||||
@ -63,22 +63,7 @@ let
|
|||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc
|
ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc
|
||||||
'');
|
'');
|
||||||
# GraalVM 23.0.0+ (i.e.: JDK 21.0.0+) clean-up the environment inside darwin
|
binPath = lib.makeBinPath (lib.optionals useMusl [ musl-gcc ] ++ [ stdenv.cc ]);
|
||||||
# So we need to re-added some env vars to make everything work correctly again
|
|
||||||
darwin-cc = (runCommandCC "darwin-cc"
|
|
||||||
{
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
|
||||||
buildInputs = [ darwin.apple_sdk.frameworks.Foundation zlib ];
|
|
||||||
} ''
|
|
||||||
makeWrapper ${stdenv.cc}/bin/cc $out/bin/cc \
|
|
||||||
--prefix NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} : "$NIX_CFLAGS_COMPILE" \
|
|
||||||
--prefix NIX_LDFLAGS_${stdenv.cc.suffixSalt} : "$NIX_LDFLAGS"
|
|
||||||
'');
|
|
||||||
binPath = lib.makeBinPath (
|
|
||||||
lib.optionals stdenv.isDarwin [ darwin-cc ]
|
|
||||||
++ lib.optionals useMusl [ musl-gcc ]
|
|
||||||
++ [ stdenv.cc ]
|
|
||||||
);
|
|
||||||
|
|
||||||
runtimeLibraryPath = lib.makeLibraryPath
|
runtimeLibraryPath = lib.makeLibraryPath
|
||||||
([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]);
|
([ cups ] ++ lib.optionals gtkSupport [ cairo glib gtk3 ]);
|
||||||
@ -180,6 +165,14 @@ let
|
|||||||
echo "Testing GraalVM"
|
echo "Testing GraalVM"
|
||||||
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
|
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
|
||||||
|
|
||||||
|
# Workaround GraalVM issue where the builder does not have access to the
|
||||||
|
# environment variables since 21.0.0
|
||||||
|
# Only needed for native-image tests
|
||||||
|
# https://github.com/oracle/graal/pull/6095
|
||||||
|
# https://github.com/oracle/graal/pull/6095
|
||||||
|
# https://github.com/oracle/graal/issues/7502
|
||||||
|
export NATIVE_IMAGE_DEPRECATED_BUILDER_SANITATION="true";
|
||||||
|
|
||||||
echo "Ahead-Of-Time compilation"
|
echo "Ahead-Of-Time compilation"
|
||||||
$out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
|
$out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces HelloWorld
|
||||||
./helloworld | fgrep 'Hello World'
|
./helloworld | fgrep 'Hello World'
|
||||||
|
|||||||
190
pkgs/development/compilers/llvm/17/lld/add-table-base.patch
Normal file
190
pkgs/development/compilers/llvm/17/lld/add-table-base.patch
Normal file
@ -0,0 +1,190 @@
|
|||||||
|
From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sam Clegg <sbc@chromium.org>
|
||||||
|
Date: Fri, 25 Aug 2023 13:56:16 -0700
|
||||||
|
Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting
|
||||||
|
|
||||||
|
This is similar to `--global-base` but determines where to place the
|
||||||
|
table segments rather than that data segments.
|
||||||
|
|
||||||
|
See https://github.com/emscripten-core/emscripten/issues/20097
|
||||||
|
|
||||||
|
Differential Revision: https://reviews.llvm.org/D158892
|
||||||
|
---
|
||||||
|
test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++
|
||||||
|
wasm/Driver.cpp | 19 ++++++++--
|
||||||
|
wasm/Options.td | 5 ++-
|
||||||
|
wasm/Writer.cpp | 8 -----
|
||||||
|
4 files changed, 93 insertions(+), 11 deletions(-)
|
||||||
|
create mode 100644 test/wasm/table-base.s
|
||||||
|
|
||||||
|
diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000000..56fff414fd31d96
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/test/wasm/table-base.s
|
||||||
|
@@ -0,0 +1,72 @@
|
||||||
|
+# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o
|
||||||
|
+
|
||||||
|
+# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o
|
||||||
|
+# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT
|
||||||
|
+
|
||||||
|
+# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o
|
||||||
|
+# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100
|
||||||
|
+
|
||||||
|
+.globl _start
|
||||||
|
+_start:
|
||||||
|
+ .functype _start () -> ()
|
||||||
|
+ i32.const _start
|
||||||
|
+ drop
|
||||||
|
+ end_function
|
||||||
|
+
|
||||||
|
+# CHECK-DEFAULT: - Type: TABLE
|
||||||
|
+# CHECK-DEFAULT-NEXT: Tables:
|
||||||
|
+# CHECK-DEFAULT-NEXT: - Index: 0
|
||||||
|
+# CHECK-DEFAULT-NEXT: ElemType: FUNCREF
|
||||||
|
+# CHECK-DEFAULT-NEXT: Limits:
|
||||||
|
+# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ]
|
||||||
|
+# CHECK-DEFAULT-NEXT: Minimum: 0x2
|
||||||
|
+# CHECK-DEFAULT-NEXT: Maximum: 0x2
|
||||||
|
+
|
||||||
|
+# CHECK-DEFAULT: - Type: GLOBAL
|
||||||
|
+# CHECK-DEFAULT-NEXT: Globals:
|
||||||
|
+# CHECK-DEFAULT-NEXT: - Index: 0
|
||||||
|
+# CHECK-DEFAULT-NEXT: Type: I32
|
||||||
|
+# CHECK-DEFAULT-NEXT: Mutable: true
|
||||||
|
+# CHECK-DEFAULT-NEXT: InitExpr:
|
||||||
|
+# CHECK-DEFAULT-NEXT: Opcode: I32_CONST
|
||||||
|
+# CHECK-DEFAULT-NEXT: Value: 66560
|
||||||
|
+# CHECK-DEFAULT-NEXT: - Index: 1
|
||||||
|
+# CHECK-DEFAULT-NEXT: Type: I32
|
||||||
|
+# CHECK-DEFAULT-NEXT: Mutable: false
|
||||||
|
+# CHECK-DEFAULT-NEXT: InitExpr:
|
||||||
|
+# CHECK-DEFAULT-NEXT: Opcode: I32_CONST
|
||||||
|
+# CHECK-DEFAULT-NEXT: Value: 1
|
||||||
|
+
|
||||||
|
+# CHECK-DEFAULT: - Type: EXPORT
|
||||||
|
+# CHECK-DEFAULT: - Name: __table_base
|
||||||
|
+# CHECK-DEFAULT-NEXT: Kind: GLOBAL
|
||||||
|
+# CHECK-DEFAULT-NEXT: Index: 1
|
||||||
|
+
|
||||||
|
+# CHECK-100: - Type: TABLE
|
||||||
|
+# CHECK-100-NEXT: Tables:
|
||||||
|
+# CHECK-100-NEXT: - Index: 0
|
||||||
|
+# CHECK-100-NEXT: ElemType: FUNCREF
|
||||||
|
+# CHECK-100-NEXT: Limits:
|
||||||
|
+# CHECK-100-NEXT: Flags: [ HAS_MAX ]
|
||||||
|
+# CHECK-100-NEXT: Minimum: 0x65
|
||||||
|
+# CHECK-100-NEXT: Maximum: 0x65
|
||||||
|
+
|
||||||
|
+# CHECK-100: - Type: GLOBAL
|
||||||
|
+# CHECK-100-NEXT: Globals:
|
||||||
|
+# CHECK-100-NEXT: - Index: 0
|
||||||
|
+# CHECK-100-NEXT: Type: I32
|
||||||
|
+# CHECK-100-NEXT: Mutable: true
|
||||||
|
+# CHECK-100-NEXT: InitExpr:
|
||||||
|
+# CHECK-100-NEXT: Opcode: I32_CONST
|
||||||
|
+# CHECK-100-NEXT: Value: 66560
|
||||||
|
+# CHECK-100-NEXT: - Index: 1
|
||||||
|
+# CHECK-100-NEXT: Type: I32
|
||||||
|
+# CHECK-100-NEXT: Mutable: false
|
||||||
|
+# CHECK-100-NEXT: InitExpr:
|
||||||
|
+# CHECK-100-NEXT: Opcode: I32_CONST
|
||||||
|
+# CHECK-100-NEXT: Value: 100
|
||||||
|
+
|
||||||
|
+# CHECK-100: - Type: EXPORT
|
||||||
|
+# CHECK-100: - Name: __table_base
|
||||||
|
+# CHECK-100-NEXT: Kind: GLOBAL
|
||||||
|
+# CHECK-100-NEXT: Index: 1
|
||||||
|
diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp
|
||||||
|
index 84304881f5ca34e..c2f5f0185781f36 100644
|
||||||
|
--- a/wasm/Driver.cpp
|
||||||
|
+++ b/wasm/Driver.cpp
|
||||||
|
@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) {
|
||||||
|
|
||||||
|
config->initialMemory = args::getInteger(args, OPT_initial_memory, 0);
|
||||||
|
config->globalBase = args::getInteger(args, OPT_global_base, 0);
|
||||||
|
+ config->tableBase = args::getInteger(args, OPT_table_base, 0);
|
||||||
|
config->maxMemory = args::getInteger(args, OPT_max_memory, 0);
|
||||||
|
config->zStackSize =
|
||||||
|
args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize);
|
||||||
|
@@ -573,6 +574,17 @@ static void setConfigs() {
|
||||||
|
if (config->exportTable)
|
||||||
|
error("-shared/-pie is incompatible with --export-table");
|
||||||
|
config->importTable = true;
|
||||||
|
+ } else {
|
||||||
|
+ // Default table base. Defaults to 1, reserving 0 for the NULL function
|
||||||
|
+ // pointer.
|
||||||
|
+ if (!config->tableBase)
|
||||||
|
+ config->tableBase = 1;
|
||||||
|
+ // The default offset for static/global data, for when --global-base is
|
||||||
|
+ // not specified on the command line. The precise value of 1024 is
|
||||||
|
+ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that
|
||||||
|
+ // emscripten used prior to wasm-ld).
|
||||||
|
+ if (!config->globalBase && !config->relocatable && !config->stackFirst)
|
||||||
|
+ config->globalBase = 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->relocatable) {
|
||||||
|
@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) {
|
||||||
|
warn("-Bsymbolic is only meaningful when combined with -shared");
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (config->globalBase && config->isPic) {
|
||||||
|
- error("--global-base may not be used with -shared/-pie");
|
||||||
|
+ if (config->isPic) {
|
||||||
|
+ if (config->globalBase)
|
||||||
|
+ error("--global-base may not be used with -shared/-pie");
|
||||||
|
+ if (config->tableBase)
|
||||||
|
+ error("--table-base may not be used with -shared/-pie");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/wasm/Options.td b/wasm/Options.td
|
||||||
|
index 50417d2928e0a34..bb764396bf4df14 100644
|
||||||
|
--- a/wasm/Options.td
|
||||||
|
+++ b/wasm/Options.td
|
||||||
|
@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">,
|
||||||
|
HelpText<"Remove maximum size from function table, allowing table to grow">;
|
||||||
|
|
||||||
|
def global_base: JJ<"global-base=">,
|
||||||
|
- HelpText<"Where to start to place global data">;
|
||||||
|
+ HelpText<"Memory offset at which to place global data (Defaults to 1024)">;
|
||||||
|
|
||||||
|
def import_memory: FF<"import-memory">,
|
||||||
|
HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">;
|
||||||
|
@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">,
|
||||||
|
def stack_first: FF<"stack-first">,
|
||||||
|
HelpText<"Place stack at start of linear memory rather than after data">;
|
||||||
|
|
||||||
|
+def table_base: JJ<"table-base=">,
|
||||||
|
+ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">;
|
||||||
|
+
|
||||||
|
defm whole_archive: B<"whole-archive",
|
||||||
|
"Force load of all members in a static library",
|
||||||
|
"Do not force load of all members in a static library (default)">;
|
||||||
|
diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp
|
||||||
|
index f25d358dc5bae6f..0576bf2907e49c4 100644
|
||||||
|
--- a/wasm/Writer.cpp
|
||||||
|
+++ b/wasm/Writer.cpp
|
||||||
|
@@ -358,13 +358,6 @@ void Writer::layoutMemory() {
|
||||||
|
memoryPtr = config->globalBase;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
- if (!config->globalBase && !config->relocatable && !config->isPic) {
|
||||||
|
- // The default offset for static/global data, for when --global-base is
|
||||||
|
- // not specified on the command line. The precise value of 1024 is
|
||||||
|
- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that
|
||||||
|
- // emscripten used prior to wasm-ld).
|
||||||
|
- config->globalBase = 1024;
|
||||||
|
- }
|
||||||
|
memoryPtr = config->globalBase;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1685,7 +1678,6 @@ void Writer::run() {
|
||||||
|
// For PIC code the table base is assigned dynamically by the loader.
|
||||||
|
// For non-PIC, we start at 1 so that accessing table index 0 always traps.
|
||||||
|
if (!config->isPic) {
|
||||||
|
- config->tableBase = 1;
|
||||||
|
if (WasmSym::definedTableBase)
|
||||||
|
WasmSym::definedTableBase->setVA(config->tableBase);
|
||||||
|
if (WasmSym::definedTableBase32)
|
||||||
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./gnu-install-dirs.patch
|
./gnu-install-dirs.patch
|
||||||
|
./add-table-base.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ninja ];
|
nativeBuildInputs = [ cmake ninja ];
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import ./generic.nix {
|
import ./generic.nix {
|
||||||
major_version = "5";
|
major_version = "5";
|
||||||
minor_version = "1";
|
minor_version = "1";
|
||||||
patch_version = "0";
|
patch_version = "1";
|
||||||
sha256 = "sha256-bOjbOTqvwmTlr3McaPvrIJIKtq6E1b+TURllt0IzUas=";
|
sha256 = "sha256-jX6Yv9o76UBgK3o53PkSotL96reR7UDmKgmkzWfd7vE=";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,6 +6,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
|||||||
owner = "QuickChick";
|
owner = "QuickChick";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
|
defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [
|
||||||
|
{ cases = [ (range "8.15" "8.18") pred.true ]; out = "2.0.1"; }
|
||||||
{ cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; }
|
{ cases = [ (range "8.13" "8.17") pred.true ]; out = "1.6.5"; }
|
||||||
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
|
{ cases = [ "8.13" pred.true ]; out = "1.5.0"; }
|
||||||
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
|
{ cases = [ "8.12" pred.true ]; out = "1.4.0"; }
|
||||||
@ -17,6 +18,7 @@ let recent = lib.versions.isGe "8.7" coq.coq-version; in
|
|||||||
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
|
{ cases = [ "8.6" pred.true ]; out = "20171102"; }
|
||||||
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
|
{ cases = [ "8.5" pred.true ]; out = "20170512"; }
|
||||||
] null;
|
] null;
|
||||||
|
release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY=";
|
||||||
release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U=";
|
release."1.6.5".sha256 = "sha256-rcFyRDH8UbB9KVk10P5qjtPkWs04p78VNHkCq4mXr3U=";
|
||||||
release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";
|
release."1.6.4".sha256 = "sha256-C1060wPSU33yZAFLxGmZlAMXASnx98qz3oSLO8DO+mM=";
|
||||||
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
|
release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0";
|
||||||
|
|||||||
@ -258,7 +258,7 @@ backendStdenv.mkDerivation rec {
|
|||||||
rm $out/host-linux-x64/libstdc++.so*
|
rm $out/host-linux-x64/libstdc++.so*
|
||||||
''}
|
''}
|
||||||
${
|
${
|
||||||
lib.optionalString (lib.versionAtLeast version "11.8")
|
lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "12")
|
||||||
# error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so
|
# error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so
|
||||||
# we only ship libtiff.so.6, so let's use qt plugins built by Nix.
|
# we only ship libtiff.so.6, so let's use qt plugins built by Nix.
|
||||||
# TODO: don't copy, come up with a symlink-based "merge"
|
# TODO: don't copy, come up with a symlink-based "merge"
|
||||||
@ -266,6 +266,21 @@ backendStdenv.mkDerivation rec {
|
|||||||
rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP
|
rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP
|
||||||
''
|
''
|
||||||
}
|
}
|
||||||
|
${
|
||||||
|
lib.optionalString (lib.versionAtLeast version "12")
|
||||||
|
# Use Qt plugins built by Nix.
|
||||||
|
''
|
||||||
|
for qtlib in $out/host-linux-x64/Plugins/*/libq*.so; do
|
||||||
|
qtdir=$(basename $(dirname $qtlib))
|
||||||
|
filename=$(basename $qtlib)
|
||||||
|
for qtpkgdir in ${lib.concatMapStringsSep " " (x: qt6Packages.${x}) ["qtbase" "qtimageformats" "qtsvg" "qtwayland"]}; do
|
||||||
|
if [ -e $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename ]; then
|
||||||
|
ln -snf $qtpkgdir/lib/qt-6/plugins/$qtdir/$filename $qtlib
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
''
|
||||||
|
}
|
||||||
|
|
||||||
rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
|
rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
|
||||||
|
|
||||||
@ -336,6 +351,20 @@ backendStdenv.mkDerivation rec {
|
|||||||
wrapProgram "$out/bin/$b" \
|
wrapProgram "$out/bin/$b" \
|
||||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||||
done
|
done
|
||||||
|
${
|
||||||
|
lib.optionalString (lib.versionAtLeast version "12")
|
||||||
|
# Check we don't have any lurking vendored qt libraries that weren't
|
||||||
|
# replaced during installPhase
|
||||||
|
''
|
||||||
|
qtlibfiles=$(find $out -name "libq*.so" -type f)
|
||||||
|
if [ ! -z "$qtlibfiles" ]; then
|
||||||
|
echo "Found unexpected vendored Qt library files in $out" >&2
|
||||||
|
echo $qtlibfiles >&2
|
||||||
|
echo "These should be replaced with symlinks in installPhase" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
''
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# cuda-gdb doesn't run correctly when not using sandboxing, so
|
# cuda-gdb doesn't run correctly when not using sandboxing, so
|
||||||
|
|||||||
@ -59,18 +59,18 @@
|
|||||||
hash = "sha256-njl3qhudBuuGC1gqyJM2MGdaAkMCnCWb/sW7VpmGfSA=";
|
hash = "sha256-njl3qhudBuuGC1gqyJM2MGdaAkMCnCWb/sW7VpmGfSA=";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
version = "8.9.6.50";
|
version = "8.9.7.29";
|
||||||
minCudaVersion = "11.0";
|
minCudaVersion = "11.0";
|
||||||
maxCudaVersion = "11.8";
|
maxCudaVersion = "11.8";
|
||||||
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.6.50_cuda11-archive.tar.xz";
|
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz";
|
||||||
hash = "sha256-nlQWYSOJWci7o3wFGIuxrkoo8d3ddg4F2hU/qJySvBE=";
|
hash = "sha256-kcN8+0WPVBQZ6YUQ8TqvWXXAIyxhPhi3djhUkAdO6hc=";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
version = "8.9.6.50";
|
version = "8.9.7.29";
|
||||||
minCudaVersion = "12.0";
|
minCudaVersion = "12.0";
|
||||||
maxCudaVersion = "12.2";
|
maxCudaVersion = "12.2";
|
||||||
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.6.50_cuda12-archive.tar.xz";
|
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz";
|
||||||
hash = "sha256-L20O26RelmeynVfjohEADW3Vaj3VbFS2dTUadTKlXdg=";
|
hash = "sha256-6Yt8gAEHheXVygHuTOm1sMjHNYfqb4ZIvjTT+NHUe9E=";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
# x86_64
|
# x86_64
|
||||||
@ -101,7 +101,7 @@
|
|||||||
minCudaVersion = "10.2";
|
minCudaVersion = "10.2";
|
||||||
maxCudaVersion = "10.2";
|
maxCudaVersion = "10.2";
|
||||||
url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz";
|
url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz";
|
||||||
hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLN=";
|
hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA='";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
version = "8.0.5.39";
|
version = "8.0.5.39";
|
||||||
@ -244,18 +244,18 @@
|
|||||||
hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w=";
|
hash = "sha256-edd6dpx+cXWrx7XC7VxJQUjAYYqGQThyLIh/lcYjd3w=";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
version = "8.9.6.50";
|
version = "8.9.7.29";
|
||||||
minCudaVersion = "11.0";
|
minCudaVersion = "11.0";
|
||||||
maxCudaVersion = "11.8";
|
maxCudaVersion = "11.8";
|
||||||
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda11-archive.tar.xz";
|
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz";
|
||||||
hash = "sha256-oOLvVemfTNZH99HaqlqkUE/6M1ujAYbVwyiPL0ffBX4=";
|
hash = "sha256-o+JQkCjOzaARfOWg9CEGNG6C6G05D0u5R1r8l2x3QC4=";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
version = "8.9.6.50";
|
version = "8.9.7.29";
|
||||||
minCudaVersion = "12.0";
|
minCudaVersion = "12.0";
|
||||||
maxCudaVersion = "12.2";
|
maxCudaVersion = "12.2";
|
||||||
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz";
|
url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz";
|
||||||
hash = "sha256-FyIlnblSZbs4E0OKWhxuzZed6JrkU2YDkEBC4STTAtU=";
|
hash = "sha256-R1MzYlx+QqevPKCy91BqEG4wyTsaoAgc2cE++24h47s=";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@ -170,13 +170,15 @@ backendStdenv.mkDerivation (
|
|||||||
''
|
''
|
||||||
# Handle the existence of libPath, which requires us to re-arrange the lib directory
|
# Handle the existence of libPath, which requires us to re-arrange the lib directory
|
||||||
+ strings.optionalString (libPath != null) ''
|
+ strings.optionalString (libPath != null) ''
|
||||||
if [[ ! -d "${libPath}" ]] ; then
|
full_lib_path="lib/${libPath}"
|
||||||
echo "${finalAttrs.pname}: ${libPath} does not exist, only found:" >&2
|
if [[ ! -d "$full_lib_path" ]] ; then
|
||||||
find "$(dirname ${libPath})"/ -maxdepth 1 >&2
|
echo "${finalAttrs.pname}: '$full_lib_path' does not exist, only found:" >&2
|
||||||
|
find lib/ -mindepth 1 -maxdepth 1 >&2
|
||||||
echo "This release might not support your CUDA version" >&2
|
echo "This release might not support your CUDA version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
mv "lib/${libPath}" lib_new
|
echo "Making libPath '$full_lib_path' the root of lib" >&2
|
||||||
|
mv "$full_lib_path" lib_new
|
||||||
rm -r lib
|
rm -r lib
|
||||||
mv lib_new lib
|
mv lib_new lib
|
||||||
''
|
''
|
||||||
@ -187,6 +189,9 @@ backendStdenv.mkDerivation (
|
|||||||
''
|
''
|
||||||
# Move the outputs into their respective outputs.
|
# Move the outputs into their respective outputs.
|
||||||
+ strings.concatMapStringsSep "\n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs)
|
+ strings.concatMapStringsSep "\n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs)
|
||||||
|
# Add a newline to the end of the installPhase, so that the post-install hook doesn't
|
||||||
|
# get concatenated with the last moveToOutput command.
|
||||||
|
+ "\n"
|
||||||
# Post-install hook
|
# Post-install hook
|
||||||
+ ''
|
+ ''
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
|
|||||||
@ -119,7 +119,6 @@ self: super: {
|
|||||||
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
|
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
|
||||||
newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2";
|
newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2";
|
||||||
|
|
||||||
cborg-json = jailbreakForCurrentVersion super.cborg-json "0.2.5.0";
|
|
||||||
serialise = jailbreakForCurrentVersion super.serialise "0.2.6.0";
|
serialise = jailbreakForCurrentVersion super.serialise "0.2.6.0";
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|||||||
@ -31,8 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
mainProgram = "iwasm";
|
mainProgram = "iwasm";
|
||||||
maintainers = with maintainers; [ ereslibre ];
|
maintainers = with maintainers; [ ereslibre ];
|
||||||
# TODO (ereslibre): this derivation should be improved to support
|
platforms = platforms.unix;
|
||||||
# more platforms.
|
|
||||||
broken = !stdenv.isLinux;
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|||||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||||||
enableParallelBuilds = true;
|
enableParallelBuilds = true;
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
inherit (python3.pkgs) grpcio-status grpcio-tools;
|
inherit (python3.pkgs) grpcio-status grpcio-tools jaxlib;
|
||||||
inherit arrow-cpp;
|
inherit arrow-cpp;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -7,42 +7,32 @@
|
|||||||
, libjpeg
|
, libjpeg
|
||||||
, libGL
|
, libGL
|
||||||
, libX11
|
, libX11
|
||||||
, withTouchSupport ? false
|
|
||||||
, libXi
|
, libXi
|
||||||
, libXext
|
, libXext
|
||||||
, Cocoa
|
, Cocoa
|
||||||
, Kernel
|
, Kernel
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "irrlichtmt";
|
pname = "irrlichtmt";
|
||||||
version = "1.9.0mt10";
|
version = "1.9.0mt13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "minetest";
|
owner = "minetest";
|
||||||
repo = "irrlicht";
|
repo = "irrlicht";
|
||||||
rev = version;
|
rev = finalAttrs.version;
|
||||||
sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g=";
|
hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
];
|
];
|
||||||
|
|
||||||
# https://github.com/minetest/minetest/pull/10729
|
|
||||||
postPatch = lib.optionalString (!withTouchSupport) ''
|
|
||||||
sed -i '1i #define NO_IRR_LINUX_X11_XINPUT2_' include/IrrCompileConfig.h
|
|
||||||
|
|
||||||
# HACK: Fix mistake in build script
|
|
||||||
sed -i '/''${X11_Xi_LIB}/d' source/Irrlicht/CMakeLists.txt
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
zlib
|
zlib
|
||||||
libpng
|
libpng
|
||||||
libjpeg
|
libjpeg
|
||||||
libGL
|
libGL
|
||||||
libX11
|
libX11
|
||||||
] ++ lib.optionals withTouchSupport [
|
|
||||||
libXi
|
libXi
|
||||||
libXext
|
libXext
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
@ -58,4 +48,4 @@ stdenv.mkDerivation rec {
|
|||||||
maintainers = with lib.maintainers; [ DeeUnderscore ];
|
maintainers = with lib.maintainers; [ DeeUnderscore ];
|
||||||
description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++";
|
description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user