mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 07:15:54 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
688991ba84
@ -6,29 +6,313 @@
|
||||
|
||||
"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.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.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.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.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.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.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.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.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.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.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.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.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",
|
||||
"systemd-user.conf(5)": "https://www.freedesktop.org/software/systemd/man/systemd-user.conf.html",
|
||||
"sysupdate.d(5)": "https://www.freedesktop.org/software/systemd/man/sysupdate.d.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.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",
|
||||
"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",
|
||||
"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-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"
|
||||
}
|
||||
|
||||
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
|
||||
control-groups.chapter.md
|
||||
logging.chapter.md
|
||||
system-state.chapter.md
|
||||
cleaning-store.chapter.md
|
||||
containers.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.
|
||||
@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
services.telegraf.extraConfig = {
|
||||
agent.interval = "1s";
|
||||
agent.flush_interval = "1s";
|
||||
inputs.procstat = {};
|
||||
inputs.exec = {
|
||||
commands = [
|
||||
"${pkgs.runtimeShell} -c 'echo $SECRET,tag=a i=42i'"
|
||||
|
||||
@ -28,8 +28,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
# `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata
|
||||
@ -203,6 +201,7 @@ rec {
|
||||
--replace-needed libcrypt.so.1 libcrypt.so
|
||||
|
||||
for dir in lib/ReSharperHost/linux-*; do
|
||||
rm -rf $dir/dotnet
|
||||
ln -s ${dotnet-sdk_7} $dir/dotnet
|
||||
done
|
||||
)
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gum";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hJuFfdUeUUIjTBRtUo2x24BDuMPPkkReGLFDZSHR9pA=";
|
||||
hash = "sha256-NgMEgSfHVLCEKZ3MmNV571ySMUD8wj+kq5EccGrxtZc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tEeP8i2I9/Q4tuswkeV1S3jpc7saLxtzzLQxcPUh1sM=";
|
||||
vendorHash = "sha256-fmc6nbS/Xmn/YRwToRH7EhP4SFRMf8hjZ/rLtaP/USo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.10.15";
|
||||
version = "1.10.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
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
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -2,5 +2,5 @@
|
||||
signal-desktop = if hostPlatform.system == "aarch64-linux"
|
||||
then callPackage ./signal-desktop-aarch64.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
|
||||
#!nix-shell -i bash -p bash nix-update curl coreutils
|
||||
#!nix-shell -i bash -p bash nix-update curl coreutils jq
|
||||
|
||||
set -ex
|
||||
|
||||
@ -18,7 +18,7 @@ signal-desktop)
|
||||
echo "Updating signal-desktop for x86_64-linux"
|
||||
nix-update --version "$latestVersion" \
|
||||
--system x86_64-linux \
|
||||
--override-filename "$SCRIPT_DIR/signal-desktop.nix"
|
||||
--override-filename "$SCRIPT_DIR/signal-desktop.nix" \
|
||||
signal-desktop
|
||||
|
||||
echo "Updating signal-desktop for aarch64-linux"
|
||||
|
||||
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
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
, e2fsprogs
|
||||
, systemd
|
||||
, coreutils
|
||||
, pkg-config
|
||||
@ -9,17 +8,18 @@
|
||||
, fontconfig
|
||||
, gtk3
|
||||
, libappindicator
|
||||
, libGL
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asusctl";
|
||||
version = "4.7.2";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "asusctl";
|
||||
rev = version;
|
||||
hash = "sha256-q4V0Cn6kZeyIMGxu/blVi/Ot8LIcv+GlZhpkTQNTjRU=";
|
||||
hash = "sha256-ZdPSUXchQ19awvlNFVih38p6AU7KQ2RttUnm8zQnTWs=";
|
||||
};
|
||||
|
||||
cargoHash = "";
|
||||
@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec {
|
||||
substituteInPlace $file --replace /usr/share $out/share
|
||||
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.service \
|
||||
--replace /usr/bin/asusd $out/bin/asusd \
|
||||
@ -67,7 +65,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
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; {
|
||||
|
||||
@ -1,33 +1,22 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, systemd
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "supergfxctl";
|
||||
version = "5.1.1";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "asus-linux";
|
||||
repo = "supergfxctl";
|
||||
rev = version;
|
||||
hash = "sha256-AThaZ9dp5T/DtLPE6gZ9qgkw0xksiq+VCL9Y4G41voE=";
|
||||
hash = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg=";
|
||||
};
|
||||
|
||||
# fix reported version in Cargo.lock
|
||||
# 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=";
|
||||
cargoSha256 = "sha256-wPqCXbpSYXwsUi1mv9ZBSxdhDgDqsjKxnPzQcURlnDU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "ark-pixel-font";
|
||||
version = "2023.08.15";
|
||||
version = "2023.11.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TakWolf";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-Qaa3uuMCPrRG0wo2AGU0v+fonY1c/KuQYTGoyvITcio=";
|
||||
hash = "sha256-6a9wNmcXlEesPthpMt+GrWyO3x6WVtemVTXP8rbWmLk=";
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "5";
|
||||
minor_version = "1";
|
||||
patch_version = "0";
|
||||
sha256 = "sha256-bOjbOTqvwmTlr3McaPvrIJIKtq6E1b+TURllt0IzUas=";
|
||||
patch_version = "1";
|
||||
sha256 = "sha256-jX6Yv9o76UBgK3o53PkSotL96reR7UDmKgmkzWfd7vE=";
|
||||
}
|
||||
|
||||
@ -7,42 +7,32 @@
|
||||
, libjpeg
|
||||
, libGL
|
||||
, libX11
|
||||
, withTouchSupport ? false
|
||||
, libXi
|
||||
, libXext
|
||||
, Cocoa
|
||||
, Kernel
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "irrlichtmt";
|
||||
version = "1.9.0mt10";
|
||||
version = "1.9.0mt13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "irrlicht";
|
||||
rev = version;
|
||||
sha256 = "sha256-PA+gz77XkwxQ3TtubaT0ov9dsT7s3ZlrQxrOkD5ku3g=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
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 = [
|
||||
zlib
|
||||
libpng
|
||||
libjpeg
|
||||
libGL
|
||||
libX11
|
||||
] ++ lib.optionals withTouchSupport [
|
||||
libXi
|
||||
libXext
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
@ -58,4 +48,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ DeeUnderscore ];
|
||||
description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apfel";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scarrazza";
|
||||
repo = "apfel";
|
||||
rev = version;
|
||||
hash = "sha256-RXzHcLgitIk+6pINqcvpQv7QpDpAuFrOHKqjwZ0K5zI=";
|
||||
hash = "sha256-0Ix7KwEZUG/NmGJ380DVJbUA0PcoEJDlcGSc09l5Tbc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(v: " -change ${v.name}" + " ${lib.strings.makeLibraryPath [ v.value ]}/${builtins.baseNameOf v.name}")
|
||||
(with lib.attrsets; [
|
||||
(nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis.1.1.0.dylib" hiredis)
|
||||
(nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" openssl)
|
||||
(nameValuePair "/opt/homebrew/opt/hiredis/lib/libhiredis_ssl.dylib.1.1.0" hiredis)
|
||||
(nameValuePair "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib" openssl)
|
||||
(nameValuePair "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib" openssl)
|
||||
(nameValuePair "/opt/homebrew/opt/zstd/lib/libzstd.1.dylib" zstd)
|
||||
|
||||
37
pkgs/development/python-modules/asgi-logger/default.nix
Normal file
37
pkgs/development/python-modules/asgi-logger/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, asgiref
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asgi-logger";
|
||||
version = "0.1.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-son1ML9J0UMgJCpWdYD/yK0FO6VmfuzifSWpeCLToKo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
];
|
||||
|
||||
# tests are not in the pypi release, and there are no tags/release corresponding to the pypi releases in the github
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"asgi_logger"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Access logger for ASGI servers";
|
||||
homepage = "https://github.com/Kludex/asgi-logger";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/imia/default.nix
Normal file
39
pkgs/development/python-modules/imia/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, poetry-core
|
||||
, starlette
|
||||
, fastapi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imia";
|
||||
version = "0.5.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4CzevO7xgo8Hb1JHe/eGEtq/KCrJM0hV/7SRV2wmux8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
starlette
|
||||
fastapi
|
||||
];
|
||||
|
||||
# running the real tests would require sqlalchemy 1.4 and starsessions 1.x
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "imia" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An authentication library for Starlette and FastAPI";
|
||||
changelog = "https://github.com/alex-oleshkevich/imia/releases/tag/v${version}";
|
||||
homepage = "https://github.com/alex-oleshkevich/imia";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
46
pkgs/development/python-modules/smtpdfix/default.nix
Normal file
46
pkgs/development/python-modules/smtpdfix/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, setuptools
|
||||
, pytest
|
||||
, portpicker
|
||||
, cryptography
|
||||
, aiosmtpd
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smtpdfix";
|
||||
version = "0.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-882i0T6EySZ6jxOgoM11MU+ha41XfKjDDhUjeX7qvp4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiosmtpd
|
||||
cryptography
|
||||
portpicker
|
||||
pytest
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An SMTP server for use as a pytest fixture for testing";
|
||||
homepage = "https://github.com/bebleo/smtpdfix";
|
||||
changelog = "https://github.com/bebleo/smtpdfix/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
45
pkgs/development/python-modules/starlette-wtf/default.nix
Normal file
45
pkgs/development/python-modules/starlette-wtf/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, itsdangerous
|
||||
, python-multipart
|
||||
, starlette
|
||||
, wtforms
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "starlette-wtf";
|
||||
version = "0.4.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muicss";
|
||||
repo = "starlette-wtf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TSxcIgINRjQwiyhpGOEEpXJKcPlhFCxMQh4/GY1g1lw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
itsdangerous
|
||||
python-multipart
|
||||
starlette
|
||||
wtforms
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple tool for integrating Starlette and WTForms";
|
||||
changelog = "https://github.com/muicss/starlette-wtf/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/muicss/starlette-wtf";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, wtforms
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, lxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wtforms-bootstrap5";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LaunchPlatform";
|
||||
repo = "wtforms-bootstrap5";
|
||||
rev = version;
|
||||
hash = "sha256-TJJ3KOeC9JXnxK0YpnfeBNq1KHwaAZ4+t9CXbc+85Ro=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wtforms
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
lxml
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple library for rendering WTForms in HTML as Bootstrap 5 form controls";
|
||||
homepage = "https://github.com/LaunchPlatform/wtforms-bootstrap5";
|
||||
changelog = "https://github.com/LaunchPlatform/wtforms-bootstrap5/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,13 @@
|
||||
{ jdk8, jdk11, jdk17 }:
|
||||
{ jdk11, jdk17, jdk21 }:
|
||||
|
||||
rec {
|
||||
gen =
|
||||
|
||||
{ version, nativeVersion, sha256,
|
||||
{ version, nativeVersion, hash,
|
||||
|
||||
# The default JDK/JRE that will be used for derived Gradle packages.
|
||||
# A current LTS version of a JDK is a good choice.
|
||||
defaultJava ? jdk8,
|
||||
defaultJava,
|
||||
|
||||
# The platforms supported by this Gradle package.
|
||||
# Gradle Native-Platform ships some binaries that
|
||||
@ -41,7 +41,7 @@ rec {
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
url =
|
||||
"https://services.gradle.org/distributions/gradle-${version}-bin.zip";
|
||||
};
|
||||
@ -128,23 +128,23 @@ rec {
|
||||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_8 = gen {
|
||||
version = "8.4";
|
||||
version = "8.5";
|
||||
nativeVersion = "0.22-milestone-25";
|
||||
sha256 = "1bkjxw7i0lm17pdyyvka4xpl6z0cdj0izagphync6839i2pg66iy";
|
||||
defaultJava = jdk17;
|
||||
hash = "sha256-nZJnhwZqCBc56CAIWDOLSmnoN8OoIaM6yp2wndSkECY=";
|
||||
defaultJava = jdk21;
|
||||
};
|
||||
|
||||
gradle_7 = gen {
|
||||
version = "7.6.3";
|
||||
nativeVersion = "0.22-milestone-25";
|
||||
sha256 = "1b6gk0yiyvf86vigd05mz7ryqs8yrpswk9bmpwrnqcp45r3jw33l";
|
||||
hash = "sha256-dAwuRy7kMmwzv3WlyfXNHmns8/m1gPbiNshtHz2Yz6w=";
|
||||
defaultJava = jdk17;
|
||||
};
|
||||
|
||||
gradle_6 = gen {
|
||||
version = "6.9.4";
|
||||
nativeVersion = "0.22-milestone-20";
|
||||
sha256 = "16iqh4bn7ndch51h2lgkdqyyhnd91fdfjx55fa3z3scdacl0491y";
|
||||
hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo=";
|
||||
defaultJava = jdk11;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
"4.14.1" = "4.13-414";
|
||||
"5.0.0" = "4.12-500";
|
||||
"5.1.0" = "4.13-501";
|
||||
# "5.1.1" = "4.13.1-501";
|
||||
"5.1.1" = "4.13.1-501";
|
||||
};
|
||||
|
||||
hashes = {
|
||||
@ -34,6 +34,7 @@ let
|
||||
"4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8=";
|
||||
"4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM=";
|
||||
"4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE=";
|
||||
"4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0=";
|
||||
};
|
||||
|
||||
version = lib.getAttr ocaml.version merlinVersions;
|
||||
|
||||
@ -40,6 +40,8 @@ let
|
||||
version = "146";
|
||||
buildVersion = makeBuildVersion version;
|
||||
|
||||
gradleWithJdk = gradle.override { java = jdk; };
|
||||
|
||||
selectedGlew = if enableWayland then glew-egl else glew;
|
||||
|
||||
Mindustry = fetchFromGitHub {
|
||||
@ -114,7 +116,7 @@ let
|
||||
inherit version unpackPhase patches;
|
||||
postPatch = cleanupMindustrySrc;
|
||||
|
||||
nativeBuildInputs = [ gradle perl ];
|
||||
nativeBuildInputs = [ gradleWithJdk perl ];
|
||||
# Here we download dependencies for both the server and the client so
|
||||
# we only have to specify one hash for 'deps'. Deps can be garbage
|
||||
# collected after the build, so this is not really an issue.
|
||||
@ -149,7 +151,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gradle
|
||||
gradleWithJdk
|
||||
makeWrapper
|
||||
jdk
|
||||
] ++ lib.optionals enableClient [
|
||||
|
||||
@ -38,106 +38,101 @@
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, withTouchSupport ? false
|
||||
, buildClient ? true
|
||||
, buildServer ? true
|
||||
}:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "minetest";
|
||||
version = "5.8.0";
|
||||
|
||||
let
|
||||
boolToCMake = b: if b then "ON" else "OFF";
|
||||
|
||||
irrlichtmtInput = irrlichtmt.override { inherit withTouchSupport; };
|
||||
|
||||
generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let
|
||||
sources = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "minetest";
|
||||
inherit rev sha256;
|
||||
};
|
||||
data = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "minetest_game";
|
||||
rev = dataRev;
|
||||
sha256 = dataSha256;
|
||||
};
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
pname = "minetest";
|
||||
inherit version;
|
||||
|
||||
src = sources.src;
|
||||
|
||||
cmakeFlags = [
|
||||
"-G Ninja"
|
||||
"-DBUILD_CLIENT=${boolToCMake buildClient}"
|
||||
"-DBUILD_SERVER=${boolToCMake buildServer}"
|
||||
"-DENABLE_GETTEXT=1"
|
||||
"-DENABLE_SPATIAL=1"
|
||||
"-DENABLE_SYSTEM_JSONCPP=1"
|
||||
|
||||
# Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
|
||||
"-DCMAKE_INSTALL_BINDIR=bin"
|
||||
"-DCMAKE_INSTALL_DATADIR=share"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_DOCDIR=share/doc"
|
||||
"-DCMAKE_INSTALL_MANDIR=share/man"
|
||||
"-DCMAKE_INSTALL_LOCALEDIR=share/locale"
|
||||
|
||||
] ++ optionals buildServer [
|
||||
"-DENABLE_PROMETHEUS=1"
|
||||
] ++ optionals withTouchSupport [
|
||||
"-DENABLE_TOUCH=TRUE"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen graphviz ninja ];
|
||||
|
||||
buildInputs = [
|
||||
irrlichtmtInput jsoncpp gettext freetype sqlite curl bzip2 ncurses
|
||||
gmp libspatialindex
|
||||
] ++ [ (if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1) ] ++ [
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
libiconv OpenGL OpenAL Carbon Cocoa
|
||||
] ++ optionals buildClient [
|
||||
libpng libjpeg libGLU openal libogg libvorbis xorg.libX11
|
||||
] ++ optionals buildServer [
|
||||
leveldb postgresql hiredis prometheus-cpp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
mkdir -pv $out/share/minetest/games/minetest_game/
|
||||
cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
|
||||
patchShebangs $out
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/minetest.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://minetest.net/";
|
||||
description = "Infinite-world block sandbox game";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ pyrolagus fpletz fgaz ];
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "minetest";
|
||||
repo = "minetest";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Oct8nQORSH8PjYs+gHU9QrKObMfapjAlGvycj+AJnOs=";
|
||||
};
|
||||
|
||||
v5 = {
|
||||
version = "5.7.0";
|
||||
sha256 = "sha256-9AL6gTmy05yTeYfCq3EMK4gqpBWdHwvJ5Flpzj8hFAE=";
|
||||
dataSha256 = "sha256-wWgeO8513N5jQdWvZrq357fPpAU5ik06mgZraWCQawo=";
|
||||
};
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_CLIENT" buildClient)
|
||||
(lib.cmakeBool "BUILD_SERVER" buildServer)
|
||||
(lib.cmakeBool "ENABLE_PROMETHEUS" buildServer)
|
||||
(lib.cmakeBool "ENABLE_TOUCH" withTouchSupport)
|
||||
# Ensure we use system libraries
|
||||
(lib.cmakeBool "ENABLE_SYSTEM_GMP" true)
|
||||
(lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true)
|
||||
# Updates are handled by nix anyway
|
||||
(lib.cmakeBool "ENABLE_UPDATE_CHECKER" false)
|
||||
# ...but make it clear that this is a nix package
|
||||
(lib.cmakeFeature "VERSION_EXTRA" "NixOS")
|
||||
|
||||
mkClient = version: generic (version // { buildClient = true; buildServer = false; });
|
||||
mkServer = version: generic (version // { buildClient = false; buildServer = true; });
|
||||
in {
|
||||
minetestclient_5 = mkClient v5;
|
||||
minetestserver_5 = mkServer v5;
|
||||
}
|
||||
# Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/minetest")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man")
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale")
|
||||
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
graphviz
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
irrlichtmt
|
||||
jsoncpp
|
||||
gettext
|
||||
freetype
|
||||
sqlite
|
||||
curl
|
||||
bzip2
|
||||
ncurses
|
||||
gmp
|
||||
libspatialindex
|
||||
] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
OpenGL
|
||||
OpenAL
|
||||
Carbon
|
||||
Cocoa
|
||||
] ++ lib.optionals buildClient [
|
||||
libpng
|
||||
libjpeg
|
||||
libGLU
|
||||
openal
|
||||
libogg
|
||||
libvorbis
|
||||
xorg.libX11
|
||||
] ++ lib.optionals buildServer [
|
||||
leveldb
|
||||
postgresql
|
||||
hiredis
|
||||
prometheus-cpp
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
patchShebangs $out
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/minetest.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://minetest.net/";
|
||||
description = "Infinite-world block sandbox game";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ pyrolagus fpletz fgaz ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, git
|
||||
, postgresql
|
||||
, postgresqlTestHook
|
||||
@ -10,6 +12,7 @@
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
# sqlalchemy 1.4.x or 2.x are not supported
|
||||
sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.3.24";
|
||||
src = fetchPypi {
|
||||
@ -19,33 +22,12 @@ let
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
starlette = prev.starlette.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.20.4";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-QvzzEi+Zj+/OPixa1+Xtvw8Cz2hdZGqDoI1ARyavUIQ=";
|
||||
};
|
||||
nativeBuildInputs = with final; [
|
||||
setuptools
|
||||
];
|
||||
doCheck = false;
|
||||
});
|
||||
ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.17.1";
|
||||
src = fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
hash = "sha256-B98wl/NkNOyq99AKsVQem9TZ0meOnvg7IdWIEAI2vy8=";
|
||||
};
|
||||
nativeBuildInputs = with final; [
|
||||
setuptools
|
||||
];
|
||||
doCheck = false;
|
||||
});
|
||||
alembic = prev.alembic.overridePythonAttrs (lib.const {
|
||||
doCheck = false;
|
||||
});
|
||||
factory-boy = prev.factory-boy.overridePythonAttrs (lib.const {
|
||||
doCheck = false;
|
||||
});
|
||||
beautifultable = prev.beautifultable.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.8.0";
|
||||
src = fetchPypi {
|
||||
@ -61,25 +43,27 @@ in
|
||||
|
||||
py.pkgs.buildPythonPackage rec {
|
||||
pname = "irrd";
|
||||
version = "4.3.0.post1";
|
||||
format = "setuptools";
|
||||
version = "4.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hayfdcYAgIopfUiAR/AUWMuTzwpXvXuq6iPp9uhWN1M=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "irrdnet";
|
||||
repo = "irrd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vZSuBP44ZvN0mu2frcaQNZN/ilvKWIY9ETnrStzSnG0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./irrd-asgiref-3.8.0.diff
|
||||
# replace poetry dependency with poetry-core
|
||||
# https://github.com/irrdnet/irrd/pull/884
|
||||
(fetchpatch {
|
||||
url = "https://github.com/irrdnet/irrd/commit/4fb6e9b50d65729aff2d0a94c2e9b4e2daadea85.patch";
|
||||
hash = "sha256-DcE6VZfJkbHnPiEdYDpXea7S/8P0SmdvvJ42hywnpf0=";
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
poetry-core
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace psycopg2-binary psycopg2
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
@ -90,6 +74,7 @@ py.pkgs.buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
pytest-freezegun
|
||||
pytestCheckHook
|
||||
smtpdfix
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = with py.pkgs; [
|
||||
@ -123,6 +108,17 @@ py.pkgs.buildPythonPackage rec {
|
||||
ujson
|
||||
wheel
|
||||
websockets
|
||||
limits
|
||||
factory-boy
|
||||
webauthn
|
||||
wtforms
|
||||
imia
|
||||
starlette-wtf
|
||||
zxcvbn
|
||||
pyotp
|
||||
asgi-logger
|
||||
wtforms-bootstrap5
|
||||
email-validator
|
||||
] ++ py.pkgs.uvicorn.optional-dependencies.standard;
|
||||
|
||||
preCheck = ''
|
||||
@ -134,10 +130,17 @@ py.pkgs.buildPythonPackage rec {
|
||||
sleep 1
|
||||
done
|
||||
|
||||
export SMTPD_HOST=127.0.0.1
|
||||
export IRRD_DATABASE_URL="postgres:///$PGDATABASE"
|
||||
export IRRD_REDIS_URL="redis://localhost/1"
|
||||
'';
|
||||
|
||||
# required for test_object_writing_and_status_checking
|
||||
postgresqlTestSetupPost = ''
|
||||
echo "track_commit_timestamp=on" >> $PGDATA/postgresql.conf
|
||||
pg_ctl restart
|
||||
'';
|
||||
|
||||
postCheck = ''
|
||||
kill $REDIS_PID
|
||||
'';
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
diff --git a/irrd/server/graphql/schema_builder.py b/irrd/server/graphql/schema_builder.py
|
||||
index 65ddf5d..b3b385a 100644
|
||||
--- a/irrd/server/graphql/schema_builder.py
|
||||
+++ b/irrd/server/graphql/schema_builder.py
|
||||
@@ -31,32 +31,32 @@ def build_executable_schema():
|
||||
"""
|
||||
schema = SchemaGenerator()
|
||||
|
||||
- schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, False))
|
||||
- schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, False))
|
||||
+ schema.rpsl_object_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False))
|
||||
+ schema.rpsl_contact_union_type.set_type_resolver(sta(resolve_rpsl_object_type, thread_sensitive=False))
|
||||
|
||||
- schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, False))
|
||||
- schema.query_type.set_field("databaseStatus", sta(resolve_database_status, False))
|
||||
- schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, False))
|
||||
- schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, False))
|
||||
- schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, False))
|
||||
+ schema.query_type.set_field("rpslObjects", sta(resolve_rpsl_objects, thread_sensitive=False))
|
||||
+ schema.query_type.set_field("databaseStatus", sta(resolve_database_status, thread_sensitive=False))
|
||||
+ schema.query_type.set_field("asnPrefixes", sta(resolve_asn_prefixes, thread_sensitive=False))
|
||||
+ schema.query_type.set_field("asSetPrefixes", sta(resolve_as_set_prefixes, thread_sensitive=False))
|
||||
+ schema.query_type.set_field("recursiveSetMembers", sta(resolve_recursive_set_members, thread_sensitive=False))
|
||||
|
||||
- schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, False))
|
||||
- schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, False))
|
||||
+ schema.rpsl_object_type.set_field("mntByObjs", sta(resolve_rpsl_object_mnt_by_objs, thread_sensitive=False))
|
||||
+ schema.rpsl_object_type.set_field("journal", sta(resolve_rpsl_object_journal, thread_sensitive=False))
|
||||
for object_type in schema.object_types:
|
||||
if "adminCObjs" in schema.graphql_types[object_type.name]:
|
||||
- object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, False))
|
||||
+ object_type.set_field("adminCObjs", sta(resolve_rpsl_object_adminc_objs, thread_sensitive=False))
|
||||
for object_type in schema.object_types:
|
||||
if "techCObjs" in schema.graphql_types[object_type.name]:
|
||||
- object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, False))
|
||||
+ object_type.set_field("techCObjs", sta(resolve_rpsl_object_techc_objs, thread_sensitive=False))
|
||||
for object_type in schema.object_types:
|
||||
if "mbrsByRefObjs" in schema.graphql_types[object_type.name]:
|
||||
- object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, False))
|
||||
+ object_type.set_field("mbrsByRefObjs", sta(resolve_rpsl_object_members_by_ref_objs, thread_sensitive=False))
|
||||
for object_type in schema.object_types:
|
||||
if "memberOfObjs" in schema.graphql_types[object_type.name]:
|
||||
- object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, False))
|
||||
+ object_type.set_field("memberOfObjs", sta(resolve_rpsl_object_member_of_objs, thread_sensitive=False))
|
||||
for object_type in schema.object_types:
|
||||
if "membersObjs" in schema.graphql_types[object_type.name]:
|
||||
- object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, False))
|
||||
+ object_type.set_field("membersObjs", sta(resolve_rpsl_object_members_objs, thread_sensitive=False))
|
||||
|
||||
@schema.asn_scalar_type.value_parser
|
||||
def parse_asn_scalar(value):
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.28.5";
|
||||
version = "1.29.0";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@ -16,10 +16,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dmePzJ10VgzN6CxFAz7QloIsPULuTZH+Pjkd/kIQUmU=";
|
||||
hash = "sha256-I6fc2cjM9dFOKvUBcMA5Suvwe3oQw2kKswfkoSJZf5I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3buC6N/tHTf6FMEXU3+XlJVGntLe86Hx3eNpn7w0yMs=";
|
||||
vendorHash = "sha256-frLMaB+n2YYsdmh3C7xPmZXwm984mYBws9jUPNhfIaU=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "android-file-transfer";
|
||||
version = "4.2";
|
||||
version = "4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whoozle";
|
||||
repo = "android-file-transfer-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b";
|
||||
sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU=";
|
||||
};
|
||||
|
||||
patches = [ ./darwin-dont-vendor-dependencies.patch ];
|
||||
|
||||
36
pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch
Normal file
36
pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch
Normal file
@ -0,0 +1,36 @@
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index e5b7dbf..01cecf1 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -73,6 +73,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
|
||||
AC_LANG_PROGRAM([
|
||||
#include <objc/objc.h>
|
||||
#include <objc/Object.h>
|
||||
+ #include <stdio.h>
|
||||
], [
|
||||
Object *obj = @<:@Object alloc@:>@;
|
||||
puts(@<:@obj name@:>@);
|
||||
@@ -94,6 +95,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
|
||||
AC_LANG_PROGRAM([
|
||||
#include <objc/objc.h>
|
||||
#include <objc/Object.h>
|
||||
+ #include <stdio.h>
|
||||
], [
|
||||
Object *obj = @<:@Object alloc@:>@;
|
||||
puts(@<:@obj name@:>@);
|
||||
@@ -131,6 +133,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
|
||||
AC_LANG_PROGRAM([
|
||||
#include <objc/objc.h>
|
||||
#include <objc/objc-api.h>
|
||||
+ #include <stdio.h>
|
||||
], [
|
||||
id class = objc_lookUpClass("Object");
|
||||
id obj = @<:@class alloc@:>@;
|
||||
@@ -162,6 +165,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[
|
||||
#else
|
||||
#include <objc/objc-api.h>
|
||||
#endif
|
||||
+ #include <stdio.h>
|
||||
], [
|
||||
#ifdef __GNU_LIBOBJC_
|
||||
Class class = objc_lookUpClass("Object");
|
||||
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./auth-ldap-fix-conftest.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gnustep.base
|
||||
|
||||
@ -600,6 +600,8 @@ mapAliases ({
|
||||
miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08
|
||||
miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08
|
||||
mime-types = mailcap; # Added 2022-01-21
|
||||
minetestclient_5 = minetestclient; # Added 2023-12-11
|
||||
minetestserver_5 = minetestserver; # Added 2023-12-11
|
||||
minizip2 = pkgs.minizip-ng; # Added 2022-12-28
|
||||
mirage-im = throw "'mirage-im' has been removed, as it was broken and unmaintained"; # Added 2023-11-26
|
||||
monero = monero-cli; # Added 2021-11-28
|
||||
|
||||
@ -19322,7 +19322,7 @@ with pkgs;
|
||||
gqlint = callPackage ../development/tools/gqlint { };
|
||||
|
||||
gradle-packages = import ../development/tools/build-managers/gradle {
|
||||
inherit jdk8 jdk11 jdk17;
|
||||
inherit jdk11 jdk17 jdk21;
|
||||
};
|
||||
gradleGen = gradle-packages.gen;
|
||||
gradle_6 = callPackage gradle-packages.gradle_6 { };
|
||||
@ -38052,14 +38052,12 @@ with pkgs;
|
||||
|
||||
moon-buggy = callPackage ../games/moon-buggy { };
|
||||
|
||||
inherit (callPackages ../games/minetest {
|
||||
minetest = callPackage ../games/minetest {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
|
||||
})
|
||||
minetestclient_5 minetestserver_5;
|
||||
|
||||
minetest = minetestclient;
|
||||
minetestclient = minetestclient_5;
|
||||
minetestserver = minetestserver_5;
|
||||
};
|
||||
minetestclient = minetest.override { buildServer = false; };
|
||||
minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; };
|
||||
minetestserver = minetest.override { buildClient = false; };
|
||||
|
||||
mnemosyne = callPackage ../games/mnemosyne {
|
||||
python = python3;
|
||||
|
||||
@ -748,6 +748,8 @@ self: super: with self; {
|
||||
|
||||
asgi-csrf = callPackage ../development/python-modules/asgi-csrf { };
|
||||
|
||||
asgi-logger = callPackage ../development/python-modules/asgi-logger { };
|
||||
|
||||
asgineer = callPackage ../development/python-modules/asgineer { };
|
||||
|
||||
asgiref = callPackage ../development/python-modules/asgiref { };
|
||||
@ -5417,6 +5419,8 @@ self: super: with self; {
|
||||
|
||||
imgtool = callPackage ../development/python-modules/imgtool { };
|
||||
|
||||
imia = callPackage ../development/python-modules/imia { };
|
||||
|
||||
iminuit = callPackage ../development/python-modules/iminuit { };
|
||||
|
||||
immutabledict = callPackage ../development/python-modules/immutabledict { };
|
||||
@ -13242,6 +13246,8 @@ self: super: with self; {
|
||||
|
||||
smpp_pdu = callPackage ../development/python-modules/smpp.pdu { };
|
||||
|
||||
smtpdfix = callPackage ../development/python-modules/smtpdfix { };
|
||||
|
||||
snack = toPythonModule (pkgs.newt.override {
|
||||
inherit (self) python;
|
||||
});
|
||||
@ -13646,6 +13652,8 @@ self: super: with self; {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices;
|
||||
};
|
||||
|
||||
starlette-wtf = callPackage ../development/python-modules/starlette-wtf { };
|
||||
|
||||
starkbank-ecdsa = callPackage ../development/python-modules/starkbank-ecdsa { };
|
||||
|
||||
starline = callPackage ../development/python-modules/starline { };
|
||||
@ -15999,6 +16007,8 @@ self: super: with self; {
|
||||
|
||||
wtforms = callPackage ../development/python-modules/wtforms { };
|
||||
|
||||
wtforms-bootstrap5 = callPackage ../development/python-modules/wtforms-bootstrap5 { };
|
||||
|
||||
wtf-peewee = callPackage ../development/python-modules/wtf-peewee { };
|
||||
|
||||
wurlitzer = callPackage ../development/python-modules/wurlitzer { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user